ASSIGNED - bug 357759: [modeling] selecting elements in Ecore Tree

editor has no effect https://bugs.eclipse.org/bugs/show_bug.cgi?id=357759
MilesParker · Sep 29, 2011 · 8d2abc6 · 8d2abc6
1 parent 5f6fcd7
commit 8d2abc6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/...deling.core/src/org/eclipse/mylyn/modeling/context/DomainModelContextStructureBridge.java b/...deling.core/src/org/eclipse/mylyn/modeling/context/DomainModelContextStructureBridge.java
@@ -75,7 +75,7 @@ public String getHandleIdentifier(Object object) {
 	 */
 	@Override
 	public Object getObjectForHandle(String handle) {
-		if (handle == null) {
+		if (handle == null || handle.equals("")) { //$NON-NLS-1$
 			return null;
 		}
 		// We're simply calling this delegated method but renaming to clarify

diff --git a/org.eclipse.mylyn.modeling.ecoretools.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.modeling.ecoretools.ui/META-INF/MANIFEST.MF
@@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.modeling.gmf.ui;bundle-version="0.9.0",
  org.eclipse.emf.ecoretools.filters;bundle-version="1.0.0",
  org.eclipse.emf.ecoretools.properties;bundle-version="1.0.0",
- org.eclipse.emf.ecoretools.tabbedproperties;bundle-version="1.0.0"
+ org.eclipse.emf.ecoretools.tabbedproperties;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.editor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.internal.modeling.ecoretools

diff --git a/...ls.ui/src/org/eclipse/mylyn/internal/modeling/ecoretools/EcoreToolsNavigatorUiBridge.java b/...ls.ui/src/org/eclipse/mylyn/internal/modeling/ecoretools/EcoreToolsNavigatorUiBridge.java
@@ -11,6 +11,7 @@
 
 package org.eclipse.mylyn.internal.modeling.ecoretools;
 
+import org.eclipse.emf.ecore.presentation.EcoreEditor;
 import org.eclipse.mylyn.modeling.emf.ecore.EcoreDomainBridge;
 import org.eclipse.mylyn.modeling.ui.DiagramUiBridge;
 import org.eclipse.ui.IWorkbenchPart;
@@ -25,7 +26,7 @@ public class EcoreToolsNavigatorUiBridge extends DiagramUiBridge {
 
 	@Override
 	public boolean acceptsPart(IWorkbenchPart part) {
-		return part instanceof ProjectExplorer;
+		return part instanceof ProjectExplorer || part instanceof EcoreEditor;
 	}
 
 	@Override

diff --git a/...clipse.mylyn.modeling.emf.core/src/org/eclipse/mylyn/modeling/emf/EmfStructureBridge.java b/...clipse.mylyn.modeling.emf.core/src/org/eclipse/mylyn/modeling/emf/EmfStructureBridge.java
@@ -89,17 +89,7 @@ public String getHandleIdentifier(Object object) {
 	 */
 	@Override
 	public boolean acceptsObject(Object object) {
-		if (object instanceof IFile) {
-			IFile file = (IFile) object;
-			for (String ext : getFileExtensions()) {
-				if (ext.equals(file.getFileExtension())) {
-					return true;
-				}
-			}
-		} else {
-			return getDomainObject(object) != null;
-		}
-		return false;
+		return getDomainObject(object) != null;
 	}
 
 	@Override