Browse Source

ProjectUpgrader - Some Formatting and re-positioned the Action in the Context Menu (It's now below "New" and not above)

MeFisto94 9 years ago
parent
commit
ade0d4b874

+ 1 - 1
jme3-core/src/com/jme3/gde/core/j2seproject/actions/Bundle.properties

@@ -2,5 +2,5 @@ UpgradeProjectVisualPanel1.jRadioButton1.text=Keep 3.0 Compatibility (Partial Up
 UpgradeProjectVisualPanel1.jRadioButton2.text=Upgrade to 3.1
 UpgradeProjectVisualPanel1.jRadioButton2.text=Upgrade to 3.1
 UpgradeProjectVisualPanel1.jTextPane1.text=As software evolves, old files can get deprecated and need an overhaul.\nThis also happened to SDK Project Files as we moved from 3.0 to 3.1\nLuckily there is this upgrader, which will do all the work for you.\n\n\
 UpgradeProjectVisualPanel1.jTextPane1.text=As software evolves, old files can get deprecated and need an overhaul.\nThis also happened to SDK Project Files as we moved from 3.0 to 3.1\nLuckily there is this upgrader, which will do all the work for you.\n\n\
 Note: In case of emergency, open "nbproject/project.properties" with Netbeans\nand click on the history button in the upper left corner.\nThere you can revert the changes.\n\n\
 Note: In case of emergency, open "nbproject/project.properties" with Netbeans\nand click on the history button in the upper left corner.\nThere you can revert the changes.\n\n\
-There are two ways I can do the upgrade: I can do a partial upgrade, which means\nyour file will be marked as a 3.0 project and only backwards-compatible changes\nare applied. That way you won't be able to compile the project under 3.1,\nbut it will work under 3.0 (and stop the warnings in 3.1). Use this way if you manage your dependencies (libs)\nmanually or if you don't use the Netbeans' compile/deploy.\n\n\
+There are two ways I can do the upgrade: I can do a partial upgrade, which means\nyour file will be marked as a 3.0 project and only backwards-compatible changes\nare applied. That way you won't be able to compile the project under 3.1,\nbut it will work under 3.0 (and stop the warnings in 3.1).\nUse this way if you manage your dependencies (libs)\nmanually or if you don't use the Netbeans' compile/deploy.\n\n\
 The other way is the simple upgrade: Your project will be upgraded to 3.1,\nhowever it won't be openable under 3.0 anymore.
 The other way is the simple upgrade: Your project will be upgraded to 3.1,\nhowever it won't be openable under 3.0 anymore.

+ 1 - 1
jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardAction.java

@@ -41,7 +41,7 @@ import org.openide.util.NbBundle;
 )
 )
 @ActionReferences({
 @ActionReferences({
     @ActionReference(path = "Menu/File", position = 1415),
     @ActionReference(path = "Menu/File", position = 1415),
-    @ActionReference(path = "Projects/org-netbeans-modules-java-j2seproject/Actions", position = 100)
+    @ActionReference(path = "Projects/org-netbeans-modules-java-j2seproject/Actions", position = 200)
 })
 })
 @NbBundle.Messages("CTL_UpgradeProjectWizardAction=Upgrade Project")
 @NbBundle.Messages("CTL_UpgradeProjectWizardAction=Upgrade Project")
 
 

+ 1 - 1
jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java

@@ -222,7 +222,7 @@ public class UpgradeProjectWizardPanel2 implements WizardDescriptor.ValidatingPa
                 if (flatUpgrade)
                 if (flatUpgrade)
                     appendLog("Chapeau! We are done :)\nNote: You can always re-run this Wizard, if you feel the need to Upgrade to 3.1");
                     appendLog("Chapeau! We are done :)\nNote: You can always re-run this Wizard, if you feel the need to Upgrade to 3.1");
                 else
                 else
-                    appendLog("\n\nChapeau! We are done :)\nNow that your project is 3.1 compatible, feel free to remove the NiftyGUI,\nBullet-Native, Terrain, etc. libraries to your liking, if you don't need them. (They were always-included in 3.0)");
+                    appendLog("\n\nChapeau! We are done :)\nNow that your project is 3.1 compatible, feel free to remove the NiftyGUI,\nBullet-Native, Terrain, etc. libraries to your liking, if you don't need them.\nThey were always automatically included in 3.0");
                 
                 
             } catch (Exception e) {
             } catch (Exception e) {
                 appendLog("Error when trying to write project.properties. Exception: " + e.getMessage());
                 appendLog("Error when trying to write project.properties. Exception: " + e.getMessage());