updated graphical visualization diagram view to navigate and select inchron model elements in Editor
diff --git a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
index 6da699a..9fed643 100644
--- a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
<packaging>pom</packaging>
<name>Ecore Reference Extractor</name>
@@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<luna-repo.url>http://download.eclipse.org/releases/luna</luna-repo.url>
- <amalthea-repo.url>http://download.eclipse.org/app4mc/updatesites/releases/0.8.2/</amalthea-repo.url>
+ <amalthea-repo.url>http://download.eclipse.org/app4mc/updatesites/releases/0.8.3/</amalthea-repo.url>
<franca-repo.url>http://franca.github.io/franca/update_site/releases/0.9.1/</franca-repo.url>
<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-repo.url>
diff --git a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/category.xml b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/category.xml
index 49573c7..661b7f4 100644
--- a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/category.xml
+++ b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.app4mc.emfutils.metamodelviewer.feature_0.8.2.jar" id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.8.2">
+ <feature url="features/org.eclipse.app4mc.emfutils.metamodelviewer.feature_0.8.3.jar" id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.8.3">
<category name="Ecore Tools"/>
</feature>
- <feature url="features/org.eclipse.app4mc.emfutils.content.extractor.feature_0.8.2.jar" id="org.eclipse.app4mc.emfutils.content.extractor.feature" version="0.8.2">
+ <feature url="features/org.eclipse.app4mc.emfutils.content.extractor.feature_0.8.3.jar" id="org.eclipse.app4mc.emfutils.content.extractor.feature" version="0.8.3">
<category name="Ecore Tools"/>
</feature>
<category-def name="Ecore Tools" label="org.eclipse.app4mc.emfutils.content.extractor"/>
diff --git a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/pom.xml b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/pom.xml
index 3e58c15..973db9b 100644
--- a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.p2repo</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/site.xml b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/site.xml
index 3b05046..806f343 100644
--- a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/site.xml
+++ b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.p2repo/site.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.app4mc.emfutils.content.extractor.feature_0.8.2.201704071342.jar" id="org.eclipse.app4mc.emfutils.content.extractor.feature" version="0.8.2.201704071342">
+ <feature url="features/org.eclipse.app4mc.emfutils.content.extractor.feature_0.8.3.201704071342.jar" id="org.eclipse.app4mc.emfutils.content.extractor.feature" version="0.8.3.201704071342">
<category name="Ecore Tools"/>
</feature>
- <feature url="features/org.eclipse.app4mc.emfutils.metamodelviewer.feature_0.8.2.201704071342.jar" id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.8.2.201704071342">
+ <feature url="features/org.eclipse.app4mc.emfutils.metamodelviewer.feature_0.8.3.201704071342.jar" id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.8.3.201704071342">
<category name="Ecore Tools"/>
</feature>
<category-def name="Ecore Tools" label="Ecore Tools"/>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
index f85f00d..92e1e33 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.app4mc.emfutils.content.extractor.feature" label="AMALTHEA Graphical Tools" provider-name="Eclipse APP4MC" version="0.8.2">
+<feature id="org.eclipse.app4mc.emfutils.content.extractor.feature" label="AMALTHEA Graphical Tools" provider-name="Eclipse APP4MC" version="0.8.3">
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/pom.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/pom.xml
index 12f2bfe..19ab779 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.content.extractor.feature</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
index 25598e3..e6a90b8 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" label="AMALTHEA MetaModel Viewer" provider-name="Eclipse APP4MC" version="0.8.2">
+<feature id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" label="AMALTHEA MetaModel Viewer" provider-name="Eclipse APP4MC" version="0.8.3">
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/pom.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/pom.xml
index 57c0b1a..0dd477c 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.metamodelviewer.feature</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml
index ab48c78..f489eaa 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>net.sourceforge.plantuml</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
index ada7420..421fcfc 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Content Extractor
Bundle-SymbolicName: org.eclipse.app4mc.emfutils.content.extractor;singleton:=true
-Bundle-Version: 0.8.2
+Bundle-Version: 0.8.3
Bundle-Activator: org.eclipse.app4mc.emfutils.content.extractor.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/pom.xml b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/pom.xml
index a74eebd..54aece7 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/pom.xml
@@ -6,7 +6,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.content.extractor</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/src/org/eclipse/app4mc/emfutils/content/extractor/views/DiagramView.java b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/src/org/eclipse/app4mc/emfutils/content/extractor/views/DiagramView.java
index d081070..0ae2235 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/src/org/eclipse/app4mc/emfutils/content/extractor/views/DiagramView.java
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/src/org/eclipse/app4mc/emfutils/content/extractor/views/DiagramView.java
@@ -15,6 +15,8 @@
package org.eclipse.app4mc.emfutils.content.extractor.views;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Stack;
@@ -43,6 +45,7 @@
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.sphinx.emf.editors.forms.BasicTransactionalFormEditor;
@@ -70,6 +73,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.part.ViewPart;
@@ -352,7 +356,8 @@
if (iEditorReference.getId().equals("org.eclipse.app4mc.amalthea.sphinx.ui.editor")
- || iEditorReference.getId().equals("org.itea2.amalthea.sphinx.ui.editor")) {
+ || iEditorReference.getId().equals("org.itea2.amalthea.sphinx.ui.editor")
+ || iEditorReference.getId().equals("com.inchron.realtime.root.presentation.RootEditorID")) {
try {
final FileEditorInput editorInput = (FileEditorInput) iEditorReference
.getEditorInput();
@@ -372,26 +377,44 @@
final IEditorPart activeEditor = iEditorReference.getEditor(false);
- if (activeEditor instanceof BasicTransactionalFormEditor) {
+ if (activeEditor instanceof MultiPageEditorPart) {
IDE.openEditor(page, editorInput, iEditorReference.getId());
if (canCollapseTreeElements()) {
- final Viewer viewer = ((BasicTransactionalFormEditor) activeEditor)
- .getViewer();
+ Method method = activeEditor.getClass().getMethod("getViewer");
+
+
+ final Viewer viewer = (Viewer) method.invoke(activeEditor);
if (viewer instanceof TreeViewer) {
((TreeViewer) viewer).collapseAll();
+
}
}
- ((BasicTransactionalFormEditor) activeEditor)
- .setSelectionToViewer(Collections.singleton(element));
+
+ if(activeEditor instanceof BasicTransactionalFormEditor) {
+ ((BasicTransactionalFormEditor) activeEditor)
+ .setSelectionToViewer(Collections.singleton(element));
+
+ }else {
+
+ Method method = activeEditor.getClass().getMethod("getViewer");
+
+
+ final Viewer viewer = (Viewer) method.invoke(activeEditor);
+
+ if (viewer instanceof TreeViewer) {
+ ((TreeViewer) viewer).setSelection(new StructuredSelection(element), true);
+
+ }
+ }
}
}
}
- catch (final PartInitException e) {
+ catch (final PartInitException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
e.printStackTrace();
}
}
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
index 26fd384..81e2803 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Metamodel Viewer
Bundle-SymbolicName: org.eclipse.app4mc.emfutils.metamodelviewer;singleton:=true
-Bundle-Version: 0.8.2
+Bundle-Version: 0.8.3
Bundle-Vendor: Eclipse APP4MC
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/pom.xml b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/pom.xml
index f6c5a6b..0f68604 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/pom.xml
@@ -6,7 +6,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.metamodelviewer</artifactId>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/META-INF/MANIFEST.MF
index dfe6d8a..8cd619d 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Resourceset Mapper
Bundle-SymbolicName: org.eclipse.app4mc.emfutils.resourceset.mapper;singleton:=true
-Bundle-Version: 0.8.2
+Bundle-Version: 0.8.3
Bundle-Activator: org.eclipse.app4mc.emfutils.resourceset.mapper.Activator
Bundle-Vendor: Eclipse APP4MC
Require-Bundle: org.eclipse.core.runtime,
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/pom.xml b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/pom.xml
index 7a4c5e8..1b5fdb8 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.resourceset.mapper/pom.xml
@@ -6,7 +6,7 @@
<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
- <version>0.8.2</version>
+ <version>0.8.3</version>
</parent>
<artifactId>org.eclipse.app4mc.emfutils.resourceset.mapper</artifactId>
