From 816842d1e1ad31069ab91e08e287b9286b618c8e Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Fri, 26 Oct 2012 20:01:50 +0000 Subject: [PATCH] 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 --- .../j2seproject/AssetsPropertiesPanel.form | 2 +- .../j2seproject/AssetsPropertiesPanel.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.form b/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.form index 4f089a8f3..866104a45 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.form +++ b/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.form @@ -1,4 +1,4 @@ - +
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.java b/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.java index 80af4d71e..40afa360d 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/AssetsPropertiesPanel.java +++ b/sdk/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") // //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 {