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 164e3a077e330afc030b7e1a744674966d5f5f57..5b7e4c600f0183a72777486fa345257a91f40b23 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Export-Package: org.fortiss.tooling.base.ui,
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.interfaces,
org.fortiss.tooling.base.ui.editpart.policy,
org.fortiss.tooling.base.ui.layout,
org.fortiss.tooling.base.ui.layout.constants,
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/BendpointCommandBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/BendpointCommandBase.java
index 15b49aafbfe82edaf8336333dadbd112c4b30a7b..311364824f8a262b9c59b6d1178b75c702dbf005 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/BendpointCommandBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/BendpointCommandBase.java
@@ -27,7 +27,7 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 6CDD3F1694F0E50432432EBBF3DA82A4
*/
public abstract class BendpointCommandBase extends Command {
@@ -47,5 +47,4 @@ public abstract class BendpointCommandBase extends Command {
this.index = index;
this.location = location;
}
-
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ChangeBoundsRequestCommandBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ChangeBoundsRequestCommandBase.java
index 08b01597d24745607cf9d6e91b977086f3b85c45..bdb134007e262ef1c3f6e9d8a2106e54d3721c66 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ChangeBoundsRequestCommandBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ChangeBoundsRequestCommandBase.java
@@ -61,6 +61,7 @@ public abstract class ChangeBoundsRequestCommandBase extends Command {
}
/** Moves the given node using info from {@link #getRequest()}. */
+ // TODO: move this computation to LayoutDataUtil
protected void moveNode(ILayoutedModelElement layouted) {
Point p = LayoutDataUtils.getNodePosition(layouted);
int dx = getRequest().getMoveDelta().x;
@@ -73,6 +74,7 @@ public abstract class ChangeBoundsRequestCommandBase extends Command {
* Moves and resizes the given node using info from {@link #getRequest()}.
* The final size is returned.
*/
+ // TODO: move this computation to LayoutDataUtil
protected Dimension moveAndResizeNode(ILayoutedModelElement layouted,
int minWidth, int minHeight) {
int dx = getRequest().getMoveDelta().x;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
index 3e0321b9ffa175071624792a550ce116da2a3e0b..53e582a17a032f390e7d01d22be927a22ffd0972 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
@@ -32,7 +32,7 @@ import org.fortiss.tooling.kernel.service.IConnectionCompositorService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 20B224AD50942791F063D9E4CE58326C
+ * @ConQAT.Rating YELLOW Hash: B0F33CCD646C725CE690BDB141193612
*/
public class ConnectionCommand extends Command {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/CreateBendpointCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/CreateBendpointCommand.java
index 2fb5ff9e2bfd8bb632cdbb8cc2ba539151f4c003..838f28e9b81fbaff9a630f896a9fc5d3b937c874 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/CreateBendpointCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/CreateBendpointCommand.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.base.ui.layout.util.LayoutDataUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: F116BF8DD007FAB3A0EA25C09A7B48BB
*/
public class CreateBendpointCommand extends BendpointCommandBase {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/DeleteBendpointCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/DeleteBendpointCommand.java
index 2e06a2fdc71427488b5703151e17370fe1934940..a13dfa891c2612fa5d755c704f9d73934133ace0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/DeleteBendpointCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/DeleteBendpointCommand.java
@@ -26,7 +26,7 @@ import org.fortiss.tooling.base.ui.layout.util.LayoutDataUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 1199086FE886DBF2B151CC79C21F48C9
*/
public class DeleteBendpointCommand extends BendpointCommandBase {
/** Creates a command to delete a bend point. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/MoveBendpointCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/MoveBendpointCommand.java
index 6ee655625a7cc8678bb87e0ae600b648a8b176fd..184e7520de58722a1cd6417dfba42dd4f26d0bc2 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/MoveBendpointCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/MoveBendpointCommand.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.base.ui.layout.util.LayoutDataUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 83BD91B4E187EEE6AAE9948532F3227F
*/
public class MoveBendpointCommand extends BendpointCommandBase {
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 51ee64ac6e77a8b8bfc5ff03e2d7f89d7f74ada7..84922416a3a1c432dc045ba72ffb016867065a51 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
@@ -26,7 +26,7 @@ import org.fortiss.tooling.base.model.base.HierarchicElementBase;
import org.fortiss.tooling.base.model.element.IConnector;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.ui.dnd.DragContext;
-import org.fortiss.tooling.base.ui.editpart.interfaces.IFreeConnectorEditPart;
+import org.fortiss.tooling.base.ui.editpart.IFreeConnectorEditPart;
import org.fortiss.tooling.kernel.extension.IConnectionCompositor;
import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
index ee48a6ddf2e3293c11381979f4052e2a85bbc10a..d748d63918ef971b36c50ac34d14ffd5029e1bda 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 61FB58030A2C456B296353EEC89181DD
+ * @ConQAT.Rating YELLOW Hash: A575B082D1C9D00D4F3DA25290D04715
*/
public class DragContext implements IConnectionCompositionContext {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
index e9a4f1e041cc23ad8f3e3788923a863eb33596ee..627be063ff3acfb446633d659ac2f9ba37571920 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
@@ -27,13 +27,13 @@ import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
* context content is defined by the editpart that was the drop target and the
* mouse position.
* <P>
- * The editpart can also be a root edit part, e.g. the background of some
- * editor.
+ * The editpart can also be a diagram edit part, e.g. the background of some
+ * diagram editor.
*
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: F41CA022ECFE85D93C254EFB2BE6D7BE
+ * @ConQAT.Rating YELLOW Hash: 9BC9334824938F81319860D8E7CAFB27
*/
public class DropContext implements IElementCompositionContext {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
index 2071b695db5ef308766645e81d114f1300520a70..4cb0ef7c94d86df3bd7d7ebbd50cfafff10841a0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
@@ -35,7 +35,7 @@ import org.fortiss.tooling.base.ui.editor.gef.GraphicalViewerEditorBase;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 63FF468A2D042586A22495828A0798EF
+ * @ConQAT.Rating YELLOW Hash: 45BCB098D77D69D38DD9D04140703745
*/
public class DropTargetListener extends AbstractTransferDropTargetListener {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
index fd2dc9200407cc99782c9e3500f87df2452176ac..e6f8a2fc91a3bcb41bdc440addc4069535924c91 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 63FF468A2D042586A22495828A0798EF
+ * @ConQAT.Rating YELLOW Hash: 5893E8E911D970E9326F642E65239F08
*/
public abstract class EditorBase<T extends EObject> extends
org.fortiss.tooling.kernel.ui.extension.base.EditorBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
index d178d0ad708f7f35b45def886672af8bbb35a455..14c6a0cd5eaf5a19738ddd8d55378c802b0a3f28 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
@@ -64,6 +64,7 @@ import org.fortiss.tooling.base.ui.action.CutModelElementsAction;
import org.fortiss.tooling.base.ui.action.ModelElementsActionBase;
import org.fortiss.tooling.base.ui.action.PasteModelElementAction;
import org.fortiss.tooling.base.ui.dnd.DropTargetListener;
+import org.fortiss.tooling.base.ui.editpart.ExtendedLayerRootEditPart;
import org.fortiss.tooling.base.ui.editpart.figure.EVisualStyle;
import org.fortiss.tooling.kernel.ui.service.IEditPartFactoryService;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
index 4cb31b53ffe6873da74216abf042e4d7ad21fd6d..b6c9b06d24f7482243f4df400c2a49fc3d211124 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
@@ -31,7 +31,6 @@ import org.eclipse.draw2d.XYLayout;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.LayerConstants;
import org.eclipse.swt.SWT;
-import org.fortiss.tooling.base.ui.editor.gef.ExtendedLayerRootEditPart;
/**
* The base class for graphical diagrams.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/ExtendedLayerRootEditPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/ExtendedLayerRootEditPart.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
index cefff60542c39922bbce483308f41ed57e81b64e..7da8cd81ce33c0a61b08d5b695201c8aeaca9af4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/ExtendedLayerRootEditPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.editor.gef;
+package org.fortiss.tooling.base.ui.editpart;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.FreeformLayer;
@@ -51,9 +51,9 @@ import org.eclipse.gef.editparts.ScalableRootEditPart;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: F8855E6AA03A3F8215C9BA073623B464
*/
-public final class ExtendedLayerRootEditPart extends ScalableRootEditPart {
+public class ExtendedLayerRootEditPart extends ScalableRootEditPart {
/** The node layer ID. */
public static final String NODE_LAYER = ExtendedLayerRootEditPart.class
.getName() + ".nodeLayer";
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IFreeConnectorEditPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IFreeConnectorEditPart.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IFreeConnectorEditPart.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IFreeConnectorEditPart.java
index 53b0d5b9e4de1d48689773d23c25e6c3ad30ff68..0d4a8a24adfb27047a3c8cb93a74fe48708d6a9b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IFreeConnectorEditPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IFreeConnectorEditPart.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.editpart.interfaces;
+package org.fortiss.tooling.base.ui.editpart;
/**
* This is a marker interface for edit parts, which resemble a free behavior
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IStickyConnectorEditPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IStickyConnectorEditPart.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IStickyConnectorEditPart.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IStickyConnectorEditPart.java
index 7d07fcfe1a5fcb52aae395ffbcc9bf40e6e20093..e47aaa6a3b0469df90d32b84fc70ddbcd44a0dd0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/interfaces/IStickyConnectorEditPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IStickyConnectorEditPart.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.editpart.interfaces;
+package org.fortiss.tooling.base.ui.editpart;
/**
* This is a marker interface for edit parts, which resemble a sticky behavior
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
index 120e64c7218aa309d5cbccd029b5659d7769ae60..26f5c8d9523979e885f7b9172bbc538fe90d5c01 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
@@ -30,7 +30,6 @@ import org.eclipse.gef.tools.ConnectionDragCreationTool;
import org.eclipse.gef.tools.DragEditPartsTracker;
import org.eclipse.swt.graphics.Color;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
-import org.fortiss.tooling.base.ui.editor.gef.ExtendedLayerRootEditPart;
/**
* The base class for all edit parts which are positioned using x/y coordinates
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
index f58530c6b5de903cd9aed52fbd59c021ec87fc58..b2f59d7e8e1d071509b0c282e858cad0a7890b57 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
@@ -28,6 +28,7 @@ import org.eclipse.gef.SnapToGrid;
* @version $Rev$
* @ConQAT.Rating RED Hash:
*/
+// TODO: rename suport -> adapter?
public final class SnapToGridSupport {
/**
* Adapter code for snap to grid feature.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
index 5d3441c65385f16737aeea433657bcc307cfbcc4..a778a4351ca474f895fdbda27a3b0fbf9a27b572 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
@@ -27,7 +27,7 @@ import org.eclipse.swt.SWT;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 07C86FB2361E45881CEB859B453E3F4F
*/
public class AntiAliasedEllipse extends Ellipse {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/MarkerFigure.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
similarity index 83%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/MarkerFigure.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
index 0ded514ceb7953a6508e3090dd4f25b52a252633..edc87afcc523f7fb198383d8370a9fb10883630a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/MarkerFigure.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
@@ -27,30 +27,30 @@ import org.eclipse.ui.PlatformUI;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation;
/**
- * Figure used for displaying markers.
+ * Figure used for displaying decorator figures.
*
- * @author hummel
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 4E2A474E77547ACB0DF8C8D25A21C743
*/
-public class MarkerFigure extends Label {
+public class DecoratorFigure extends Label {
/** Constructor. */
- public MarkerFigure() {
+ public DecoratorFigure() {
setTextAlignment(PositionConstants.LEFT | PositionConstants.TOP);
}
- /** Updates the figure based on markers. */
- public void setMarkers(Collection<IConstraintViolation<EObject>> markers) {
- if (markers.isEmpty()) {
+ /** Updates the figure based on constraint violations. */
+ public void setConstraintViolations(
+ Collection<IConstraintViolation<EObject>> violations) {
+ if (violations.isEmpty()) {
setVisible(false);
return;
}
setVisible(true);
- IConstraintViolation<EObject> highest = markers.iterator().next();
+ IConstraintViolation<EObject> highest = violations.iterator().next();
switch (highest.getSeverity()) {
case FATAL:
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
index 3de85322384741f88204cc936b67ef3aa9ece8db..1bbed77b914817961962635e816d34a773005858 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: B5D40E290043ECEE13218F5DA589AFB5
*/
public enum EVisualStyle {
/** Traditional (since 2007) CCTS style with soft gradients. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
index 4f3bfb10b7f990a5db9c27706f74681b66dfac3d..493046e862d42b611be9721a2222bada08703549 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
@@ -40,7 +40,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 6532DB99FCD990C052DA0B8D0957D3E2
*/
public class PrettyInsetEllipse extends Shape {
@@ -52,12 +52,7 @@ public class PrettyInsetEllipse extends Shape {
.imageDescriptorFromPlugin("edu.tum.cs.ccts.editor.base",
"icons/ellipse-reflections.png").createImage();
- /**
- * Creates a new ConQAT-Shape with given {@link Insets}.
- *
- * @param insets
- * the transparent insets surrounding this shape.
- */
+ /** Constructor. */
public PrettyInsetEllipse(Insets insets) {
this.insets = insets;
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
index 011c02bb55128508095fbff20ac7493bd0dc2ab1..cf48e6478e3a9cc3babeac178fffe1f1550ed99a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: BF9CBEC805A24099FC3782B3DAFD11CE
*/
public class PrettyRoundedRectangle extends Shape {
@@ -57,7 +57,7 @@ public class PrettyRoundedRectangle extends Shape {
protected static final Image radialBlend = ToolingBaseUIActivator
.getImageDescriptor("icons/overlay/radial-blend.png").createImage();
- /** Creates a new {@link PrettyRoundedRectangle} with given {@link Insets}. */
+ /** Constructor. */
public PrettyRoundedRectangle(int cornerRadius, Insets insets) {
this.cornerRadius = cornerRadius;
this.insets = insets;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
index 0a2401eab367dffd4e3b8ee5628eb82dea86c417..b86e10953b5da14fa80f8902f4df9756b1ab9025 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 3E1BC1C0506F211714AAE4DB9FD1ADC8
+ * @ConQAT.Rating YELLOW Hash: CBF14C3DBC2699A22B49D4140040F4B2
*/
public class GEF2ToolingKernelCommandStack extends CommandStack implements
CommandStackListener {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
index 6f7e24a6cb8592ab195d57731820f3fdd4963c90..25232b23c92f406b3c03c75042f2c982cb5f6355 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
@@ -26,12 +26,10 @@ import org.eclipse.draw2d.geometry.Point;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 0D060C9B0786494C97B67B8D571F5E1D
+ * @ConQAT.Rating YELLOW Hash: 3198DA6EC6F6DB4064197E9461B2C181
*/
public interface IPointLayouter {
- /**
- * Performs the layout task on the given {@link Point}.
- */
+ /** Performs the layout task on the given {@link Point}. */
public void doLayout(Point point);
}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
index 546d036e26881ea0eebcb530a35460bccd4d6a97..d82257e013949335fcaba26ef9a59962d98b15d4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
@@ -38,6 +38,7 @@ import org.fortiss.tooling.base.ui.layout.constants.DefaultLayoutConstants;
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: C35B3098DFF4E3BD3F5B0AB20DC39B30
*/
+// TODO: split class into sTg, rectangular and oval?
public class EditPartLayoutUtils {
/** Returns the given value aligned to the given grid size. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
index abf53879b530f8a723d3a2a7dc690a2769c29fe5..600924f995eb5d5efd71f1b5b4fdc7410f302352 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
@@ -84,6 +84,7 @@ public class LayoutDataUtils {
}
/** Sets the layouted node's position. */
+ // TODO: clean up should remove this
public static void setNodePosition(ILayoutedModelElement layouted,
Point position) {
setNodePosition(layouted, position.getX(), position.getY());
@@ -114,6 +115,7 @@ public class LayoutDataUtils {
}
/** Sets the layouted node's size. */
+ // TODO: cleanup should remove this method
public static void setNodeSize(ILayoutedModelElement layouted,
Dimension size) {
setNodeSize(layouted, size.getWidth(), size.getHeight());
@@ -131,12 +133,6 @@ public class LayoutDataUtils {
LayoutKeyConstants.CONNECTOR_POSITION);
}
- /** Sets the layouted connector's position. */
- public static void setConnectorPosition(ILayoutedModelElement layouted,
- Point position) {
- setConnectorPosition(layouted, position.getX(), position.getY());
- }
-
/** Sets the layouted connector's position. */
public static void setConnectorPosition(ILayoutedModelElement layouted,
int x, int y) {
@@ -182,6 +178,7 @@ public class LayoutDataUtils {
}
/** Returns the layouted connector's angle. */
+ // TODO: used?
public static Angle getConnectorAngle(ILayoutedModelElement layouted) {
Angle angle = AngleUtil.getAngle(layouted,
LayoutKeyConstants.CONNECTOR_ANGLE);
@@ -192,11 +189,13 @@ public class LayoutDataUtils {
}
/** Returns the angle as double value (0 if not existing). */
+ // TODO: used?
public static double getConnectorAngleAsDouble(ILayoutedModelElement lobject) {
return getConnectorAngle(lobject).getAngle();
}
/** Creates a new connection layout. */
+ // TODO: used?
public static void createConnectionLayout(ILayoutedModelElement lo) {
Points points = PointsUtil.createPoints();
points.setKey(LayoutKeyConstants.CONNECTION_POINTS);
@@ -218,6 +217,7 @@ public class LayoutDataUtils {
}
/** Creates a new node layout. */
+ // TODO: public?
public static void createNodeLayout(ILayoutedModelElement lobject) {
PointUtil.setPoint(lobject, LayoutKeyConstants.NODE_POSITION, 0, 0);
DimensionUtil.setDimension(lobject, LayoutKeyConstants.NODE_DIMENSION,
@@ -235,6 +235,7 @@ public class LayoutDataUtils {
}
/** Return the absolute position for a given offset and orientation. */
+ // TODO: public?
public static Point getAbsolute(OffsetOrientation oo, Dimension parentSize,
int parentInsets) {
Point pos = PointUtil.createPoint(0, 0);
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
index e36e2cdd6546b46f4901daefb7ec3d690efff620..3e065113c780bc02b701be35347fc45fe773da99 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
@@ -31,7 +31,7 @@ import org.fortiss.tooling.base.ui.editpart.figure.EVisualStyle;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: A4BF19B04F9E2FCCB5439FE5A029BBBA
*/
public class GraphicalViewerPreferencePage extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
index 0710523832b0f995f86b6feb9826ba65dab8e6d1..d721cb52843ddb30d13200c0b218b490dc6e58f8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
* @author hoelzlf
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: 6B7E44F27214D28ABD5CE7B961495A60
*/
public class MainPreferencePage extends FieldEditorPreferencePage implements
IWorkbenchPreferencePage {