Author: snjeza Date: 2008-12-12 17:37:47 -0500 (Fri, 12 Dec 2008) New Revision: 12580 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-3080 Created servers uses specific JDK instead default JDK Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-12-12 21:32:48 UTC (rev 12579) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-12-12 22:37:47 UTC (rev 12580) @@ -79,6 +79,7 @@ explanationLabel; private Text nameText, homeDirText; private Combo jreCombo; + private int jreComboIndex; private Button homeDirButton, jreButton; private Composite nameComposite, homeDirComposite, jreComposite, configComposite; @@ -144,14 +145,18 @@ configurations.setConfiguration(config); configLabel.setText(Messages.wf_ConfigLabel); - IVMInstall install = rt.getVM(); - String vmName = install.getName(); - String[] jres = jreCombo.getItems(); - for (int i = 0; i < jres.length; i++) { - if (vmName.equals(jres[i])) - jreCombo.select(i); + if (rt.isUsingDefaultJRE()) { + jreCombo.select(0); + } else { + IVMInstall install = rt.getVM(); + String vmName = install.getName(); + String[] jres = jreCombo.getItems(); + for (int i = 0; i < jres.length; i++) { + if (vmName.equals(jres[i])) + jreCombo.select(i); + } } - + jreComboIndex = jreCombo.getSelectionIndex(); homeDirText.setEditable(canEdit); homeDirButton.setEnabled(canEdit); configurations.getTable().setVisible(canEdit); @@ -305,6 +310,7 @@ jreCombo.setText(currentVM); if (jreCombo.getSelectionIndex() == -1) jreCombo.select(defaultVMIndex); + jreComboIndex = jreCombo.getSelectionIndex(); } } }); @@ -396,8 +402,8 @@ } int sel = jreCombo.getSelectionIndex(); - if (sel != -1) - selectedVM = installedJREs.get(sel); + if (sel > 0) + selectedVM = installedJREs.get(sel-1); else selectedVM = null; } @@ -429,7 +435,7 @@ if (homeDir == null || homeDir.equals("")) return Messages.rwf_homeDirBlank; - if (selectedVM == null) + if (jreComboIndex < 0) return "No VM selected"; return null; @@ -509,14 +515,16 @@ // get names size = installedJREs.size(); - jreNames = new String[size]; + jreNames = new String[size+1]; + jreNames[0] = "Default JRE"; for (int i = 0; i < size; i++) { IVMInstall vmInstall = installedJREs.get(i); - jreNames[i] = vmInstall.getName(); + jreNames[i+1] = vmInstall.getName(); } - selectedVM = JavaRuntime.getDefaultVMInstall(); - defaultVMIndex = installedJREs.indexOf(selectedVM); + //selectedVM = JavaRuntime.getDefaultVMInstall(); + //defaultVMIndex = installedJREs.indexOf(selectedVM); + defaultVMIndex = 0; } // WST API methods