Author: snjeza Date: 2012-02-10 18:09:04 -0500 (Fri, 10 Feb 2012) New Revision: 38631 Added: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimeDefinition.java Removed: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java 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.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/InvalidRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector/src/org/jboss/tools/runtime/handlers/DroolsHandler.java trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector/src/org/jboss/tools/runtime/handlers/EsbHandler.java trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector/src/org/jboss/tools/runtime/handlers/JbpmHandler.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/JBossRuntimeStartup.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeLabelProvider.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeDialog.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java Log: JBIDE-10244 Cleaning up Runtime plugin 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-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -56,7 +56,7 @@ import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector; import org.jboss.tools.runtime.core.model.IRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.osgi.framework.Bundle; public class JBossASHandler extends AbstractRuntimeDetector implements IJBossRuntimePluginConstants { @@ -68,11 +68,11 @@ private static final String DROOLS = "DROOLS"; // NON-NLS-1$ private static final String ESB = "ESB"; //$NON-NLS-1$ - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { createJBossServerFromDefinitions(serverDefinitions); } - private static File getLocation(ServerDefinition serverDefinition) { + private static File getLocation(RuntimeDefinition serverDefinition) { String type = serverDefinition.getType(); String version = serverDefinition.getVersion(); if (EAP.equals(type) && version != null && version.startsWith("6") ) { @@ -93,8 +93,8 @@ return null; } - public static void createJBossServerFromDefinitions(List<ServerDefinition> serverDefinitions) { - for (ServerDefinition serverDefinition:serverDefinitions) { + public static void createJBossServerFromDefinitions(List<RuntimeDefinition> serverDefinitions) { + for (RuntimeDefinition serverDefinition:serverDefinitions) { if (!serverDefinition.isEnabled()) { continue; } @@ -137,7 +137,7 @@ } } - private static int getJBossASVersion(File asLocation, ServerDefinition serverDefinition) { + private static int getJBossASVersion(File asLocation, RuntimeDefinition serverDefinition) { int index = -1; String type = serverDefinition.getType(); String ver = serverDefinition.getVersion(); @@ -327,7 +327,7 @@ } - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { if (monitor.isCanceled() || root == null || !isEnabled()) { return null; @@ -336,7 +336,7 @@ ServerBean serverBean = loader.getServerBean(); if (!JBossServerType.UNKNOWN.equals(serverBean.getType())) { - ServerDefinition serverDefinition = new ServerDefinition(serverBean.getName(), + RuntimeDefinition serverDefinition = new RuntimeDefinition(serverBean.getName(), serverBean.getVersion(), serverBean.getType().getId(), new File(serverBean.getLocation())); calculateIncludedServerDefinition(serverDefinition, monitor); return serverDefinition; @@ -345,7 +345,7 @@ } private void calculateIncludedServerDefinition( - ServerDefinition serverDefinition, IProgressMonitor monitor) { + RuntimeDefinition serverDefinition, IProgressMonitor monitor) { if (serverDefinition == null || serverDefinition.getType() == null) { return; } @@ -354,7 +354,7 @@ return; } serverDefinition.getIncludedServerDefinitions().clear(); - List<ServerDefinition> serverDefinitions = serverDefinition + List<RuntimeDefinition> serverDefinitions = serverDefinition .getIncludedServerDefinitions(); JBossRuntimeLocator locator = new JBossRuntimeLocator(); final File location = getLocation(serverDefinition); @@ -373,9 +373,9 @@ try { setEnabled(false); for (File directory : directories) { - List<ServerDefinition> definitions = new ArrayList<ServerDefinition>(); + List<RuntimeDefinition> definitions = new ArrayList<RuntimeDefinition>(); locator.searchDirectory(directory, definitions, 1, monitor); - for (ServerDefinition definition:definitions) { + for (RuntimeDefinition definition:definitions) { definition.setParent(serverDefinition); } serverDefinitions.addAll(definitions); @@ -389,7 +389,7 @@ } } - private void addDrools(ServerDefinition serverDefinition) { + private void addDrools(RuntimeDefinition serverDefinition) { if (serverDefinition == null) { return; } @@ -400,7 +400,7 @@ File droolsRoot = serverDefinition.getLocation(); if (droolsRoot.isDirectory()) { String name = "Drools - " + serverDefinition.getName(); - ServerDefinition droolsDefinition = new ServerDefinition( + RuntimeDefinition droolsDefinition = new RuntimeDefinition( name, serverDefinition.getVersion(), DROOLS, droolsRoot); droolsDefinition.setParent(serverDefinition); @@ -410,7 +410,7 @@ } } - private void addEsb(ServerDefinition serverDefinition) { + private void addEsb(RuntimeDefinition serverDefinition) { if (serverDefinition == null) { return; } @@ -428,7 +428,7 @@ if (esbRoot.isDirectory()) { String name = "ESB - " + serverDefinition.getName(); String version=""; - ServerDefinition esbDefinition = new ServerDefinition( + RuntimeDefinition esbDefinition = new RuntimeDefinition( name, version, ESB, esbRoot); IRuntimeDetector esbDetector = RuntimeCoreActivator.getEsbDetector(); @@ -454,7 +454,7 @@ } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return false; } @@ -481,7 +481,7 @@ @Override public void computeIncludedServerDefinition( - ServerDefinition serverDefinition) { + RuntimeDefinition serverDefinition) { if (serverDefinition == null) { return; } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.jboss.tools.runtime.core.model.IRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; /** * @author snjeza @@ -33,17 +33,17 @@ public JBossRuntimeLocator() { } - public List<ServerDefinition> searchForRuntimes(String path, IProgressMonitor monitor) { + public List<RuntimeDefinition> searchForRuntimes(String path, IProgressMonitor monitor) { return searchForRuntimes(new Path(path), monitor); } - public List<ServerDefinition> searchForRuntimes(IPath path, IProgressMonitor monitor) { - List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>(); + public List<RuntimeDefinition> searchForRuntimes(IPath path, IProgressMonitor monitor) { + List<RuntimeDefinition> serverDefinitions = new ArrayList<RuntimeDefinition>(); searchForRuntimes(serverDefinitions, path, monitor); return serverDefinitions; } - private void searchForRuntimes(List<ServerDefinition> serverDefinitions, IPath path, + private void searchForRuntimes(List<RuntimeDefinition> serverDefinitions, IPath path, IProgressMonitor monitor) { File[] files = null; if (path != null) { @@ -73,7 +73,7 @@ } - public void searchDirectory(File directory, List<ServerDefinition> serverDefinitions, + public void searchDirectory(File directory, List<RuntimeDefinition> serverDefinitions, int depth, IProgressMonitor monitor) { if (depth == 0 || monitor.isCanceled() || directory == null || !directory.isDirectory()) { return; @@ -89,7 +89,7 @@ if (!detector.isEnabled()) { continue; } - ServerDefinition serverDefinition = detector.getServerDefinition(directory, monitor); + RuntimeDefinition serverDefinition = detector.getServerDefinition(directory, monitor); if (serverDefinition != null) { serverDefinitions.add(serverDefinition); return; Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -126,7 +126,7 @@ @Override public void computeIncludedServerDefinition( - ServerDefinition serverDefinition) { + RuntimeDefinition serverDefinition) { } @@ -139,7 +139,7 @@ } @Override - public String getVersion(ServerDefinition serverDefinition) { + public String getVersion(RuntimeDefinition serverDefinition) { if (serverDefinition != null) { return serverDefinition.getVersion(); } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -20,7 +20,7 @@ * */ public interface IRuntimeDetector extends Comparable<IRuntimeDetector> { - void initializeRuntimes(List<ServerDefinition> serverDefinitions); + void initializeRuntimes(List<RuntimeDefinition> serverDefinitions); void setName(String name); @@ -38,19 +38,19 @@ boolean isEnabled(); - ServerDefinition getServerDefinition(File root, IProgressMonitor monitor); + RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor); - boolean exists(ServerDefinition serverDefinition); + boolean exists(RuntimeDefinition serverDefinition); int getPriority(); void setPriority(int priority); - void computeIncludedServerDefinition(ServerDefinition serverDefinition); + void computeIncludedServerDefinition(RuntimeDefinition serverDefinition); boolean isValid(); void setValid(boolean valid); - String getVersion(ServerDefinition serverDefinition); + String getVersion(RuntimeDefinition serverDefinition); } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/InvalidRuntimeDetector.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/InvalidRuntimeDetector.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/InvalidRuntimeDetector.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -23,18 +23,18 @@ public class InvalidRuntimeDetector extends AbstractRuntimeDetector { @Override - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { } @Override - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { return null; } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { return false; } Copied: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimeDefinition.java (from rev 35631, trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java) =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimeDefinition.java (rev 0) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimeDefinition.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -0,0 +1,158 @@ +/************************************************************************************* + * Copyright (c) 2010-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.runtime.core.model; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * @author snjeza + * + */ +public class RuntimeDefinition { + + private String name; + private String version; + private String type; + private File location; + private String description; + private boolean enabled = true; + private RuntimePath runtimePath; + private List<RuntimeDefinition> includedServerDefinitions = new ArrayList<RuntimeDefinition>(); + private RuntimeDefinition parent; + + public RuntimeDefinition(String name, String version, + String type, File location) { + super(); + this.name = name; + this.version = version; + this.type = type; + this.location = location; + this.description = ""; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public File getLocation() { + return location; + } + + public void setLocation(File location) { + this.location = location; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((location == null) ? 0 : location.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((version == null) ? 0 : version.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + RuntimeDefinition other = (RuntimeDefinition) obj; + if (location == null) { + if (other.location != null) + return false; + } else if (!location.equals(other.location)) + return false; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (type == null) { + if (other.type != null) + return false; + } else if (!type.equals(other.type)) + return false; + if (version == null) { + if (other.version != null) + return false; + } else if (!version.equals(other.version)) + return false; + return true; + } + + @Override + public String toString() { + return "ServerDefinition [name=" + name + ", version=" + version + + ", type=" + type + ", location=" + location + "]"; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public RuntimePath getRuntimePath() { + return runtimePath; + } + + public void setRuntimePath(RuntimePath runtimePath) { + this.runtimePath = runtimePath; + } + + public List<RuntimeDefinition> getIncludedServerDefinitions() { + return includedServerDefinitions; + } + + public RuntimeDefinition getParent() { + return parent; + } + + public void setParent(RuntimeDefinition parent) { + this.parent = parent; + } + +} Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; /** * @author snjeza @@ -24,13 +24,13 @@ private String path; private boolean scanOnEveryStartup; - private List<ServerDefinition> serverDefinitions; + private List<RuntimeDefinition> serverDefinitions; private long timestamp; public RuntimePath(String path) { this.path = path; this.scanOnEveryStartup = false; - this.serverDefinitions = new ArrayList<ServerDefinition>(); + this.serverDefinitions = new ArrayList<RuntimeDefinition>(); this.timestamp = -1; } @@ -50,7 +50,7 @@ this.scanOnEveryStartup = scanOnEveryStartup; } - public List<ServerDefinition> getServerDefinitions() { + public List<RuntimeDefinition> getServerDefinitions() { return serverDefinitions; } @@ -58,7 +58,7 @@ public Object clone() throws CloneNotSupportedException { RuntimePath runtimePath = new RuntimePath(path); runtimePath.setScanOnEveryStartup(scanOnEveryStartup); - runtimePath.serverDefinitions = (List<ServerDefinition>) ((ArrayList<ServerDefinition>)serverDefinitions).clone(); + runtimePath.serverDefinitions = (List<RuntimeDefinition>) ((ArrayList<RuntimeDefinition>)serverDefinitions).clone(); return runtimePath; } Deleted: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/ServerDefinition.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -1,158 +0,0 @@ -/************************************************************************************* - * Copyright (c) 2010-2011 Red Hat, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * JBoss by Red Hat - Initial implementation. - ************************************************************************************/ -package org.jboss.tools.runtime.core.model; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -/** - * @author snjeza - * - */ -public class ServerDefinition { - - private String name; - private String version; - private String type; - private File location; - private String description; - private boolean enabled = true; - private RuntimePath runtimePath; - private List<ServerDefinition> includedServerDefinitions = new ArrayList<ServerDefinition>(); - private ServerDefinition parent; - - public ServerDefinition(String name, String version, - String type, File location) { - super(); - this.name = name; - this.version = version; - this.type = type; - this.location = location; - this.description = ""; - } - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getVersion() { - return version; - } - public void setVersion(String version) { - this.version = version; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public File getLocation() { - return location; - } - - public void setLocation(File location) { - this.location = location; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((location == null) ? 0 : location.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + ((version == null) ? 0 : version.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ServerDefinition other = (ServerDefinition) obj; - if (location == null) { - if (other.location != null) - return false; - } else if (!location.equals(other.location)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; - if (version == null) { - if (other.version != null) - return false; - } else if (!version.equals(other.version)) - return false; - return true; - } - - @Override - public String toString() { - return "ServerDefinition [name=" + name + ", version=" + version - + ", type=" + type + ", location=" + location + "]"; - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public RuntimePath getRuntimePath() { - return runtimePath; - } - - public void setRuntimePath(RuntimePath runtimePath) { - this.runtimePath = runtimePath; - } - - public List<ServerDefinition> getIncludedServerDefinitions() { - return includedServerDefinitions; - } - - public ServerDefinition getParent() { - return parent; - } - - public void setParent(ServerDefinition parent) { - this.parent = parent; - } - -} Modified: trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector/src/org/jboss/tools/runtime/handlers/DroolsHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -19,7 +19,7 @@ import org.drools.eclipse.util.DroolsRuntimeManager; import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; public class DroolsHandler extends AbstractRuntimeDetector { @@ -27,7 +27,7 @@ private static final String SOA_P = "SOA-P"; //$NON-NLS-1$ @Override - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { DroolsRuntime[] existingRuntimes = DroolsRuntimeManager .getDroolsRuntimes(); List<DroolsRuntime> droolsRuntimes = new ArrayList<DroolsRuntime>(); @@ -44,9 +44,9 @@ } - private void initializeInternal(List<ServerDefinition> serverDefinitions, + private void initializeInternal(List<RuntimeDefinition> serverDefinitions, List<DroolsRuntime> droolsRuntimes) { - for (ServerDefinition serverDefinition : serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { String type = serverDefinition.getType(); if (serverDefinition.isEnabled() && !droolsExists(serverDefinition)) { if (DROOLS.equals(type)) { @@ -70,7 +70,7 @@ * @param serverDefinition * @return */ - private static boolean droolsExists(ServerDefinition serverDefinition) { + private static boolean droolsExists(RuntimeDefinition serverDefinition) { DroolsRuntime[] droolsRuntimes = DroolsRuntimeManager .getDroolsRuntimes(); for (DroolsRuntime dr : droolsRuntimes) { @@ -85,7 +85,7 @@ } @Override - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { if (monitor.isCanceled() || root == null) { return null; @@ -103,7 +103,7 @@ String version = getImplementationVersion(root, files[0]); if (version != null) { version = version.substring(0, 3); - return new ServerDefinition(root.getName(), version, DROOLS, + return new RuntimeDefinition(root.getName(), version, DROOLS, root.getAbsoluteFile()); } } @@ -111,7 +111,7 @@ } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return false; } @@ -119,7 +119,7 @@ } public static void calculateIncludedServerDefinition( - ServerDefinition serverDefinition) { + RuntimeDefinition serverDefinition) { if (serverDefinition == null || !SOA_P.equals(serverDefinition.getType())) { return; @@ -127,7 +127,7 @@ File droolsRoot = serverDefinition.getLocation(); //$NON-NLS-1$ if (droolsRoot.isDirectory()) { String name = "Drools - " + serverDefinition.getName(); //$NON-NLS-1$ - ServerDefinition sd = new ServerDefinition(name, + RuntimeDefinition sd = new RuntimeDefinition(name, serverDefinition.getVersion(), DROOLS, droolsRoot); sd.setParent(serverDefinition); serverDefinition.getIncludedServerDefinitions().add(sd); Modified: trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector/src/org/jboss/tools/runtime/handlers/EsbHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector/src/org/jboss/tools/runtime/handlers/EsbHandler.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector/src/org/jboss/tools/runtime/handlers/EsbHandler.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -17,15 +17,15 @@ import org.jboss.tools.esb.core.runtime.JBossESBRuntime; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; public class EsbHandler extends AbstractRuntimeDetector { private static final String DEFAULT_CONFIGURATION = "default"; private static final String ESB = "ESB"; //$NON-NLS-1$ - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { - for (ServerDefinition serverDefinition : serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { String type = serverDefinition.getType(); if (serverDefinition.isEnabled() && !esbExists(serverDefinition)) { if (ESB.equals(type)) { @@ -46,7 +46,7 @@ * @param serverDefinition * @return */ - private static boolean esbExists(ServerDefinition serverDefinition) { + private static boolean esbExists(RuntimeDefinition serverDefinition) { JBossESBRuntime[] runtimes = JBossRuntimeManager.getInstance().getRuntimes(); for (JBossESBRuntime runtime:runtimes) { String location = runtime.getHomeDir(); @@ -57,7 +57,7 @@ return false; } - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { if (monitor.isCanceled() || root == null) { return null; @@ -67,7 +67,7 @@ } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return false; } @@ -75,7 +75,7 @@ } @Override - public String getVersion(ServerDefinition serverDefinition) { + public String getVersion(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return null; } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector/src/org/jboss/tools/runtime/handlers/JbpmHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -20,7 +20,7 @@ import org.jboss.tools.jbpm.preferences.JbpmInstallation; import org.jboss.tools.jbpm.preferences.PreferencesManager; import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; public class JbpmHandler extends AbstractRuntimeDetector { @@ -30,7 +30,7 @@ private static final String SOA_P = "SOA-P"; //$NON-NLS-1$ private static final String SOA_P_STD = "SOA-P-STD"; //$NON-NLS-1$ - public static File getJbpmRoot(ServerDefinition serverDefinition) { + public static File getJbpmRoot(RuntimeDefinition serverDefinition) { String type = serverDefinition.getType(); if (SOA_P.equals(type) || SOA_P_STD.equals(type)) { return new File(serverDefinition.getLocation(),"jbpm-jpdl"); //$NON-NLS-1$ @@ -42,8 +42,8 @@ } @Override - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { - for (ServerDefinition serverDefinition : serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { if (serverDefinition.isEnabled() && !jbpmExists(serverDefinition)) { File jbpmRoot = getJbpmRoot(serverDefinition); if (jbpmRoot == null || !jbpmRoot.isDirectory()) { @@ -63,7 +63,7 @@ * @param serverDefinition * @return */ - public static boolean jbpmExists(ServerDefinition serverDefinition) { + public static boolean jbpmExists(RuntimeDefinition serverDefinition) { File jbpmRoot = getJbpmRoot(serverDefinition); if (jbpmRoot == null || !jbpmRoot.isDirectory()) { return false; @@ -80,7 +80,7 @@ } @Override - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { if (monitor.isCanceled() || root == null) { return null; @@ -100,7 +100,7 @@ name = root.getName() + " " + index++; nameExists = PreferencesManager.getInstance().getJbpmInstallation(name) != null; } - return new ServerDefinition(name, version, JBPM, root.getAbsoluteFile()); + return new RuntimeDefinition(name, version, JBPM, root.getAbsoluteFile()); } return null; } @@ -118,7 +118,7 @@ } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return false; } @@ -126,7 +126,7 @@ } public static void calculateIncludedServerDefinition( - ServerDefinition serverDefinition) { + RuntimeDefinition serverDefinition) { if (serverDefinition == null || !SOA_P.equals(serverDefinition.getType())) { return; } @@ -136,7 +136,7 @@ if (isJbpm4(serverDefinition.getLocation().getAbsolutePath())) { version = JBPM4; } - ServerDefinition sd = new ServerDefinition(serverDefinition.getName(), version, JBPM, jbpmRoot); + RuntimeDefinition sd = new RuntimeDefinition(serverDefinition.getName(), version, JBPM, jbpmRoot); sd.setParent(serverDefinition); serverDefinition.getIncludedServerDefinitions().add(sd); } 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-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/src/org/jboss/tools/runtime/handlers/SeamHandler.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.seam.core.SeamUtil; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; @@ -33,7 +33,7 @@ private final static String seamVersionAttributeName = "Seam-Version"; private static final String SEAM = "SEAM"; // NON-NLS-1$ - private static File getSeamRoot(ServerDefinition serverDefinition) { + private static File getSeamRoot(RuntimeDefinition serverDefinition) { String type = serverDefinition.getType(); if (SEAM.equals(type)) { return serverDefinition.getLocation(); @@ -42,11 +42,11 @@ } @Override - public void initializeRuntimes(List<ServerDefinition> serverDefinitions) { + public void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>(); - for(ServerDefinition serverDefinition:serverDefinitions) { + for(RuntimeDefinition serverDefinition:serverDefinitions) { if (!serverDefinition.isEnabled()) { continue; } @@ -60,7 +60,7 @@ } private static void addSeam(Map<String, SeamRuntime> map, - ServerDefinition serverDefinition, File seamFile) { + RuntimeDefinition serverDefinition, File seamFile) { if (seamFile.exists() && seamFile.canRead() && seamFile.isDirectory()) { SeamVersion seamVersion = getSeamVersion(seamFile.getAbsolutePath()); if (seamVersion != null) { @@ -115,14 +115,14 @@ } @Override - public ServerDefinition getServerDefinition(File root, + public RuntimeDefinition getServerDefinition(File root, IProgressMonitor monitor) { if (monitor.isCanceled() || root == null) { return null; } String seamVersion = getSeamVersionFromManifest(root.getAbsolutePath()); if (seamVersion != null) { - return new ServerDefinition(root.getName(), seamVersion, SEAM, root.getAbsoluteFile()); + return new RuntimeDefinition(root.getName(), seamVersion, SEAM, root.getAbsoluteFile()); } return null; } @@ -169,7 +169,7 @@ } @Override - public boolean exists(ServerDefinition serverDefinition) { + public boolean exists(RuntimeDefinition serverDefinition) { if (serverDefinition == null || serverDefinition.getLocation() == null) { return false; } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -35,7 +35,7 @@ import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.IRuntimeDetector; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.runtime.ui.RuntimeUIActivator; import org.osgi.framework.Bundle; @@ -64,10 +64,10 @@ JBossRuntimeLocator locator = new JBossRuntimeLocator(); for (RuntimePath runtimePath : runtimePaths) { - List<ServerDefinition> serverDefinitions = locator + List<RuntimeDefinition> serverDefinitions = locator .searchForRuntimes(runtimePath.getPath(), monitor); runtimePath.getServerDefinitions().clear(); - for (ServerDefinition serverDefinition : serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { serverDefinition.setRuntimePath(runtimePath); } runtimePath.getServerDefinitions().addAll(serverDefinitions); @@ -81,7 +81,7 @@ } } - public static void initializeRuntimes(List<ServerDefinition> serverDefinitions) { + public static void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) { Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); for( IRuntimeDetector detector:detectors) { if (detector.isEnabled()) { Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeContentProvider.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; /** * @author snjeza @@ -22,9 +22,9 @@ */ public class RuntimeContentProvider implements ITreeContentProvider { - private List<ServerDefinition> serverDefinitions; + private List<RuntimeDefinition> serverDefinitions; - public RuntimeContentProvider(List<ServerDefinition> serverDefinitions) { + public RuntimeContentProvider(List<RuntimeDefinition> serverDefinitions) { this.serverDefinitions = serverDefinitions; } @@ -37,21 +37,21 @@ } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - serverDefinitions = (List<ServerDefinition>) newInput; + serverDefinitions = (List<RuntimeDefinition>) newInput; } public boolean hasChildren(Object element) { - return ((ServerDefinition) element).getIncludedServerDefinitions().size() > 0; + return ((RuntimeDefinition) element).getIncludedServerDefinitions().size() > 0; } @Override public Object[] getChildren(Object parentElement) { - List<ServerDefinition> list = ((ServerDefinition) parentElement).getIncludedServerDefinitions(); + List<RuntimeDefinition> list = ((RuntimeDefinition) parentElement).getIncludedServerDefinitions(); return list.toArray(); } @Override public Object getParent(Object element) { - return ((ServerDefinition) element).getParent(); + return ((RuntimeDefinition) element).getParent(); } } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeLabelProvider.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeLabelProvider.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeLabelProvider.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; /** * @author snjeza @@ -29,8 +29,8 @@ } public String getColumnText(Object element, int columnIndex) { - if (element instanceof ServerDefinition) { - ServerDefinition definition = (ServerDefinition) element; + if (element instanceof RuntimeDefinition) { + RuntimeDefinition definition = (RuntimeDefinition) element; if (columnIndex == 0) { return definition.getName(); } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -22,7 +22,7 @@ import org.eclipse.ui.IStartup; import org.jboss.tools.runtime.core.JBossRuntimeLocator; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; /** * @author snjeza @@ -80,20 +80,20 @@ } if (runtimePath.isModified()) { JBossRuntimeLocator locator = new JBossRuntimeLocator(); - List<ServerDefinition> serverDefinitions = locator.searchForRuntimes(runtimePath.getPath(), monitor); + List<RuntimeDefinition> serverDefinitions = locator.searchForRuntimes(runtimePath.getPath(), monitor); if (monitor.isCanceled()) { return false; } runtimePath.getServerDefinitions().clear(); - for (ServerDefinition serverDefinition:serverDefinitions) { + for (RuntimeDefinition serverDefinition:serverDefinitions) { serverDefinition.setRuntimePath(runtimePath); } runtimePath.getServerDefinitions().addAll(serverDefinitions); RuntimeUIActivator.setTimestamp(runtimePaths); } monitor.setTaskName("JBoss Runtime Detector: checking " + runtimePath.getPath()); - List<ServerDefinition> serverDefinitions = runtimePath.getServerDefinitions(); - for (ServerDefinition serverDefinition:serverDefinitions) { + List<RuntimeDefinition> serverDefinitions = runtimePath.getServerDefinitions(); + for (RuntimeDefinition serverDefinition:serverDefinitions) { if (monitor.isCanceled()) { return false; } Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -52,7 +52,7 @@ import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.IRuntimeDetector; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.runtime.ui.dialogs.SearchRuntimePathDialog; import org.jboss.tools.runtime.ui.preferences.RuntimePreferencePage; import org.osgi.framework.BundleContext; @@ -113,7 +113,7 @@ private Set<IRuntimeDetector> runtimeDetectors; - private List<ServerDefinition> serverDefinitions; + private List<RuntimeDefinition> serverDefinitions; /** * The constructor @@ -187,13 +187,13 @@ } viewer.setLabelProvider(new RuntimeLabelProvider()); - List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>(); + List<RuntimeDefinition> serverDefinitions = new ArrayList<RuntimeDefinition>(); for (RuntimePath runtimePath:runtimePaths2) { serverDefinitions.addAll(runtimePath.getServerDefinitions()); } viewer.setContentProvider(new RuntimeContentProvider(serverDefinitions)); viewer.setInput(serverDefinitions); - for (ServerDefinition definition:serverDefinitions) { + for (RuntimeDefinition definition:serverDefinitions) { viewer.setChecked(definition, definition.isEnabled()); } return viewer; @@ -207,10 +207,10 @@ InterruptedException { JBossRuntimeLocator locator = new JBossRuntimeLocator(); for (RuntimePath runtimePath : runtimePaths) { - List<ServerDefinition> serverDefinitions = locator + List<RuntimeDefinition> serverDefinitions = locator .searchForRuntimes(runtimePath.getPath(), monitor); runtimePath.getServerDefinitions().clear(); - for (ServerDefinition serverDefinition : serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { serverDefinition.setRuntimePath(runtimePath); } runtimePath.getServerDefinitions() @@ -227,12 +227,12 @@ @Override public void widgetDisposed(DisposeEvent e) { viewer.setInput(null); - List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>(); + List<RuntimeDefinition> serverDefinitions = new ArrayList<RuntimeDefinition>(); for (RuntimePath runtimePath : runtimePaths) { serverDefinitions.addAll(runtimePath .getServerDefinitions()); viewer.setInput(serverDefinitions); - for (ServerDefinition serverDefinition : serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { runtimeExists(serverDefinition); viewer.setChecked(serverDefinition, serverDefinition.isEnabled()); @@ -248,7 +248,7 @@ } } - public static boolean runtimeExists(ServerDefinition serverDefinition) { + public static boolean runtimeExists(RuntimeDefinition serverDefinition) { Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); for (IRuntimeDetector detector:detectors) { if (detector.isEnabled() && detector.exists(serverDefinition)) { @@ -311,14 +311,14 @@ IMemento serverDefinitionsNode = node.getChild(SERVER_DEFINITIONS); IMemento[] sdNodes = serverDefinitionsNode.getChildren(SERVER_DEFINITION); for (IMemento sdNode:sdNodes) { - ServerDefinition serverDefinition = createServerDefinition(sdNode); + RuntimeDefinition serverDefinition = createServerDefinition(sdNode); serverDefinition.setRuntimePath(runtimePath); IMemento includedDefinition = sdNode.getChild(INCLUDED_DEFINITION); if (includedDefinition != null) { IMemento[] includedNodes = includedDefinition .getChildren(SERVER_DEFINITION); for (IMemento includedNode : includedNodes) { - ServerDefinition included = createServerDefinition(includedNode); + RuntimeDefinition included = createServerDefinition(includedNode); included.setRuntimePath(runtimePath); included.setParent(serverDefinition); serverDefinition.getIncludedServerDefinitions().add( @@ -330,7 +330,7 @@ runtimePaths.add(runtimePath); } if (computeIncluded) { - for(ServerDefinition definition:getServerDefinitions()) { + for(RuntimeDefinition definition:getServerDefinitions()) { Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); for (IRuntimeDetector detector:detectors) { detector.computeIncludedServerDefinition(definition); @@ -339,15 +339,15 @@ } } - private ServerDefinition createServerDefinition(IMemento node) { + private RuntimeDefinition createServerDefinition(IMemento node) { String name = node.getString(NAME); String version = node.getString(VERSION); String type = node.getString(TYPE); String location = node.getString(LOCATION); String description = node.getString(DESCRIPTION); boolean enabled = node.getBoolean(ENABLED); - ServerDefinition serverDefinition = - new ServerDefinition(name, version, type, new File(location)); + RuntimeDefinition serverDefinition = + new RuntimeDefinition(name, version, type, new File(location)); serverDefinition.setDescription(description); serverDefinition.setEnabled(enabled); return serverDefinition; @@ -374,7 +374,7 @@ runtimePathNode.putBoolean(SCAN_ON_EVERY_STAERTUP, runtimePath.isScanOnEveryStartup()); runtimePathNode.putString(TIMESTAMP, String.valueOf(runtimePath.getTimestamp())); IMemento serverDefinitionsNode = runtimePathNode.createChild(SERVER_DEFINITIONS); - List<ServerDefinition> definitions = runtimePath.getServerDefinitions(); + List<RuntimeDefinition> definitions = runtimePath.getServerDefinitions(); putDefinitions(serverDefinitionsNode, definitions); } writer = new StringWriter(); @@ -397,19 +397,19 @@ } private void putDefinitions(IMemento serverDefintionsNode, - List<ServerDefinition> definitions) { - for (ServerDefinition serverDefinition:definitions) { + List<RuntimeDefinition> definitions) { + for (RuntimeDefinition serverDefinition:definitions) { IMemento sdNode = serverDefintionsNode.createChild(SERVER_DEFINITION); putServerDefinition(serverDefinition, sdNode); IMemento includedNodes = sdNode.createChild(INCLUDED_DEFINITION); - for (ServerDefinition included:serverDefinition.getIncludedServerDefinitions()) { + for (RuntimeDefinition included:serverDefinition.getIncludedServerDefinitions()) { IMemento includedNode = includedNodes.createChild(SERVER_DEFINITION); putServerDefinition(included, includedNode); } } } - private void putServerDefinition(ServerDefinition serverDefinition, + private void putServerDefinition(RuntimeDefinition serverDefinition, IMemento node) { node.putString(NAME, serverDefinition.getName()); node.putString(VERSION, serverDefinition.getVersion()); @@ -431,9 +431,9 @@ return runtimePaths; } - public List<ServerDefinition> getServerDefinitions() { + public List<RuntimeDefinition> getServerDefinitions() { if (serverDefinitions == null) { - serverDefinitions = new ArrayList<ServerDefinition>(); + serverDefinitions = new ArrayList<RuntimeDefinition>(); } else { serverDefinitions.clear(); } @@ -472,7 +472,7 @@ runtimeDetectors = null; } - public static boolean runtimeCreated(ServerDefinition serverDefinition) { + public static boolean runtimeCreated(RuntimeDefinition serverDefinition) { Set<IRuntimeDetector> detectors = getDefault().getRuntimeDetectors(); boolean created = false; for (IRuntimeDetector detector:detectors) { Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeDialog.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeDialog.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -54,7 +54,7 @@ import org.jboss.tools.runtime.core.model.DownloadRuntime; import org.jboss.tools.runtime.core.model.IRuntimeDetector; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.runtime.ui.RuntimeUIActivator; /** @@ -411,18 +411,18 @@ RuntimePath newPath = new RuntimePath(directory); runtimePaths.add(newPath); for (RuntimePath runtimePath : runtimePaths) { - List<ServerDefinition> serverDefinitions = locator + List<RuntimeDefinition> serverDefinitions = locator .searchForRuntimes(runtimePath.getPath(), monitor); runtimePath.getServerDefinitions().clear(); - for (ServerDefinition serverDefinition : serverDefinitions) { + for (RuntimeDefinition serverDefinition : serverDefinitions) { serverDefinition.setRuntimePath(runtimePath); } runtimePath.getServerDefinitions().addAll(serverDefinitions); RuntimeUIActivator.getDefault().getRuntimePaths().add(runtimePath); RuntimeUIActivator.getDefault().saveRuntimePaths(); } - List<ServerDefinition> serverDefinitions = RuntimeUIActivator + List<RuntimeDefinition> serverDefinitions = RuntimeUIActivator .getDefault().getServerDefinitions(); Set<IRuntimeDetector> detectors = RuntimeCoreActivator .getRuntimeDetectors(); Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2012-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.runtime.ui.RuntimeUIActivator; /** @@ -138,7 +138,7 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { - ServerDefinition definition = (ServerDefinition) event.getElement(); + RuntimeDefinition definition = (RuntimeDefinition) event.getElement(); definition.setEnabled(!definition.isEnabled()); } }); 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-02-10 23:08:50 UTC (rev 38630) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-02-10 23:09:04 UTC (rev 38631) @@ -44,7 +44,7 @@ import org.jboss.tools.runtime.core.RuntimeCoreActivator; import org.jboss.tools.runtime.core.model.IRuntimeDetector; import org.jboss.tools.runtime.core.model.RuntimePath; -import org.jboss.tools.runtime.core.model.ServerDefinition; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; import org.jboss.tools.runtime.ui.RuntimeUIActivator; /** @@ -59,7 +59,7 @@ private boolean canceled; private boolean needRefresh; private Label foundRuntimesLabel; - private List<ServerDefinition> serverDefinitions; + private List<RuntimeDefinition> serverDefinitions; private Button hideCreatedRuntimes; private int heightHint; @@ -121,11 +121,11 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { - ServerDefinition definition = (ServerDefinition) event.getElement(); + RuntimeDefinition definition = (RuntimeDefinition) event.getElement(); definition.setEnabled(!definition.isEnabled()); boolean enableOk = false; - List<ServerDefinition> serverDefinitions = getServerDefinitions(hideCreatedRuntimes.getSelection()); - for (ServerDefinition serverDefinition:serverDefinitions) { + List<RuntimeDefinition> serverDefinitions = getServerDefinitions(hideCreatedRuntimes.getSelection()); + for (RuntimeDefinition serverDefinition:serverDefinitions) { if (serverDefinition.isEnabled()) { enableOk = true; } @@ -218,19 +218,19 @@ private void refresh(String message) { running = false; treeViewer.setInput(null); - List<ServerDefinition> serverDefinitions = getServerDefinitions(hideCreatedRuntimes.getSelection()); + List<RuntimeDefinition> serverDefinitions = getServerDefinitions(hideCreatedRuntimes.getSelection()); treeViewer.setInput(serverDefinitions); - for (ServerDefinition definition:serverDefinitions) { + for (RuntimeDefinition definition:serverDefinitions) { treeViewer.setChecked(definition, definition.isEnabled()); - for (ServerDefinition included:definition.getIncludedServerDefinitions()) { + for (RuntimeDefinition included:definition.getIncludedServerDefinitions()) { treeViewer.setChecked(included, included.isEnabled()); } } TreeItem[] treeItems = treeViewer.getTree().getItems(); for (TreeItem treeItem:treeItems) { Object data = treeItem.getData(); - if (data instanceof ServerDefinition) { - ServerDefinition serverDefinition = (ServerDefinition) data; + if (data instanceof RuntimeDefinition) { + RuntimeDefinition serverDefinition = (RuntimeDefinition) data; boolean exists = RuntimeUIActivator.runtimeExists(serverDefinition); if (exists) { treeItem.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY)); @@ -247,7 +247,7 @@ protected void okPressed() { getShell().setCursor(Display.getCurrent().getSystemCursor(SWT.CURSOR_WAIT)); Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); - List<ServerDefinition> definitions = getServerDefinitions(true); + List<RuntimeDefinition> definitions = getServerDefinitions(true); for( IRuntimeDetector detector:detectors) { if (detector.isEnabled()) { detector.initializeRuntimes(definitions); @@ -320,18 +320,18 @@ return composite; } - private List<ServerDefinition> getServerDefinitions( + private List<RuntimeDefinition> getServerDefinitions( boolean hideCreatedRuntimes) { if (serverDefinitions == null) { - serverDefinitions = new ArrayList<ServerDefinition>(); + serverDefinitions = new ArrayList<RuntimeDefinition>(); } else { serverDefinitions.clear(); } for (RuntimePath runtimePath : runtimePaths) { - for (ServerDefinition serverDefinition : runtimePath + for (RuntimeDefinition serverDefinition : runtimePath .getServerDefinitions()) { if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) { - List<ServerDefinition> allServerDefinitions = RuntimeUIActivator.getDefault().getServerDefinitions(); + List<RuntimeDefinition> allServerDefinitions = RuntimeUIActivator.getDefault().getServerDefinitions(); String name = serverDefinition.getName(); int i = 2; while (serverDefinitionsExists(serverDefinition, allServerDefinitions)) { @@ -349,8 +349,8 @@ return serverDefinitions; } - private boolean serverDefinitionsExists(ServerDefinition serverDefinition, - List<ServerDefinition> allServerDefinitions) { + private boolean serverDefinitionsExists(RuntimeDefinition serverDefinition, + List<RuntimeDefinition> allServerDefinitions) { String name = serverDefinition.getName(); File location = serverDefinition.getLocation(); String type = serverDefinition.getType(); @@ -361,7 +361,7 @@ if (path == null) { return false; } - for (ServerDefinition definition:allServerDefinitions) { + for (RuntimeDefinition definition:allServerDefinitions) { if (name.equals(definition.getName()) && type.equals(definition.getType())) { File loc = definition.getLocation(); if (loc == null) {