Attachment #32334 for bug #110317

View | Details | Raw Unified | Return to bug 110317 | Differences between

and this patch




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;

					domain.runAsWrite(new MRunnable() {
						public Object run() {
							try {
								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;




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;

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


	/** @deprecated */
	public boolean isLogicalResource(Resource resource) {
		return resource instanceof org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
	}
	
	/** @deprecated */
	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 org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) {
			result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) resource;
		} else {
			result = org.eclipse.gmf.runtime.emf.core.internal.resources.LogicalResourceWrapper.get(resource);
		}
		
		return result;

Lines 108-113 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/domain/MSLAdapterFactoryEditingDomain.java (+2 lines)
108	// the EPackage for some namespace in one of my resources.	108	// the EPackage for some namespace in one of my resources.
109	// Take this opportunity also to clean out proxies	109	// Take this opportunity also to clean out proxies
110	resources = new ResourcesEList() {	110	resources = new ResourcesEList() {
		111	private static final long serialVersionUID = 401816160908753449L;
		112
111	protected void didRemove(int index, Object oldObject) {	113	protected void didRemove(int index, Object oldObject) {
112	EPackage.Registry registry = getPackageRegistry();	114	EPackage.Registry registry = getPackageRegistry();
113		115

Lines 27-32 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLExportsAdapter.java (+2 lines)
27	extends HashMap	27	extends HashMap
28	implements Adapter {	28	implements Adapter {
29		29
		30	private static final long serialVersionUID = -9110312883845863489L;
		31
30	/**	32	/**
31	* Constructor.	33	* Constructor.
32	*/	34	*/

Lines 27-32 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLReferenceAdapter.java (+2 lines)
27	extends HashMap	27	extends HashMap
28	implements Adapter {	28	implements Adapter {
29		29
		30	private static final long serialVersionUID = 1989964645244552123L;
		31
30	/**	32	/**
31	* Constructor.	33	* Constructor.
32	*/	34	*/

Lines 27-32 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/index/MSLImportsAdapter.java (+2 lines)
27	extends HashMap	27	extends HashMap
28	implements Adapter {	28	implements Adapter {
29		29
		30	private static final long serialVersionUID = 7770242431763053066L;
		31
30	/**	32	/**
31	* Constructor.	33	* Constructor.
32	*/	34	*/

Lines 27-33 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/edit/MEditingDomain.java (-2 / +2 lines)
27	import org.eclipse.emf.edit.domain.EditingDomain;	27	import org.eclipse.emf.edit.domain.EditingDomain;
28	import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;	28	import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;
29	import org.eclipse.gmf.runtime.emf.core.internal.domain.MSLEditingDomain;	29	import org.eclipse.gmf.runtime.emf.core.internal.domain.MSLEditingDomain;
30	import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
31		30
32	/**	31	/**
33	* <p>	32	* <p>
Lines 392-398 Link Here
392	* instead, by defining containment features that are capable of storing	391	* instead, by defining containment features that are capable of storing
393	* proxies.	392	* proxies.
394	*/	393	*/
395	public abstract ILogicalResource asLogicalResource(Resource resource);	394	public abstract org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource
		395	asLogicalResource(Resource resource);
396		396
397	/**	397	/**
398	* Opens an undo interval. An undo interval must be open before starting a	398	* Opens an undo interval. An undo interval must be open before starting a




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

	 *     proxies.
	 */
	public void handleElementSeparatedEvent(Notification notification,
			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

	 *     proxies.
	 */
	public void handleElementAbsorbedEvent(Notification notification,
			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

	 *     proxies.
	 */
	public void handleElementLoadedEvent(Notification notification,
			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




import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;

import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;



/**

	 *     proxies.
	 */
	public void handleElementSeparatedEvent(Notification notification,
			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
			EObject eObject, Resource newResource) {
		// nothing to do
	}
	

	 *     proxies.
	 */
	public void handleElementAbsorbedEvent(Notification notification,
			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
			EObject eObject, Resource oldResource) {
		// nothing to do
	}
	

	 *     proxies.
	 */
	public void handleElementLoadedEvent(Notification notification,
			org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
			EObject eObject) {
		// nothing to do
	}


Lines 21-26 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/exceptions/MSLActionProtocolException.java (+2 lines)
21	public class MSLActionProtocolException	21	public class MSLActionProtocolException
22	extends MSLRuntimeException {	22	extends MSLRuntimeException {
23		23
		24	private static final long serialVersionUID = 6373560684111580870L;
		25
24	/**	26	/**
25	* Initializes me without any details.	27	* Initializes me without any details.
26	*/	28	*/

Lines 24-29 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLActionAbandonedException.java (+2 lines)
24	public class MSLActionAbandonedException	24	public class MSLActionAbandonedException
25	extends MSLCheckedException {	25	extends MSLCheckedException {
26		26
		27	private static final long serialVersionUID = 6054386644313187147L;
		28
27	private final IStatus status;	29	private final IStatus status;
28		30
29	/**	31	/**

Lines 19-24 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLCheckedException.java (+2 lines)
19	public class MSLCheckedException	19	public class MSLCheckedException
20	extends Exception {	20	extends Exception {
21		21
		22	private static final long serialVersionUID = 7693613568779908246L;
		23
22	/**	24	/**
23	* Initializes me without any details.	25	* Initializes me without any details.
24	*/	26	*/

Lines 19-24 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/exceptions/MSLRuntimeException.java (+2 lines)
19	public class MSLRuntimeException	19	public class MSLRuntimeException
20	extends RuntimeException {	20	extends RuntimeException {
21		21
		22	private static final long serialVersionUID = 4756697463399265322L;
		23
22	/**	24	/**
23	* Initializes me without any details.	25	* Initializes me without any details.
24	*/	26	*/

Lines 27-33 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLResource.java (-2 / +1 lines)
27	import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;	27	import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
28	import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;	28	import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
29	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLConstants;	29	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLConstants;
30	import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
31		30
32	/**	31	/**
33	* Custom implementation of an XMIResource.	32	* Custom implementation of an XMIResource.
Lines 36-42 Link Here
36	*/	35	*/
37	public class MSLResource	36	public class MSLResource
38	extends XMIResourceImpl	37	extends XMIResourceImpl
39	implements ILogicalResource {	38	implements org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource {
40		39
41	private boolean useIDAttributes = false;	40	private boolean useIDAttributes = false;
42		41




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;


/**

 */
public class LogicalResourceWrapper
	extends AbstractResourceWrapper
	implements org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource {
	
	private static final CanonicalMap instances = new CanonicalMap() {
		protected AbstractResourceWrapper createWrapper(Resource resource) {

	 * @param resource the resource to get an unmodifiable view of
	 * @return its unmodifiable view
	 */
	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 = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) resource;
		} else {
			result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) instances.get(resource);
		}
		
		return result;





package org.eclipse.gmf.runtime.emf.core.internal.plugin;

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;


 * @author rafikj
 */
public class MSLPlugin
	extends Plugin {

	private static MSLPlugin plugin;
		

	 * Get plugin ID.
	 */
	public static String getPluginId() {
		return getDefault().getBundle().getSymbolicName();
	}

	/**

Lines 33-39 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/util/ResourceUtil.java (-2 / +2 lines)
33	import org.eclipse.gmf.runtime.emf.core.internal.resources.MResource;	33	import org.eclipse.gmf.runtime.emf.core.internal.resources.MResource;
34	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;	34	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;
35	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLUtil;	35	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLUtil;
36	import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
37		36
38	/**	37	/**
39	* This class contains a set of <code>Resource</code> related utility methods.	38	* This class contains a set of <code>Resource</code> related utility methods.
Lines 102-108 Link Here
102	* instead, by defining containment features that are capable of storing	101	* instead, by defining containment features that are capable of storing
103	* proxies.	102	* proxies.
104	s */	103	s */
105	public static ILogicalResource asLogicalResource(Resource resource) {	104	public static org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource asLogicalResource(
		105	Resource resource) {
106	return MEditingDomain.INSTANCE.asLogicalResource(resource);	106	return MEditingDomain.INSTANCE.asLogicalResource(resource);
107	}	107	}
108		108

Lines 133-140 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/commands/ExecutionLock.java (-2 / +2 lines)
133	// MSLPlugin.getDefault().getSymbolicName(), IStatus.OK, "", null);	133	// MSLPlugin.getDefault().getSymbolicName(), IStatus.OK, "", null);
134	// //$NON-NLS-1$	134	// //$NON-NLS-1$
135	// else	135	// else
136	return new Status(IStatus.OK, MSLPlugin.getDefault()	136	return new Status(IStatus.OK, MSLPlugin.getPluginId(),
137	.getSymbolicName(), IStatus.OK, "", null); //$NON-NLS-1$	137	IStatus.OK, "", null); //$NON-NLS-1$
138	}	138	}
139		139
140	/**	140	/**

Lines 440-445 Link Here

(-)src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java (+2 lines)
440	private class CopyParentsCopier	440	private class CopyParentsCopier
441	extends EcoreUtil.Copier {	441	extends EcoreUtil.Copier {
442		442
		443	private static final long serialVersionUID = 6178429496879264655L;
		444
443	private Map copyToObjectMap = new HashMap();	445	private Map copyToObjectMap = new HashMap();
444		446
445	private Collection doNotCopyEObjects;	447	private Collection doNotCopyEObjects;

Lines 318-323 Link Here

(-)src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java (+2 lines)
318	extends EcoreEList.UnmodifiableEList	318	extends EcoreEList.UnmodifiableEList
319	implements InternalEList {	319	implements InternalEList {
320		320
		321	private static final long serialVersionUID = -2551747854798104709L;
		322
321	ContentBasicEList(Set contentSet) {	323	ContentBasicEList(Set contentSet) {
322	super(null, null, contentSet.size(), contentSet.toArray());	324	super(null, null, contentSet.size(), contentSet.toArray());
323	}	325	}

Lines 52-58 Link Here

(-)src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java (-1 / +1 lines)
52		52
53	private static final String COMMA = ","; //$NON-NLS-1$	53	private static final String COMMA = ","; //$NON-NLS-1$
54		54
55	private static final String PROPERTY_DELIM = SEPARATOR + PLUS; //$NON-NLS-1$	55	private static final String PROPERTY_DELIM = SEPARATOR + PLUS;
56		56
57	private static final String VERSION = "VERSION"; //$NON-NLS-1$	57	private static final String VERSION = "VERSION"; //$NON-NLS-1$
58		58




   </extension>
   
   <extension
         point="org.eclipse.gmf.runtime.emf.core.resourcePolicies">
      <!-- This is not a mistake.  We need to register two policies for our test. -->
      <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"




							cls.setName("NewName"); //$NON-NLS-1$

							// so should this one
							cls.setName(null);

							// this should *not* go into the undo interval
							cls.setName(null);
							return null;
						}
					});

					// this command changes the eclass name
					commandCount++;

					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) {
							// this is the "bad" command, which does not change
							// the name
							badCommand = cmd;

Lines 86-92 Link Here

(-)src/org/eclipse/gmf/tests/runtime/emf/core/internal/listener/MFilterTests.java (-1 / +1 lines)
86	};	86	};
87		87
88	/* Set the filter */	88	/* Set the filter */
89	regularListener.setFilter(new MFilter.ResourceContentType(Collections.singleton(EXTLIBRARY_CONTENTTYPE))); //$NON-NLS-1$	89	regularListener.setFilter(new MFilter.ResourceContentType(Collections.singleton(EXTLIBRARY_CONTENTTYPE)));
90		90
91	/* Load the resource */	91	/* Load the resource */
92	domain.loadResource(testResource);	92	domain.loadResource(testResource);

Return to bug 110317

Lines 510-519 Link Here

(-)src/org/eclipse/gmf/tests/runtime/emf/core/RegressionTestCase.java (-4 / +4 lines)
510	cls.setName("NewName"); //$NON-NLS-1$	510	cls.setName("NewName"); //$NON-NLS-1$
511		511
512	// so should this one	512	// so should this one
513	cls.setName(null); //$NON-NLS-1$	513	cls.setName(null);
514		514
515	// this should not go into the undo interval	515	// this should not go into the undo interval
516	cls.setName(null); //$NON-NLS-1$	516	cls.setName(null);
517	return null;	517	return null;
518	}	518	}
519	});	519	});
Lines 553-564 Link Here
553	// this command changes the eclass name	553	// this command changes the eclass name
554	commandCount++;	554	commandCount++;
555		555
556	if (cmd.getValue() == null) { //$NON-NLS-1$	556	if (cmd.getValue() == null) {
557	if ("NewName".equals(cmd.getOldValue())) { //$NON-NLS-1$	557	if ("NewName".equals(cmd.getOldValue())) { //$NON-NLS-1$
558	// this is the "good" command, which changed the	558	// this is the "good" command, which changed the
559	// name	559	// name
560	setCommand = cmd;	560	setCommand = cmd;
561	} else if (cmd.getOldValue() == null) { //$NON-NLS-1$	561	} else if (cmd.getOldValue() == null) {
562	// this is the "bad" command, which does not change	562	// this is the "bad" command, which does not change
563	// the name	563	// the name
564	badCommand = cmd;	564	badCommand = cmd;

Lines 19-25 Link Here

(-)src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java (-5 / +5 lines)
19	import org.eclipse.emf.examples.extlibrary.Writer;	19	import org.eclipse.emf.examples.extlibrary.Writer;
20	import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;	20	import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
21	import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;	21	import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
22	import org.eclipse.gmf.runtime.emf.core.edit.MResourceOption;
23	import org.eclipse.gmf.runtime.emf.core.edit.MRunnable;	22	import org.eclipse.gmf.runtime.emf.core.edit.MRunnable;
24	import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;	23	import org.eclipse.gmf.runtime.emf.core.exceptions.MSLActionAbandonedException;
25	import org.eclipse.gmf.runtime.emf.core.internal.commands.MSLUndoStack.ActionLockMode;	24	import org.eclipse.gmf.runtime.emf.core.internal.commands.MSLUndoStack.ActionLockMode;
Lines 103-112 Link Here
103	domain.runAsWrite(new MRunnable() {	102	domain.runAsWrite(new MRunnable() {
104	public Object run() {	103	public Object run() {
105	try {	104	try {
106	Resource originalRes = domain.loadResource(URI	105	Resource originalRes = domain.getResourceSet().getResource(
107	.createURI(CLIPBOARD_TESTS_BUNDLE.getEntry(	106	URI.createURI(
108	"/test_models/clipboard_test.extlibrary") //$NON-NLS-1$	107	CLIPBOARD_TESTS_BUNDLE.getEntry(
109	.toString()).toString(), MResourceOption.URI);	108	"/test_models/clipboard_test.extlibrary") //$NON-NLS-1$
		109	.toString()), true);
110	originalRes.setURI(URI.createPlatformResourceURI(RESOURCE_NAME));	110	originalRes.setURI(URI.createPlatformResourceURI(RESOURCE_NAME));
111	originalRes.save(Collections.EMPTY_MAP);	111	originalRes.save(Collections.EMPTY_MAP);
112	testResource = originalRes;	112	testResource = originalRes;

Lines 16-23 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/edit/IDemuxedMListener2.java (-5 / +6 lines)
16	import org.eclipse.emf.ecore.EObject;	16	import org.eclipse.emf.ecore.EObject;
17	import org.eclipse.emf.ecore.resource.Resource;	17	import org.eclipse.emf.ecore.resource.Resource;
18		18
19	import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
20
21		19
22	/**	20	/**
23	* An optional extension to the {@link IDemuxedListener} interface for listeners	21	* An optional extension to the {@link IDemuxedListener} interface for listeners
Lines 45-51 Link Here
45	* proxies.	43	* proxies.
46	*/	44	*/
47	public void handleElementSeparatedEvent(Notification notification,	45	public void handleElementSeparatedEvent(Notification notification,
48	ILogicalResource resource, EObject eObject, Resource newResource);	46	org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
		47	EObject eObject, Resource newResource);
49		48
50	/**	49	/**
51	* Notifies me of an event indicating that an element in a logical resource	50	* Notifies me of an event indicating that an element in a logical resource
Lines 63-69 Link Here
63	* proxies.	62	* proxies.
64	*/	63	*/
65	public void handleElementAbsorbedEvent(Notification notification,	64	public void handleElementAbsorbedEvent(Notification notification,
66	ILogicalResource resource, EObject eObject, Resource oldResource);	65	org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
		66	EObject eObject, Resource oldResource);
67		67
68	/**	68	/**
69	* Notifies me of an event indicating that an element in a logical resource	69	* Notifies me of an event indicating that an element in a logical resource
Lines 79-85 Link Here
79	* proxies.	79	* proxies.
80	*/	80	*/
81	public void handleElementLoadedEvent(Notification notification,	81	public void handleElementLoadedEvent(Notification notification,
82	ILogicalResource resource, EObject eObject);	82	org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource resource,
		83	EObject eObject);
83		84
84	/**	85	/**
85	* Notifies me of an event indicating that a root has been added to the resource	86	* Notifies me of an event indicating that a root has been added to the resource

Lines 20-26 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/resources/LogicalResourceWrapper.java (-6 / +6 lines)
20	import org.eclipse.emf.common.util.URI;	20	import org.eclipse.emf.common.util.URI;
21	import org.eclipse.emf.ecore.EObject;	21	import org.eclipse.emf.ecore.EObject;
22	import org.eclipse.emf.ecore.resource.Resource;	22	import org.eclipse.emf.ecore.resource.Resource;
23	import org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource;
24		23
25		24
26	/**	25	/**
Lines 37-43 Link Here
37	*/	36	*/
38	public class LogicalResourceWrapper	37	public class LogicalResourceWrapper
39	extends AbstractResourceWrapper	38	extends AbstractResourceWrapper
40	implements ILogicalResource {	39	implements org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource {
41		40
42	private static final CanonicalMap instances = new CanonicalMap() {	41	private static final CanonicalMap instances = new CanonicalMap() {
43	protected AbstractResourceWrapper createWrapper(Resource resource) {	42	protected AbstractResourceWrapper createWrapper(Resource resource) {
Lines 61-73 Link Here
61	* @param resource the resource to get an unmodifiable view of	60	* @param resource the resource to get an unmodifiable view of
62	* @return its unmodifiable view	61	* @return its unmodifiable view
63	*/	62	*/
64	public static ILogicalResource get(Resource resource) {	63	public static org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource get(
65	ILogicalResource result = null;	64	Resource resource) {
		65	org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource result = null;
66		66
67	if (resource instanceof LogicalResourceWrapper) {	67	if (resource instanceof LogicalResourceWrapper) {
68	result = (ILogicalResource) resource;	68	result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) resource;
69	} else {	69	} else {
70	result = (ILogicalResource) instances.get(resource);	70	result = (org.eclipse.gmf.runtime.emf.core.resources.ILogicalResource) instances.get(resource);
71	}	71	}
72		72
73	return result;	73	return result;

Lines 11-17 Link Here

(-)src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java (-3 / +3 lines)
11		11
12	package org.eclipse.gmf.runtime.emf.core.internal.plugin;	12	package org.eclipse.gmf.runtime.emf.core.internal.plugin;
13		13
14	import org.eclipse.gmf.runtime.common.core.plugin.XToolsPlugin;	14	import org.eclipse.core.runtime.Plugin;
15	import org.eclipse.gmf.runtime.common.core.util.Trace;	15	import org.eclipse.gmf.runtime.common.core.util.Trace;
16	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;	16	import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;
17		17
Lines 21-27 Link Here
21	* @author rafikj	21	* @author rafikj
22	*/	22	*/
23	public class MSLPlugin	23	public class MSLPlugin
24	extends XToolsPlugin {	24	extends Plugin {
25		25
26	private static MSLPlugin plugin;	26	private static MSLPlugin plugin;
27		27
Lines 44-50 Link Here
44	* Get plugin ID.	44	* Get plugin ID.
45	*/	45	*/
46	public static String getPluginId() {	46	public static String getPluginId() {
47	return getDefault().getSymbolicName();	47	return getDefault().getBundle().getSymbolicName();
48	}	48	}
49		49
50	/**	50	/**

Lines 49-68 Link Here

(-)plugin.xml (-14 lines)
49	</extension>	49	</extension>
50		50
51	<extension	51	<extension
52	point="org.eclipse.gmf.runtime.emf.core.resourcePolicies">
53	<!-- This is not a mistake. We need to register two policies for our test. -->
54	<policy
55	class="org.eclipse.gmf.tests.runtime.emf.core.internal.resources.LogicalResourcePolicyManagerTest$TestPolicy">
56	<epackage
57	nsURI="http:///com/ibm/xtools/emf/msl/core/tests/logrestest.ecore"/>
58	</policy>
59	<policy
60	class="org.eclipse.gmf.tests.runtime.emf.core.internal.resources.LogicalResourcePolicyManagerTest$TestPolicy">
61	<epackage
62	nsURI="http:///com/ibm/xtools/emf/msl/core/tests/logrestest.ecore"/>
63	</policy>
64	</extension>
65	<extension
66	point="org.eclipse.emf.ecore.extension_parser">	52	point="org.eclipse.emf.ecore.extension_parser">
67	<parser	53	<parser
68	class="org.eclipse.gmf.tests.runtime.emf.core.internal.listener.MListenerTest$BrokenResourceFactory"	54	class="org.eclipse.gmf.tests.runtime.emf.core.internal.listener.MListenerTest$BrokenResourceFactory"