Skip to content

Commit fa0e060

Browse files
benfrybenfry
committed
fix package names for all these fellas
1 parent c683528 commit fa0e060

59 files changed

Lines changed: 1305 additions & 836 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/.classpath‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="generated">
5-
<attributes>
6-
<attribute name="ignore_optional_problems" value="true"/>
7-
</attributes>
8-
</classpathentry>
94
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
105
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
11-
<classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/>
126
<classpathentry kind="lib" path="lib/jna.jar"/>
137
<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
148
<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
159
<classpathentry kind="lib" path="lib/apple.jar"/>
1610
<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
17-
<classpathentry kind="lib" path="lib/org-netbeans-swing-outline.jar"/>
18-
<classpathentry kind="lib" path="lib/com.ibm.icu_4.4.2.v20110823.jar"/>
19-
<classpathentry kind="lib" path="lib/jdi.jar" sourcepath="/processing-experimental/mode/jdi-src.zip"/>
20-
<classpathentry kind="lib" path="lib/jdimodel.jar" sourcepath="/processing-experimental/mode/jdimodel-src.zip"/>
21-
<classpathentry kind="lib" path="lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
2211
<classpathentry kind="output" path="bin"/>
2312
</classpath>

‎java/.classpath‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="generated"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="lib" path="mode/antlr.jar"/>
6+
<classpathentry kind="lib" path="mode/classpath-explorer-1.0.jar"/>
7+
<classpathentry kind="lib" path="mode/com.ibm.icu.jar"/>
8+
<classpathentry kind="lib" path="mode/jdi.jar"/>
9+
<classpathentry kind="lib" path="mode/jdimodel.jar"/>
10+
<classpathentry kind="lib" path="mode/jdtCompilerAdapter.jar"/>
11+
<classpathentry kind="lib" path="mode/jsoup-1.7.1.jar"/>
12+
<classpathentry kind="lib" path="mode/org.eclipse.core.contenttype.jar"/>
13+
<classpathentry kind="lib" path="mode/org.eclipse.core.jobs.jar"/>
14+
<classpathentry kind="lib" path="mode/org.eclipse.core.resources.jar"/>
15+
<classpathentry kind="lib" path="mode/org.eclipse.core.runtime.jar"/>
16+
<classpathentry kind="lib" path="mode/org.eclipse.equinox.common.jar"/>
17+
<classpathentry kind="lib" path="mode/org.eclipse.equinox.preferences.jar"/>
18+
<classpathentry kind="lib" path="mode/org.eclipse.jdt.core.jar"/>
19+
<classpathentry kind="lib" path="mode/org.eclipse.osgi.jar"/>
20+
<classpathentry kind="lib" path="mode/org.eclipse.text.jar"/>
21+
<classpathentry kind="lib" path="mode/org.netbeans.swing.outline.jar"/>
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
23+
<classpathentry combineaccessrules="false" kind="src" path="/processing-app"/>
24+
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
25+
<classpathentry kind="output" path="bin"/>
26+
</classpath>

‎java/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>processing-java</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

