Browse Source

SDK:
- fix npe in Android Settings when no SDK is selected
- change Android and Desktop ordering and naming in project properties slightly

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

nor..67 13 years ago
parent
commit
55b482c14f

+ 1 - 1
jme3-android/src/com/jme3/gde/android/Bundle.properties

@@ -3,7 +3,7 @@ android-base=android-base
 OpenIDE-Module-Display-Category=jMonkeyEngine
 OpenIDE-Module-Name=Android Support
 OpenIDE-Module-Short-Description=Provides Android deployment for jMonkeyEngine SDK
-LBL_Category_Mobile=Mobile
+LBL_Category_Mobile=Android
 MobileCustomizerPanel.jLabel2.text=Mobile Deployment
 MobileCustomizerPanel.jCheckBox1.text=Enable Android Deployment
 MobileCustomizerPanel.jLabel1.text=Android Target

+ 6 - 1
jme3-android/src/com/jme3/gde/android/MobileCustomizerPanel.java

@@ -71,7 +71,12 @@ public class MobileCustomizerPanel extends javax.swing.JPanel implements ActionL
             properties.setProperty("mobile.android.enabled", "");
         }
         //TODO: check properties
-        properties.setProperty("mobile.android.target", ((AndroidTarget) jComboBox1.getSelectedItem()).getName());
+        AndroidTarget target = ((AndroidTarget) jComboBox1.getSelectedItem());
+        if (target != null) {
+            properties.setProperty("mobile.android.target", target.getName());
+        } else {
+            properties.setProperty("mobile.android.target", "");
+        }
         properties.setProperty("mobile.android.package", jTextField1.getText());
     }
     

+ 1 - 1
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java

@@ -22,7 +22,7 @@ import org.openide.util.NbBundle;
  *
  * @author normenhansen
  */
[email protected](projectType = "org-netbeans-modules-java-j2seproject", category = "Application", position = 400)
[email protected](projectType = "org-netbeans-modules-java-j2seproject", category = "Application", position = 420)
 public class DesktopExeCompositeProvider implements ProjectCustomizer.CompositeCategoryProvider {
 
     private static final String CAT_LWJGL_APPLET = "DesktopExe"; // NOI18N