diff options
author | kkomissarchik | 2006-09-21 22:06:39 +0000 |
---|---|---|
committer | kkomissarchik | 2006-09-21 22:06:39 +0000 |
commit | 394abb925d9d555b1535ffc3be8b5a24cdea91ed (patch) | |
tree | 805b08ac3481ad92effec7201cdcef2074b0486f /plugins/org.eclipse.jst.j2ee/earproject/org/eclipse | |
parent | d62c6bdcb69d0e5adb5088c1ef7f7810fa9599e7 (diff) | |
download | webtools.javaee-394abb925d9d555b1535ffc3be8b5a24cdea91ed.tar.gz webtools.javaee-394abb925d9d555b1535ffc3be8b5a24cdea91ed.tar.xz webtools.javaee-394abb925d9d555b1535ffc3be8b5a24cdea91ed.zip |
[nocr] rollback
Diffstat (limited to 'plugins/org.eclipse.jst.j2ee/earproject/org/eclipse')
2 files changed, 7 insertions, 8 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java index a27b139b7..4dd10c7b8 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java @@ -11,7 +11,6 @@ package org.eclipse.jst.j2ee.project.facet; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -58,13 +57,13 @@ public final class EarFacetRuntimeHandler final IFacetedProject earFacetedProject = ProjectFacetsManager.create( earProject ); - final IRuntime earRuntime = earFacetedProject.getPrimaryRuntime(); + final IRuntime earRuntime = earFacetedProject.getRuntime(); final IFacetedProject moduleFacetedProject = ProjectFacetsManager.create( moduleProject ); if( moduleFacetedProject != null && - ! equals( earRuntime, moduleFacetedProject.getPrimaryRuntime() ) ) + ! equals( earRuntime, moduleFacetedProject.getRuntime() ) ) { boolean supports = true; @@ -86,7 +85,7 @@ public final class EarFacetRuntimeHandler if( supports ) { - moduleFacetedProject.setTargetedRuntimes( Collections.singleton( earRuntime ), submon( monitor, 1 ) ); + moduleFacetedProject.setRuntime( earRuntime, submon( monitor, 1 ) ); } } } diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java index baa507fc1..386297246 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java @@ -95,8 +95,8 @@ public final class EarFacetValidator throws CoreException { - final IRuntime earRuntime = ear.getPrimaryRuntime(); - final IRuntime moduleRuntime = module.getPrimaryRuntime(); + final IRuntime earRuntime = ear.getRuntime(); + final IRuntime moduleRuntime = module.getRuntime(); if( earRuntime == null && moduleRuntime != null ) { @@ -116,8 +116,8 @@ public final class EarFacetValidator final IMarker m = ear.createWarningMarker( MARKER_ID, msg ); m.setAttribute( "moduleProject", module.getProject().getName() ); - m.setAttribute( "runtime1", ear.getPrimaryRuntime().getName() ); - m.setAttribute( "runtime2", module.getPrimaryRuntime().getName() ); + m.setAttribute( "runtime1", ear.getRuntime().getName() ); + m.setAttribute( "runtime2", module.getRuntime().getName() ); } } |