eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 10:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up warnings, specifying Java 1.6 for build in Eclipse, remove unused

Browse Source
This commit is contained in:
benfry
2011-11-12 17:31:06 +00:00
parent 0487c536a1
commit 436a81e330
18 changed files with 1510 additions and 1502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/processing/mode/java/AutoFormat.java
View File

@@ -53,7 +53,8 @@ public class AutoFormat implements Formatter {
private boolean EOF;
private boolean a_flg, e_flg, if_flg, s_flag, q_flg;
private boolean s_if_flg[];
private int pos, lineNumber;
private int pos;
// private int lineNumber;
private int s_level[];
private int c_level;
private int sp_flg[][];
@@ -82,7 +83,7 @@ public class AutoFormat implements Formatter {
buf.append(c = next());
while ((c != '/')) {
if (c == '\n') {
lineNumber++;
// lineNumber++;
writeIndentedComment();
s_flag = true;
}
@@ -192,7 +193,7 @@ public class AutoFormat implements Formatter {
buf.append(c);
c = next();
}
lineNumber++;
// lineNumber++;
writeIndentedLine();
s_flag = true;
}
@@ -298,7 +299,7 @@ public class AutoFormat implements Formatter {
if (c == '\n') {
// eat it
next();
lineNumber++;
// lineNumber++;
tabs = savedTabs;
return true;
}
@@ -332,7 +333,7 @@ public class AutoFormat implements Formatter {
result.setLength(0);
indentValue = Preferences.getInteger("editor.tabs.size");
lineNumber = 0;
// lineNumber = 0;
q_flg = e_flg = a_flg = if_flg = false;
s_flag = true;
c_level = if_lev = level = paren = 0;
@@ -349,7 +350,7 @@ public class AutoFormat implements Formatter {
s_tabs = new int[20][10];
pos = -1;
chars = cleanText.toCharArray();
lineNumber = 1;
// lineNumber = 1;
EOF = false; // set in next() when EOF
@@ -385,7 +386,7 @@ public class AutoFormat implements Formatter {
break;
case '\n':
lineNumber++;
// lineNumber++;
if (EOF) {
break;
}
@@ -499,7 +500,7 @@ public class AutoFormat implements Formatter {
buf.append(cc = next());
}
if (cc == '\n') {
lineNumber++;
// lineNumber++;
writeIndentedLine();
s_flag = true;
}

4
app/src/processing/mode/java/JavaBuild.java
View File

@@ -1236,7 +1236,7 @@ public class JavaBuild {
String includes = Base.contentsToClassPath(sketch.getCodeFolder());
// Use tokens to get rid of extra blanks, which causes huge exports
String[] codeList = PApplet.splitTokens(includes, File.pathSeparator);
String cp = "";
// String cp = "";
for (int i = 0; i < codeList.length; i++) {
if (codeList[i].toLowerCase().endsWith(".jar") ||
codeList[i].toLowerCase().endsWith(".zip")) {
@@ -1245,7 +1245,7 @@ public class JavaBuild {
Base.copyFile(exportFile, new File(jarFolder, exportFilename));
jarListVector.add(exportFilename);
} else {
cp += codeList[i] + File.pathSeparator;
// cp += codeList[i] + File.pathSeparator;
}
}
// packClassPathIntoZipFile(cp, zos, zipFileContents); // this was double adding the code folder prior to 2.0a2