Skip to content

Commit 7c1e8ab

Browse files
committed
Merge branch 'master' into codex/create-building.md-for-codename-one-o1r15v
2 parents faaaef0 + eb0a09a commit 7c1e8ab

File tree

45 files changed

+148
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+148
-173
lines changed

CodenameOne/src/com/codename1/facebook/ui/LikeButton.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
/**
3333
* Generic "Like" button that enables us to submit a like to facebook, to get the post id
34-
* required for the like functionality you will need to use a tool such as:
35-
* https://developers.facebook.com/tools/explorer/?method=GET&path=me%2Fposts
34+
* required for the like functionality you will need to use a tool such as:
35+
* <a href="https://developers.facebook.com/tools/explorer/?method=GET&amp;path=me%2Fposts">https://developers.facebook.com/tools/explorer/?method=GET&amp;path=me%2Fposts</a>
3636
* You can ask it to list your posts and then seek the correct id within the returned JSON
3737
*
3838
* @author Chen Fishbein

CodenameOne/src/com/codename1/io/JSONParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*
4848
* <p>
4949
* The sample below includes JSON from <a href="https://anapioficeandfire.com/">https://anapioficeandfire.com/</a>
50-
* generated by the query <a href="http://www.anapioficeandfire.com/api/characters?page=5&pageSize=3">http://www.anapioficeandfire.com/api/characters?page=5&pageSize=3</a>:
50+
* generated by the query <a href="http://www.anapioficeandfire.com/api/characters?page=5&amp;pageSize=3">http://www.anapioficeandfire.com/api/characters?page=5&amp;pageSize=3</a>:
5151
* </p>
5252
* <script src="https://gist.github.com/codenameone/f9fdacaac12583cd2eed.js"></script>
5353
* <img src="https://www.codenameone.com/img/developer-guide/json-parsing.png" alt="JSON Parsing Result">
@@ -548,7 +548,7 @@ public static void parse(Reader i, JSONParseCallback callback) throws IOExceptio
548548
* </p>
549549
* <p>
550550
* The sample below includes JSON from <a href="https://anapioficeandfire.com/">https://anapioficeandfire.com/</a>
551-
* generated by the query <a href="http://www.anapioficeandfire.com/api/characters?page=5&pageSize=3">http://www.anapioficeandfire.com/api/characters?page=5&pageSize=3</a>:
551+
* generated by the query <a href="http://www.anapioficeandfire.com/api/characters?page=5&amp;pageSize=3">http://www.anapioficeandfire.com/api/characters?page=5&amp;pageSize=3</a>:
552552
* </p>
553553
* <script src="https://gist.github.com/codenameone/f9fdacaac12583cd2eed.js"></script>
554554
* <img src="https://www.codenameone.com/img/developer-guide/json-parsing.png" alt="JSON Parsing Result">

CodenameOne/src/com/codename1/javascript/JavascriptContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ public void setAsync(String key, Object value) {
572572
/**
573573
* Calls the appropriate callback method given a URL that was received
574574
* from the NavigationCallback. It is set up to accept URLs of the
575-
* form cn1command:object.method?type1=value1&type2=value2&...&typen=valuen
575+
* form cn1command:object.method?type1=value1&amp;type2=value2&amp;...&amp;typen=valuen
576576
*
577577
* <p>This method parses the URL and converts all arguments (including the
578578
* object and method) into their associated Java representations, then

CodenameOne/src/com/codename1/l10n/DateFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* exposed.
3434
*
3535
* @author Eric Coolman
36-
* @see http://docs.oracle.com/javase/6/docs/api/java/text/DateFormat.html
36+
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/text/DateFormat.html">http://docs.oracle.com/javase/6/docs/api/java/text/DateFormat.html</a>
3737
*/
3838
public class DateFormat extends Format {
3939
/**

CodenameOne/src/com/codename1/l10n/Format.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* An abstract class for parsing and formatting localisation sensitive information, compatible with JDK 6.
2727
*
28-
* @see http://docs.oracle.com/javase/6/docs/api/java/text/Format.html
28+
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/text/Format.html">http://docs.oracle.com/javase/6/docs/api/java/text/Format.html</a>
2929
* @author Eric Coolman
3030
*/
3131
public abstract class Format implements Cloneable {

CodenameOne/src/com/codename1/payment/Purchase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* <p>In-app-purchase API's rely on managed server based products, other payment systems
4747
* use the manual approach. An application dealing with virtual goods must support both
4848
* since not all devices feature in-app-purchase API's. An application dealing with physical
49-
* goods & services must use the latter according to the TOS of current in-app-purchase
49+
* goods &amp; services must use the latter according to the TOS of current in-app-purchase
5050
* solutions.
5151
*
5252
* @author Shai Almog

CodenameOne/src/com/codename1/ui/animations/Motion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public static Motion createLinearMotion(int sourceValue, int destinationValue, i
227227

228228
/**
229229
* Creates a linear motion starting from source value all the way to destination value for a color value.
230-
* Unlike a regular linear motion a color linear motion is shifted based on channels where red, green & blue
230+
* Unlike a regular linear motion a color linear motion is shifted based on channels where red, green &amp; blue
231231
* get shifted separately.
232232
*
233233
* @param sourceValue the color from which we are starting

CodenameOne/src/com/codename1/ui/html/HTMLComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public void setParser(HTMLParser parser) {
464464

465465
/**
466466
* Adds the given symbol and code to the user defined char entities table.
467-
* Symbols do not need to include leading & and trailing ; - these will be trimmed if given as the symbol
467+
* Symbols do not need to include leading &amp; and trailing ; - these will be trimmed if given as the symbol
468468
*
469469
* @param symbol The symbol to add
470470
* @param code The symbol's code

CodenameOne/src/com/codename1/ui/html/HTMLParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class HTMLParser extends XMLParser {
4242

4343
/**
4444
* The list of empty tags (tags that naturally don't have any children).
45-
* This is used to enable empty tags to be closed also in a non-strict way (i.e. &lt;br&gt; instead of &lt;br&gt/;)
45+
* This is used to enable empty tags to be closed also in a non-strict way (i.e. &lt;br&gt; instead of &lt;br/&gt;)
4646
* some of these tags are not a part of the XHTML-MP 1.0 standard, but including them here allows a more smooth parsing if the document is not strictly XHTML-MP 1.0
4747
*/
4848
private static String[] EMPTY_TAGS = {"br","link","meta","base","area","basefont","col","frame","hr","img","input","isindex","param"};
@@ -113,7 +113,7 @@ protected Element createNewTextElement(String text) {
113113
* Overrides XMLParser.convertCharEntity to add in HTML char entities
114114
*
115115
* @param charEntity The char entity to convert
116-
* @return A string containing a single char, or the original char entity string (with & and ;) if the char entity couldn't be resolved
116+
* @return A string containing a single char, or the original char entity string (with &amp; and ;) if the char entity couldn't be resolved
117117
*/
118118
protected String convertCharEntity(String charEntity) {
119119
try {

CodenameOne/src/com/codename1/ui/html/HTMLUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ private HTMLUtils() {
8080
* Converts an XML char entity to the matching character or string.
8181
* This is a convenience method that uses convertCharEntity with false for lookupHTMLentities and a null userDefinedCharEntities
8282
*
83-
* @param charEntity The char entity to convert (Not including the & and ;)
84-
* @return A string containing a single char, or the original char entity string (with & and ;) if the char entity couldn't be resolved
83+
* @param charEntity The char entity to convert (Not including the &amp; and ;)
84+
* @return A string containing a single char, or the original char entity string (with &amp; and ;) if the char entity couldn't be resolved
8585
*/
8686
public static String convertXMLCharEntity(String charEntity) {
8787
return convertCharEntity(charEntity, false, null);
@@ -91,8 +91,8 @@ public static String convertXMLCharEntity(String charEntity) {
9191
* Converts an HTML char entity to the matching character or string.
9292
* This is a convenience method that uses convertCharEntity with true for lookupHTMLentities and a null userDefinedCharEntities
9393
*
94-
* @param charEntity The char entity to convert (Not including the & and ;)
95-
* @return A string containing a single char, or the original char entity string (with & and ;) if the char entity couldn't be resolved
94+
* @param charEntity The char entity to convert (Not including the &amp; and ;)
95+
* @return A string containing a single char, or the original char entity string (with &amp; and ;) if the char entity couldn't be resolved
9696
*/
9797
public static String convertHTMLCharEntity(String charEntity) {
9898
return convertCharEntity(charEntity, true, null);
@@ -103,10 +103,10 @@ public static String convertHTMLCharEntity(String charEntity) {
103103
* Converts a char entity to the matching character or string.
104104
* This handles both numbered and symbol char entities (The latter is done via getCharEntityCode)
105105
*
106-
* @param charEntity The char entity to convert (Not including the & and ;)
106+
* @param charEntity The char entity to convert (Not including the &amp; and ;)
107107
* @param lookupHTMLentities true to include the basic HTML named char entities (unicode 160-255), false otherwise
108108
* @param userDefinedCharEntities A hashtable containing (String,int) dentoing the char entity name and its unicode
109-
* @return A string containing a single char, or the original char entity string (with & and ;) if the char entity couldn't be resolved
109+
* @return A string containing a single char, or the original char entity string (with &amp; and ;) if the char entity couldn't be resolved
110110
*/
111111
public static String convertCharEntity(String charEntity,boolean lookupHTMLentities,Hashtable userDefinedCharEntities) {
112112
int charCode=-1;

0 commit comments

Comments
 (0)