Attachment 32334 Details for Bug 110317 – More warning fixes in the emf.core and emf.clipboard.core plug-ins

[patch] More warning fixes in the emf.core and emf.clipboard.core plug-ins

more_emf_core_clipboard_warnings.patch (text/plain), 28.28 KB, created by Christian Damus

on 2005-12-29 13:43:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Damus

Created: 2005-12-29 13:43:01 EST

Size: 28.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.tests.runtime.emf.clipboard.core
>Index: src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 BaseClipboardTest.java
>--- src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java	31 Oct 2005 19:46:36 -0000	1.1
>+++ src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java	29 Dec 2005 18:42:31 -0000
>@@ -19,7 +19,6 @@
> import org.eclipse.emf.examples.extlibrary.Writer;
> import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
> import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
>-import org.eclipse.gmf.runtime.emf.core.edit.MResourceOption;
> import org.eclipse.gmf.runtime.emf.core.edit.MRunnable;
> import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;
> import org.eclipse.gmf.runtime.emf.core.internal.commands.MSLUndoStack.ActionLockMode;
>@@ -103,10 +102,11 @@
> 					domain.runAsWrite(new MRunnable() {
> 						public Object run() {
> 							try {
>-								Resource originalRes = domain.loadResource(URI
>-									.createURI(CLIPBOARD_TESTS_BUNDLE.getEntry(
>-										"/test_models/clipboard_test.extlibrary") //$NON-NLS-1$
>-										.toString()).toString(), MResourceOption.URI);
>+								Resource originalRes = domain.getResourceSet().getResource(
>+										URI.createURI(
>+												CLIPBOARD_TESTS_BUNDLE.getEntry(
>+													"/test_models/clipboard_test.extlibrary") //$NON-NLS-1$
>+										.toString()), true);
> 								originalRes.setURI(URI.createPlatformResourceURI(RESOURCE_NAME));
> 								originalRes.save(Collections.EMPTY_MAP);
> 								testResource = originalRes;
>#P org.eclipse.gmf.runtime.emf.core
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLEditingDomain.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLEditingDomain.java,v
>retrieving revision 1.8
>diff -u -r1.8 MSLEditingDomain.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLEditingDomain.java	23 Dec 2005 20:19:04 -0000	1.8
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLEditingDomain.java	29 Dec 2005 18:42:33 -0000
>@@ -81,7 +81,6 @@
> import org.eclipse.gmf.runtime.emf.core.internal.plugin.MSLDebugOptions;
> import org.eclipse.gmf.runtime.emf.core.internal.plugin.MSLPlugin;
> import org.eclipse.gmf.runtime.emf.core.internal.plugin.MSLStatusCodes;
>-import org.eclipse.gmf.runtime.emf.core.internal.resources.LogicalResourceWrapper;
> import org.eclipse.gmf.runtime.emf.core.internal.resources.MResource;
> import org.eclipse.gmf.runtime.emf.core.internal.resources.MSLExtendedMetaData;
> import org.eclipse.gmf.runtime.emf.core.internal.resources.MSLPathmap;
>@@ -89,7 +88,6 @@
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLComposedAdapterFactory;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLConstants;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLUtil;
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 
> /**
>  * This is the implementation of the MSL editing domain interface. The
>@@ -1961,17 +1959,17 @@
> 
> 	/** @deprecated */
> 	public boolean isLogicalResource(Resource resource) {
>-		return resource instanceof ILogicalResource;
>+		return resource instanceof org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 	}
> 	
> 	/** @deprecated */
>-	public ILogicalResource asLogicalResource(Resource resource) {
>-		ILogicalResource result = null;
>+	public org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource asLogicalResource(Resource resource) {
>+		org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource result = null;
> 		
>-		if (resource instanceof ILogicalResource) {
>-			result = (ILogicalResource) resource;
>+		if (resource instanceof org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) {
>+			result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) resource;
> 		} else {
>-			result = LogicalResourceWrapper.get(resource);
>+			result = org.eclipse.gmf.runtime.emf.core.internal.resources.LogicalResourceWrapper.get(resource);
> 		}
> 		
> 		return result;
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLAdapterFactoryEditingDomain.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLAdapterFactoryEditingDomain.java,v
>retrieving revision 1.3
>diff -u -r1.3 MSLAdapterFactoryEditingDomain.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLAdapterFactoryEditingDomain.java	14 Nov 2005 21:10:12 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLAdapterFactoryEditingDomain.java	29 Dec 2005 18:42:32 -0000
>@@ -108,6 +108,8 @@
> 				//    the EPackage for some namespace in one of my resources.
> 				//    Take this opportunity also to clean out proxies
> 				resources = new ResourcesEList() {
>+					private static final long serialVersionUID = 401816160908753449L;
>+
> 					protected void didRemove(int index, Object oldObject) {
> 						EPackage.Registry registry = getPackageRegistry();
> 						
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLExportsAdapter.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLExportsAdapter.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLExportsAdapter.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLExportsAdapter.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLExportsAdapter.java	29 Dec 2005 18:42:33 -0000
>@@ -27,6 +27,8 @@
> 	extends HashMap
> 	implements Adapter {
> 
>+	private static final long serialVersionUID = -9110312883845863489L;
>+
> 	/**
> 	 * Constructor.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLReferenceAdapter.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLReferenceAdapter.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLReferenceAdapter.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLReferenceAdapter.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLReferenceAdapter.java	29 Dec 2005 18:42:33 -0000
>@@ -27,6 +27,8 @@
> 	extends HashMap
> 	implements Adapter {
> 
>+	private static final long serialVersionUID = 1989964645244552123L;
>+
> 	/**
> 	 * Constructor.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLImportsAdapter.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLImportsAdapter.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLImportsAdapter.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLImportsAdapter.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLImportsAdapter.java	29 Dec 2005 18:42:33 -0000
>@@ -27,6 +27,8 @@
> 	extends HashMap
> 	implements Adapter {
> 
>+	private static final long serialVersionUID = 7770242431763053066L;
>+
> 	/**
> 	 * Constructor.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/edit/MEditingDomain.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/edit/MEditingDomain.java,v
>retrieving revision 1.5
>diff -u -r1.5 MEditingDomain.java
>--- src/org/eclipse/gmf/runtime/emf/core/edit/MEditingDomain.java	23 Dec 2005 20:19:04 -0000	1.5
>+++ src/org/eclipse/gmf/runtime/emf/core/edit/MEditingDomain.java	29 Dec 2005 18:42:32 -0000
>@@ -27,7 +27,6 @@
> import org.eclipse.emf.edit.domain.EditingDomain;
> import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;
> import org.eclipse.gmf.runtime.emf.core.internal.domain.MSLEditingDomain;
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 
> /**
>  * <p>
>@@ -392,7 +391,8 @@
> 	 *     instead, by defining containment features that are capable of storing
> 	 *     proxies.
> 	 */
>-	public abstract ILogicalResource asLogicalResource(Resource resource);
>+	public abstract org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource
>+			asLogicalResource(Resource resource);
> 
> 	/**
> 	 * Opens an undo interval. An undo interval must be open before starting a
>Index: src/org/eclipse/gmf/runtime/emf/core/edit/IDemuxedMListener2.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/edit/IDemuxedMListener2.java,v
>retrieving revision 1.3
>diff -u -r1.3 IDemuxedMListener2.java
>--- src/org/eclipse/gmf/runtime/emf/core/edit/IDemuxedMListener2.java	23 Dec 2005 20:19:03 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/core/edit/IDemuxedMListener2.java	29 Dec 2005 18:42:32 -0000
>@@ -16,8 +16,6 @@
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.Resource;
> 
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
>-
> 
> /**
>  * An optional extension to the {@link IDemuxedListener} interface for listeners
>@@ -45,7 +43,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementSeparatedEvent(Notification notification,
>-		ILogicalResource resource, EObject eObject, Resource newResource);
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject, Resource newResource);
> 	
> 	/**
> 	 * Notifies me of an event indicating that an element in a logical resource
>@@ -63,7 +62,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementAbsorbedEvent(Notification notification,
>-			ILogicalResource resource, EObject eObject, Resource oldResource);
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject, Resource oldResource);
> 	
> 	/**
> 	 * Notifies me of an event indicating that an element in a logical resource
>@@ -79,7 +79,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementLoadedEvent(Notification notification,
>-			ILogicalResource resource, EObject eObject);
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject);
> 	
> 	/**
> 	 * Notifies me of an event indicating that a root has been added to the resource
>Index: src/org/eclipse/gmf/runtime/emf/core/edit/DemuxedMListener.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/edit/DemuxedMListener.java,v
>retrieving revision 1.3
>diff -u -r1.3 DemuxedMListener.java
>--- src/org/eclipse/gmf/runtime/emf/core/edit/DemuxedMListener.java	23 Dec 2005 20:19:04 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/core/edit/DemuxedMListener.java	29 Dec 2005 18:42:32 -0000
>@@ -16,8 +16,6 @@
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.Resource;
> 
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
>-
> 
> 
> /**
>@@ -179,7 +177,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementSeparatedEvent(Notification notification,
>-			ILogicalResource resource, EObject eObject, Resource newResource) {
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject, Resource newResource) {
> 		// nothing to do
> 	}
> 	
>@@ -191,7 +190,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementAbsorbedEvent(Notification notification,
>-			ILogicalResource resource, EObject eObject, Resource oldResource) {
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject, Resource oldResource) {
> 		// nothing to do
> 	}
> 	
>@@ -203,7 +203,8 @@
> 	 *     proxies.
> 	 */
> 	public void handleElementLoadedEvent(Notification notification,
>-			ILogicalResource resource, EObject eObject) {
>+			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
>+			EObject eObject) {
> 		// nothing to do
> 	}
> 
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/exceptions/MSLActionProtocolException.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/exceptions/MSLActionProtocolException.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLActionProtocolException.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/exceptions/MSLActionProtocolException.java	12 Sep 2005 21:25:12 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/exceptions/MSLActionProtocolException.java	29 Dec 2005 18:42:33 -0000
>@@ -21,6 +21,8 @@
> public class MSLActionProtocolException
> 	extends MSLRuntimeException {
> 
>+	private static final long serialVersionUID = 6373560684111580870L;
>+
> 	/**
> 	 * Initializes me without any details.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLActionAbandonedException.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLActionAbandonedException.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLActionAbandonedException.java
>--- src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLActionAbandonedException.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLActionAbandonedException.java	29 Dec 2005 18:42:32 -0000
>@@ -24,6 +24,8 @@
> public class MSLActionAbandonedException
> 	extends MSLCheckedException {
> 
>+	private static final long serialVersionUID = 6054386644313187147L;
>+	
> 	private final IStatus status;
> 
> 	/**
>Index: src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLCheckedException.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLCheckedException.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLCheckedException.java
>--- src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLCheckedException.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLCheckedException.java	29 Dec 2005 18:42:32 -0000
>@@ -19,6 +19,8 @@
> public class MSLCheckedException
> 	extends Exception {
> 
>+	private static final long serialVersionUID = 7693613568779908246L;
>+
> 	/**
> 	 * Initializes me without any details.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLRuntimeException.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLRuntimeException.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLRuntimeException.java
>--- src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLRuntimeException.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLRuntimeException.java	29 Dec 2005 18:42:32 -0000
>@@ -19,6 +19,8 @@
> public class MSLRuntimeException
> 	extends RuntimeException {
> 
>+	private static final long serialVersionUID = 4756697463399265322L;
>+
> 	/**
> 	 * Initializes me without any details.
> 	 */
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLResource.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLResource.java,v
>retrieving revision 1.4
>diff -u -r1.4 MSLResource.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLResource.java	23 Dec 2005 20:19:04 -0000	1.4
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLResource.java	29 Dec 2005 18:42:33 -0000
>@@ -27,7 +27,6 @@
> import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
> import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLConstants;
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 
> /**
>  * Custom implementation of an XMIResource.
>@@ -36,7 +35,7 @@
>  */
> public class MSLResource
> 	extends XMIResourceImpl
>-	implements ILogicalResource {
>+	implements org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource {
> 
> 	private boolean useIDAttributes = false;
> 	
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/resources/LogicalResourceWrapper.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/LogicalResourceWrapper.java,v
>retrieving revision 1.3
>diff -u -r1.3 LogicalResourceWrapper.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/resources/LogicalResourceWrapper.java	23 Dec 2005 20:19:04 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/resources/LogicalResourceWrapper.java	29 Dec 2005 18:42:33 -0000
>@@ -20,7 +20,6 @@
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.Resource;
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 
> 
> /**
>@@ -37,7 +36,7 @@
>  */
> public class LogicalResourceWrapper
> 	extends AbstractResourceWrapper
>-	implements ILogicalResource {
>+	implements org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource {
> 	
> 	private static final CanonicalMap instances = new CanonicalMap() {
> 		protected AbstractResourceWrapper createWrapper(Resource resource) {
>@@ -61,13 +60,14 @@
> 	 * @param resource the resource to get an unmodifiable view of
> 	 * @return its unmodifiable view
> 	 */
>-	public static ILogicalResource get(Resource resource) {
>-		ILogicalResource result = null;
>+	public static org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource get(
>+			Resource resource) {
>+		org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource result = null;
> 		
> 		if (resource instanceof LogicalResourceWrapper) {
>-			result = (ILogicalResource) resource;
>+			result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) resource;
> 		} else {
>-			result = (ILogicalResource) instances.get(resource);
>+			result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) instances.get(resource);
> 		}
> 		
> 		return result;
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java,v
>retrieving revision 1.5
>diff -u -r1.5 MSLPlugin.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java	31 Oct 2005 19:43:48 -0000	1.5
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java	29 Dec 2005 18:42:33 -0000
>@@ -11,7 +11,7 @@
> 
> package org.eclipse.gmf.runtime.emf.core.internal.plugin;
> 
>-import org.eclipse.gmf.runtime.common.core.plugin.XToolsPlugin;
>+import org.eclipse.core.runtime.Plugin;
> import org.eclipse.gmf.runtime.common.core.util.Trace;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;
> 
>@@ -21,7 +21,7 @@
>  * @author rafikj
>  */
> public class MSLPlugin
>-	extends XToolsPlugin {
>+	extends Plugin {
> 
> 	private static MSLPlugin plugin;
> 		
>@@ -44,7 +44,7 @@
> 	 * Get plugin ID.
> 	 */
> 	public static String getPluginId() {
>-		return getDefault().getSymbolicName();
>+		return getDefault().getBundle().getSymbolicName();
> 	}
> 
> 	/**
>Index: src/org/eclipse/gmf/runtime/emf/core/util/ResourceUtil.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/ResourceUtil.java,v
>retrieving revision 1.4
>diff -u -r1.4 ResourceUtil.java
>--- src/org/eclipse/gmf/runtime/emf/core/util/ResourceUtil.java	23 Dec 2005 20:19:04 -0000	1.4
>+++ src/org/eclipse/gmf/runtime/emf/core/util/ResourceUtil.java	29 Dec 2005 18:42:33 -0000
>@@ -33,7 +33,6 @@
> import org.eclipse.gmf.runtime.emf.core.internal.resources.MResource;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLUtil;
>-import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
> 
> /**
>  * This class contains a set of <code>Resource</code> related utility methods.
>@@ -102,7 +101,8 @@
> 	 *     instead, by defining containment features that are capable of storing
> 	 *     proxies.
> s	 */
>-	public static ILogicalResource asLogicalResource(Resource resource) {
>+	public static org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource asLogicalResource(
>+			Resource resource) {
> 		return MEditingDomain.INSTANCE.asLogicalResource(resource);
> 	}
> 	
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/commands/ExecutionLock.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/commands/ExecutionLock.java,v
>retrieving revision 1.2
>diff -u -r1.2 ExecutionLock.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/commands/ExecutionLock.java	12 Sep 2005 21:25:11 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/commands/ExecutionLock.java	29 Dec 2005 18:42:32 -0000
>@@ -133,8 +133,8 @@
> 			// MSLPlugin.getDefault().getSymbolicName(), IStatus.OK, "", null);
> 			// //$NON-NLS-1$
> 			//			else
>-			return new Status(IStatus.OK, MSLPlugin.getDefault()
>-				.getSymbolicName(), IStatus.OK, "", null); //$NON-NLS-1$
>+			return new Status(IStatus.OK, MSLPlugin.getPluginId(),
>+				IStatus.OK, "", null); //$NON-NLS-1$
> 		}
> 
> 		/**
>#P org.eclipse.gmf.runtime.emf.clipboard.core
>Index: src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java,v
>retrieving revision 1.3
>diff -u -r1.3 CopyOperation.java
>--- src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java	12 Sep 2005 21:28:21 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java	29 Dec 2005 18:42:34 -0000
>@@ -440,6 +440,8 @@
> 	private class CopyParentsCopier
> 		extends EcoreUtil.Copier {
> 
>+		private static final long serialVersionUID = 6178429496879264655L;
>+
> 		private Map copyToObjectMap = new HashMap();
> 
> 		private Collection doNotCopyEObjects;
>Index: src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java,v
>retrieving revision 1.4
>diff -u -r1.4 SavingEMFResource.java
>--- src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java	31 Oct 2005 19:43:53 -0000	1.4
>+++ src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java	29 Dec 2005 18:42:34 -0000
>@@ -318,6 +318,8 @@
> 		extends EcoreEList.UnmodifiableEList
> 		implements InternalEList {
> 
>+		private static final long serialVersionUID = -2551747854798104709L;
>+
> 		ContentBasicEList(Set contentSet) {
> 			super(null, null, contentSet.size(), contentSet.toArray());
> 		}
>Index: src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResourceInfoProcessor.java
>--- src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java	31 Oct 2005 19:43:53 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java	29 Dec 2005 18:42:34 -0000
>@@ -52,7 +52,7 @@
> 
> 	private static final String COMMA = ","; //$NON-NLS-1$	
> 
>-	private static final String PROPERTY_DELIM = SEPARATOR + PLUS; //$NON-NLS-1$	
>+	private static final String PROPERTY_DELIM = SEPARATOR + PLUS;	
> 
> 	private static final String VERSION = "VERSION"; //$NON-NLS-1$
> 
>#P org.eclipse.gmf.tests.runtime.emf.core
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.core/plugin.xml,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.xml
>--- plugin.xml	25 Nov 2005 21:58:28 -0000	1.4
>+++ plugin.xml	29 Dec 2005 18:42:35 -0000
>@@ -49,20 +49,6 @@
>    </extension>
>    
>    <extension
>-         point="org.eclipse.gmf.runtime.emf.core.resourcePolicies">
>-      
>-      <policy
>-            class="org.eclipse.gmf.tests.runtime.emf.core.internal.resources.LogicalResourcePolicyManagerTest$TestPolicy">
>-         <epackage
>-               nsURI="http:///com/ibm/xtools/emf/msl/core/tests/logrestest.ecore"/>
>-      </policy>
>-      <policy
>-            class="org.eclipse.gmf.tests.runtime.emf.core.internal.resources.LogicalResourcePolicyManagerTest$TestPolicy">
>-         <epackage
>-               nsURI="http:///com/ibm/xtools/emf/msl/core/tests/logrestest.ecore"/>
>-      </policy>
>-   </extension>
>-   <extension
>          point="org.eclipse.emf.ecore.extension_parser">
>       <parser
>             class="org.eclipse.gmf.tests.runtime.emf.core.internal.listener.MListenerTest$BrokenResourceFactory"
>Index: src/org/eclipse/gmf/tests/runtime/emf/core/RegressionTestCase.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/RegressionTestCase.java,v
>retrieving revision 1.6
>diff -u -r1.6 RegressionTestCase.java
>--- src/org/eclipse/gmf/tests/runtime/emf/core/RegressionTestCase.java	16 Dec 2005 17:53:08 -0000	1.6
>+++ src/org/eclipse/gmf/tests/runtime/emf/core/RegressionTestCase.java	29 Dec 2005 18:42:35 -0000
>@@ -510,10 +510,10 @@
> 							cls.setName("NewName"); //$NON-NLS-1$
> 
> 							// so should this one
>-							cls.setName(null); //$NON-NLS-1$
>+							cls.setName(null);
> 
> 							// this should *not* go into the undo interval
>-							cls.setName(null); //$NON-NLS-1$
>+							cls.setName(null);
> 							return null;
> 						}
> 					});
>@@ -553,12 +553,12 @@
> 					// this command changes the eclass name
> 					commandCount++;
> 
>-					if (cmd.getValue() == null) { //$NON-NLS-1$
>+					if (cmd.getValue() == null) {
> 						if ("NewName".equals(cmd.getOldValue())) { //$NON-NLS-1$
> 							// this is the "good" command, which changed the
> 							// name
> 							setCommand = cmd;
>-						} else if (cmd.getOldValue() == null) { //$NON-NLS-1$
>+						} else if (cmd.getOldValue() == null) {
> 							// this is the "bad" command, which does not change
> 							// the name
> 							badCommand = cmd;
>Index: src/org/eclipse/gmf/tests/runtime/emf/core/internal/listener/MFilterTests.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/internal/listener/MFilterTests.java,v
>retrieving revision 1.4
>diff -u -r1.4 MFilterTests.java
>--- src/org/eclipse/gmf/tests/runtime/emf/core/internal/listener/MFilterTests.java	25 Nov 2005 21:58:28 -0000	1.4
>+++ src/org/eclipse/gmf/tests/runtime/emf/core/internal/listener/MFilterTests.java	29 Dec 2005 18:42:35 -0000
>@@ -86,7 +86,7 @@
> 		};
> 		
> 		/* Set the filter */
>-		regularListener.setFilter(new MFilter.ResourceContentType(Collections.singleton(EXTLIBRARY_CONTENTTYPE))); //$NON-NLS-1$
>+		regularListener.setFilter(new MFilter.ResourceContentType(Collections.singleton(EXTLIBRARY_CONTENTTYPE)));
> 
> 		/* Load the resource */
> 		domain.loadResource(testResource);

Actions: View | Diff

Attachments on bug 110317: 27964 | 27965 | 27966 | 27968 | 27969 | 27970 | 27972 | 27973 | 27974 | 27975 | 27976 | 32334