Commit 03f1efa7 authored by Hernan Ponce de Leon's avatar Hernan Ponce de Leon
Browse files

Ready for review



Issue-Ref: 3882
Signed-off-by: Hernan Ponce de Leon's avatarHernan Ponce de Leon <ponce@fortiss.org>
parent 6915b564
ControllerFactory.java d8e4cbbe87ef0fd48aa69c07149e11c7d797ef8c YELLOW
ModelFactory.java ddbe47a55a0fe5e1657100ff4ac216cc58d5a3c1 YELLOW
PlaformArchitectureFXEditorBinding.java 23ec41b34ca4dc05d25862c5c4f31af090a1903d YELLOW
PlatformArchitectureFXEditor.java 7050c819056a873a4bcaca96809d47293a66ba6e YELLOW
VisualFactory.java 9023df0cbc12db5e420c8c434e652f60b9c930f2 YELLOW
DiagramController.java 5e1a7cede2f95c9cfed7fb42821733b13b5a788f YELLOW
GenericConnectionController.java 03698c9ab3d95ba382a5749cca8d4a6c029e7846 YELLOW
GenericConnectorController.java fef499bbfe3884f83a132c46d425a59c857d24e5 YELLOW
GenericUnitController.java 6cccfc46335f39a4bd477a126e461d4a32071255 YELLOW
......@@ -15,6 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.ui.editor.fx.controller;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.controller.IController;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.fortiss.af3.platform.model.generic.GenericReceiver;
import org.fortiss.af3.platform.model.generic.GenericTransceiver;
......@@ -22,6 +23,7 @@ import org.fortiss.af3.platform.model.generic.GenericTransmitter;
import org.fortiss.tooling.base.ui.editor.fx.LayoutedModelElementBasedContentAnchorageController;
/**
* {@link IController} for connectors on ECUs and buses.
*
* @author ponce
*/
......
GenericConnectionVisual.java 89bd887788ea0882eee3d74f1cf1d0dd17ffb3e4 YELLOW
GenericExecutionUnitVisual.java 9b713cce9ae5d55c8cb4090019b3e8e070583a4b YELLOW
GenericReceiverVisual.java 70c01c9d36525348b260387848266ad6a35c3582 YELLOW
GenericTransceiverVisual.java 8fbc064d8acc6a96e786a70cba5098592b9b5a5a YELLOW
GenericTransmissionUnitVisual.java 133d9852028d9fba38a2fdf655386b9515017735 YELLOW
GenericTransmitterVisual.java baac0dadc8f64487e3de6c0df53dffaf8b3b59a4 YELLOW
......@@ -48,13 +48,4 @@ public class GenericConnectionVisual extends LayoutedLineLinkVisualBase {
protected boolean showArrowOnLastSegment() {
return false;
}
/** {@inheritDoc} */
@Override
protected String getLabelText(int currentSegment, int lastSegment) {
if(currentSegment == 0) {
return getConnection().getName();
}
return null;
}
}
......@@ -16,15 +16,18 @@
package org.fortiss.af3.platform.ui.editor.fx.visual;
import static javafx.scene.paint.Color.BLACK;
import static org.fortiss.af3.component.ui.AF3ComponentUIActivator.convertColor;
import static org.fortiss.af3.platform.ui.DefaultStyle.EU_BACKGROUND;
import static org.fortiss.af3.platform.ui.DefaultStyle.EU_FOREGROUND;
import static org.fortiss.tooling.common.ui.javafx.util.GraphicUtils.convertColor;
import static org.fortiss.tooling.common.ui.javafx.util.GraphicUtils.getFXImage;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentMVCBundle;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.af3.platform.model.generic.GenericExecutionUnit;
import org.fortiss.af3.platform.ui.AF3PlatformUIActivator;
import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedRectangularContentVisualBase;
import javafx.scene.image.Image;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.scene.text.TextAlignment;
......@@ -35,6 +38,10 @@ import javafx.scene.text.TextAlignment;
* @author ponce
*/
public final class GenericExecutionUnitVisual extends LayoutedRectangularContentVisualBase {
/** The plug-in ID. */
public static final String PLUGIN_ID = AF3PlatformUIActivator.class.getPackage().getName();
/** The icon image. */
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/unknown.png");
/** The fill color used by GenericExecutionUnits. */
private static final Color ECU_COLOR1 = convertColor(EU_BACKGROUND);
/** The foreground color used by GenericExecutionUnits. */
......@@ -75,6 +82,12 @@ public final class GenericExecutionUnitVisual extends LayoutedRectangularContent
return ECU_COLOR2;
}
/** {@inheritDoc} */
@Override
protected Image getIcon() {
return ICON;
}
/** {@inheritDoc} */
@Override
protected String getName() {
......
......@@ -18,12 +18,14 @@ package org.fortiss.af3.platform.ui.editor.fx.visual;
import static javafx.scene.paint.Color.WHITE;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.af3.platform.model.generic.GenericReceiver;
import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedCircularContentAnchorageVisualBase;
import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
*/
......
......@@ -19,6 +19,7 @@ import static javafx.scene.paint.Color.BLACK;
import static javafx.scene.paint.Color.WHITE;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.af3.platform.model.generic.GenericExecutionUnit;
import org.fortiss.af3.platform.model.generic.GenericTransceiver;
import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedCircularContentAnchorageVisualBase;
......@@ -26,6 +27,7 @@ import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedCircularContentAnch
import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
*/
......@@ -53,9 +55,9 @@ public class GenericTransceiverVisual extends LayoutedCircularContentAnchorageVi
protected Paint getFillColor() {
Object parent = getTransceiver().getOwner();
if(parent instanceof GenericExecutionUnit) {
return WHITE;
return BLACK;
}
return BLACK;
return WHITE;
}
/** {@inheritDoc} */
......
......@@ -16,15 +16,18 @@
package org.fortiss.af3.platform.ui.editor.fx.visual;
import static javafx.scene.paint.Color.BLACK;
import static org.fortiss.af3.component.ui.AF3ComponentUIActivator.convertColor;
import static org.fortiss.af3.platform.ui.DefaultStyle.EU_BACKGROUND;
import static org.fortiss.af3.platform.ui.DefaultStyle.EU_FOREGROUND;
import static org.fortiss.tooling.common.ui.javafx.util.GraphicUtils.convertColor;
import static org.fortiss.tooling.common.ui.javafx.util.GraphicUtils.getFXImage;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentMVCBundle;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.af3.platform.model.generic.GenericTransmissionUnit;
import org.fortiss.af3.platform.ui.AF3PlatformUIActivator;
import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedRectangularContentVisualBase;
import javafx.scene.image.Image;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.scene.text.TextAlignment;
......@@ -35,6 +38,10 @@ import javafx.scene.text.TextAlignment;
* @author ponce
*/
public final class GenericTransmissionUnitVisual extends LayoutedRectangularContentVisualBase {
/** The plug-in ID. */
public static final String PLUGIN_ID = AF3PlatformUIActivator.class.getPackage().getName();
/** The icon image. */
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/unknown.png");
/** The fill color used by GenericTransmissionUnitVisual. */
private static final Color TRU_COLOR1 = convertColor(EU_BACKGROUND);
/** The foreground color used by GenericTransmissionUnitVisual. */
......@@ -66,13 +73,19 @@ public final class GenericTransmissionUnitVisual extends LayoutedRectangularCont
/** {@inheritDoc} */
@Override
protected Paint getFillColor() {
return TRU_COLOR2;
return TRU_COLOR1;
}
/** {@inheritDoc} */
@Override
protected Paint getBorderColor() {
return TRU_COLOR1;
return TRU_COLOR2;
}
/** {@inheritDoc} */
@Override
protected Image getIcon() {
return ICON;
}
/** {@inheritDoc} */
......
......@@ -18,12 +18,14 @@ package org.fortiss.af3.platform.ui.editor.fx.visual;
import static javafx.scene.paint.Color.BLACK;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.eclipse.systemfocus.kernel.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.af3.platform.model.generic.GenericTransmitter;
import org.fortiss.tooling.base.ui.editor.fx.visuals.LayoutedCircularContentAnchorageVisualBase;
import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
*/
......
Markdown is supported
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