[153344] MANIFEST Changes
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
index 2787fde..6234d05 100644
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.wst.common.internal.emf.utilities;x-internal:=true
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)"
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
index c2ed467..f307c20 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@
org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
org.eclipse.xsd;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0)"
+ org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0]"
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF
index 41fd953..0e1bf5a 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/META-INF/MANIFEST.MF
@@ -11,11 +11,11 @@
org.eclipse.wst.common.frameworks.internal.eclipse.ui;x-internal:=true,
org.eclipse.wst.common.frameworks.internal.operation.extensionui;x-internal:=true,
org.eclipse.wst.common.frameworks.internal.ui;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.ui;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.frameworks;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
Eclipse-AutoStart: true
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 3500113..c43383f 100644
--- a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@
org.eclipse.wst.common.frameworks.internal.enablement.nonui;x-internal:=true,
org.eclipse.wst.common.frameworks.internal.operations;x-internal:=true,
org.eclipse.wst.common.frameworks.internal.plugin;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0]",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)"
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index 8157894..c3b8366 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -16,14 +16,14 @@
org.eclipse.wst.common.componentcore.internal.resources;x-internal:=true,
org.eclipse.wst.common.componentcore.internal.util;x-internal:=true,
org.eclipse.wst.common.componentcore.resources
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0]",
org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
index 9f6e499..00a3111 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
import org.eclipse.wst.common.componentcore.internal.DependencyType;
@@ -83,63 +84,10 @@
}
public boolean exists() {
- StructureEdit core = null;
IProject project = getProject();
- try {
- if (project != null && getName() != null) {
- core = StructureEdit.getStructureEditForRead(project);
- if(core == null){
- return false;
- }
- WorkbenchComponent component = core.getComponent();
- return component != null;
- }
- } finally {
- if(core != null)
- core.dispose();
- }
- return false;
+ return ModuleCoreNature.isFlexibleProject(project);
}
-// public String getComponentTypeId() {
-// if (null == componentTypeId) {
-// StructureEdit core = null;
-// try {
-// if (getProject() == null || getName() == null)
-// return null;
-// core = StructureEdit.getStructureEditForRead(getProject());
-// if (core == null)
-// return null;
-// WorkbenchComponent component = core.getComponent();
-// ComponentType cType = component == null ? null : component.getComponentType();
-// componentTypeId = cType == null ? null : cType.getComponentTypeId();
-// } finally {
-// if (core != null)
-// core.dispose();
-// }
-// }
-// return componentTypeId;
-// }
-
-// public void setComponentTypeId(String aComponentTypeId) {
-//
-// StructureEdit core = null;
-// try {
-// core = StructureEdit.getStructureEditForWrite(getProject());
-// WorkbenchComponent component = core.getComponent();
-// ComponentType cType = component.getComponentType();
-// if(cType == null) {
-// cType = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createComponentType();
-// component.setComponentType(cType);
-// }
-// cType.setComponentTypeId(aComponentTypeId);
-// } finally {
-// if(core != null) {
-// core.saveIfNecessary(null);
-// core.dispose();
-// }
-// }
-// }
public Properties getMetaProperties() {
StructureEdit core = null;
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
index 0285666..45b4773 100644
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
@@ -8,14 +8,14 @@
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.validation.internal.ui;x-internal:=true,
org.eclipse.wst.validation.internal.ui.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.ui;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.swt;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.swt;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)"
+ org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0]"
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
index f178647..710861a 100644
--- a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@
org.eclipse.wst.validation.internal.plugin;x-internal:=true,
org.eclipse.wst.validation.internal.provisional;x-internal:=true,
org.eclipse.wst.validation.internal.provisional.core;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0)"
+ org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0]"
Eclipse-LazyStart: true
