replace existing files with saveBytes(), also look into deployJava.js (issue #650)

This commit is contained in:
benfry
2011-06-21 01:23:49 +00:00
parent 47ae658028
commit c159f0eb04
6 changed files with 53 additions and 18 deletions
@@ -4399,6 +4399,11 @@ public class PApplet extends Activity implements PConstants, Runnable {
bos.close();
bos = null;
if (targetFile.exists() && !targetFile.delete()) {
System.err.println("Could not replace " +
targetFile.getAbsolutePath() + ".");
}
if (!tempFile.renameTo(targetFile)) {
System.err.println("Could not rename temporary file " +
tempFile.getAbsolutePath());
+6 -1
View File
@@ -783,17 +783,22 @@ public class JavaBuild {
sketch.hasCodeFolder() ||
javaLibraryPath.length() != 0;
File skeletonFolder = mode.getContentFile("applet");
// Copy the loading gif to the applet
String LOADING_IMAGE = "loading.gif";
// Check if the user already has their own loader image
File loadingImage = new File(sketch.getFolder(), LOADING_IMAGE);
if (!loadingImage.exists()) {
// File skeletonFolder = new File(Base.getContentFile("lib"), "export");
File skeletonFolder = mode.getContentFile("applet");
loadingImage = new File(skeletonFolder, LOADING_IMAGE);
}
Base.copyFile(loadingImage, new File(appletFolder, LOADING_IMAGE));
// not a good idea after all
// File deployFile = new File(skeletonFolder, "deployJava.js");
// Base.copyFile(deployFile, new File(appletFolder, "deployJava.js"));
// Create new .jar file
FileOutputStream zipOutputFile =
new FileOutputStream(new File(appletFolder, sketch.getName() + ".jar"));
+8
View File
@@ -112,6 +112,14 @@
</fileset>
</copy>
<!-- decided against this.
see: http://code.google.com/p/processing/issues/detail?id=650 -->
<!--
<get src="http://www.java.com/js/deployJava.js"
dest="${target.path}/modes/java/applet/deployJava.js"
usetimestamp="true" />
-->
<delete dir="${target.path}/modes/java/examples">
<include name="**/applet/**" />
</delete>
+12
View File
@@ -5007,6 +5007,12 @@ public class PApplet extends Applet
bos.close();
bos = null;
if (targetFile.exists()) {
if (!targetFile.delete()) {
System.err.println("Could not replace " +
targetFile.getAbsolutePath() + ".");
}
}
if (!tempFile.renameTo(targetFile)) {
System.err.println("Could not rename temporary file " +
tempFile.getAbsolutePath());
@@ -5058,6 +5064,12 @@ public class PApplet extends Applet
output.close();
output = null;
if (file.exists()) {
if (!file.delete()) {
System.err.println("Could not replace " + file.getAbsolutePath());
}
}
if (!tempFile.renameTo(file)) {
System.err.println("Could not rename temporary file " +
tempFile.getAbsolutePath());
+2
View File
@@ -72,6 +72,8 @@ X decision: add note to reference that the 'c' is a misnomer
X screen.width/screen.height -> screen.width, screenW/H
o needs to be documented, and excise all screen.width/height references
X add to the 'changes' document
X saveBytes() error when writing to existing file
X http://code.google.com/p/processing/issues/detail?id=667
cleanup
o if too many errors come through during setup, app will terminate
+20 -17
View File
@@ -7,10 +7,12 @@ X Launch script for Linux fails to open a sketches with relative paths
X http://code.google.com/p/processing/issues/detail?id=707
X Badly formed character constant exception
X http://code.google.com/p/processing/issues/detail?id=714
_ add deployJava.js to local sketch folder (causes internet requirement)
_ http://code.google.com/p/processing/issues/detail?id=650
_ http://www.java.com/js/deployJava.js
o people not knowing how to use Java w/ OpenGL renderer
o http://dev.processing.org/bugs/show_bug.cgi?id=1259
o add deployJava.js to local sketch folder (causes internet requirement)
X http://code.google.com/p/processing/issues/detail?id=650
X http://www.java.com/js/deployJava.js
X bad idea, since it adds 17k to every download
cleanup
X how is autoformat doing? good now
@@ -31,21 +33,27 @@ o prevent people from setting the font size too small in the editor
o how do we figure out what "too small" is?
X -> everyone thinks this is funny
_ play button (and others) no longer highlighting
_ http://code.google.com/p/processing/issues/detail?id=688
_ write quicktime uncompressed (w/o qtjava)
_ http://www.randelshofer.ch/blog/2010/10/writing-quicktime-movies-in-pure-java/
_ fix opengl applets so that we can safely kill P3D
_ automatically insert the 'import processing.opengl' when P3D used
_ add support for automatically including OpenGL when asking for P3D
_ when using P3D and not realizing that it's really OpenGL...
Exception in thread "Animation Thread" java.lang.NoClassDefFoundError: Could not initialize class javax.media.opengl.GLProfile
Exception in thread "Animation Thread" java.lang.UnsatisfiedLinkError: no gluegen-rt in java.library.path
_ why we can't do OpenGL applets that are self-signed (wiki?)
_ http://www.cert.org/blogs/vuls/2008/06/signed_java_security_worse_tha.html
_ handleFindReference in Editor.java should be public for alternative modes (?)
_ http://code.google.com/p/processing/issues/detail?id=713
_ play button (and others) no longer highlighting
_ http://code.google.com/p/processing/issues/detail?id=688
_ write quicktime uncompressed (w/o qtjava)
_ http://www.randelshofer.ch/blog/2010/10/writing-quicktime-movies-in-pure-java/
_ Resize box on OS X is not present in Examples box
_ http://code.google.com/p/processing/issues/detail?id=730
_ fix opengl applets so that we can safely kill P3D
_ automatically insert the 'import processing.opengl' when P3D used
_ examples window placed off-screen when PDE window is maximized
_ http://code.google.com/p/processing/issues/detail?id=669
pnode: look more closely at json and xml compatibility
@@ -209,8 +217,6 @@ _ idea of examples, libraries, reference built into the base system
_ look through web/java_generate to see how the doc stuff works
_ work through andres' pshape changes to smooth things out
_ post videos online of the android work
_ why we can't do OpenGL applets that are self-signed (wiki?)
_ http://www.cert.org/blogs/vuls/2008/06/signed_java_security_worse_tha.html
_ don't make examples read-only
_ just do them from psk files
@@ -229,9 +235,6 @@ _ jogl jar files, or jogl install will cause trouble
_ /System/Library/Java/Extensions or /Library/Java/Extensions
_ the /System one contains qtjava
_ the /Library one is empty (by default), maybe skip it?
_ http://dev.processing.org/bugs/show_bug.cgi?id=1259
_ another problem with opengl libraries
_ http://dev.processing.org/bugs/show_bug.cgi?id=1570
_ when a conflicting library is found, need to report it
_ altho prolly only when it's actually different (md5hash it?)
_ this seems to be causing a lot of trouble with recent releases