[519968] fix unnecessary casts
Signed-off-by: Rob Stryker <stryker@redhat.com>
Change-Id: I874d088cf5865f7283cfdc67c5daa7cab7729de9
diff --git a/features/org.eclipse.wst.common.fproj.feature/feature.xml b/features/org.eclipse.wst.common.fproj.feature/feature.xml
index 48fd7e0..c65a825 100644
--- a/features/org.eclipse.wst.common.fproj.feature/feature.xml
+++ b/features/org.eclipse.wst.common.fproj.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common.fproj"
label="%featureName"
- version="3.7.0.qualifier"
+ version="3.7.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.wst.common.project.facet.core"
license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.wst.common.fproj.feature/pom.xml b/features/org.eclipse.wst.common.fproj.feature/pom.xml
index d7bf004..61e215f 100644
--- a/features/org.eclipse.wst.common.fproj.feature/pom.xml
+++ b/features/org.eclipse.wst.common.fproj.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.fproj</artifactId>
- <version>3.7.0-SNAPSHOT</version>
+ <version>3.7.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
index a92e614..5d97230 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common.fproj.sdk"
label="%featureName"
- version="3.7.0.qualifier"
+ version="3.7.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.wst.common.fproj.sdk"
license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml b/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
index 6552b87..2200459 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.fproj.sdk</artifactId>
- <version>3.7.0-SNAPSHOT</version>
+ <version>3.7.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.wst.common_tests.feature/feature.xml b/features/org.eclipse.wst.common_tests.feature/feature.xml
index 0b398f1..3b6ec33 100644
--- a/features/org.eclipse.wst.common_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.common_tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common_tests.feature"
label="%featureName"
- version="3.6.0.qualifier"
+ version="3.6.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.common_tests.feature/pom.xml b/features/org.eclipse.wst.common_tests.feature/pom.xml
index 41cd89d..9dbc061 100644
--- a/features/org.eclipse.wst.common_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.common_tests.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common_tests.feature</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
index 66f6702..4dfaf70 100644
--- a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.util; singleton:=true
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.1.201.qualifier
Bundle-Activator: org.eclipse.jem.util.plugin.JEMUtilPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
index c69ceeb..6952fb0 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
@@ -267,7 +267,7 @@
else if (object instanceof IResource)
result = ((IResource) object).getProject();
else if (object instanceof IAdaptable)
- result = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
+ result = ((IAdaptable) object).getAdapter(IProject.class);
else if (object instanceof EObject)
result = getProject((EObject) object);
diff --git a/plugins/org.eclipse.jem.util/pom.xml b/plugins/org.eclipse.jem.util/pom.xml
index 8b208f6..1ec411e 100644
--- a/plugins/org.eclipse.jem.util/pom.xml
+++ b/plugins/org.eclipse.jem.util/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.jem.util</artifactId>
- <version>2.1.200-SNAPSHOT</version>
+ <version>2.1.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF
index 9765363..b1c45f6 100644
--- a/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.jst.common.ui;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.301.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.jst.common.ui.internal.JstCommonUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.common.ui/pom.xml b/plugins/org.eclipse.jst.common.ui/pom.xml
index 6fce986..671be31 100644
--- a/plugins/org.eclipse.jst.common.ui/pom.xml
+++ b/plugins/org.eclipse.jst.common.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.jst.common.ui</artifactId>
- <version>1.0.300-SNAPSHOT</version>
+ <version>1.0.301-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java
index b61bc7a..c4e7fc9 100644
--- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java
+++ b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java
@@ -334,7 +334,7 @@
// default impl
if( component.isBinary() ) {
- IPath p = (IPath)component.getAdapter(IPath.class);
+ IPath p = component.getAdapter(IPath.class);
return p == null ? null : p.toString();
}
return component.getProject().getName();
diff --git a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
index f17c5a7..66ccd48 100644
--- a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.frameworks; singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.201.qualifier
Bundle-Activator: org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin
Bundle-Vendor: %provider
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.frameworks/pom.xml b/plugins/org.eclipse.wst.common.frameworks/pom.xml
index a734a16..1e51c89 100644
--- a/plugins/org.eclipse.wst.common.frameworks/pom.xml
+++ b/plugins/org.eclipse.wst.common.frameworks/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.frameworks</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
index ab74ed3..3dc8d80 100644
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
+++ b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
@@ -152,7 +152,7 @@
else if (object instanceof IResource)
result = ((IResource) object).getProject();
else if (object instanceof IAdaptable)
- result = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
+ result = ((IAdaptable) object).getAdapter(IProject.class);
return result;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
index ec61ccb..3f3bad7 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore.ui; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.301.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
@@ -16,7 +16,6 @@
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.202,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml b/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
index 83c847e..94df763 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.modulecore.ui</artifactId>
- <version>1.0.300-SNAPSHOT</version>
+ <version>1.0.301-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
index d262603..6da1717 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
@@ -123,7 +123,7 @@
// default impl
if( component.isBinary() ) {
- IPath p = (IPath)component.getAdapter(IPath.class);
+ IPath p = component.getAdapter(IPath.class);
return p == null ? component.getName() : p.toString();
}
return component.getProject().getName();
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
index e433b25..ca4cb51 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
@@ -76,7 +76,7 @@
String name;
if( reference.getReferencedComponent().isBinary() ) {
IVirtualComponent vc = reference.getReferencedComponent();
- IPath p = (IPath)vc.getAdapter(IPath.class);
+ IPath p = vc.getAdapter(IPath.class);
name= p == null ? vc.getName() : p.toString();
}
else {
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
index c183835..ae90331 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
@@ -15,7 +15,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
public class DeploymentAssemblyVerifierData {
@@ -39,9 +39,19 @@
public void setComponent(IVirtualComponent component) {
this.component = component;
}
+
+ /**
+ * Return the facet runtime (NOT SERVER RUNTIME) associated with this data
+ * @return
+ */
public IRuntime getRuntime() {
return runtime;
}
+ /**
+ * Set the facet runtime (NOT SERVER RUNTIME) to be associated with this data
+ * @param runtime set the runtime
+ * @return
+ */
public void setRuntime(IRuntime runtime) {
this.runtime = runtime;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
index aa1b6cd..6116ca8 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
@@ -30,7 +30,7 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
public class DeploymentAssemblyVerifierHelper {
@@ -47,7 +47,6 @@
*/
public static IStatus verify(IVirtualComponent component,IRuntime runtime, ArrayList<IVirtualReference> currentReferences, ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged) {
IProject project = component.getProject();
-
List verifiers = collectAllVerifiers(project,runtime);
if (verifiers.isEmpty()) return Status.OK_STATUS;
MultiStatus masterStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, IStatus.OK, Messages.DeploymentAssemblyVerifierHelper_0,null);
@@ -91,7 +90,9 @@
List verifiers = new ArrayList();
for (Iterator iterator = facets.iterator(); iterator.hasNext();) {
IProjectFacetVersion facet = (IProjectFacetVersion)iterator.next();
- verifiers.addAll(VerifierRegistry.instance().getVerifierExtensions(facet.getProjectFacet().getId(), runtime));
+ String facetId = facet.getProjectFacet().getId();
+ String runtimeId = (runtime == null ? null : runtime.getProperty("id"));
+ verifiers.addAll(VerifierRegistry.instance().getVerifierExtensions(facetId, runtimeId));
}
return verifiers;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
index ba74ba0..734cbb5 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
@@ -18,7 +18,6 @@
import java.util.List;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.server.core.IRuntime;
public class VerifierRegistry {
/**
@@ -101,16 +100,13 @@
* @param runtime
* @return List of IConfigurationElements representing instances of IDeploymentAssemblyVerifier
*/
- public List getVerifierExtensions(String facetTypeID, IRuntime runtime) {
+ public List getVerifierExtensions(String facetTypeID, String runtimeId) {
// Identifier used by verifiers that will run for any runtime
String allRuntimes = "org.eclipse.wst.common.modulecore.ui.deploymentAssemblyVerifier.anyruntime"; //$NON-NLS-1$
- String runtimeID = null;
- if (runtime == null)
- runtimeID = "None"; //$NON-NLS-1$
- else
- runtimeID = runtime.getRuntimeType().getId();
+ if (runtimeId == null)
+ runtimeId = "None"; //$NON-NLS-1$
// Get the verifiers specific for the target runtime
- List verifiers = getVerifiers(facetTypeID, runtimeID);
+ List verifiers = getVerifiers(facetTypeID, runtimeId);
if (verifiers == null)
verifiers = Collections.EMPTY_LIST;
// Get the verifiers for any runtime
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
index 466c682..8ebaa61 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
@@ -111,8 +111,7 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.facets.FacetUtil;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
public class AddModuleDependenciesPropertiesPage extends AbstractIModuleDependenciesControl implements Listener,
ILabelProviderListener {
@@ -177,7 +176,7 @@
if(path2.segmentCount() > 0) {
ref.setArchiveName(path2.lastSegment());
} else if(ref.getReferencedComponent() instanceof VirtualArchiveComponent && ((VirtualArchiveComponent)ref.getReferencedComponent()).getArchiveType().equals(VirtualArchiveComponent.VARARCHIVETYPE) ) {
- File diskFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
+ File diskFile = ref.getReferencedComponent().getAdapter(java.io.File.class);
IPath filePath = null;
if (diskFile.exists()) {
filePath = new Path(diskFile.getAbsolutePath());
@@ -203,7 +202,7 @@
private IRuntime setRuntime() {
IRuntime aRuntime = null;
try {
- aRuntime = getServerRuntime(project);
+ aRuntime = getFacetRuntime(project);
}
catch (CoreException e) {
ModuleCoreUIPlugin.log(e);
@@ -927,16 +926,14 @@
hasInitialized = true;
}
- private IRuntime getServerRuntime(IProject project2) throws CoreException {
+ private IRuntime getFacetRuntime(IProject project2) throws CoreException {
if (project == null)
return null;
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if (facetedProject == null)
return null;
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = facetedProject.getRuntime();
- if (runtime == null)
- return null;
- return FacetUtil.getRuntime(runtime);
+ IRuntime runtime = facetedProject.getPrimaryRuntime();
+ return runtime;
}
protected IVirtualReference[] cloneReferences(IVirtualReference[] refs) {
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
index af1d781..98c5681 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.project.facet.ui; singleton:=true
-Bundle-Version: 1.4.600.qualifier
+Bundle-Version: 1.4.601.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.wst.common.project.facet.ui.internal.FacetUiPlugin
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml b/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
index 3ee31e0..5d08dc0 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.project.facet.ui</artifactId>
- <version>1.4.600-SNAPSHOT</version>
+ <version>1.4.601-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/ConvertProjectToFacetedFormCommandHandler.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/ConvertProjectToFacetedFormCommandHandler.java
index c103478..c976e66 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/ConvertProjectToFacetedFormCommandHandler.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/ConvertProjectToFacetedFormCommandHandler.java
@@ -44,7 +44,7 @@
if( currentSelection instanceof IStructuredSelection )
{
final Object element = ( (IStructuredSelection) currentSelection).getFirstElement();
- project = (IProject) Platform.getAdapterManager().getAdapter( element, IProject.class );
+ project = Platform.getAdapterManager().getAdapter( element, IProject.class );
}
if( project == null )
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsPropertyPage.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsPropertyPage.java
index 5fcf9ec..7e22669 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsPropertyPage.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsPropertyPage.java
@@ -133,7 +133,7 @@
control.dispose();
}
- this.project = (IProject) getElement().getAdapter( IProject.class );
+ this.project = getElement().getAdapter( IProject.class );
try
{
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionPanel.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionPanel.java
index 18ffc3e..9dc4f27 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionPanel.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionPanel.java
@@ -539,7 +539,7 @@
if( image == null )
{
final IDecorationsProvider decprov
- = (IDecorationsProvider) facet.getAdapter( IDecorationsProvider.class );
+ = facet.getAdapter( IDecorationsProvider.class );
ImageDescriptor imgdesc = decprov.getIcon();
@@ -564,7 +564,7 @@
if( image == null )
{
final IDecorationsProvider decprov
- = (IDecorationsProvider) category.getAdapter( IDecorationsProvider.class );
+ = category.getAdapter( IDecorationsProvider.class );
final ImageDescriptor imgdesc = decprov.getIcon();
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimeDecorationsProvider.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimeDecorationsProvider.java
index fe2f74e..ab6bf15 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimeDecorationsProvider.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimeDecorationsProvider.java
@@ -45,7 +45,7 @@
final IRuntimeComponentVersion rcv = rc.getRuntimeComponentVersion();
final IDecorationsProvider rcvDecorationsProvider
- = (IDecorationsProvider) rcv.getAdapter( IDecorationsProvider.class );
+ = rcv.getAdapter( IDecorationsProvider.class );
return rcvDecorationsProvider.getIcon();
}
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimesPanel.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimesPanel.java
index b4ecb53..ede065e 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimesPanel.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/RuntimesPanel.java
@@ -715,7 +715,7 @@
if( image == null )
{
final IDecorationsProvider decprov
- = (IDecorationsProvider) r.getAdapter( IDecorationsProvider.class );
+ = r.getAdapter( IDecorationsProvider.class );
final ImageDescriptor imgdesc
= new DecoratedRuntimeImageDescriptor( decprov.getIcon(), isPrimary, valResult );
@@ -842,7 +842,7 @@
final IRuntimeComponent comp = (IRuntimeComponent) element;
final IRuntimeComponentLabelProvider provider
- = (IRuntimeComponentLabelProvider) comp.getAdapter( IRuntimeComponentLabelProvider.class );
+ = comp.getAdapter( IRuntimeComponentLabelProvider.class );
if( provider == null )
{
@@ -876,7 +876,7 @@
if( image == null )
{
final IDecorationsProvider decprov
- = (IDecorationsProvider) rcv.getAdapter( IDecorationsProvider.class );
+ = rcv.getAdapter( IDecorationsProvider.class );
this.imageRegistry.put( key, decprov.getIcon() );
image = this.imageRegistry.get( key );
