Skip to content

Commit d1a241e

Browse files
committed
deal with some warnings and other notes
1 parent c9c95cc commit d1a241e

10 files changed

Lines changed: 29 additions & 21 deletions

File tree

build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BundleDocument {
3838
private String[] extensions;
3939
private boolean isPackage = false;
4040

41-
private String capitalizeFirst(String string) {
41+
static private String capitalizeFirst(String string) {
4242
char[] stringArray = string.toCharArray();
4343
stringArray[0] = Character.toUpperCase(stringArray[0]);
4444
return new String(stringArray);

core/todo.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ _ no high-dpi support for core on Windows
9292
_ https://github.com/processing/processing/issues/2411
9393
_ retina sketches slow to start
9494
_ https://github.com/processing/processing/issues/2357
95+
_ glw? lwjgl? retina jogl?
9596

9697

9798
cantfix

java/libraries/glw/src/processing/glw/PNEWT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void windowDestroyNotify(final WindowEvent e) {
174174
}
175175

176176

177-
private void displayWindows() {
177+
static private void displayWindows() {
178178
int totalCount = 0;
179179
int realizedCount = 0;
180180
for (GLWindow win: GLW.windows.values()) {

java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,10 @@ static public String[] listFonts() {
647647
// fontList = new String[entries.size()];
648648
fontList = new String[map.size()];
649649
int count = 0;
650-
for (Object entry : map.entrySet()) {
651-
fontList[count++] = (String) ((Map.Entry) entry).getKey();
650+
for (Object key : map.keySet()) {
651+
// for (Object entry : map.entrySet()) {
652+
// fontList[count++] = (String) ((Map.Entry) entry).getKey();
653+
fontList[count++] = (String) key;
652654
}
653655
// Iterator it = entries.iterator();
654656
// int count = 0;

pdex/src/processing/mode/experimental/ASTGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ public ClassMember resolveExpression3rdParty(ASTNode nearestNode,
561561
}
562562
else {
563563
// or in a predefined class?
564-
Class tehClass = findClassIfExists(((SimpleName) astNode).toString());
564+
Class<?> tehClass = findClassIfExists(((SimpleName) astNode).toString());
565565
if (tehClass != null) {
566566
return new ClassMember(tehClass);
567567
}
@@ -587,7 +587,7 @@ public ClassMember resolveExpression3rdParty(ASTNode nearestNode,
587587
/*The type wasn't found in local code, so it might be something like
588588
* log(), or maybe belonging to super class, etc.
589589
*/
590-
Class tehClass = findClassIfExists(((SimpleName)fa.getExpression()).toString());
590+
Class<?> tehClass = findClassIfExists(((SimpleName)fa.getExpression()).toString());
591591
if (tehClass != null) {
592592
// Method Expression is a simple name and wasn't located locally, but found in a class
593593
// so look for method in this class.

pdex/src/processing/mode/experimental/Debugger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ protected void printThis(ThreadReference t) {
11161116
for (Field f : type.visibleFields()) {
11171117
System.out.println(f.typeName() + " " + f.name() + " = " + thisObject.getValue(f));
11181118
}
1119-
} else {
1119+
} else { // TODO [this is not reachable - fry]
11201120
System.out.println("can't get this (in native or static method)");
11211121
}
11221122
}

pdex/src/processing/mode/experimental/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public static int distance(String a, String b) {
213213
}
214214

215215
public void minDistInGrid(int g[][], int i, int j, int fi, int fj,
216-
char s1[], char s2[], ArrayList set) {
216+
char s1[], char s2[], ArrayList<OfsSetTemp> set) {
217217
// if(i < s1.length)System.out.print(s1[i] + " <->");
218218
// if(j < s2.length)System.out.print(s2[j]);
219219
if (i < s1.length && j < s2.length) {

pdex/src/processing/mode/experimental/VariableInspector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class VariableInspector extends javax.swing.JFrame {
7474
protected List<VariableNode> declaredThisFields; // declared i.e. non-inherited fields of this
7575
protected DebugEditor editor; // the editor
7676
protected Debugger dbg; // the debugger
77-
protected List<TreePath> expandedNodes = new ArrayList(); // list of expanded tree paths. (using list to maintain the order of expansion)
77+
protected List<TreePath> expandedNodes = new ArrayList<>(); // list of expanded tree paths. (using list to maintain the order of expansion)
7878
protected boolean p5mode = true; // processing / "advanced" mode flag (currently not used
7979

8080
/**
@@ -515,7 +515,7 @@ public void treeCollapsed(TreeExpansionEvent tee) {
515515
// first remove all children of collapsed path
516516
// this makes sure children do not appear before parents in the list.
517517
// (children can't be expanded before their parents)
518-
List<TreePath> removalList = new ArrayList();
518+
List<TreePath> removalList = new ArrayList<>();
519519
for (TreePath path : expandedNodes) {
520520
if (path.getParentPath().equals(tee.getPath())) {
521521
removalList.add(path);

pdex/src/processing/mode/experimental/VariableNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class VariableNode implements MutableTreeNode {
5353
protected String type;
5454
protected String name;
5555
protected Value value;
56-
protected List<MutableTreeNode> children = new ArrayList();
56+
protected List<MutableTreeNode> children = new ArrayList<>();
5757
protected MutableTreeNode parent;
5858

5959
/**

todo.txt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
0230 pde (3.0a3)
22

3+
earlier
4+
X repo cleanup
5+
X remove non-web stuff from web
6+
X remove non-android stuff from android
7+
X remove web and android from the main repo
8+
39
pulls
410
X Add polling to detect file system changes
511
X https://github.com/processing/processing/issues/1939
@@ -9,18 +15,24 @@ X https://github.com/processing/processing/issues/632
915
X https://github.com/processing/processing/pull/2084
1016
X http://code.google.com/p/processing/issues/detail?id=593
1117
_ need to make sure the .properties files are read properly as UTF-8
18+
X Indent breaks when hitting enter before spaces
19+
X https://github.com/processing/processing/issues/2004
20+
X https://github.com/processing/processing/pull/2690
21+
X support for Japanese
22+
X https://github.com/processing/processing/pull/2688
1223

1324

1425
pending
1526
_ look at the sound library https://github.com/wirsing/ProcessingSound
1627
_ sound is not yet supported on Windows
17-
_ glw? lwjgl? retina jogl?
1828
_ make reference build process part of dist
1929
_ https://github.com/processing/processing-docs/issues/85
2030
_ separate ant target, but only require them for dist
2131
_ as separate targets, folks can build explicitly if they'd like
2232
_ processing-docs/java_generate/ReferenceGenerator/processingrefBuild.sh
2333
_ remove reference.zip from main repo
34+
_ clean out the repo
35+
_ https://github.com/processing/processing/issues/1898
2436

2537

2638
gsoc/help me
@@ -59,12 +71,6 @@ _ display "1" is not correct in 2.1.2
5971
_ https://github.com/processing/processing/issues/2502
6072
_ re/move things from Google Code downloads
6173
_ https://code.google.com/p/support/wiki/DownloadsFAQ
62-
_ clean out the repo
63-
_ https://github.com/processing/processing/issues/1898
64-
_ requires re-forking, so still a ton of work
65-
_ remove non-web stuff from web
66-
_ remove non-android stuff from android
67-
_ remove web and android from the main repo
6874
_ add font fixes to the rest of the API
6975
_ https://github.com/processing/processing/commit/eaff673d173b2d27f276cf5c59e3abf6c0fab86b
7076
_ g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
@@ -96,9 +102,6 @@ _ add documentation for how to run mode development from Eclipse
96102
_ implementation/changes from JDF
97103
_ modes are being loaded multiple times, which can cause trouble
98104
_ add minimum version required (or max version?) to libraries/modes/etc
99-
_ no high-res display support for the PDE
100-
_ PDE and sketches are 2x smaller on high-res Windows 8 machines
101-
_ https://github.com/processing/processing/issues/2411
102105

103106

104107
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -802,6 +805,8 @@ _ avoid some confusion for when describing the libraries folder to users
802805

803806
DIST / Windows
804807

808+
_ PDE and sketches are 2x smaller on high-res Windows 8 machines
809+
_ https://github.com/processing/processing/issues/2411
805810
_ processing-java output as UTF-8 makes Windows unhappy
806811
_ https://github.com/processing/processing/issues/1633
807812
_ does launching p5 from inside the .zip folder cause it to quit immediately?

0 commit comments

Comments
 (0)