diff --git a/app/PdePreprocessor.java b/app/PdePreprocessor.java index a568cc635..ab16202b5 100644 --- a/app/PdePreprocessor.java +++ b/app/PdePreprocessor.java @@ -23,13 +23,59 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +import java.io.*; + public class PdePreprocessor { - public PdePreprocessor() { + static final String applet_imports[] = { + "java.applet", "java.awt", "java.awt.image", "java.awt.event", + "java.io", "java.net", "java.text", "java.util", "java.util.zip" + }; + + static final String application_imports[] = { + "java.applet", "java.awt", "java.awt.image", "java.awt.event", + "java.io", "java.net", "java.text", "java.util", "java.util.zip", + "javax.comm", + + // if jdk14 defined, jdk13 will be as well +#ifdef JDK13 + "javax.sound.midi", "javax.sound.midi.spi", + "javax.sound.sampled", "javax.sound.sampled.spi", +#endif + +#ifdef JDK14 + "javax.xml.parsers", "javax.xml.transform", + "javax.xml.transform.dom", "javax.xml.transform.sax", + "javax.xml.transform.stream", "org.xml.sax", + "org.xml.sax.ext", "org.xml.sax.helpers" +#endif + }; + + static final int BEGINNER = 0; + static final int INTERMEDIATE = 1; + static final int ADVANCED = 2; + + String tempClass; + String tempFilename; + String tempClassFilename; + + Reader programReader; + String buildPath; + + boolean usingExternal; // use an external process to display the applet? + + public PdePreprocessor(String program, String buildPath) { + this.programReader = new StringReader(program); + this.buildPath = buildPath; + + usingExternal = PdeBase.getBoolean("play.external", false); } public String writeJava(String name, boolean extendsNormal, - boolean exporting) { - return "This class is currently purely abstract"; + boolean exporting) throws java.lang.Exception { + + String extendsWhat = extendsNormal ? "BApplet" : "BAppletGL"; + + return ""; } } diff --git a/app/PdePreprocessorOro.java b/app/PdePreprocessorOro.java index 95cd7849f..5a978b7c7 100644 --- a/app/PdePreprocessorOro.java +++ b/app/PdePreprocessorOro.java @@ -28,52 +28,13 @@ import java.io.*; public class PdePreprocessorOro extends PdePreprocessor { - //static final String EXTENDS = "extends BApplet "; - //static final String EXTENDS_KJC = "extends KjcApplet "; - - static final String applet_imports[] = { - "java.applet", "java.awt", "java.awt.image", "java.awt.event", - "java.io", "java.net", "java.text", "java.util", "java.util.zip" - }; - - static final String application_imports[] = { - "java.applet", "java.awt", "java.awt.image", "java.awt.event", - "java.io", "java.net", "java.text", "java.util", "java.util.zip", - "javax.comm", - - // if jdk14 defined, jdk13 will be as well -#ifdef JDK13 - "javax.sound.midi", "javax.sound.midi.spi", - "javax.sound.sampled", "javax.sound.sampled.spi", -#endif - -#ifdef JDK14 - "javax.xml.parsers", "javax.xml.transform", - "javax.xml.transform.dom", "javax.xml.transform.sax", - "javax.xml.transform.stream", "org.xml.sax", - "org.xml.sax.ext", "org.xml.sax.helpers" -#endif - }; String program; - String buildPath; - boolean usingExternal; // use an external process to display the applet? - - String tempClass; - String tempFilename; - String tempClassFilename; public PdePreprocessorOro(String program, String buildPath) { - this.program = program; - this.buildPath = buildPath; - - usingExternal = PdeBase.getBoolean("play.external", false); + super(program, buildPath); } - static final int BEGINNER = 0; - static final int INTERMEDIATE = 1; - static final int ADVANCED = 2; - // writes .java file into buildPath public String writeJava(String name, boolean extendsNormal, boolean exporting) {