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

Merge branch '4060' into 'master'

[4060] Double clicking on a Raspberry Pi platform element causes an exception to be thrown

See merge request af3/af3!366
parents d5653f58 31b904a0
PlatformRaspberryPiArchitectureFXEditorBinding.java 9be142805db274439b6c5e05470d822272f03539 GREEN
PlatformRaspberryPiArchitectureFXEditorBinding.java 5a0d24cb7ab3acae886d99b222d447dafd0dc733 GREEN
PlatformRaspberryPiControllerFactory.java afdb681a5a039ac0512b7f8897815ca358bdc8e7 GREEN
PlatformRaspberryPiModelFactory.java a2550b7cd0b6d31767db7fc316ecca687f0039bf GREEN
PlatformRaspberryPiVisualFactory.java c3e24dee4a2557dd88d9d8b3a899330d068bef6d GREEN
......@@ -20,20 +20,22 @@ import org.fortiss.af3.platform.model.PlatformArchitecture;
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;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
import org.fortiss.tooling.kernel.ui.extension.ModelEditorNotAvailableBinding;
/**
* Editor binding for the JavaFX-based platform architecture editor.
* Editor binding for the JavaFX-based platform architecture editor. Since the RPi platform is not
* hierarchical, its purpose is merely to delegate to the respective controller, model, and visual
* factories.
*
* @author eisenmann
*/
public class PlatformRaspberryPiArchitectureFXEditorBinding
extends ModelEditorBindingBase<PlatformArchitecture> {
extends ModelEditorNotAvailableBinding<PlatformArchitecture> {
/** {@inheritDoc} */
@Override
public Class<? extends IEditorPart> getEditorClass() {
// has to be null otherwise editor is instantiated twice
// has to be null otherwise the platform architecture editor is instantiated twice
return null;
}
......
CanBusTransmissionUnitVisual.java e5b63b66db715016a836643fc3e0411ff88c029f GREEN
RaspberryPiExecutionUnitVisual.java 157aa23b9ba18e591b434c59576df5c2e43b49de GREEN
CanBusTransmissionUnitVisual.java 42883e8bd633b51a2ddff364078f446db2d2abba GREEN
RaspberryPiExecutionUnitVisual.java 9bc5597b81890812fb5b4c7372e245b1950c26a4 GREEN
RaspberryPiReceiverVisual.java 474b6e6057a3330f84bc9f7eb953ebc6cd9e3d30 GREEN
RaspberryPiTransceiverVisual.java 60c020813f9b213f341fd0a7f14b07bfddd92870 GREEN
RaspberryPiTransmitterVisual.java 2adead2607212ce25501619e1498b6a2066e3561 GREEN
......@@ -18,7 +18,7 @@ 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.raspberry.ui.AF3PlatformRaspberryUIActivator.PLUGIN_ID;
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;
......@@ -41,7 +41,7 @@ import javafx.scene.text.TextAlignment;
public final class CanBusTransmissionUnitVisual
extends NamedLayoutedRectangularContentVisual<CanBus> {
/** The icon image. */
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/unknown.png");
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/can-logo.jpeg");
/** The fill color used by CanBusTransmissionUnitVisual. */
private static final Color FILL_COLOR = convertColor(getColor(47, 86, 233));
/** The foreground color used by CanBusTransmissionUnitVisual. */
......
......@@ -17,7 +17,7 @@ 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.fortiss.af3.platform.ui.AF3PlatformUIActivator.PLUGIN_ID;
import static org.fortiss.af3.platform.raspberry.ui.AF3PlatformRaspberryUIActivator.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;
......@@ -42,7 +42,7 @@ public final class RaspberryPiExecutionUnitVisual
extends NamedLayoutedRectangularContentVisual<RaspberryPi> {
/** The icon image. */
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/unknown.png");
private static final Image ICON = getFXImage(PLUGIN_ID, "/icons/raspberry-pi-logo.png");
/** The fill color used by RaspberryPis. */
private static final Color FILL_COLOR = convertColor(EU_BACKGROUND);
/** The foreground color used by RaspberryPis. */
......
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