Author: snjeza Date: 2008-12-12 17:37:53 -0500 (Fri, 12 Dec 2008) New Revision: 12581 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java Log: JBIDE-3080 Created servers uses specific JDK instead default JDK Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-12-12 22:37:47 UTC (rev 12580) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-12-12 22:37:53 UTC (rev 12581) @@ -46,4 +46,5 @@ public String getDefaultRunArgs(); public String getDefaultRunVMArgs(); public HashMap<String, String> getDefaultRunEnvVars(); + public boolean isUsingDefaultJRE(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-12-12 22:37:47 UTC (rev 12580) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-12-12 22:37:53 UTC (rev 12581) @@ -77,6 +77,9 @@ } public IVMInstall getVM() { + if (getVMInstallTypeId() == null) { + return JavaRuntime.getDefaultVMInstall(); + } String id = getAttribute(PROPERTY_VM_ID, (String)null); String type = getAttribute(PROPERTY_VM_TYPE_ID, (String)null); @@ -93,12 +96,14 @@ } public void setVM(IVMInstall selectedVM) { - if( selectedVM == null ) - selectedVM = JavaRuntime.getDefaultVMInstall(); - - setAttribute(IJBossServerRuntime.PROPERTY_VM_ID, selectedVM.getId()); - setAttribute(IJBossServerRuntime.PROPERTY_VM_TYPE_ID, selectedVM - .getVMInstallType().getId()); + if (selectedVM == null) { + setAttribute(IJBossServerRuntime.PROPERTY_VM_ID, (String) null); + setAttribute(IJBossServerRuntime.PROPERTY_VM_TYPE_ID, (String) null); + } else { + setAttribute(IJBossServerRuntime.PROPERTY_VM_ID, selectedVM.getId()); + setAttribute(IJBossServerRuntime.PROPERTY_VM_TYPE_ID, selectedVM + .getVMInstallType().getId()); + } } public String getJBossConfiguration() { @@ -135,4 +140,12 @@ envVars.put("Path", "native"); return envVars; } + + public boolean isUsingDefaultJRE() { + return getVMInstallTypeId() == null; + } + + protected String getVMInstallTypeId() { + return getAttribute(PROPERTY_VM_TYPE_ID, (String)null); + } }