Browse Source

SDK:
- change AssetsPropertiesPanel so that it doesn't create an assets configuration if not path is specified (e.g. in library projects)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9907 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 13 years ago
parent
commit
75b585fa59

+ 1 - 1
jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.form

@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>

+ 12 - 6
jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.java

@@ -56,7 +56,9 @@ public class AssetsPropertiesPanel extends javax.swing.JPanel implements ActionL
 
     private Project project;
 
-    /** Creates new form ProjectAssetsPropertiesPanel */
+    /**
+     * Creates new form ProjectAssetsPropertiesPanel
+     */
     public AssetsPropertiesPanel(Project propertiesFile) {
         initComponents();
         this.project = propertiesFile;
@@ -64,10 +66,10 @@ public class AssetsPropertiesPanel extends javax.swing.JPanel implements ActionL
         HelpCtx.setHelpIDString(this, "sdk.application_deployment");
     }
 
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
      */
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@@ -187,7 +189,11 @@ public class AssetsPropertiesPanel extends javax.swing.JPanel implements ActionL
 
         properties.setProperty("assets.jar.name", jTextField1.getText());
         properties.setProperty("assets.excludes", jTextField2.getText());
-        properties.setProperty("assets.folder.name", jTextField3.getText());
+        if (jTextField3.getText() != null && jTextField3.getText().trim().length() > 0) {
+            properties.setProperty("assets.folder.name", jTextField3.getText());
+        }else{
+            properties.setProperty("assets.folder.name", (String)null);
+        }
         if (jCheckBox1.isSelected()) {
             properties.setProperty("assets.compress", "true");
         } else {