rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Drop dependency from processing-core project.

Browse Source
This commit is contained in:
Cristian Maglie 2014-08-19 11:53:44 +02:00
parent 18a8d4d627
commit e0f680be5b
18 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/.classpath
View File

@ -5,7 +5,6 @@
<classpathentry kind="lib" path="lib/antlr.jar"/> <classpathentry kind="lib" path="lib/antlr.jar"/>
<classpathentry kind="lib" path="lib/jna.jar"/> <classpathentry kind="lib" path="lib/jna.jar"/>
<classpathentry kind="lib" path="lib/ecj.jar"/> <classpathentry kind="lib" path="lib/ecj.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
<classpathentry kind="lib" path="lib/apple.jar"/> <classpathentry kind="lib" path="lib/apple.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/> <classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>

2
app/src/processing/app/AbstractMonitor.java
View File

@ -1,7 +1,7 @@
package processing.app; package processing.app;
import processing.app.debug.MessageConsumer; import processing.app.debug.MessageConsumer;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;

3
app/src/processing/app/Base.java
View File

@ -46,11 +46,12 @@ import processing.app.helpers.PreferencesMap;
import processing.app.helpers.filefilters.OnlyDirs; import processing.app.helpers.filefilters.OnlyDirs;
import processing.app.helpers.filefilters.OnlyFilesWithExtension; import processing.app.helpers.filefilters.OnlyFilesWithExtension;
import processing.app.javax.swing.filechooser.FileNameExtensionFilter; import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
import processing.app.legacy.PApplet;
import processing.app.legacy.PConstants;
import processing.app.packages.Library; import processing.app.packages.Library;
import processing.app.packages.LibraryList; import processing.app.packages.LibraryList;
import processing.app.tools.MenuScroller; import processing.app.tools.MenuScroller;
import processing.app.tools.ZipDeflater; import processing.app.tools.ZipDeflater;
import processing.core.*;
import static processing.app.I18n._; import static processing.app.I18n._;

4
app/src/processing/app/Editor.java
View File

@ -23,13 +23,15 @@
package processing.app; package processing.app;
import cc.arduino.packages.UploaderAndMonitorFactory; import cc.arduino.packages.UploaderAndMonitorFactory;
import com.jcraft.jsch.JSchException; import com.jcraft.jsch.JSchException;
import processing.app.debug.*; import processing.app.debug.*;
import processing.app.forms.PasswordAuthorizationDialog; import processing.app.forms.PasswordAuthorizationDialog;
import processing.app.helpers.PreferencesMapException; import processing.app.helpers.PreferencesMapException;
import processing.app.legacy.PApplet;
import processing.app.syntax.*; import processing.app.syntax.*;
import processing.app.tools.*; import processing.app.tools.*;
import processing.core.*;
import static processing.app.I18n._; import static processing.app.I18n._;
import java.awt.*; import java.awt.*;

2
app/src/processing/app/Platform.java
View File

@ -35,7 +35,7 @@ import com.sun.jna.Native;
import processing.app.debug.TargetBoard; import processing.app.debug.TargetBoard;
import processing.app.debug.TargetPackage; import processing.app.debug.TargetPackage;
import processing.app.debug.TargetPlatform; import processing.app.debug.TargetPlatform;
import processing.core.PConstants; import processing.app.legacy.PConstants;
/** /**

2
app/src/processing/app/Preferences.java
View File

@ -52,7 +52,7 @@ import javax.swing.KeyStroke;
import processing.app.helpers.FileUtils; import processing.app.helpers.FileUtils;
import processing.app.helpers.PreferencesHelper; import processing.app.helpers.PreferencesHelper;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import processing.core.PApplet; import processing.app.legacy.PApplet;
/** /**

4
app/src/processing/app/PreferencesData.java
View File

@ -12,8 +12,8 @@ import java.util.Arrays;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import processing.core.PConstants; import processing.app.legacy.PConstants;
public class PreferencesData { public class PreferencesData {

2
app/src/processing/app/SerialMonitor.java
View File

@ -19,7 +19,7 @@
package processing.app; package processing.app;
import cc.arduino.packages.BoardPort; import cc.arduino.packages.BoardPort;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;

2
app/src/processing/app/UpdateCheck.java
View File

@ -31,7 +31,7 @@ import java.util.Random;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import static processing.app.I18n._; import static processing.app.I18n._;

2
app/src/processing/app/debug/Compiler.java
View File

@ -49,7 +49,7 @@ import processing.app.helpers.filefilters.OnlyDirs;
import processing.app.packages.Library; import processing.app.packages.Library;
import processing.app.packages.LibraryList; import processing.app.packages.LibraryList;
import processing.app.preproc.PdePreprocessor; import processing.app.preproc.PdePreprocessor;
import processing.core.PApplet; import processing.app.legacy.PApplet;
public class Compiler implements MessageConsumer { public class Compiler implements MessageConsumer {

4
app/src/processing/app/helpers/PreferencesMap.java
View File

@ -27,14 +27,12 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import processing.app.Base; import processing.app.Base;
import processing.core.PApplet; import processing.app.legacy.PApplet;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class PreferencesMap extends LinkedHashMap<String, String> { public class PreferencesMap extends LinkedHashMap<String, String> {

2
app/src/processing/app/linux/Platform.java
View File

@ -27,7 +27,7 @@ import org.apache.commons.exec.Executor;
import processing.app.Preferences; import processing.app.Preferences;
import processing.app.debug.TargetPackage; import processing.app.debug.TargetPackage;
import processing.app.tools.ExternalProcessExecutor; import processing.app.tools.ExternalProcessExecutor;
import processing.core.PConstants; import processing.app.legacy.PConstants;
import java.io.*; import java.io.*;
import java.util.Map; import java.util.Map;

8
app/src/processing/app/macosx/Platform.java
View File

@ -28,8 +28,8 @@ import org.apache.commons.exec.Executor;
import processing.app.Base; import processing.app.Base;
import processing.app.debug.TargetPackage; import processing.app.debug.TargetPackage;
import processing.app.tools.ExternalProcessExecutor; import processing.app.tools.ExternalProcessExecutor;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import processing.core.PConstants; import processing.app.legacy.PConstants;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -129,7 +129,7 @@ public class Platform extends processing.app.Platform {
} else { } else {
// Assume this is a file instead, and just open it. // Assume this is a file instead, and just open it.
// Extension of http://dev.processing.org/bugs/show_bug.cgi?id=1010 // Extension of http://dev.processing.org/bugs/show_bug.cgi?id=1010
processing.core.PApplet.open(url); PApplet.open(url);
} }
} else { } else {
try { try {
@ -162,7 +162,7 @@ public class Platform extends processing.app.Platform {
public void openFolder(File file) throws Exception { public void openFolder(File file) throws Exception {
//openURL(file.getAbsolutePath()); // handles char replacement, etc //openURL(file.getAbsolutePath()); // handles char replacement, etc
processing.core.PApplet.open(file.getAbsolutePath()); PApplet.open(file.getAbsolutePath());
} }

3
app/src/processing/app/preproc/PdePreprocessor.java
View File

@ -31,11 +31,10 @@ package processing.app.preproc;
import static processing.app.I18n._; import static processing.app.I18n._;
import processing.app.*; import processing.app.*;
import processing.core.*; import processing.app.legacy.PApplet;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.util.regex.*; import java.util.regex.*;

3
app/src/processing/app/syntax/PdeKeywords.java
View File

@ -25,6 +25,7 @@
package processing.app.syntax; package processing.app.syntax;
import processing.app.*; import processing.app.*;
import processing.app.legacy.PApplet;
import processing.app.packages.Library; import processing.app.packages.Library;
import java.io.*; import java.io.*;
@ -84,7 +85,7 @@ public class PdeKeywords extends CTokenMarker {
// in case there's any garbage on the line // in case there's any garbage on the line
//if (line.trim().length() == 0) continue; //if (line.trim().length() == 0) continue;
String pieces[] = processing.core.PApplet.split(line, '\t'); String pieces[] = PApplet.split(line, '\t');
if (pieces.length >= 2) { if (pieces.length >= 2) {
//int tab = line.indexOf('\t'); //int tab = line.indexOf('\t');
// any line with no tab is ignored // any line with no tab is ignored

2
app/src/processing/app/tools/AutoFormat.java
View File

@ -25,7 +25,7 @@
package processing.app.tools; package processing.app.tools;
import processing.app.*; import processing.app.*;
import processing.core.PApplet; import processing.app.legacy.PApplet;
import static processing.app.I18n._; import static processing.app.I18n._;
import java.io.*; import java.io.*;

2
app/src/processing/app/tools/DiscourseFormat.java
View File

@ -29,7 +29,7 @@ import javax.swing.text.Segment;
import processing.app.*; import processing.app.*;
import processing.app.syntax.*; import processing.app.syntax.*;
import processing.core.PApplet; import processing.app.legacy.PApplet;
/** /**
* Format for Discourse Tool * Format for Discourse Tool

6
app/src/processing/app/windows/Platform.java
View File

@ -24,15 +24,17 @@ package processing.app.windows;
import com.sun.jna.Library; import com.sun.jna.Library;
import com.sun.jna.Native; import com.sun.jna.Native;
import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.Executor; import org.apache.commons.exec.Executor;
import processing.app.Base; import processing.app.Base;
import processing.app.Preferences; import processing.app.Preferences;
import processing.app.debug.TargetPackage; import processing.app.debug.TargetPackage;
import processing.app.legacy.PApplet;
import processing.app.legacy.PConstants;
import processing.app.tools.ExternalProcessExecutor; import processing.app.tools.ExternalProcessExecutor;
import processing.app.windows.Registry.REGISTRY_ROOT_KEY; import processing.app.windows.Registry.REGISTRY_ROOT_KEY;
import processing.core.PApplet;
import processing.core.PConstants;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;