Commit 3f12cc1f authored by Simon Barner's avatar Simon Barner
Browse files

GREEN

parent 74e32efd
ConnectionCompositionDropTargetListener.java 502736cffbe766ee4df5fec44e90b6d9d49584a8 YELLOW ConnectionCompositionDropTargetListener.java 5d9b9b1ceebe054d5f32e64a6a2e18b3983dfa01 GREEN
ElementCompositionDropTargetListener.java 1fda888c2229eab3f20ea0d32be27520eeed9519 YELLOW ElementCompositionDropTargetListener.java 6d2d93d706a61aaa3069826c66410591d0bee72a GREEN
...@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ConnectionCompositionSource; ...@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ConnectionCompositionSource;
* handled by the target edit part's {@link RelayCreateCommandEditPolicyBase}, * handled by the target edit part's {@link RelayCreateCommandEditPolicyBase},
* which completes the DND operation with the target information. It then relays * which completes the DND operation with the target information. It then relays
* the completed DND operation to the {@link IConnectionCompositorService}. * the completed DND operation to the {@link IConnectionCompositorService}.
* <p>
*
* {@link AbstractTransferDropTargetListener} super class.
*
* @see RelayCreateCommandEditPolicyBase
* *
* @author hoelzl * @author hoelzl
*/ */
...@@ -64,14 +59,15 @@ public class ConnectionCompositionDropTargetListener extends AbstractTransferDro ...@@ -64,14 +59,15 @@ public class ConnectionCompositionDropTargetListener extends AbstractTransferDro
ConnectionCompositionSource sourceData = null; ConnectionCompositionSource sourceData = null;
if(getCurrentEvent().data instanceof ConnectionCompositionSource) { if(getCurrentEvent().data instanceof ConnectionCompositionSource) {
sourceData = (ConnectionCompositionSource)getCurrentEvent().data; sourceData = (ConnectionCompositionSource)getCurrentEvent().data;
} else if(CompositionServiceLocalDNDTransfer.getInstance().getObject() instanceof ConnectionCompositionSource) { } else {
// there have been reports about SWT platform inconsistencies: Object object = CompositionServiceLocalDNDTransfer.getInstance().getObject();
// on OSX getCurrentEvent().data might be null during dragging if(object instanceof ConnectionCompositionSource) {
// while it is not null on other platforms. Therefore, we use this // There have been reports about SWT platform inconsistencies:
// fallback. // on OSX getCurrentEvent().data might be null during dragging
sourceData = // while it is not null on other platforms. Therefore, we use this
(ConnectionCompositionSource)CompositionServiceLocalDNDTransfer.getInstance() // fallback.
.getObject(); sourceData = (ConnectionCompositionSource)object;
}
} }
req.setDragSource(sourceData); req.setDragSource(sourceData);
} }
......
...@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ElementCompositionSource; ...@@ -32,11 +32,6 @@ import org.fortiss.tooling.kernel.ui.dnd.ElementCompositionSource;
* target edit part's {@link RelayCreateCommandEditPolicyBase}, which completes * target edit part's {@link RelayCreateCommandEditPolicyBase}, which completes
* the DND operation with the target information. It then relays the completed * the DND operation with the target information. It then relays the completed
* DND operation to the {@link IElementCompositorService}. * DND operation to the {@link IElementCompositorService}.
* <p>
*
* {@link AbstractTransferDropTargetListener} super class.
*
* @see RelayCreateCommandEditPolicyBase
* *
* @author hoelzl * @author hoelzl
*/ */
...@@ -64,14 +59,15 @@ public class ElementCompositionDropTargetListener extends AbstractTransferDropTa ...@@ -64,14 +59,15 @@ public class ElementCompositionDropTargetListener extends AbstractTransferDropTa
ElementCompositionSource sourceData = null; ElementCompositionSource sourceData = null;
if(getCurrentEvent().data instanceof ElementCompositionSource) { if(getCurrentEvent().data instanceof ElementCompositionSource) {
sourceData = (ElementCompositionSource)getCurrentEvent().data; sourceData = (ElementCompositionSource)getCurrentEvent().data;
} else if(CompositionServiceLocalDNDTransfer.getInstance().getObject() instanceof ElementCompositionSource) { } else {
// there have been reports about SWT platform inconsistencies: Object object = CompositionServiceLocalDNDTransfer.getInstance().getObject();
// on OSX getCurrentEvent().data might be null during dragging if(object instanceof ElementCompositionSource) {
// while it is not null on other platforms. Therefore, we use this // There have been reports about SWT platform inconsistencies:
// fallback. // on OSX getCurrentEvent().data might be null during dragging
sourceData = // while it is not null on other platforms. Therefore, we use this
(ElementCompositionSource)CompositionServiceLocalDNDTransfer.getInstance() // fallback.
.getObject(); sourceData = (ElementCompositionSource)object;
}
} }
req.setDragSource(sourceData); req.setDragSource(sourceData);
} }
......
ViewerElementCompositionDropAdapter.java 255646545e2c72055c1c090396525f21491f70e4 YELLOW ViewerElementCompositionDropAdapter.java 255646545e2c72055c1c090396525f21491f70e4 GREEN
...@@ -7,4 +7,4 @@ DiagramKeyHandler.java 9c59eca862c9f878da7cbf7c220f26b38737095c GREEN ...@@ -7,4 +7,4 @@ DiagramKeyHandler.java 9c59eca862c9f878da7cbf7c220f26b38737095c GREEN
FormsEditorBase.java 50934d36124dea9b16ac45fe3621d878afb48bc7 GREEN FormsEditorBase.java 50934d36124dea9b16ac45fe3621d878afb48bc7 GREEN
GEFEditorBase.java 7cc55eaf9c9ffa351b683512832273a4b54a3830 GREEN GEFEditorBase.java 7cc55eaf9c9ffa351b683512832273a4b54a3830 GREEN
StyledTextCellEditor.java 3e678e4e8dbadb8463201bc62e7a67003acae8a8 GREEN StyledTextCellEditor.java 3e678e4e8dbadb8463201bc62e7a67003acae8a8 GREEN
TreeViewerEditorBase.java 5d2f159b59a1785cf118ac95cf4ad99b475efbe2 YELLOW TreeViewerEditorBase.java 8cff2f2c65d61d267513a787b76d991dda7ff317 GREEN
...@@ -38,7 +38,6 @@ import org.fortiss.tooling.kernel.ui.extension.base.EditorBase; ...@@ -38,7 +38,6 @@ import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
* *
* @author hoelzl * @author hoelzl
*/ */
public abstract class TreeViewerEditorBase<T extends EObject> extends EditorBase<T> { public abstract class TreeViewerEditorBase<T extends EObject> extends EditorBase<T> {
/** Stores the {@link TreeViewer}. */ /** Stores the {@link TreeViewer}. */
......
...@@ -5,4 +5,4 @@ AllocationFreeConnectorEditPartBase.java d6f602170056b5c020477a8863e753f19a8cc44 ...@@ -5,4 +5,4 @@ AllocationFreeConnectorEditPartBase.java d6f602170056b5c020477a8863e753f19a8cc44
AllocationPositionService.java 0efc15deec12730ac7ba02fb2ccb66833b783ffd GREEN AllocationPositionService.java 0efc15deec12730ac7ba02fb2ccb66833b783ffd GREEN
AllocationStickyConnectorEditPartBase.java 52d43906d4eedd9d3e31058fff67d40c43ffddb2 GREEN AllocationStickyConnectorEditPartBase.java 52d43906d4eedd9d3e31058fff67d40c43ffddb2 GREEN
AllocationSubDiagramEditPartBase.java e46342ed93d0214cf1b5c74f37ea813822d94650 GREEN AllocationSubDiagramEditPartBase.java e46342ed93d0214cf1b5c74f37ea813822d94650 GREEN
IAllocationPositionService.java a41bb4154f3d6ce986da447945d9edab53b38495 YELLOW IAllocationPositionService.java e531ff569354711697ce7e30a361ba0dc317645d GREEN
...@@ -20,12 +20,11 @@ import org.eclipse.draw2d.geometry.Rectangle; ...@@ -20,12 +20,11 @@ import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.RootEditPart; import org.eclipse.gef.RootEditPart;
/** /**
* Interface for allocation target elements. * Interface for allocation target elements. Stores the position of allocation sources and
* Stores the position of allocation sources and allocation targets in the diagram editor. * allocation targets in the diagram editor.
* *
* @author eder * @author eder
*/ */
public interface IAllocationPositionService { public interface IAllocationPositionService {
/** Returns the service instance. */ /** Returns the service instance. */
public static IAllocationPositionService getInstance() { public static IAllocationPositionService getInstance() {
......
...@@ -10,6 +10,6 @@ PropertiesViewUtils.java 009d390b8aa41bb79b45b1e09a3375d0374fa139 GREEN ...@@ -10,6 +10,6 @@ PropertiesViewUtils.java 009d390b8aa41bb79b45b1e09a3375d0374fa139 GREEN
RectangleLayoutUIUtils.java b64f2f86b8254363689bf0809f681fc59a87a04a GREEN RectangleLayoutUIUtils.java b64f2f86b8254363689bf0809f681fc59a87a04a GREEN
SnapToGridUtils.java 0ee536d1c1028aec313c59d533d6717b68febc85 GREEN SnapToGridUtils.java 0ee536d1c1028aec313c59d533d6717b68febc85 GREEN
StatusUtils.java c0630d0c51d978831b3657541c78f6f07e8ace0a RED StatusUtils.java c0630d0c51d978831b3657541c78f6f07e8ace0a RED
TableViewerUtils.java 49f22f0a3c9bc719467e877537623b45d08b492e YELLOW TableViewerUtils.java 7b72baa029b4a8a5371464f78fe6f2829e2e87eb GREEN
TreeViewerUtils.java 296ae7efad3a472c00522be723d7853710069177 GREEN TreeViewerUtils.java 296ae7efad3a472c00522be723d7853710069177 GREEN
ZoomUIUtils.java 0e04976d43076e7e4b3f2d244a303463c71390f5 YELLOW ZoomUIUtils.java 0e04976d43076e7e4b3f2d244a303463c71390f5 YELLOW
...@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite; ...@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite;
* *
* @author hoelzl * @author hoelzl
*/ */
public class TableViewerUtils { public class TableViewerUtils {
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment