Author: rob.stryker(a)jboss.com Date: 2009-02-24 01:37:26 -0500 (Tue, 24 Feb 2009) New Revision: 13745 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java Log: JBIDE-3770 - changed ids to non-internal Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-24 06:23:49 UTC (rev 13744) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-24 06:37:26 UTC (rev 13745) @@ -130,7 +130,7 @@ "\"" + runtime.getRuntime().getLocation().append("bin").append("native") + "\"", false); /* Claspath */ - List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, (List<String>)null); + List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>()); List<String> newCP = fixCP(cp, jbs); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin"); @@ -143,13 +143,19 @@ protected static List<String> fixCP(List<String> list, JBossServer jbs) { try { + boolean found = false; String[] asString = (String[]) list.toArray(new String[list.size()]); for( int i = 0; i < asString.length; i++ ) { if( asString[i].contains(RunJarContainerWrapper.ID)) { + found = true; asString[i] = getRunJarRuntimeCPEntry(jbs).getMemento(); } } - return Arrays.asList(asString); + ArrayList<String> result = new ArrayList<String>(); + result.addAll(Arrays.asList(asString)); + if( !found ) + result.add(getRunJarRuntimeCPEntry(jbs).getMemento()); + return result; } catch( CoreException ce) { return list; }