sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- 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
This commit is contained in:
nor..67 2012-10-26 12:49:49 +00:00
parent 23fd08ac45
commit 24712d4170
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/jme3-android/src/com/jme3/gde/android/Bundle.properties
View File

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

7
sdk/jme3-android/src/com/jme3/gde/android/MobileCustomizerPanel.java
View File

@ -71,7 +71,12 @@ public class MobileCustomizerPanel extends javax.swing.JPanel implements ActionL
properties.setProperty("mobile.android.enabled", ""); properties.setProperty("mobile.android.enabled", "");
} }
//TODO: check properties //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()); properties.setProperty("mobile.android.package", jTextField1.getText());
} }

2
sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java
View File

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