‎java/src/processing/mode/java/JavaBuild.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,6 +1831,8 @@ protected void packClassPathIntoZipFile(String path,
18311831
zos.closeEntry();
18321832
}
18331833
}
1834+
file.close();
1835+
18341836
} catch (IOException e) {
18351837
System.err.println("Error in file " + pieces[i]);
18361838
e.printStackTrace();

java/src/processing/mode/java/pdex/ArrayFieldNode.java renamed to java/src/processing/mode/java/debug/ArrayFieldNode.java

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
13
/*
2-
* Copyright (C) 2012 Martin Leopold <[email protected]>
3-
*
4-
* This program is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU General Public License
6-
* as published by the Free Software Foundation; either version 2
7-
* of the License, or (at your option) any later version.
8-
*
9-
* This program is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
* GNU General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU General Public License
15-
* along with this program; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*/
18-
package processing.mode.experimental;
4+
Part of the Processing project - http://processing.org
5+
Copyright (c) 2012-15 The Processing Foundation
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License version 2
9+
as published by the Free Software Foundation.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software Foundation, Inc.
18+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
21+
package processing.mode.java.debug;
1922

2023
import com.sun.jdi.ArrayReference;
2124
import com.sun.jdi.ClassNotLoadedException;

‎java/src/processing/mode/java/debug/ClassLoadListener.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
3+
/*
4+
Part of the Processing project - http://processing.org
5+
Copyright (c) 2012-15 The Processing Foundation
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License version 2
9+
as published by the Free Software Foundation.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software Foundation, Inc.
18+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
21+
package processing.mode.java.debug;
22+
23+
import com.sun.jdi.ReferenceType;
24+
25+
/**
26+
* Listener to be notified when a class is loaded in the debugger. Used by
27+
* {@link LineBreakpoint}s to activate themselves as soon as the respective
28+
* class is loaded.
29+
*
30+
* @author Martin Leopold <[email protected]>
31+
*/
32+
public interface ClassLoadListener {
33+
34+
/**
35+
* Event handler called when a class is loaded.
36+
*
37+
* @param theClass the class
38+
*/
39+
public void classLoaded(ReferenceType theClass);
40+
}

java/src/processing/mode/java/pdex/Compiler.java renamed to java/src/processing/mode/java/debug/Compiler.java

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
13
/*
2-
* Copyright (C) 2012 Martin Leopold <[email protected]>
3-
*
4-
* This program is free software; you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation; either version 2 of the License, or (at your option) any later
7-
* version.
8-
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details.
13-
*
14-
* You should have received a copy of the GNU General Public License along with
15-
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
16-
* Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*/
18-
package processing.mode.experimental;
4+
Part of the Processing project - http://processing.org
5+
Copyright (c) 2012-15 The Processing Foundation
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License version 2
9+
as published by the Free Software Foundation.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software Foundation, Inc.
18+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
21+
package processing.mode.java.debug;
1922

2023
import java.io.*;
2124
import java.lang.reflect.Method;

java/src/processing/mode/java/pdex/DebugBuild.java renamed to java/src/processing/mode/java/debug/DebugBuild.java

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
13
/*
2-
* Copyright (C) 2012 Martin Leopold <[email protected]>
3-
*
4-
* This program is free software; you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation; either version 2 of the License, or (at your option) any later
7-
* version.
8-
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details.
13-
*
14-
* You should have received a copy of the GNU General Public License along with
15-
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
16-
* Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*/
18-
package processing.mode.experimental;
4+
Part of the Processing project - http://processing.org
5+
Copyright (c) 2012-15 The Processing Foundation
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License version 2
9+
as published by the Free Software Foundation.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software Foundation, Inc.
18+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
21+
package processing.mode.java.debug;
1922

2023
import java.io.File;
24+
2125
import processing.app.Sketch;
2226
import processing.app.SketchException;
2327
import processing.mode.java.JavaBuild;
28+
import processing.mode.java.pdex.ExperimentalMode;
2429

2530
/**
2631
* Copied from processing.mode.java.JavaBuild, just changed compiler.

java/src/processing/mode/java/pdex/DebugEditor.java renamed to java/src/processing/mode/java/debug/DebugEditor.java

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
13
/*
2-
* Copyright (C) 2012-14 Martin Leopold <[email protected]> and Manindra Moharana <[email protected]>
3-
*
4-
* This program is free software; you can redistribute it and/or modify it under
5-
* the terms of the GNU General Public License as published by the Free Software
6-
* Foundation; either version 2 of the License, or (at your option) any later
7-
* version.
8-
*
9-
* This program is distributed in the hope that it will be useful, but WITHOUT
10-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12-
* details.
13-
*
14-
* You should have received a copy of the GNU General Public License along with
15-
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
16-
* Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*/
18-
package processing.mode.experimental;
19-
import static processing.mode.experimental.ExperimentalMode.log;
20-
import static processing.mode.experimental.ExperimentalMode.logE;
21-
import galsasson.mode.tweak.ColorControlBox;
22-
import galsasson.mode.tweak.Handle;
23-
import galsasson.mode.tweak.SketchParser;
24-
import galsasson.mode.tweak.UDPTweakClient;
4+
Part of the Processing project - http://processing.org
5+
Copyright (c) 2012-15 The Processing Foundation
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License version 2
9+
as published by the Free Software Foundation.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software Foundation, Inc.
18+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19+
*/
20+
21+
package processing.mode.java.debug;
22+
23+
import static processing.mode.java.pdex.ExperimentalMode.log;
24+
import static processing.mode.java.pdex.ExperimentalMode.logE;
2525

2626
import java.awt.BorderLayout;
2727
import java.awt.CardLayout;
@@ -81,6 +81,20 @@
8181
import processing.app.syntax.PdeTextAreaDefaults;
8282
import processing.core.PApplet;
8383
import processing.mode.java.JavaEditor;
84+
import processing.mode.java.pdex.AutoSaveUtil;
85+
import processing.mode.java.pdex.ErrorBar;
86+
import processing.mode.java.pdex.ErrorCheckerService;
87+
import processing.mode.java.pdex.ErrorMessageSimplifier;
88+
import processing.mode.java.pdex.ExperimentalMode;
89+
import processing.mode.java.pdex.Problem;
90+
import processing.mode.java.pdex.TextArea;
91+
import processing.mode.java.pdex.XQConsoleToggle;
92+
import processing.mode.java.pdex.XQErrorTable;
93+
import processing.mode.java.tweak.ColorControlBox;
94+
import processing.mode.java.tweak.Handle;
95+
import processing.mode.java.tweak.SketchParser;
96+
import processing.mode.java.tweak.UDPTweakClient;
97+
8498

8599
/**
86100
* Main View Class. Handles the editor window including tool bar and menu. Has
@@ -128,13 +142,13 @@ public class DebugEditor extends JavaEditor implements ActionListener {
128142
// variable inspector
129143
protected JMenuItem toggleVariableInspectorMenuItem;
130144
// references
131-
protected ExperimentalMode dmode; // the mode
145+
public ExperimentalMode dmode; // the mode
132146
protected Debugger dbg; // the debugger
133147
protected VariableInspector vi; // the variable inspector frame
134-
protected TextArea ta; // the text area
135-
136148

137-
protected ErrorBar errorBar;
149+
public TextArea ta; // the text area
150+
public ErrorBar errorBar;
151+
138152
/**
139153
* Show Console button
140154
*/
@@ -161,7 +175,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
161175
/**
162176
* Enable/Disable compilation checking
163177
*/
164-
protected boolean compilationCheckEnabled = true;
178+
public boolean compilationCheckEnabled = true;
165179

166180
/**
167181
* Show warnings menu item
@@ -196,7 +210,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
196210
/**
197211
* If sketch contains java tabs, some editor features are disabled
198212
*/
199-
protected boolean hasJavaTabs;
213+
public boolean hasJavaTabs;
200214

201215
/**
202216
* UNUSED. Disbaled for now.
@@ -454,7 +468,7 @@ public void actionPerformed(ActionEvent e) {
454468
/**
455469
* Whether debug toolbar is enabled
456470
*/
457-
AtomicBoolean debugToolbarEnabled;
471+
public AtomicBoolean debugToolbarEnabled;
458472

459473
protected EditorToolbar javaToolbar, debugToolbar;
460474

@@ -1622,7 +1636,7 @@ public void statusEmpty(){
16221636
super.statusEmpty();
16231637
}
16241638

1625-
ErrorCheckerService errorCheckerService;
1639+
public ErrorCheckerService errorCheckerService;
16261640

16271641
/**
16281642
* Initializes and starts Error Checker Service
@@ -1740,7 +1754,7 @@ protected void applyPreferences() {
17401754
public static final String prefTweakPort = "tweak.port";
17411755
public static final String prefTweakShowCode = "tweak.showcode";
17421756

1743-
String[] baseCode;
1757+
public String[] baseCode;
17441758

17451759
final static int SPACE_AMOUNT = 0;
17461760

0 commit comments

Comments
 (0)