From 1f774404b03cc661b62bea768ad1de18378bd8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20D=C3=B6bber?= <doebber@in.tum.de>
Date: Mon, 9 Jan 2012 13:17:37 +0000
Subject: [PATCH] reviewed portion of tooling.base.ui refs 311
---
.../tooling/base/ui/ToolingBaseUIActivator.java | 2 +-
.../ConnectorConnectionCompositorBase.java | 2 +-
...ierarchicElementConnectionCompositorBase.java | 2 +-
...coratedTextCellDatabindingEditingSupport.java | 2 +-
...bstractTextCellDatabindingEditingSupport.java | 4 +++-
.../ui/dialog/ElementTreeMultiSelectDialog.java | 16 +++++++++++-----
.../ui/dialog/ElementTreeSingleSelectDialog.java | 5 +++++
.../base/ui/dialog/IDialogEditSupport.java | 2 +-
.../dialog/ModelElementTreeContentProvider.java | 2 +-
.../ui/dialog/MultiRootTreeContentProvider.java | 2 +-
.../fortiss/tooling/base/ui/dialog/package.html | 2 +-
11 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index 38dbc1c0c..aab4e6f2b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: D08B4E6B896E809A083887F9C6F14F97
+ * @ConQAT.Rating GREEN Hash: 9DC68662D9F1765A0A286793C828A64B
*/
public class ToolingBaseUIActivator extends AbstractUIPlugin {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
index 631e1dc12..b688343e4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 1C61F6AB68C85978EAC5B75371A69DED
+ * @ConQAT.Rating GREEN Hash: DC62440F9F73D431A7044F396EC715C9
*/
public abstract class ConnectorConnectionCompositorBase<HE extends IHierarchicElement, S extends IConnector, T extends IConnector>
implements IConnectionCompositor<HE, S, T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
index 7d287a6b6..0f41627cc 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
@@ -55,7 +55,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C3FC40AF5B9351FB7B4C3D3A5424CCC1
+ * @ConQAT.Rating GREEN Hash: 37C3A557C68036CCE7206DA269A079F3
*/
public abstract class HierarchicElementConnectionCompositorBase<HE extends IHierarchicElement, S extends IHierarchicElement, T extends IHierarchicElement>
implements IConnectionCompositor<HE, S, T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
index 27ad33735..a4f5ddc09 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
@@ -40,7 +40,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 06F0B1246D80A923D8D6CC99575F57A5
+ * @ConQAT.Rating GREEN Hash: 1C0D4AC12A6198508678FDF15E213AF3
*/
public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends
AbstractTextCellDatabindingEditingSupport {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
index 958c9868e..ecba26005 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
* @author hoelzlf
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 4332834DD629BC28D0C0E6C5F3FBEE60
+ * @ConQAT.Rating RED Hash: 383223FFB9C18CFC5E18AE6C875F2FDA
*/
public abstract class AbstractTextCellDatabindingEditingSupport extends
EditingSupport {
@@ -115,6 +115,8 @@ public abstract class AbstractTextCellDatabindingEditingSupport extends
this.cellEditor.setValue("");
bindings = createBinding(cellEditor, cell, this.cellEditor, dbc);
+ // TODO @review CD: don't we use Eclipse.core.runtime.Assert instead of
+ // CCSMPre?
CCSMPre.isTrue(bindings != null && bindings.length > 0
&& bindings[0] != null,
"Illegal implementation: no binding returned.");
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
index e40039de3..f8101af6c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
@@ -17,6 +17,10 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui.dialog;
+import static org.eclipse.jface.dialogs.IDialogConstants.CANCEL_ID;
+import static org.eclipse.jface.dialogs.IDialogConstants.CANCEL_LABEL;
+import static org.eclipse.jface.dialogs.IDialogConstants.OK_ID;
+import static org.eclipse.jface.dialogs.IDialogConstants.OK_LABEL;
import static org.eclipse.wb.swt.ResourceManager.decorateImage;
import static org.eclipse.wb.swt.ResourceManager.getPluginImage;
import static org.eclipse.wb.swt.SWTResourceManager.BOTTOM_RIGHT;
@@ -25,7 +29,6 @@ import java.util.ArrayList;
import java.util.List;
import org.conqat.ide.commons.ui.jface.TreeContentProviderBase;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -59,9 +62,11 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 83D78C1AC95F8C254DFF26D4569C92C3
+ * @ConQAT.Rating RED Hash: D0847D3C8771737C03D1977C1B5B81DF
*/
public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
+ // TODO @review CD: Isn't there plenty of code in common with
+ // ElementTreeSingleSelectDialog? -> common base class
/** Default content provider */
private static class EmptyTreeContentProvider extends
@@ -148,6 +153,8 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
/** {@inheritDoc} */
@Override
protected Control createDialogArea(Composite parent) {
+ // TODO @review CD: externalize to *GUI class
+
// CAUTION: The code below is automatically generated, do not edit
// manually!
@@ -303,9 +310,8 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
/** {@inheritDoc} */
@Override
protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- false);
- createButton(parent, IDialogConstants.CANCEL_ID, "Cancel", true);
+ createButton(parent, OK_ID, OK_LABEL, false);
+ createButton(parent, CANCEL_ID, CANCEL_LABEL, true);
}
/** {@inheritDoc} */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
index 75a4ae2b5..cdbd5769b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
@@ -62,6 +62,9 @@ import org.eclipse.wb.swt.ResourceManager;
*/
public class ElementTreeSingleSelectDialog extends TitleAreaDialog {
+ // TODO @review CD: Isn't there plenty of code in common with
+ // ElementTreeMultiSelectDialog? -> common base class
+
/** GUI Factory */
private final FormToolkit formToolkit = new FormToolkit(
Display.getDefault());
@@ -141,6 +144,8 @@ public class ElementTreeSingleSelectDialog extends TitleAreaDialog {
/** {@inheritDoc} */
@Override
protected Control createDialogArea(Composite parent) {
+ // TODO @review CD: externalize to *GUI class
+
// CAUTION: The code below is automatically generated, do not edit
// manually!
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
index 9a6d0fb8e..65d76b601 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
@@ -24,7 +24,7 @@ package org.fortiss.tooling.base.ui.dialog;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 18119587EF4CCE8667EF38F2C34D6C76
+ * @ConQAT.Rating GREEN Hash: 5C2B3DE414E278D8C6AF42B9A9B9A9CC
*/
public interface IDialogEditSupport {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
index 151aaa56b..67a7624c1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 03BB6022DF79E9871A0AF7503EA9942A
+ * @ConQAT.Rating GREEN Hash: 2115ED45E5130BA9E549B8AEE8DD201F
*/
public class ModelElementTreeContentProvider extends TreeContentProviderBase {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
index 4fbd97d96..cc7cf8ecc 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C99AE660759E352AE4D3A9E7BF0C5AD2
+ * @ConQAT.Rating GREEN Hash: D67E79EAD1793F7BA36881429E291991
*/
public class MultiRootTreeContentProvider extends TreeContentProviderBase {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
index 1a5033fd7..7ff05069d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
@@ -1,7 +1,7 @@
<!--
$Id$
@version $Rev$
- @ConQAT.Rating YELLOW Hash: F5BA263532A5969D12FAEEF7BDC9B2AF
+ @ConQAT.Rating GREEN Hash: 10C27A17381EDF414F6F734941B5676D
-->
<body>
Package for basic dialog classes
--
GitLab