From ddb5c7370d8a2238ea51048071d2deab862c44a3 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Tue, 10 Jan 2012 09:36:03 +0000
Subject: [PATCH] YELLOW refs 311
---
.../contentprovider/TableContentProviderBase.java | 11 ++---------
.../AbstractTextCellDatabindingEditingSupport.java | 11 ++++-------
.../tooling/base/ui/editor/DiagramEditorBase.java | 14 ++++++--------
.../base/ContextMenuSubMenuContributorBase.java | 2 +-
4 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
index 80dff926b..cec248f61 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Table;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: 615F4C5D7DBBFB198EF23CA44E3D562C
+ * @ConQAT.Rating YELLOW Hash: A0EBE838F6C48C637BF66BDCC7BECCF6
*/
public abstract class TableContentProviderBase implements
IStructuredContentProvider {
@@ -83,14 +83,7 @@ public abstract class TableContentProviderBase implements
// default implementation ignores the input changed event
}
- /**
- * ViewerSorter using {@link TableContentProviderBase#compare}
- *
- * @author hoelzlf
- * @author $Author: hoelzlf $
- * @version $Rev: 955 $
- * @levd.rating RED Rev:
- */
+ /** ViewerSorter using {@link TableContentProviderBase#compare}. */
private class TableViewerSorter extends ViewerSorter {
/** {@inheritDoc} */
@Override
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 ecba26005..a22f9ad35 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
@@ -17,10 +17,10 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui.databinding;
-import org.conqat.lib.commons.assertion.CCSMPre;
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
@@ -35,10 +35,10 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
/**
* Abstract base class for inline text cell editors using data binding.
*
- * @author hoelzlf
+ * @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash: 383223FFB9C18CFC5E18AE6C875F2FDA
+ * @ConQAT.Rating YELLOW Hash: 97B2B23D7EF5DA85AEF4EF792A1C394D
*/
public abstract class AbstractTextCellDatabindingEditingSupport extends
EditingSupport {
@@ -115,9 +115,7 @@ 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
+ Assert.isTrue(bindings != null && bindings.length > 0
&& bindings[0] != null,
"Illegal implementation: no binding returned.");
@@ -172,7 +170,6 @@ public abstract class AbstractTextCellDatabindingEditingSupport extends
}
bindings = null;
}
-
getViewer().getColumnViewerEditor().removeEditorActivationListener(
this);
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
index 4899b8e85..57668728f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
@@ -102,7 +102,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash: 2201EB7242C0D85A6E6D82A776246026
+ * @ConQAT.Rating YELLOW Hash: 29B690AA556FE2BDF57B347269A25E91
*/
public class DiagramEditorBase<T extends EObject> extends GEFEditorBase<T>
implements IPostSelectionProvider, ContextMenuContextProvider {
@@ -475,15 +475,13 @@ public class DiagramEditorBase<T extends EObject> extends GEFEditorBase<T>
* Highlights a figure by setting its color to be RED. This implementation
* can be changed by more specific editors.
*/
-
- // TODO @review CD: unsafe code
- // IMO double invocation of highlight(true) overwrites the normal color in
- // the map and makes de-highlighting impossible
-
protected void setHighlight(IFigure fig, boolean highlighted) {
if (highlighted) {
- highlightedFigures2NormalColor.put(fig, fig.getForegroundColor());
- fig.setForegroundColor(ColorConstants.red);
+ if (!highlightedFigures2NormalColor.containsKey(fig)) {
+ highlightedFigures2NormalColor.put(fig,
+ fig.getForegroundColor());
+ fig.setForegroundColor(ColorConstants.red);
+ }
} else {
Color normalColor = highlightedFigures2NormalColor.get(fig);
fig.setForegroundColor(normalColor);
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
index dba66206b..de715e091 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
@@ -50,7 +50,7 @@ import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
* @author trachtenherz
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: C9D77819956A4B95AC544B63F2BADF2A
+ * @ConQAT.Rating GREEN Hash: 8573587F690FC94EF1300F9200C6793A
*/
public abstract class ContextMenuSubMenuContributorBase<T extends EObject>
implements IContextMenuContributor {
--
GitLab