[jbosstools-commits] JBoss Tools SVN: r17023 - in branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2009-08-07 18:06:01 -0400 (Fri, 07 Aug 2009) New Revision: 17023 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-4726 in branch for jbds Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-07 21:20:18 UTC (rev 17022) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-07 22:06:01 UTC (rev 17023) @@ -46,6 +46,7 @@ public static String rwf_nameTextBlank; public static String rwf_homeDirBlank; public static String rwf_NoVMSelected; + public static String rwf_jre6NotFound; public static String swf_Title; public static String swf_RuntimeInformation; public static String swf_AuthorizationDescription; Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-07 21:20:18 UTC (rev 17022) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-07 22:06:01 UTC (rev 17023) @@ -16,6 +16,7 @@ rwf_nameTextBlank=The name field must not be blank rwf_homeDirBlank=The directory field must not be blank rwf_NoVMSelected=No VM selected +rwf_jre6NotFound=No Java 6 runtime environment found JBAS_version=JBoss Application Server {0} JBEAP_version=JBoss Enterprise Application Platform {0} swf_Title=Create a new JBoss Server Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 21:20:18 UTC (rev 17022) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:06:01 UTC (rev 17023) @@ -337,8 +337,9 @@ jreCombo = new Combo(jreComposite, SWT.DROP_DOWN | SWT.READ_ONLY); jreCombo.setItems(jreNames); - jreCombo.select(defaultVMIndex); - + if( defaultVMIndex != -1 ) + jreCombo.select(defaultVMIndex); + jreButton = new Button(jreComposite, SWT.NONE); jreButton.setText(Messages.wf_JRELabel); @@ -348,6 +349,7 @@ String currentVM = jreCombo.getText(); if (showPreferencePage()) { updateJREs(); + updateErrorMessage(); jreCombo.setItems(jreNames); jreCombo.setText(currentVM); if (jreCombo.getSelectionIndex() == -1) @@ -462,7 +464,7 @@ handle.setMessage(error, IMessageProvider.ERROR); } - private String getErrorString() { + protected String getErrorString() { if (nameText == null) { // not yet initialized. no errors return null; @@ -561,29 +563,39 @@ // JRE methods protected void updateJREs() { // get all installed JVMs - installedJREs = new ArrayList<IVMInstall>(); + installedJREs = getValidJREs(); + // get names + int size = installedJREs.size(); + size = shouldIncludeDefaultJRE() ? size+1 : size; + int index = 0; + jreNames = new String[size]; + if( shouldIncludeDefaultJRE()) + jreNames[index++] = "Default JRE"; //$NON-NLS-1$ + + for (int i = 0; i < installedJREs.size(); i++) { + IVMInstall vmInstall = installedJREs.get(i); + jreNames[index++] = vmInstall.getName(); + } + defaultVMIndex = shouldIncludeDefaultJRE() ? 0 : + jreNames.length > 0 ? 0 : -1; + } + + protected boolean shouldIncludeDefaultJRE() { + return true; + } + + protected ArrayList<IVMInstall> getValidJREs() { + ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>(); IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes(); int size = vmInstallTypes.length; for (int i = 0; i < size; i++) { IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls(); int size2 = vmInstalls.length; for (int j = 0; j < size2; j++) { - installedJREs.add(vmInstalls[j]); + valid.add(vmInstalls[j]); } } - - // get names - size = installedJREs.size(); - jreNames = new String[size+1]; - jreNames[0] = "Default JRE"; - for (int i = 0; i < size; i++) { - IVMInstall vmInstall = installedJREs.get(i); - jreNames[i+1] = vmInstall.getName(); - } - - //selectedVM = JavaRuntime.getDefaultVMInstall(); - //defaultVMIndex = installedJREs.indexOf(selectedVM); - defaultVMIndex = 0; + return valid; } // WST API methods Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-07 21:20:18 UTC (rev 17022) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-07 22:06:01 UTC (rev 17023) @@ -30,9 +30,14 @@ point="org.eclipse.wst.server.ui.wizardFragments"> <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment" - typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50" - id="org.jboss.ide.eclipse.as.ui.jboss32RuntimeWizardFragmentragment"/> + typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43" + id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/> + <!-- Fragment for runtimes that require java 6 --> <fragment + class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment" + typeIds="org.jboss.ide.eclipse.as.runtime.eap.50" + id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/> + <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment" typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>