Skip to content

Commit 48b44cb

Browse files
committed
cleaning up from PRs, other todo items
1 parent b992671 commit 48b44cb

File tree

4 files changed

+24
-38
lines changed

4 files changed

+24
-38
lines changed

app/src/processing/app/contrib/ContributionListing.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private void addContribution(Contribution contribution) {
159159
Collections.sort(list, COMPARATOR);
160160

161161
} else {
162-
ArrayList<Contribution> list = new ArrayList<Contribution>();
162+
ArrayList<Contribution> list = new ArrayList<>();
163163
list.add(contribution);
164164
librariesByCategory.put(category, list);
165165
}
@@ -210,7 +210,7 @@ protected AvailableContribution getAvailableContribution(Contribution info) {
210210

211211

212212
protected Set<String> getCategories(Contribution.Filter filter) {
213-
Set<String> outgoing = new HashSet<String>();
213+
Set<String> outgoing = new HashSet<>();
214214

215215
Set<String> categorySet = librariesByCategory.keySet();
216216
for (String categoryName : categorySet) {
@@ -426,28 +426,6 @@ public void run() {
426426
}
427427

428428

429-
/*
430-
boolean hasUpdates(Base base) {
431-
for (ModeContribution mc : base.getModeContribs()) {
432-
if (hasUpdates(mc)) {
433-
return true;
434-
}
435-
}
436-
for (Library lib : base.getActiveEditor().getMode().contribLibraries) {
437-
if (hasUpdates(lib)) {
438-
return true;
439-
}
440-
}
441-
for (ToolContribution tc : base.getToolContribs()) {
442-
if (hasUpdates(tc)) {
443-
return true;
444-
}
445-
}
446-
return false;
447-
}
448-
*/
449-
450-
451429
protected boolean hasUpdates(Contribution contribution) {
452430
if (contribution.isInstalled()) {
453431
Contribution advertised = getAvailableContribution(contribution);
@@ -482,7 +460,7 @@ protected boolean hasListDownloadFailed() {
482460

483461
private List<AvailableContribution> parseContribList(File file) {
484462
List<AvailableContribution> outgoing =
485-
new ArrayList<AvailableContribution>();
463+
new ArrayList<>();
486464

487465
if (file != null && file.exists()) {
488466
String[] lines = PApplet.loadStrings(file);

core/src/processing/core/PApplet.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ public class PApplet implements PConstants {
141141
* Do not use; javaPlatform or javaVersionName are better options.
142142
* For instance, javaPlatform is useful when you need a number for
143143
* comparison, i.e. "if (javaPlatform >= 9)".
144-
* @deprecated
145144
*/
146145
@Deprecated
147146
public static final float javaVersion = 1 + javaPlatform / 10f;
@@ -8299,9 +8298,8 @@ static public void arrayCopy(Object src, Object dst) {
82998298
System.arraycopy(src, 0, dst, 0, Array.getLength(src));
83008299
}
83018300

8302-
//
83038301
/**
8304-
* @deprecated Use arrayCopy() instead.
8302+
* Use arrayCopy() instead.
83058303
*/
83068304
@Deprecated
83078305
static public void arraycopy(Object src, int srcPosition,
@@ -8311,21 +8309,22 @@ static public void arraycopy(Object src, int srcPosition,
83118309
}
83128310

83138311
/**
8314-
* @deprecated Use arrayCopy() instead.
8312+
* Use arrayCopy() instead.
83158313
*/
83168314
@Deprecated
83178315
static public void arraycopy(Object src, Object dst, int length) {
83188316
System.arraycopy(src, 0, dst, 0, length);
83198317
}
83208318

83218319
/**
8322-
* @deprecated Use arrayCopy() instead.
8320+
* Use arrayCopy() instead.
83238321
*/
83248322
@Deprecated
83258323
static public void arraycopy(Object src, Object dst) {
83268324
System.arraycopy(src, 0, dst, 0, Array.getLength(src));
83278325
}
83288326

8327+
83298328
/**
83308329
* ( begin auto-generated from expand.xml )
83318330
*
@@ -12115,11 +12114,11 @@ public void rect(float a, float b, float c, float d,
1211512114
/**
1211612115
* ( begin auto-generated from square.xml )
1211712116
*
12118-
* Draws a square to the screen. A square is a four-sided shape with
12119-
* every angle at ninety degrees and each side is the same length.
12120-
* By default, the first two parameters set the location of the
12121-
* upper-left corner, the third sets the width and height. The way
12122-
* these parameters are interpreted, however, may be changed with the
12117+
* Draws a square to the screen. A square is a four-sided shape with
12118+
* every angle at ninety degrees and each side is the same length.
12119+
* By default, the first two parameters set the location of the
12120+
* upper-left corner, the third sets the width and height. The way
12121+
* these parameters are interpreted, however, may be changed with the
1212312122
* <b>rectMode()</b> function.
1212412123
*
1212512124
* ( end auto-generated )
@@ -12228,9 +12227,9 @@ public void arc(float a, float b, float c, float d,
1222812227
/**
1222912228
* ( begin auto-generated from circle.xml )
1223012229
*
12231-
* Draws a circle to the screen. By default, the first two parameters
12232-
* set the location of the center, and the third sets the shape's width
12233-
* and height. The origin may be changed with the <b>ellipseMode()</b>
12230+
* Draws a circle to the screen. By default, the first two parameters
12231+
* set the location of the center, and the third sets the shape's width
12232+
* and height. The origin may be changed with the <b>ellipseMode()</b>
1223412233
* function.
1223512234
*
1223612235
* ( end auto-generated )

core/todo.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
0269 (3.5.3)
22

33

4+
contrib
5+
X Update missing @Deprecated tags in PApplet.java
6+
X https://github.com/processing/processing/pull/5686
7+
8+
49
high-ish
510
_ add separator option to loadTable()
611
_ https://github.com/processing/processing/issues/5068

todo.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
0269 (3.5.3)
22

33

4+
contrib
5+
X update translation of "sketch" for Russian speakers
6+
X https://github.com/processing/processing/pull/5673
7+
48
_ Find in Reference disabled for various keywords (draw, for, if, catch, while)
59
_ https://github.com/processing/processing/issues/5562
610
_ https://github.com/processing/processing/pull/5642

0 commit comments

Comments
 (0)