From 863053abb9aea0912cc55eb7a1d8a9489955b5c8 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Fri, 2 Dec 2011 09:07:18 +0000
Subject: [PATCH] moved non-kernel related editor code to tooling.base refs 311
---
.../trunk/META-INF/MANIFEST.MF | 2 ++
.../ui/contentprovider/TableContentProviderBase.java | 11 +++++------
...actDecoratedTextCellDatabindingEditingSupport.java | 4 +---
.../AbstractTextCellDatabindingEditingSupport.java | 4 +---
.../tooling/base/ui/editor}/FormsEditorBase.java | 5 ++---
.../trunk/META-INF/MANIFEST.MF | 1 -
6 files changed, 11 insertions(+), 16 deletions(-)
rename org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TableViewerBase.java => org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java (91%)
rename {org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport => org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding}/AbstractDecoratedTextCellDatabindingEditingSupport.java (95%)
rename {org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport => org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding}/AbstractTextCellDatabindingEditingSupport.java (97%)
rename {org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base => org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor}/FormsEditorBase.java (94%)
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 986eddba8..f62e17348 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -14,12 +14,14 @@ Export-Package: org.fortiss.tooling.base.ui,
org.fortiss.tooling.base.ui.command,
org.fortiss.tooling.base.ui.compose,
org.fortiss.tooling.base.ui.contentprovider,
+ org.fortiss.tooling.base.ui.databinding,
org.fortiss.tooling.base.ui.dnd,
org.fortiss.tooling.base.ui.editor,
org.fortiss.tooling.base.ui.editpart,
org.fortiss.tooling.base.ui.editpart.anchor,
org.fortiss.tooling.base.ui.editpart.figure,
org.fortiss.tooling.base.ui.editpart.policy,
+ org.fortiss.tooling.base.ui.editpart.request,
org.fortiss.tooling.base.ui.layout,
org.fortiss.tooling.base.ui.preferences,
org.fortiss.tooling.base.ui.utils
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TableViewerBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
similarity index 91%
rename from org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TableViewerBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
index c382a8660..8dc285116 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TableViewerBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
@@ -15,7 +15,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.extension.base;
+package org.fortiss.tooling.base.ui.contentprovider;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -37,9 +37,8 @@ import org.eclipse.swt.widgets.Table;
* @version $Rev: 18709 $
* @ConQAT.Rating RED Hash:
*/
-// TODO (FH): why is this class here? It does not implement any of the extension
-// interfaces. I suggest moving to tooling.base.ui.editor.
-public abstract class TableViewerBase implements IStructuredContentProvider {
+public abstract class TableContentProviderBase implements
+ IStructuredContentProvider {
/** Compares content objects. */
protected abstract int compare(Viewer viewer, Object o1, Object o2);
@@ -98,7 +97,7 @@ public abstract class TableViewerBase implements IStructuredContentProvider {
}
/**
- * ViewerSorter using {@link TableViewerBase#compare}
+ * ViewerSorter using {@link TableContentProviderBase#compare}
*
* @author hoelzlf
* @author $Author: hoelzlf $
@@ -109,7 +108,7 @@ public abstract class TableViewerBase implements IStructuredContentProvider {
/** {@inheritDoc} */
@Override
public int compare(Viewer viewer, Object o1, Object o2) {
- return TableViewerBase.this.compare(viewer, o1, o2);
+ return TableContentProviderBase.this.compare(viewer, o1, o2);
}
}
}
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractDecoratedTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
similarity index 95%
rename from org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractDecoratedTextCellDatabindingEditingSupport.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
index 2c89c70dd..f9e3d5763 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractDecoratedTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
@@ -15,7 +15,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.extension.editingsupport;
+package org.fortiss.tooling.base.ui.databinding;
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
@@ -42,8 +42,6 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
* @version $Rev: 1670 $
* @levd.rating RED Rev:
*/
-// TODO (FH): why is this class here? It is not used by the kernel. I suggest
-// moving to tooling.base.ui. somewhere.
public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends
AbstractTextCellDatabindingEditingSupport {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
similarity index 97%
rename from org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractTextCellDatabindingEditingSupport.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
index 9c3a081d3..5430f26d3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/editingsupport/AbstractTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
@@ -15,7 +15,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.extension.editingsupport;
+package org.fortiss.tooling.base.ui.databinding;
import org.conqat.lib.commons.assertion.CCSMPre;
import org.eclipse.core.databinding.Binding;
@@ -40,8 +40,6 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
* @version $Rev: 5848 $
* @levd.rating RED Rev:
*/
-// TODO (FH): why is this class here? It is not used by the kernel. I suggest
-// moving to tooling.base.ui. somewhere.
public abstract class AbstractTextCellDatabindingEditingSupport extends
EditingSupport {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/FormsEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
similarity index 94%
rename from org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/FormsEditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
index f2083296c..03a37f59a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/FormsEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
@@ -15,7 +15,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.extension.base;
+package org.fortiss.tooling.base.ui.editor;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.layout.GridDataFactory;
@@ -26,6 +26,7 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
+import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
/**
* Basic GEF editor based on forms.
@@ -35,8 +36,6 @@ import org.eclipse.ui.forms.widgets.Section;
* @version $Rev: 18709 $
* @ConQAT.Rating RED Hash:
*/
-// TODO (FH): why is this class here? It does not implement any of the extension
-// interfaces. I suggest moving to tooling.base.ui.editor.
public abstract class FormsEditorBase<T extends EObject> extends EditorBase<T> {
/** Our toolkit. */
diff --git a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
index a047282c9..73e45e39e 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@ Export-Package: org.fortiss.tooling.kernel.ui,
org.fortiss.tooling.kernel.ui.extension,
org.fortiss.tooling.kernel.ui.extension.base,
org.fortiss.tooling.kernel.ui.extension.data,
- org.fortiss.tooling.kernel.ui.extension.editingsupport,
org.fortiss.tooling.kernel.ui.listener,
org.fortiss.tooling.kernel.ui.service,
org.fortiss.tooling.kernel.ui.util
--
GitLab