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

changes in progress for 86

Browse Source
This commit is contained in:
benfry
2005-05-01 18:52:27 +00:00
parent f3b1c9a3c9
commit 9a5d1d4be3
6 changed files with 86 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
processing/app/Editor.java
View File

@@ -1359,8 +1359,9 @@ public class Editor extends JFrame
sketch = new Sketch(this, path);
// TODO re-enable this once export application works
exportAppItem.setEnabled(false && !sketch.isLibrary());
buttons.disableRun(sketch.isLibrary());
exportAppItem.setEnabled(false);
//exportAppItem.setEnabled(false && !sketch.isLibrary());
//buttons.disableRun(sketch.isLibrary());
header.rebuild();
if (Preferences.getBoolean("console.auto_clear")) {
console.clear();
@@ -1425,11 +1426,13 @@ public class Editor extends JFrame
* hitting export twice, quickly, and horking things up.
*/
synchronized public void handleExport() {
String what = sketch.isLibrary() ? "Applet" : "Library";
message("Exporting " + what + "...");
//String what = sketch.isLibrary() ? "Applet" : "Library";
//message("Exporting " + what + "...");
message("Exporting applet...");
try {
boolean success = sketch.isLibrary() ?
sketch.exportLibrary() : sketch.exportApplet();
//boolean success = sketch.isLibrary() ?
//sketch.exportLibrary() : sketch.exportApplet();
boolean success = sketch.exportApplet();
if (success) {
message("Done exporting.");
} else {

32
processing/app/Sketch.java
View File

@@ -40,23 +40,25 @@ import com.oroinc.text.regex.*;
* Stores information about files in the current sketch
*/
public class Sketch {
//static String TEMP_BUILD_PATH = "lib" + File.separator + "build";
static File tempBuildFolder;
Editor editor;
// name of sketch, which is the name of main file
// (without .pde or .java extension)
/**
* Name of sketch, which is the name of main file
* (without .pde or .java extension)
*/
String name;
// name of 'main' file, used by load(), such as sketch_04040.pde
/**
* Name of 'main' file, used by load(), such as sketch_04040.pde
*/
String mainFilename;
//String path; // path to 'main' file for this sketch
// true if any of the files have been modified
/// true if any of the files have been modified
boolean modified;
boolean library; // true if it's a library
//boolean library; // true if it's a library
public File folder; //sketchFolder;
public File dataFolder;
@@ -146,10 +148,10 @@ public class Sketch {
codeFolder = new File(folder, "code");
dataFolder = new File(folder, "data");
File libraryFolder = new File(folder, "library");
if (libraryFolder.exists()) {
library = true;
}
//File libraryFolder = new File(folder, "library");
//if (libraryFolder.exists()) {
//library = true;
//}
// get list of files in the sketch folder
String list[] = folder.list();
@@ -599,9 +601,9 @@ public class Sketch {
/**
* Return true if this sketch is a library.
*/
public boolean isLibrary() {
return library;
}
//public boolean isLibrary() {
//return library;
//}
/**
@@ -798,7 +800,7 @@ public class Sketch {
// otherwise their .class and .jar files can cause conflicts.
Base.removeDir(new File(folder, "applet"));
Base.removeDir(new File(folder, "application"));
Base.removeDir(new File(folder, "library"));
//Base.removeDir(new File(folder, "library"));
// do a "save"
// this will take care of the unsaved changes in each of the tabs