[141816] Removing "isLoading" adapter
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
index adc44b2..fba954c 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
@@ -168,14 +168,12 @@
* java.util.Map)
*/
public final void doLoad(InputStream inputStream, Map options) throws IOException {
- ExtendedEcoreUtil.addLoadingTag(this);
- try {
- basicDoLoad(inputStream, options);
- } finally {
- ExtendedEcoreUtil.removeLoadingTag(this);
- }
+ basicDoLoad(inputStream, options);
}
+ /**
+ * @deprecated Use {@link #doLoad(InputStream, Map)} instead.
+ */
protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
super.doLoad(inputStream, options);
}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
index 2860b2a..2762f09 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.Resource.Internal;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.xmi.XMLResource;
@@ -123,12 +124,18 @@
return null;
}
+ /**
+ * @deprecated No longer needed.
+ */
public static void addLoadingTag(Resource resource) {
- resource.eAdapters().add(IsLoadingDetector.INSTANCE);
+ //resource.eAdapters().add(IsLoadingDetector.INSTANCE);
}
+ /**
+ * @deprecated No longer needed.
+ */
public static void removeLoadingTag(Resource resource) {
- resource.eAdapters().remove(IsLoadingDetector.INSTANCE);
+ //resource.eAdapters().remove(IsLoadingDetector.INSTANCE);
}
/**
@@ -140,13 +147,10 @@
*
* @see addLoadingTag(Resource)
* @see removeLoadingTag(Resource)
- *
+ * @deprecated use {@link Resource.Internal#isLoading()}
*/
public static boolean isLoading(Resource resource) {
- if (resource != null) {
- return resource.eAdapters().contains(IsLoadingDetector.INSTANCE);
- }
- return false;
+ return resource != null ? ((Resource.Internal)resource).isLoaded() : false;
}
public static Adapter createAdapterForLoading(Adapter targetAdapter, EObject targetObject) {
