eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

replacing ecj.jar with jdt-core.jar to support XQMode

Browse Source
This commit is contained in:
benfry
2012-10-20 18:12:26 +00:00
parent 3f50413442
commit 6e7bffd5ec
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/.classpath
+1 -1
View File
@@ -12,10 +12,10 @@
<classpathentry combineaccessrules="false" kind="src" path="/processing-video"/>
<classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/>
<classpathentry kind="lib" path="lib/jna.jar"/>
<classpathentry kind="lib" path="lib/ecj.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
<classpathentry kind="lib" path="lib/apple.jar"/>
<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
<classpathentry kind="lib" path="lib/jdt-core.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
app/src/processing/app/Base.java
+2 -1
View File
@@ -280,8 +280,9 @@ public class Base {
* remove modes because modes can't be removed once they are instantiated.
*/
void rebuildContribModes() {
if (contribModes == null)
if (contribModes == null) {
contribModes = new ArrayList<ModeContribution>();
}
ArrayList<ModeContribution> newContribs =
ModeContribution.list(this, getSketchbookModesFolder());
app/src/processing/app/Recent.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class Recent {
menu.removeAll();
for (final Record rec : records) {
String purtyPath = new File(rec.getPath()).getParent();
String sketchbookPath = base.getSketchbookFolder().getAbsolutePath();
String sketchbookPath = Base.getSketchbookFolder().getAbsolutePath();
if (purtyPath.startsWith(sketchbookPath)) {
purtyPath = "sketchbook \u2192 " +
purtyPath.substring(sketchbookPath.length() + 1);
app/src/processing/app/contrib/ModeContribution.java
+1 -2
View File
@@ -80,6 +80,7 @@ public class ModeContribution extends InstalledContribution {
try {
URL[] urlList = new URL[archives.length];
for (int j = 0; j < urlList.length; j++) {
// System.out.println("found lib: " + archives[j] + " for " + getName());
urlList[j] = archives[j].toURI().toURL();
}
loader = new URLClassLoader(urlList);
@@ -144,10 +145,8 @@ public class ModeContribution extends InstalledContribution {
ArrayList<File> modeFolders = discover(folder);
for (File potentialModeFolder : modeFolders) {
System.out.println("getting mode from " + potentialModeFolder);
ModeContribution contrib = getContributedMode(base, potentialModeFolder);
if (contrib != null) {
System.out.println("adding mode " + contrib);
modes.add(contrib);
}
}
build/build.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<!--<include name="core/library/core.jar" />-->
<include name="app/pde.jar" />
<include name="app/lib/antlr.jar" />
<include name="app/lib/ecj.jar" />
<include name="app/lib/jdt-core.jar" />
<include name="app/lib/jna.jar" />
<include name="app/lib/ant.jar" />
<include name="app/lib/ant-launcher.jar" />
build/macosx/template.app/Contents/Info.plist
+1 -1
View File
@@ -81,7 +81,7 @@
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
it can cause problems if users have installed weird files there.
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
<string>$JAVAROOT/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/ant.jar:$JAVAROOT/ant-launcher.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/jna.jar:$JAVAROOT/quaqua.jar</string>
<string>$JAVAROOT/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/ant.jar:$JAVAROOT/ant-launcher.jar:$JAVAROOT/antlr.jar:$JAVAROOT/jdt-core.jar:$JAVAROOT/jna.jar:$JAVAROOT/quaqua.jar</string>
<!-- More properties can be found in http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
<key>Properties</key>
build/windows/launcher/config.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<cp>lib/pde.jar</cp>
<cp>core/library/core.jar</cp>
<cp>lib/jna.jar</cp>
<cp>lib/ecj.jar</cp>
<cp>lib/jdt-core.jar</cp>
<cp>lib/antlr.jar</cp>
<cp>lib/ant.jar</cp>
<cp>lib/ant-launcher.jar</cp>