From ee2dccaca4e319b9fdc5c5384b1e290018f92f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20D=C3=B6bber?= <doebber@in.tum.de>
Date: Tue, 24 Jan 2012 12:55:11 +0000
Subject: [PATCH] reviewed tooling.base.ui refs 311
---
.../tooling/base/ToolingBaseActivator.java | 2 +-
.../HierarchicElementCompositorBase.java | 2 +-
.../base/layout/DefaultLayoutConstants.java | 2 +-
.../tooling/base/utils/AngleUtils.java | 2 +-
.../base/utils/BaseModelElementUtils.java | 2 +-
.../tooling/base/utils/DimensionUtils.java | 2 +-
.../base/utils/LayoutModelElementFactory.java | 39 ++++++++++---------
.../base/utils/OffsetOrientationUtils.java | 2 +-
.../tooling/base/utils/PointUtils.java | 3 +-
.../tooling/base/utils/PointsUtils.java | 3 +-
10 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
index f59c7f03f..39a70df10 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
@@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 2100D91404D5AB79EAEBB5E5107245D1
+ * @ConQAT.Rating GREEN Hash: 13207B1B51F8F60D2122999D2EDB0603
*/
public class ToolingBaseActivator extends Plugin {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/decompose/HierarchicElementCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/decompose/HierarchicElementCompositorBase.java
index 78e109404..fb155fce2 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/decompose/HierarchicElementCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/decompose/HierarchicElementCompositorBase.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
* @author doebber
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: E5DA3C13BF3E5399E425B401D62C0579
+ * @ConQAT.Rating GREEN Hash: 26FC35FD40E28AB8F78FC7E42569DD0B
*/
public abstract class HierarchicElementCompositorBase<HE extends IHierarchicElementContainer>
implements IElementCompositor<HE> {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
index 69717a1bd..c30ff5626 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
@@ -23,7 +23,7 @@ package org.fortiss.tooling.base.layout;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C73875A2DF5C4FA193DBD6AD12A220E4
+ * @ConQAT.Rating GREEN Hash: 518B269F6FBF5ECE75F034373B4240A4
*/
public class DefaultLayoutConstants {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
index 1b5e647cb..57f82fc8d 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: DE79B340A0B6E270C967987E242746CC
+ * @ConQAT.Rating GREEN Hash: C5106CA497CBD9039D93527011B31922
*/
public final class AngleUtils {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
index 9ee36146c..4689a8aea 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.base.model.element.IModelElementSpecification;
* @author hoelzl
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: 77C22DC9FB8BAD588272F4B738249542
+ * @ConQAT.Rating GREEN Hash: 66CCCA68F9162A427BB1BDF853DB0146
*/
public class BaseModelElementUtils {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
index 6e2991db9..68fe31631 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: AD7143102CB3ED7457686F16AE7E1E77
+ * @ConQAT.Rating GREEN Hash: 5C92A83202006734362EED9438B3A2D8
*/
public final class DimensionUtils {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
index e1b946c00..96c7d1a0f 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
@@ -17,8 +17,16 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.utils;
-import org.fortiss.tooling.base.layout.DefaultLayoutConstants;
-import org.fortiss.tooling.base.layout.LayoutKeyConstants;
+import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_HEIGHT;
+import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_WIDTH;
+import static org.fortiss.tooling.base.layout.LayoutKeyConstants.CONNECTION_POINTS;
+import static org.fortiss.tooling.base.layout.LayoutKeyConstants.CONNECTOR_DIMENSION;
+import static org.fortiss.tooling.base.layout.LayoutKeyConstants.CONNECTOR_POSITION;
+import static org.fortiss.tooling.base.layout.LayoutKeyConstants.NODE_DIMENSION;
+import static org.fortiss.tooling.base.layout.LayoutKeyConstants.NODE_POSITION;
+import static org.fortiss.tooling.base.utils.DimensionUtils.setDimension;
+import static org.fortiss.tooling.base.utils.PointUtils.setPoint;
+
import org.fortiss.tooling.base.model.layout.Angle;
import org.fortiss.tooling.base.model.layout.Dimension;
import org.fortiss.tooling.base.model.layout.EOrientation;
@@ -34,34 +42,28 @@ import org.fortiss.tooling.base.model.layout.Points;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: E84D6730B2F452D7DD81165E6C195730
+ * @ConQAT.Rating GREEN Hash: B56440764A42F45EA1CB2A0902098928
*/
public final class LayoutModelElementFactory {
/** Creates a model element node layout. */
public static void createNodeElementLayout(ILayoutedModelElement layouted) {
- PointUtils.setPoint(layouted, LayoutKeyConstants.NODE_POSITION, 0, 0);
+ setPoint(layouted, NODE_POSITION, 0, 0);
- DimensionUtils.setDimension(layouted,
- LayoutKeyConstants.NODE_DIMENSION,
- DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_WIDTH,
- DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_HEIGHT);
+ setDimension(layouted, NODE_DIMENSION, DEFAULT_SHAPE_MINIMUM_WIDTH,
+ DEFAULT_SHAPE_MINIMUM_HEIGHT);
}
/** Creates a connector layout. */
public static void createConnectorLayout(ILayoutedModelElement layouted) {
- PointUtils.setPoint(layouted, LayoutKeyConstants.NODE_POSITION, 0, 0);
+ setPoint(layouted, NODE_POSITION, 0, 0);
- DimensionUtils.setDimension(layouted,
- LayoutKeyConstants.NODE_DIMENSION,
- DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_WIDTH,
- DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_HEIGHT);
+ setDimension(layouted, NODE_DIMENSION, DEFAULT_SHAPE_MINIMUM_WIDTH,
+ DEFAULT_SHAPE_MINIMUM_HEIGHT);
- Point cpos = LayoutModelElementFactory.createPoint(0, 0,
- LayoutKeyConstants.CONNECTOR_POSITION);
+ Point cpos = createPoint(0, 0, CONNECTOR_POSITION);
- Dimension cdim = LayoutModelElementFactory.createDimension(0, 0,
- LayoutKeyConstants.CONNECTOR_DIMENSION);
+ Dimension cdim = createDimension(0, 0, CONNECTOR_DIMENSION);
layouted.getLayoutDataList().add(cpos);
layouted.getLayoutDataList().add(cdim);
@@ -69,8 +71,7 @@ public final class LayoutModelElementFactory {
/** Creates a new connection layout. */
public static void createConnectionLayout(ILayoutedModelElement layouted) {
- Points points = LayoutModelElementFactory
- .createPoints(LayoutKeyConstants.CONNECTION_POINTS);
+ Points points = createPoints(CONNECTION_POINTS);
layouted.getLayoutDataList().add(points);
}
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
index 1164776ad..5095679b1 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
@@ -32,7 +32,7 @@ import org.fortiss.tooling.base.model.layout.Orientation;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 53B0B2AFACC1B5CFC39BCF1568622294
+ * @ConQAT.Rating GREEN Hash: 5C22AE10DC58624221B46523BC0EF0F3
*/
public final class OffsetOrientationUtils {
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
index 1d705d465..fde678c8b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
@@ -32,8 +32,9 @@ import org.fortiss.tooling.base.model.layout.Point;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 424A37CE4EA761ABD1CD4B9E82E1CF5C
+ * @ConQAT.Rating RED Hash: F8F0E6464D6AE313BE24C2CDE47F38D5
*/
+// TODO @review CD: merge with PointsUtils
public final class PointUtils {
/**
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
index f99859508..152ad80ee 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
@@ -32,8 +32,9 @@ import org.fortiss.tooling.base.model.layout.Points;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: AFC510FBC49D82AE86018CF7A4D3ABF5
+ * @ConQAT.Rating RED Hash: DE74A89AC972DD275E820C33319FA03B
*/
+// TODO @review CD: merge with PointUtils
public final class PointsUtils {
/**
--
GitLab