From 986cb32c3c415104d761fa25b75be52f9b26a15e Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Thu, 1 Dec 2011 12:06:15 +0000
Subject: [PATCH] Moved and renamed GEF editor base implementations. refs 339
---
org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF | 1 -
...hicalViewerEditorBase.java => DiagramEditorBase.java} | 6 +++---
.../editor/{gef/EditorBase.java => GEFEditorBase.java} | 9 +++------
3 files changed, 6 insertions(+), 10 deletions(-)
rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/{gef/GraphicalViewerEditorBase.java => DiagramEditorBase.java} (98%)
rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/{gef/EditorBase.java => GEFEditorBase.java} (93%)
diff --git a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
index 8e4f0c6e8..986eddba8 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Export-Package: org.fortiss.tooling.base.ui,
org.fortiss.tooling.base.ui.contentprovider,
org.fortiss.tooling.base.ui.dnd,
org.fortiss.tooling.base.ui.editor,
- org.fortiss.tooling.base.ui.editor.gef,
org.fortiss.tooling.base.ui.editpart,
org.fortiss.tooling.base.ui.editpart.anchor,
org.fortiss.tooling.base.ui.editpart.figure,
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
index fcf66a28c..4d5362048 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.editor.gef;
+package org.fortiss.tooling.base.ui.editor;
import java.util.ArrayList;
import java.util.Arrays;
@@ -88,7 +88,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 63FF468A2D042586A22495828A0798EF
*/
-public class GraphicalViewerEditorBase<T extends EObject> extends EditorBase<T>
+public class DiagramEditorBase<T extends EObject> extends GEFEditorBase<T>
implements IPostSelectionProvider, ContextMenuContextProvider {
/** Stores the viewer. */
@@ -212,7 +212,7 @@ public class GraphicalViewerEditorBase<T extends EObject> extends EditorBase<T>
/**
* Returns the root object used as content root. Sub-classes may override to
* provide a different content root object. The default implementation uses
- * {@link EditorBase#getEditedObject()}
+ * {@link GEFEditorBase#getEditedObject()}
*/
protected Object getViewerContentObject() {
return getEditedObject();
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
similarity index 93%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
index 1a1935399..9b76e27d7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.editor.gef;
+package org.fortiss.tooling.base.ui.editor;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
@@ -35,16 +35,13 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
*
* It provides {@link EditDomain} and thus a {@link CommandStack}.
*
- * TODO: A better name: "DiagramEditorBase" to be homogeneous with
- * "TextEditorBase"
- *
* @author hummel
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating RED Hash: ACB0A017DFD8FCAEFD9CDF1BE89476EF
*/
-public abstract class EditorBase<T extends EObject> extends
+public abstract class GEFEditorBase<T extends EObject> extends
org.fortiss.tooling.kernel.ui.extension.base.EditorBase<T> {
/** The edit domain (used e.g. for managing the command stack). */
@@ -59,7 +56,7 @@ public abstract class EditorBase<T extends EObject> extends
if (getEditedObject().eContainer() == null
&& IPersistencyService.INSTANCE
.getTopLevelElementFor(getEditedObject()) != null) {
- getSite().getPage().closeEditor(EditorBase.this, false);
+ getSite().getPage().closeEditor(GEFEditorBase.this, false);
}
}
};
--
GitLab