Merge branch 'processing:master' into master

core/src/processing/core/PApplet.java

@@ -141,34 +141,26 @@ public class PApplet implements PConstants {
   public PGraphics g;
 
   /**
+   * System variable that stores the width of the computer screen. For
+   * example, if the current screen resolution is 1920x1080,
+   * <b>displayWidth</b> is 1920 and <b>displayHeight</b> is 1080.
    *
-   * System variable which stores the width of the computer screen. For
-   * example, if the current screen resolution is 1024x768,
-   * <b>displayWidth</b> is 1024 and <b>displayHeight</b> is 768. These
-   * dimensions are useful when exporting full-screen applications.
-   * <br /><br />
-   * To ensure that the sketch takes over the entire screen, use "Present"
-   * instead of "Run". Otherwise the window will still have a frame border
-   * around it and not be placed in the upper corner of the screen. On Mac OS
-   * X, the menu bar will remain present unless "Present" mode is used.
-   *
-   *
+   * @webref environment
+   * @webBrief Variable that stores the width of the computer screen
+   * @see PApplet#displayHeight
+   * @see PApplet#size(int, int)
    */
   public int displayWidth;
 
   /**
-   *
    * System variable that stores the height of the computer screen. For
-   * example, if the current screen resolution is 1024x768,
-   * <b>displayWidth</b> is 1024 and <b>displayHeight</b> is 768. These
-   * dimensions are useful when exporting full-screen applications.
-   * <br /><br />
-   * To ensure that the sketch takes over the entire screen, use "Present"
-   * instead of "Run". Otherwise the window will still have a frame border
-   * around it and not be placed in the upper corner of the screen. On Mac OS
-   * X, the menu bar will remain present unless "Present" mode is used.
-   *
+   * example, if the current screen resolution is 1920x1080,
+   * <b>displayWidth</b> is 1920 and <b>displayHeight</b> is 1080.
    *
+   * @webref environment
+   * @webBrief Variable that stores the height of the computer screen
+   * @see PApplet#displayWidth
+   * @see PApplet#size(int, int)
    */
   public int displayHeight;
 

core/src/processing/data/FloatDict.java

@@ -227,7 +227,12 @@ public class FloatDict {
     }
   }
 
-
+  /** 
+   * Return the internal array being used to store the keys.
+   * 
+   * @webref floatdict:method
+   * @webBrief Return the internal array being used to store the keys
+   */
   public Iterable<String> keys() {
     return new Iterable<String>() {
 

core/src/processing/data/IntDict.java

@@ -224,6 +224,12 @@ public class IntDict {
   }
 
 
+  /** 
+   * Return the internal array being used to store the keys.
+   * 
+   * @webref intdict:method
+   * @webBrief Return the internal array being used to store the keys
+   */
   public Iterable<String> keys() {
     return new Iterable<String>() {
 

core/src/processing/data/StringDict.java

@@ -246,7 +246,12 @@ public class StringDict {
     }
   }
 
-
+  /** 
+   * Return the internal array being used to store the keys.
+   * 
+   * @webref stringdict:method
+   * @webBrief Return the internal array being used to store the keys
+   */
   public Iterable<String> keys() {
     return new Iterable<String>() {
 

core/src/processing/data/XML.java

@@ -836,8 +836,7 @@ public class XML implements Serializable {
   /**
    * Sets the content of an element as an <b>int</b>
    *
-   * @webref xml:method
-   * @webBrief Sets the content of an element as an <b>int</b>
+   * @nowebref
    */
   public void setLong(String name, long value) {
     setString(name, String.valueOf(value));