diff options
author | kkomissarchik | 2005-11-09 21:44:27 +0000 |
---|---|---|
committer | kkomissarchik | 2005-11-09 21:44:27 +0000 |
commit | 6b991b6f0e671a964c1fdc89eb79261e80c1887c (patch) | |
tree | 3ba2f62135ffd9ee47e0c63d89bfe0817108b953 /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project | |
parent | 4897db56654e42e5e2687d27424333b237689889 (diff) | |
download | webtools.javaee-6b991b6f0e671a964c1fdc89eb79261e80c1887c.tar.gz webtools.javaee-6b991b6f0e671a964c1fdc89eb79261e80c1887c.tar.xz webtools.javaee-6b991b6f0e671a964c1fdc89eb79261e80c1887c.zip |
*** empty log message ***
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project')
-rw-r--r-- | plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard2.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard2.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard2.java index 7c7ad64b8..27a45b64b 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard2.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard2.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.servlet.ui.project.facet; +import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import org.eclipse.core.commands.ExecutionException; @@ -21,6 +23,7 @@ import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreat import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentFacetCreationWizardPage; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -59,13 +62,13 @@ public class WebProjectWizard2 extends AddRemoveFacetsWizard implements INewWiza this.facetsSelectionPage.setFixedProjectFacets(fixed); -// Set facetVersions = new HashSet(); -// FacetDataModelMap map = (FacetDataModelMap) dataModel.getProperty(FACET_DM_MAP); -// for(Iterator iterator=map.values().iterator(); iterator.hasNext();){ -// IDataModel model = (IDataModel)iterator.next(); -// facetVersions.add(model.getProperty(IFacetDataModelProperties.FACET_VERSION)); -// } -// this.facetsSelectionPage.setInitialSelection(facetVersions); + Set facetVersions = new HashSet(); + FacetDataModelMap map = (FacetDataModelMap) dataModel.getProperty(FACET_DM_MAP); + for(Iterator iterator=map.values().iterator(); iterator.hasNext();){ + IDataModel model = (IDataModel)iterator.next(); + facetVersions.add(model.getProperty(IFacetDataModelProperties.FACET_VERSION)); + } + this.facetsSelectionPage.setInitialSelection(facetVersions); final ConflictingFacetsFilter filter = new ConflictingFacetsFilter(fixed); |