[jbosstools-commits] JBoss Tools SVN: r40381 - in trunk/runtime/plugins: org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers and 1 other directories.

Author: snjeza Date: 2012-04-20 08:56:38 -0400 (Fri, 20 Apr 2012) New Revision: 40381 Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers/SeamHandler.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java Log: JBIDE-11571 - Seam cannot be added using runtime detection without the parent JBoss AS being added as well Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2012-04-20 12:23:36 UTC (rev 40380) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2012-04-20 12:56:38 UTC (rev 40381) @@ -95,43 +95,44 @@ public static void createJBossServerFromDefinitions(List<RuntimeDefinition> serverDefinitions) { for (RuntimeDefinition serverDefinition:serverDefinitions) { - if (!serverDefinition.isEnabled()) { - continue; - } - File asLocation = getLocation(serverDefinition); - if (asLocation == null || !asLocation.isDirectory()) { - continue; - } - String type = serverDefinition.getType(); - if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) - || SOA_P_STD.equals(type) || EWP.equals(type) - || EAP_STD.equals(type)) { - String name = serverDefinition.getName(); - String runtimeName = name + " " + RUNTIME; //$NON-NLS-1$ - int index = getJBossASVersion(asLocation, serverDefinition); - createJBossServer(asLocation, index, name, runtimeName); - } else if (AS.equals(type)){ - String version = serverDefinition.getVersion(); - int index = 2; - if ("3.2".equals(version)) { //$NON-NLS-1$ - index = 0; - } else if ("4.0".equals(version)) { //$NON-NLS-1$ - index = 1; - } else if ("4.2".equals(version)) { //$NON-NLS-1$ - index = 2; - } else if ("5.0".equals(version)) { //$NON-NLS-1$ - index = 3; - } else if ("5.1".equals(version)) { //$NON-NLS-1$ - index = 4; - } else if ("6.0".equals(version) || "6.1".equals(version)) { //$NON-NLS-1$ - index = 5; - } else if ("7.0".equals(version)) { //$NON-NLS-1$ - index = JBOSS_AS70_INDEX; - } else if ("7.1".equals(version)) { //$NON-NLS-1$ - index = JBOSS_AS71_INDEX; + if (serverDefinition.isEnabled()) { + File asLocation = getLocation(serverDefinition); + if (asLocation == null || !asLocation.isDirectory()) { + continue; } - // NEW_SERVER_ADAPTER add logic for new adapter here - createJBossServer(serverDefinition.getLocation(),index,serverDefinition.getName(),serverDefinition.getName() + " " + RUNTIME); //$NON-NLS-1$ + String type = serverDefinition.getType(); + if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) + || SOA_P_STD.equals(type) || EWP.equals(type) + || EAP_STD.equals(type)) { + String name = serverDefinition.getName(); + String runtimeName = name + " " + RUNTIME; //$NON-NLS-1$ + int index = getJBossASVersion(asLocation, serverDefinition); + createJBossServer(asLocation, index, name, runtimeName); + } else if (AS.equals(type)) { + String version = serverDefinition.getVersion(); + int index = 2; + if ("3.2".equals(version)) { //$NON-NLS-1$ + index = 0; + } else if ("4.0".equals(version)) { //$NON-NLS-1$ + index = 1; + } else if ("4.2".equals(version)) { //$NON-NLS-1$ + index = 2; + } else if ("5.0".equals(version)) { //$NON-NLS-1$ + index = 3; + } else if ("5.1".equals(version)) { //$NON-NLS-1$ + index = 4; + } else if ("6.0".equals(version) || "6.1".equals(version)) { //$NON-NLS-1$ + index = 5; + } else if ("7.0".equals(version)) { //$NON-NLS-1$ + index = JBOSS_AS70_INDEX; + } else if ("7.1".equals(version)) { //$NON-NLS-1$ + index = JBOSS_AS71_INDEX; + } + // NEW_SERVER_ADAPTER add logic for new adapter here + createJBossServer(serverDefinition.getLocation(), index, + serverDefinition.getName(), + serverDefinition.getName() + " " + RUNTIME); //$NON-NLS-1$ + } } createJBossServerFromDefinitions(serverDefinition.getIncludedServerDefinitions()); } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers/SeamHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers/SeamHandler.java 2012-04-20 12:23:36 UTC (rev 40380) +++ trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers/SeamHandler.java 2012-04-20 12:56:38 UTC (rev 40381) @@ -47,13 +47,13 @@ Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>(); for(RuntimeDefinition serverDefinition:serverDefinitions) { - if (!serverDefinition.isEnabled()) { - continue; + if (serverDefinition.isEnabled()) { + String type = serverDefinition.getType(); + if (SEAM.equals(type)) { + addSeam(map, serverDefinition, + serverDefinition.getLocation()); + } } - String type = serverDefinition.getType(); - if (SEAM.equals(type)) { - addSeam(map, serverDefinition, serverDefinition.getLocation()); - } initializeRuntimes(serverDefinition.getIncludedServerDefinitions()); } SeamRuntimeManager.getInstance().save(); Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-04-20 12:23:36 UTC (rev 40380) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-04-20 12:56:38 UTC (rev 40381) @@ -128,7 +128,17 @@ for (RuntimeDefinition serverDefinition:serverDefinitions) { if (serverDefinition.isEnabled()) { enableOk = true; + } else { + for (RuntimeDefinition includedDefinition:serverDefinition.getIncludedServerDefinitions()) { + if (includedDefinition.isEnabled()) { + enableOk = true; + break; + } + } } + if (enableOk) { + break; + } } getButton(IDialogConstants.OK_ID).setEnabled(enableOk); }