From 3f12cc1f0c035428b48d2c6dab7d5c5405bdaaaf Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 13 Mar 2018 16:43:10 +0000
Subject: [PATCH] GREEN
---
.../fortiss/tooling/base/ui/dnd/gef/.ratings | 4 ++--
...nnectionCompositionDropTargetListener.java | 22 ++++++++-----------
.../ElementCompositionDropTargetListener.java | 22 ++++++++-----------
.../tooling/base/ui/dnd/jface/.ratings | 2 +-
.../fortiss/tooling/base/ui/editor/.ratings | 2 +-
.../base/ui/editor/TreeViewerEditorBase.java | 1 -
.../base/ui/editpart/allocation/.ratings | 2 +-
.../IAllocationPositionService.java | 5 ++---
.../fortiss/tooling/base/ui/utils/.ratings | 2 +-
.../base/ui/utils/TableViewerUtils.java | 1 -
10 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/.ratings
index 1d34bbdbe..74cc2cc9e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/.ratings
@@ -1,2 +1,2 @@
-ConnectionCompositionDropTargetListener.java 502736cffbe766ee4df5fec44e90b6d9d49584a8 YELLOW
-ElementCompositionDropTargetListener.java 1fda888c2229eab3f20ea0d32be27520eeed9519 YELLOW
+ConnectionCompositionDropTargetListener.java 5d9b9b1ceebe054d5f32e64a6a2e18b3983dfa01 GREEN
+ElementCompositionDropTargetListener.java 6d2d93d706a61aaa3069826c66410591d0bee72a GREEN
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
index 381852ea1..4b7e08ad3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ConnectionCompositionSource;
* handled by the target edit part's {@link RelayCreateCommandEditPolicyBase},
* which completes the DND operation with the target information. It then relays
* the completed DND operation to the {@link IConnectionCompositorService}.
- * <p>
- *
- * {@link AbstractTransferDropTargetListener} super class.
- *
- * @see RelayCreateCommandEditPolicyBase
*
* @author hoelzl
*/
@@ -64,14 +59,15 @@ public class ConnectionCompositionDropTargetListener extends AbstractTransferDro
ConnectionCompositionSource sourceData = null;
if(getCurrentEvent().data instanceof ConnectionCompositionSource) {
sourceData = (ConnectionCompositionSource)getCurrentEvent().data;
- } else if(CompositionServiceLocalDNDTransfer.getInstance().getObject() instanceof ConnectionCompositionSource) {
- // there have been reports about SWT platform inconsistencies:
- // on OSX getCurrentEvent().data might be null during dragging
- // while it is not null on other platforms. Therefore, we use this
- // fallback.
- sourceData =
- (ConnectionCompositionSource)CompositionServiceLocalDNDTransfer.getInstance()
- .getObject();
+ } else {
+ Object object = CompositionServiceLocalDNDTransfer.getInstance().getObject();
+ if(object instanceof ConnectionCompositionSource) {
+ // There have been reports about SWT platform inconsistencies:
+ // on OSX getCurrentEvent().data might be null during dragging
+ // while it is not null on other platforms. Therefore, we use this
+ // fallback.
+ sourceData = (ConnectionCompositionSource)object;
+ }
}
req.setDragSource(sourceData);
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
index cd5f5984a..8941932b4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ElementCompositionSource;
* target edit part's {@link RelayCreateCommandEditPolicyBase}, which completes
* the DND operation with the target information. It then relays the completed
* DND operation to the {@link IElementCompositorService}.
- * <p>
- *
- * {@link AbstractTransferDropTargetListener} super class.
- *
- * @see RelayCreateCommandEditPolicyBase
*
* @author hoelzl
*/
@@ -64,14 +59,15 @@ public class ElementCompositionDropTargetListener extends AbstractTransferDropTa
ElementCompositionSource sourceData = null;
if(getCurrentEvent().data instanceof ElementCompositionSource) {
sourceData = (ElementCompositionSource)getCurrentEvent().data;
- } else if(CompositionServiceLocalDNDTransfer.getInstance().getObject() instanceof ElementCompositionSource) {
- // there have been reports about SWT platform inconsistencies:
- // on OSX getCurrentEvent().data might be null during dragging
- // while it is not null on other platforms. Therefore, we use this
- // fallback.
- sourceData =
- (ElementCompositionSource)CompositionServiceLocalDNDTransfer.getInstance()
- .getObject();
+ } else {
+ Object object = CompositionServiceLocalDNDTransfer.getInstance().getObject();
+ if(object instanceof ElementCompositionSource) {
+ // There have been reports about SWT platform inconsistencies:
+ // on OSX getCurrentEvent().data might be null during dragging
+ // while it is not null on other platforms. Therefore, we use this
+ // fallback.
+ sourceData = (ElementCompositionSource)object;
+ }
}
req.setDragSource(sourceData);
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/.ratings
index 22690d627..19923c5f4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/.ratings
@@ -1 +1 @@
-ViewerElementCompositionDropAdapter.java 255646545e2c72055c1c090396525f21491f70e4 YELLOW
+ViewerElementCompositionDropAdapter.java 255646545e2c72055c1c090396525f21491f70e4 GREEN
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/.ratings
index 25505d025..cb8b8ff89 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/.ratings
@@ -7,4 +7,4 @@ DiagramKeyHandler.java 9c59eca862c9f878da7cbf7c220f26b38737095c GREEN
FormsEditorBase.java 50934d36124dea9b16ac45fe3621d878afb48bc7 GREEN
GEFEditorBase.java 7cc55eaf9c9ffa351b683512832273a4b54a3830 GREEN
StyledTextCellEditor.java 3e678e4e8dbadb8463201bc62e7a67003acae8a8 GREEN
-TreeViewerEditorBase.java 5d2f159b59a1785cf118ac95cf4ad99b475efbe2 YELLOW
+TreeViewerEditorBase.java 8cff2f2c65d61d267513a787b76d991dda7ff317 GREEN
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
index 72c5464f7..57835acf4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
@@ -38,7 +38,6 @@ import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
*
* @author hoelzl
*/
-
public abstract class TreeViewerEditorBase<T extends EObject> extends EditorBase<T> {
/** Stores the {@link TreeViewer}. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/.ratings
index a7056c21c..001a9064e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/.ratings
@@ -5,4 +5,4 @@ AllocationFreeConnectorEditPartBase.java d6f602170056b5c020477a8863e753f19a8cc44
AllocationPositionService.java 0efc15deec12730ac7ba02fb2ccb66833b783ffd GREEN
AllocationStickyConnectorEditPartBase.java 52d43906d4eedd9d3e31058fff67d40c43ffddb2 GREEN
AllocationSubDiagramEditPartBase.java e46342ed93d0214cf1b5c74f37ea813822d94650 GREEN
-IAllocationPositionService.java a41bb4154f3d6ce986da447945d9edab53b38495 YELLOW
+IAllocationPositionService.java e531ff569354711697ce7e30a361ba0dc317645d GREEN
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
index ca0996141..257bb97d3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
@@ -20,12 +20,11 @@ import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.RootEditPart;
/**
- * Interface for allocation target elements.
- * Stores the position of allocation sources and allocation targets in the diagram editor.
+ * Interface for allocation target elements. Stores the position of allocation sources and
+ * allocation targets in the diagram editor.
*
* @author eder
*/
-
public interface IAllocationPositionService {
/** Returns the service instance. */
public static IAllocationPositionService getInstance() {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
index 089c5b2ab..ee6b767c7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
@@ -10,6 +10,6 @@ PropertiesViewUtils.java 009d390b8aa41bb79b45b1e09a3375d0374fa139 GREEN
RectangleLayoutUIUtils.java b64f2f86b8254363689bf0809f681fc59a87a04a GREEN
SnapToGridUtils.java 0ee536d1c1028aec313c59d533d6717b68febc85 GREEN
StatusUtils.java c0630d0c51d978831b3657541c78f6f07e8ace0a RED
-TableViewerUtils.java 49f22f0a3c9bc719467e877537623b45d08b492e YELLOW
+TableViewerUtils.java 7b72baa029b4a8a5371464f78fe6f2829e2e87eb GREEN
TreeViewerUtils.java 296ae7efad3a472c00522be723d7853710069177 GREEN
ZoomUIUtils.java 0e04976d43076e7e4b3f2d244a303463c71390f5 YELLOW
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
index c14b4295b..ed732ecf1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite;
*
* @author hoelzl
*/
-
public class TableViewerUtils {
/**
--
GitLab