Commit c38659bb authored by Johannes Eder's avatar Johannes Eder
Browse files

YELLOW

* fixed editor such that no second platform architecture is created
* changed color of can bus to blue
* added missing handlers to plugin.xml
* removed unnecessary editor bindings for raspberry pi and can bus

Issue-Ref: 4053
Issue-Url: https://af3-developer.fortiss.org/issues/4053

Signed-off-by: Johannes Eder's avatarJohannes Eder <eder@fortiss.org>
parent 041236b0
......@@ -25,18 +25,6 @@
modelElementClass="org.fortiss.af3.platform.raspberry.model.RaspberryPi">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.platform.raspberry.ui.handler.CanBusHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.CanBus">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.platform.raspberry.ui.handler.CanConnectorHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.CanConnector">
</modelElementClass>
</modelElementHandler>
</extension>
<extension point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
......@@ -428,6 +416,18 @@
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.lightrunner.Poti"/>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.platform.raspberry.ui.handler.CanBusHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.CanBus">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.platform.raspberry.ui.handler.CanConnectorHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.platform.raspberry.model.CanConnector">
</modelElementClass>
</modelElementHandler>
</extension>
<extension
point="org.eclipse.ui.views.properties.tabbed.propertySections">
......
PlatformRaspberryPiArchitectureFXEditorBinding.java 0ea5a5a11bbff57c6cc55676ed97ebb892e6e97a YELLOW
PlatformRaspberryPiControllerFactory.java 6f2bab5eeacfe749832bf5900b80a3b291d38786 YELLOW
PlatformRaspberryPiModelFactory.java bc6a14c7d7d7c44dc31717da9401efc7e905c182 YELLOW
PlatformRaspberryPiVisualFactory.java da6ef86989791215d9f7f3c57d3e1825b999af76 YELLOW
PlatformRaspberryPiArchitectureFXEditorBinding.java 9be142805db274439b6c5e05470d822272f03539 YELLOW
PlatformRaspberryPiControllerFactory.java afdb681a5a039ac0512b7f8897815ca358bdc8e7 GREEN
PlatformRaspberryPiModelFactory.java a2550b7cd0b6d31767db7fc316ecca687f0039bf GREEN
PlatformRaspberryPiVisualFactory.java c3e24dee4a2557dd88d9d8b3a899330d068bef6d GREEN
......@@ -17,7 +17,6 @@ package org.fortiss.af3.platform.raspberry.ui.editor;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.af3.platform.ui.editor.fx.PlatformArchitectureFXEditor;
import org.fortiss.tooling.common.ui.javafx.lwfxef.controller.IControllerFactory;
import org.fortiss.tooling.common.ui.javafx.lwfxef.model.IModelFactory;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
......@@ -34,7 +33,8 @@ public class PlatformRaspberryPiArchitectureFXEditorBinding
/** {@inheritDoc} */
@Override
public Class<? extends IEditorPart> getEditorClass() {
return PlatformArchitectureFXEditor.class;
// has to be null otherwise editor is instantiated twice
return null;
}
/** {@inheritDoc} */
......@@ -55,12 +55,6 @@ public class PlatformRaspberryPiArchitectureFXEditorBinding
return PlatformRaspberryPiControllerFactory.class;
}
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Platform Architecture";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
......
......@@ -36,7 +36,7 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.ILinkMVCBundle;
/**
* The implementation of the {@link IControllerFactory} for the platform architecture editor.
*
* @author ponce
* @author eisenmann
*/
public class PlatformRaspberryPiControllerFactory implements IControllerFactory {
......
......@@ -28,7 +28,7 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.model.IModelFactory;
/**
* The implementation of the {@link IModelFactory} for the RaspberryPi platform architecture editor.
*
* @author ponce
* @author eisenmann
*/
public class PlatformRaspberryPiModelFactory extends PlatformModelFactory {
......
......@@ -46,7 +46,7 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
/**
* The implementation of the {@link IVisualFactory} for the platform architecture editor.
*
* @author ponce
* @author eisenmann
*/
public class PlatformRaspberryPiVisualFactory implements IVisualFactory {
......
CanBusTransmissionUnitVisual.java 395b4f9d61a7b806e08a1f1544515622a70ca0c3 YELLOW
RaspberryPiExecutionUnitVisual.java d47903f7a97b53e12dcd1192cf6c707d6f35d137 YELLOW
RaspberryPiReceiverVisual.java f37bec7e78993ea43931a7c32af114e6cb047671 YELLOW
RaspberryPiTransceiverVisual.java d8b3b1a177f2d19962292c5dfea16cf08b9836d0 YELLOW
RaspberryPiTransmitterVisual.java c03eb1911574de68af736de7b0594eb8cd76ea67 YELLOW
CanBusTransmissionUnitVisual.java e5b63b66db715016a836643fc3e0411ff88c029f YELLOW
RaspberryPiExecutionUnitVisual.java 157aa23b9ba18e591b434c59576df5c2e43b49de GREEN
RaspberryPiReceiverVisual.java 474b6e6057a3330f84bc9f7eb953ebc6cd9e3d30 GREEN
RaspberryPiTransceiverVisual.java 60c020813f9b213f341fd0a7f14b07bfddd92870 GREEN
RaspberryPiTransmitterVisual.java 2adead2607212ce25501619e1498b6a2066e3561 GREEN
......@@ -17,8 +17,8 @@ package org.fortiss.af3.platform.raspberry.ui.editor.visual;
import static javafx.scene.paint.Color.BLACK;
import static javafx.scene.text.TextAlignment.CENTER;
import static org.eclipse.wb.swt.SWTResourceManager.getColor;
import static org.fortiss.af3.platform.ui.AF3PlatformUIActivator.PLUGIN_ID;
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;
......@@ -36,14 +36,14 @@ import javafx.scene.text.TextAlignment;
/**
* {@link IContentVisual} for {@link CanBus}s displayed in the diagram.
*
* @author ponce
* @author eisenmann
*/
public final class CanBusTransmissionUnitVisual
extends NamedLayoutedRectangularContentVisual<CanBus> {
/** The icon image. */
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/unknown.png");
/** The fill color used by CanBusTransmissionUnitVisual. */
private static final Color FILL_COLOR = convertColor(EU_BACKGROUND);
private static final Color FILL_COLOR = convertColor(getColor(47, 86, 233));
/** The foreground color used by CanBusTransmissionUnitVisual. */
private static final Color BORDER_COLOR = convertColor(EU_FOREGROUND);
......
......@@ -36,7 +36,7 @@ import javafx.scene.text.TextAlignment;
/**
* {@link IContentVisual} for {@link RaspberryPi}s displayed in the diagram.
*
* @author ponce
* @author eisenmann
*/
public final class RaspberryPiExecutionUnitVisual
extends NamedLayoutedRectangularContentVisual<RaspberryPi> {
......
......@@ -27,7 +27,7 @@ import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
* @author eisenmann
*/
public class RaspberryPiReceiverVisual
extends NamedLayoutedCircularAnchorageContentVisual<Receiver> {
......
......@@ -27,7 +27,7 @@ import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
* @author eisenmann
*/
public class RaspberryPiTransceiverVisual
extends NamedLayoutedCircularAnchorageContentVisual<Transceiver> {
......
......@@ -27,7 +27,7 @@ import javafx.scene.paint.Paint;
/**
* {@link IContentVisual} for connectors displayed in the diagram.
*
* @author ponce
* @author eisenmann
*/
public class RaspberryPiTransmitterVisual
extends NamedLayoutedCircularAnchorageContentVisual<Transmitter> {
......
PlatformArchitectureFXEditor.java 40bfae198b562b291e8b203b50872d1ed6790b6d GREEN
PlatformArchitectureFXEditorBinding.java 045f273a65df5baabfe8627a12d24eabdedf0747 GREEN
PlatformControllerFactory.java 4532d4e47238dc20caa31477991404869d1665dd GREEN
PlatformModelFactory.java d76aa558beba855fed5aaf879ba4d2790f1d2b12 YELLOW
PlatformModelFactory.java d76aa558beba855fed5aaf879ba4d2790f1d2b12 GREEN
PlatformVisualFactory.java 99853f446d5d94a0cfee2a9b95590626566caf3c GREEN
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