Commit a86982bf authored by Simon Barner's avatar Simon Barner
Browse files

YELLOW

refs 2562
parent eb8ed9e8
......@@ -20,8 +20,10 @@ import org.eclipse.draw2d.Shape;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.swt.SWT;
import org.fortiss.af3.task.model.Task;
/**
* Rectangle used to represent {@link Task}s.
*
* @author eder
*/
......@@ -29,6 +31,7 @@ public class TaskRectangle extends Shape {
/** Corner radius of rectangle. */
private int cornerRadius;
/** Insets of rectangle. */
private Insets insets;
......@@ -55,6 +58,7 @@ public class TaskRectangle extends Shape {
* {@inheritDoc}
* <p>
* Additionally enables anti-aliasing.
* </p>
*/
@Override
protected void outlineShape(Graphics gfx) {
......
AF3TaskActivator.java 61aedec99ac17ba6bdaa234ad4efd2c8612a3854 YELLOW
AF3TaskActivator.java 6d8878ff2eb7769f924099c51deb017a396bca13 YELLOW
ComponentToTaskAllocationTableCollectionCompositor.java 19733b43e4684d81799557e5c70c9b708e94b554 YELLOW
TaskArchitectureFileProjectCompositor.java 18f5a3e06bc20432d6853461b614b769bf37028d YELLOW
TaskCompositor.java fb72faa5a865ac643227419749d3fa88a9eaa39c RED
TaskConnectionCompositor.java 8d27d5b5da4277123423d7aaad65360f784a4c0f RED
TaskPortCompositor.java 816605945bb057a765b82a1fcf349356c41195fa RED
TaskCompositor.java fb72faa5a865ac643227419749d3fa88a9eaa39c YELLOW
TaskConnectionCompositor.java 13c8268671e24ed4ee192f537bffe5aa794503d3 YELLOW
TaskPortCompositor.java 5a56d2990ffddd5f80c00629e5f78d73c2aac7f2 YELLOW
TaskToExecutionUnitAllocationTableCollectionCompositor.java 2495dd4c9fe63c90aae254dccdc388cd0722be70 YELLOW
TaskWcetTableCompositor.java aa91d730714883a2f35beb80672141ec40a89593 YELLOW
......@@ -15,6 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.task.compositor;
import static org.fortiss.af3.task.util.TaskModelElementFactory.createSignal;
import static org.fortiss.tooling.kernel.utils.UniqueIDUtils.prepareUniqueID;
import org.eclipse.emf.common.util.EList;
......@@ -25,14 +26,13 @@ import org.fortiss.af3.task.model.TaskQueuingInputPort;
import org.fortiss.af3.task.model.TaskQueuingOutputPort;
import org.fortiss.af3.task.model.TaskSamplingInputPort;
import org.fortiss.af3.task.model.TaskSamplingOutputPort;
import org.fortiss.af3.task.util.TaskModelElementFactory;
import org.fortiss.tooling.base.compose.ConnectionCompositorBase;
import org.fortiss.tooling.base.model.element.IConnector;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
/**
* Compositor for connections of Tasks via {@link Signal}s
* Compositor for connections of Tasks via {@link Signal}s.
*
* @author eder
*/
......@@ -74,7 +74,7 @@ public class TaskConnectionCompositor extends
/** {@inheritDoc} */
@Override
protected Signal createConnection() {
return TaskModelElementFactory.createSignal();
return createSignal();
}
/** {@inheritDoc} */
......
......@@ -16,6 +16,7 @@
package org.fortiss.af3.task.compositor;
import static org.conqat.lib.commons.reflect.ReflectionUtils.isInstanceOfAny;
import static org.fortiss.tooling.base.utils.RectangleLayoutUtils.layoutConnectorInRectangle;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.task.model.Task;
......@@ -25,7 +26,6 @@ import org.fortiss.af3.task.model.TaskPort;
import org.fortiss.tooling.base.compose.HierarchicElementCompositorBase;
import org.fortiss.tooling.base.dnd.ElementDropContext;
import org.fortiss.tooling.base.model.layout.Point;
import org.fortiss.tooling.base.utils.RectangleLayoutUtils;
import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
import org.fortiss.tooling.kernel.extension.data.Prototype;
......@@ -62,7 +62,7 @@ public class TaskPortCompositor extends HierarchicElementCompositorBase<Task> {
if(((ElementDropContext)context).isRootFigureCanvas()) {
ctxPosition.translate(ctx.getViewLocationZoomed());
}
RectangleLayoutUtils.layoutConnectorInRectangle(port, container, ctxPosition);
layoutConnectorInRectangle(port, container, ctxPosition);
}
container.getConnectors().add(port);
return true;
......
ComponentToTaskAllocationTableStaticImpl.java 649817aec13d984e2607da3c35765a547e12e463 YELLOW
ComponentToTaskAllocationTableStaticImpl.java f35303d6a455a77facc236287abbd56e2de5ee51 YELLOW
TaskToExecutionUnitAllocationTableStaticImpl.java 5d156100194afdff6f59b7299511c48fad453ca8 YELLOW
TaskWcetTableStaticImpl.java 49151911a13c184b9580fe095f9650404f7cab51 YELLOW
TaskArchitectureStaticImpl.java f2398052566455e98406f594b13b25f8bd25ccdf RED
TaskArchitectureStaticImpl.java f2398052566455e98406f594b13b25f8bd25ccdf YELLOW
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