REOPENED - bug 355025: [modeling] Project packaging and maintenance

https://bugs.eclipse.org/bugs/show_bug.cgi?id=355025

org.eclipse.mylyn.modeling.ecoretools/plugin.xml

@@ -35,7 +35,7 @@
       <extension
             point="org.eclipse.mylyn.context.core.bridges">
          <structureBridge
-               class="org.eclipse.mylyn.modeling.internal.ecoretools.EcoreDomainBridge">
+               class="org.eclipse.mylyn.modeling.internal.ecoretools.EcoreGmfDomainBridge">
          </structureBridge>
       </extension>
 

org.eclipse.mylyn.modeling.ecoretools/src/org/eclipse/mylyn/modeling/internal/ecoretools/EcoreDiagramUiBridge.java

@@ -68,6 +68,6 @@ public static EcoreDiagramUiBridge getInstance() {
 
 	@Override
 	public String getContentType() {
-		return EcoreDomainBridge.ECORE_CONTENT_TYPE;
+		return EcoreGmfDomainBridge.ECORE_CONTENT_TYPE;
 	}
 }

org.eclipse.mylyn.modeling.ecoretools/src/org/eclipse/mylyn/modeling/internal/ecoretools/EcoreDiagramUiBridgePlugin.java

@@ -51,7 +51,7 @@ public void start(BundleContext context) throws Exception {
 	}
 
 	private void lazyStart() {
-		AbstractContextStructureBridge structureBridge = ContextCore.getStructureBridge(EcoreDomainBridge.ECORE_CONTENT_TYPE);
+		AbstractContextStructureBridge structureBridge = ContextCore.getStructureBridge(EcoreGmfDomainBridge.ECORE_CONTENT_TYPE);
 		// we'll get resource by default -- shouldn't we get null as failure
 		// case? https://bugs.eclipse.org/bugs/show_bug.cgi?id=353439
 		if (structureBridge instanceof EmfStructureBridge) {
@@ -62,7 +62,7 @@ private void lazyStart() {
 			MonitorUi.getSelectionMonitors().add(navigatorMonitor);
 		} else {
 			StatusHandler.log(new Status(IStatus.WARNING, ID_PLUGIN,
-					"Couldn't load EMFStructure Bridge for " + EcoreDomainBridge.ECORE_CONTENT_TYPE)); //$NON-NLS-1$	
+					"Couldn't load EMFStructure Bridge for " + EcoreGmfDomainBridge.ECORE_CONTENT_TYPE)); //$NON-NLS-1$	
 		}
 	}
 

org.eclipse.mylyn.modeling.ecoretools/src/org/eclipse/mylyn/modeling/internal/ecoretools/EcoreGmfDomainBridge.java

@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.modeling.internal.ecoretools;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.mylyn.modeling.emf.ecore.EcoreDomainBridge;
+
+/**
+ * @author Miles Parker
+ */
+public class EcoreGmfDomainBridge extends EcoreDomainBridge {
+
+	@Override
+	public Object getDomainObject(Object object) {
+		if (object instanceof View) {
+			return ((View) object).getElement();
+		}
+		return super.getDomainObject(object);
+	}
+
+}

org.eclipse.mylyn.modeling.ecoretools/src/org/eclipse/mylyn/modeling/internal/ecoretools/EcoreToolsNavigatorUiBridge.java

@@ -43,6 +43,6 @@ public static EcoreToolsNavigatorUiBridge getInstance() {
 
 	@Override
 	public String getContentType() {
-		return EcoreDomainBridge.ECORE_CONTENT_TYPE;
+		return EcoreGmfDomainBridge.ECORE_CONTENT_TYPE;
 	}
 }

org.eclipse.mylyn.modeling.emf/META-INF/MANIFEST.MF

@@ -11,5 +11,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.context.core,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore
-Export-Package: org.eclipse.mylyn.modeling.emf
+Export-Package: org.eclipse.mylyn.modeling.emf,
+ org.eclipse.mylyn.modeling.emf.ecore
 Bundle-ActivationPolicy: lazy

org.eclipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/context/AbstractEmfContextTest.java

@@ -14,7 +14,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.mylyn.commons.sdk.util.ResourceTestUtil;
-import org.eclipse.mylyn.modeling.internal.ecoretools.EcoreDomainBridge;
+import org.eclipse.mylyn.modeling.internal.ecoretools.EcoreGmfDomainBridge;
 import org.eclipse.mylyn.modeling.tests.WorkspaceSetupHelper;
 
 /**
@@ -29,7 +29,7 @@ public class AbstractEmfContextTest extends AbstractDiagramContextTest {
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		structureBridge = new EcoreDomainBridge();
+		structureBridge = new EcoreGmfDomainBridge();
 		emfProject = WorkspaceSetupHelper.createJavaPluginProjectFromZip(
 				"org.eclipse.mylyn.modeling.tests.ecorediagram", "ecorediagram.zip");
 		emfProject.open(new NullProgressMonitor());

org.eclipse.mylyn.modeling.tests/src/org/eclipse/mylyn/modeling/ui/EmfUIBridgeTest.java

@@ -22,7 +22,7 @@
 import org.eclipse.mylyn.context.core.IInteractionElement;
 import org.eclipse.mylyn.modeling.context.AbstractEmfContextTest;
 import org.eclipse.mylyn.modeling.internal.ecoretools.EcoreDiagramUiBridge;
-import org.eclipse.mylyn.modeling.internal.ecoretools.EcoreDomainBridge;
+import org.eclipse.mylyn.modeling.internal.ecoretools.EcoreGmfDomainBridge;
 import org.eclipse.mylyn.monitor.ui.MonitorUi;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
@@ -76,7 +76,7 @@ public void testModification() throws Exception {
 				"platform:/resource/org.eclipse.mylyn.emf.tests.library/model/library.ecore#//Book");
 		assertTrue(element2.getInterest().isInteresting());
 
-		assertEquals(element2.getContentType(), EcoreDomainBridge.ECORE_CONTENT_TYPE);
+		assertEquals(element2.getContentType(), EcoreGmfDomainBridge.ECORE_CONTENT_TYPE);
 	}
 
 }