Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjlanuti2006-02-08 16:52:30 +0000
committerjlanuti2006-02-08 16:52:30 +0000
commit2b79abfce79f8c7d5147a9ccb0b566ae19a81418 (patch)
treee7a543ba0f0687605e1f917ea27b81b9321a9c5c /plugins
parent6b91c679f66a229037fbc3ab515e2e41e066cf02 (diff)
downloadwebtools.common-2b79abfce79f8c7d5147a9ccb0b566ae19a81418.tar.gz
webtools.common-2b79abfce79f8c7d5147a9ccb0b566ae19a81418.tar.xz
webtools.common-2b79abfce79f8c7d5147a9ccb0b566ae19a81418.zip
[126782] fix for setting fixed facets
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
index 123c75cc6..a62fd98d2 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/FacetProjectCreationOperation.java
@@ -187,15 +187,14 @@ public class FacetProjectCreationOperation extends AbstractDataModelOperation {
}
}
- try{
- if (!fixedFacets.isEmpty()) {
- facetProj.setFixedProjectFacets(fixedFacets);
- }
+ try {
+ fixedFacets.addAll(facetProj.getFixedProjectFacets());
+ facetProj.setFixedProjectFacets(fixedFacets);
if (runtime != null ) {
addDefaultFacetsInProject(facetProj,runtime.getDefaultFacets( fixedFacets ));
}
- }catch(CoreException e){
+ } catch(CoreException e){
Logger.getLogger().logError(e);
throw new ExecutionException(e.getMessage(), e);
}

Back to the top