Author: Grid.Qian Date: 2008-06-12 23:24:05 -0400 (Thu, 12 Jun 2008) New Revision: 8748 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java Log: JBIDE-2261: add runtime version Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java 2008-06-12 22:23:39 UTC (rev 8747) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java 2008-06-13 03:24:05 UTC (rev 8748) @@ -22,6 +22,8 @@ String name = null; String homeDir = null; + + String version = null; boolean defaultRt = false; @@ -110,4 +112,12 @@ this.userConfigClasspath = userConfigClasspath; } + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java 2008-06-12 22:23:39 UTC (rev 8747) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java 2008-06-13 03:24:05 UTC (rev 8748) @@ -2,7 +2,6 @@ import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,6 +25,7 @@ private static final String FIELD_SEPARATOR = "|"; private static final String DEFAULT = "default"; private static final String HOME_DIR = "homeDir"; + private static final String VERSION = "version"; private static final String NAME = "name"; private static final String USER_CONFIG_CLASSPATH = "userConfig"; private static final String LIBRARY = "libraries"; @@ -59,6 +59,8 @@ rt.setName(value); } else if (HOME_DIR.equals(name)) { rt.setHomeDir(value); + } else if (VERSION.equals(name)) { + rt.setVersion(value); } else if (DEFAULT.equals(name)) { rt.setDefault(Boolean.parseBoolean(value)); }else if(USER_CONFIG_CLASSPATH.equals(name)){ @@ -116,6 +118,9 @@ for (int i = 0; i < runtimes.length; i++) { buffer.append(NAME).append(FIELD_SEPARATOR); buffer.append(runtimes[i].getName()); + buffer.append(FIELD_SEPARATOR).append(VERSION).append( + FIELD_SEPARATOR); + buffer.append(runtimes[i].getVersion()); buffer.append(FIELD_SEPARATOR).append(HOME_DIR).append( FIELD_SEPARATOR); buffer.append(runtimes[i].getHomeDir()); Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-12 22:23:39 UTC (rev 8747) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-13 03:24:05 UTC (rev 8748) @@ -150,7 +150,7 @@ */ public void save() { JbossWSCorePlugin.getDefault().getPreferenceStore().setValue( - "jbosswsruntimelocation", converter.getString(runtimes)); + JbossWSCoreMessages.WS_Location, converter.getString(runtimes)); IPreferenceStore store = JbossWSCorePlugin.getDefault() .getPreferenceStore(); if (store instanceof IPersistentPreferenceStore) { Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2008-06-12 22:23:39 UTC (rev 8747) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2008-06-13 03:24:05 UTC (rev 8748) @@ -24,7 +24,8 @@ * * @return set of property names */ - public Set getPropertyNames() { + @SuppressWarnings("unchecked") + public Set<String> getPropertyNames() { Set<String> names = super.getPropertyNames(); names.add(JBOSS_WS_DEPLOY);