diff --git a/sdk/jme3-lwjgl-applet/applet-data/appletlogo.png b/sdk/jme3-lwjgl-applet/applet-data/appletlogo.png deleted file mode 100644 index f40cf4d3b..000000000 Binary files a/sdk/jme3-lwjgl-applet/applet-data/appletlogo.png and /dev/null differ diff --git a/sdk/jme3-lwjgl-applet/build.xml b/sdk/jme3-lwjgl-applet/build.xml index da4ff691b..8fae365fc 100644 --- a/sdk/jme3-lwjgl-applet/build.xml +++ b/sdk/jme3-lwjgl-applet/build.xml @@ -5,12 +5,7 @@ Builds, tests, and runs the project com.jme3.gde.lwjgl.applet. - - - - - - + diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties index 8eb4cf0c8..710252ec6 100644 --- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties +++ b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/Bundle.properties @@ -12,3 +12,4 @@ LwjglAppletCustomizerPanel.jTextField1.text=640 LwjglAppletCustomizerPanel.jLabel2.text=An applet can be launched in any browser supporting Java. LwjglAppletCustomizerPanel.jTextField2.text=480 LwjglAppletCustomizerPanel.jLabel3.text=X +LwjglAppletCustomizerPanel.jLabel4.text=The applet uses the splash image set in the "Application" tab. diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCompositeProvider.java b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCompositeProvider.java index c9c64c94b..3b33ed258 100644 --- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCompositeProvider.java +++ b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCompositeProvider.java @@ -9,18 +9,10 @@ import com.jme3.gde.core.j2seproject.ProjectExtensionProperties; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import javax.swing.JComponent; import org.netbeans.api.project.Project; import org.netbeans.spi.project.ui.support.ProjectCustomizer; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; import org.openide.util.Exceptions; import org.openide.util.Lookup; @@ -62,7 +54,7 @@ public class LwjglAppletCompositeProvider implements ProjectCustomizer.Composite private class SavePropsListener implements ActionListener { private String extensionName = "lwjglapplet"; - private String extensionVersion = "v0.98"; + private String extensionVersion = "v1.0"; private String[] extensionDependencies = new String[]{"jar", "-lwjgl-applet"}; private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies); private ProjectExtensionProperties properties; @@ -72,7 +64,6 @@ public class LwjglAppletCompositeProvider implements ProjectCustomizer.Composite this.properties = props; this.project = project; manager.setAntTaskLibrary("lwjgl-applet"); - manager.setDataZip("nbres:/com/jme3/gde/lwjgl/applet/applet-data.zip"); } public void actionPerformed(ActionEvent e) { diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.form b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.form index 01e92333e..729aea3f0 100644 --- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.form +++ b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.form @@ -28,6 +28,7 @@ + @@ -43,7 +44,9 @@ - + + + @@ -91,5 +94,15 @@ + + + + + + + + + + diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.java b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.java index 7900fa32a..753da45d2 100644 --- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.java +++ b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/LwjglAppletCustomizerPanel.java @@ -73,6 +73,7 @@ public class LwjglAppletCustomizerPanel extends javax.swing.JPanel implements Ac jLabel2 = new javax.swing.JLabel(); jTextField2 = new javax.swing.JTextField(); jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); jCheckBox1.setText(org.openide.util.NbBundle.getMessage(LwjglAppletCustomizerPanel.class, "LwjglAppletCustomizerPanel.jCheckBox1.text")); // NOI18N @@ -86,6 +87,9 @@ public class LwjglAppletCustomizerPanel extends javax.swing.JPanel implements Ac jLabel3.setText(org.openide.util.NbBundle.getMessage(LwjglAppletCustomizerPanel.class, "LwjglAppletCustomizerPanel.jLabel3.text")); // NOI18N + jLabel4.setFont(new java.awt.Font("Lucida Grande", 2, 13)); // NOI18N + jLabel4.setText(org.openide.util.NbBundle.getMessage(LwjglAppletCustomizerPanel.class, "LwjglAppletCustomizerPanel.jLabel4.text")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -101,6 +105,7 @@ public class LwjglAppletCustomizerPanel extends javax.swing.JPanel implements Ac .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(169, Short.MAX_VALUE)) + .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 408, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -114,7 +119,9 @@ public class LwjglAppletCustomizerPanel extends javax.swing.JPanel implements Ac .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel3) .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(212, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel4) + .addContainerGap(188, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables @@ -122,6 +129,7 @@ public class LwjglAppletCustomizerPanel extends javax.swing.JPanel implements Ac private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; private javax.swing.JTextField jTextField1; private javax.swing.JTextField jTextField2; // End of variables declaration//GEN-END:variables diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/applet-data.zip b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/applet-data.zip deleted file mode 100644 index 36a392b97..000000000 Binary files a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/applet-data.zip and /dev/null differ diff --git a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/lwjgl-applet-targets.xml b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/lwjgl-applet-targets.xml index 7538e54bc..88f00c118 100644 --- a/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/lwjgl-applet-targets.xml +++ b/sdk/jme3-lwjgl-applet/src/com/jme3/gde/lwjgl/applet/lwjgl-applet-targets.xml @@ -1,11 +1,5 @@ - Packing Splash - - - Applet Creation @@ -17,58 +11,20 @@ - - - - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + +