diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java index b054b2e97..6f35ca3fd 100644 --- a/app/src/processing/app/contrib/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -159,7 +159,7 @@ public class ContributionListing { Collections.sort(list, COMPARATOR); } else { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(contribution); librariesByCategory.put(category, list); } @@ -210,7 +210,7 @@ public class ContributionListing { protected Set getCategories(Contribution.Filter filter) { - Set outgoing = new HashSet(); + Set outgoing = new HashSet<>(); Set categorySet = librariesByCategory.keySet(); for (String categoryName : categorySet) { @@ -426,28 +426,6 @@ public class ContributionListing { } - /* - boolean hasUpdates(Base base) { - for (ModeContribution mc : base.getModeContribs()) { - if (hasUpdates(mc)) { - return true; - } - } - for (Library lib : base.getActiveEditor().getMode().contribLibraries) { - if (hasUpdates(lib)) { - return true; - } - } - for (ToolContribution tc : base.getToolContribs()) { - if (hasUpdates(tc)) { - return true; - } - } - return false; - } - */ - - protected boolean hasUpdates(Contribution contribution) { if (contribution.isInstalled()) { Contribution advertised = getAvailableContribution(contribution); @@ -482,7 +460,7 @@ public class ContributionListing { private List parseContribList(File file) { List outgoing = - new ArrayList(); + new ArrayList<>(); if (file != null && file.exists()) { String[] lines = PApplet.loadStrings(file); diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index f036f501c..22867676d 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -141,7 +141,6 @@ public class PApplet implements PConstants { * Do not use; javaPlatform or javaVersionName are better options. * For instance, javaPlatform is useful when you need a number for * comparison, i.e. "if (javaPlatform >= 9)". - * @deprecated */ @Deprecated public static final float javaVersion = 1 + javaPlatform / 10f; @@ -8299,9 +8298,8 @@ public class PApplet implements PConstants { System.arraycopy(src, 0, dst, 0, Array.getLength(src)); } - // /** - * @deprecated Use arrayCopy() instead. + * Use arrayCopy() instead. */ @Deprecated static public void arraycopy(Object src, int srcPosition, @@ -8311,7 +8309,7 @@ public class PApplet implements PConstants { } /** - * @deprecated Use arrayCopy() instead. + * Use arrayCopy() instead. */ @Deprecated static public void arraycopy(Object src, Object dst, int length) { @@ -8319,13 +8317,14 @@ public class PApplet implements PConstants { } /** - * @deprecated Use arrayCopy() instead. + * Use arrayCopy() instead. */ @Deprecated static public void arraycopy(Object src, Object dst) { System.arraycopy(src, 0, dst, 0, Array.getLength(src)); } + /** * ( begin auto-generated from expand.xml ) * @@ -12115,11 +12114,11 @@ public class PApplet implements PConstants { /** * ( begin auto-generated from square.xml ) * - * Draws a square to the screen. A square is a four-sided shape with - * every angle at ninety degrees and each side is the same length. - * By default, the first two parameters set the location of the - * upper-left corner, the third sets the width and height. The way - * these parameters are interpreted, however, may be changed with the + * Draws a square to the screen. A square is a four-sided shape with + * every angle at ninety degrees and each side is the same length. + * By default, the first two parameters set the location of the + * upper-left corner, the third sets the width and height. The way + * these parameters are interpreted, however, may be changed with the * rectMode() function. * * ( end auto-generated ) @@ -12228,9 +12227,9 @@ public class PApplet implements PConstants { /** * ( begin auto-generated from circle.xml ) * - * Draws a circle to the screen. By default, the first two parameters - * set the location of the center, and the third sets the shape's width - * and height. The origin may be changed with the ellipseMode() + * Draws a circle to the screen. By default, the first two parameters + * set the location of the center, and the third sets the shape's width + * and height. The origin may be changed with the ellipseMode() * function. * * ( end auto-generated ) diff --git a/core/todo.txt b/core/todo.txt index 26d6bbf8d..0c2b2c79c 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,6 +1,11 @@ 0269 (3.5.3) +contrib +X Update missing @Deprecated tags in PApplet.java +X https://github.com/processing/processing/pull/5686 + + high-ish _ add separator option to loadTable() _ https://github.com/processing/processing/issues/5068 diff --git a/todo.txt b/todo.txt index bf3eef922..32de9ef44 100755 --- a/todo.txt +++ b/todo.txt @@ -1,6 +1,10 @@ 0269 (3.5.3) +contrib +X update translation of "sketch" for Russian speakers +X https://github.com/processing/processing/pull/5673 + _ Find in Reference disabled for various keywords (draw, for, if, catch, while) _ https://github.com/processing/processing/issues/5562 _ https://github.com/processing/processing/pull/5642