Commit 84eb0421 authored by Tiziano Munaro's avatar Tiziano Munaro

Display link labels in the JavaFX editors of state and mode automata

Issue-Ref: 3873
Issue-Url: https://af3-developer.fortiss.org/issues/3873Signed-off-by: Tiziano Munaro's avatarTiziano Munaro <munaro@fortiss.org>
parent ec68191c
......@@ -2,6 +2,6 @@ ModeAutomatonControllerFactory.java 3e60fb8432aef914d0c63e8dfeb18b6ac57ddb6f YEL
ModeAutomatonFXEditor.java 2d70d6f9ad225ebb767d20009f3d7f9f9dda2be2 YELLOW
ModeAutomatonFXEditorBinding.java af89d0d7698e7098a409bdced91f01953c1cef2c YELLOW
ModeAutomatonModelFactory.java 90826e0ff88b73784e41cc71f473c11daa6bc36d YELLOW
ModeAutomatonVisualFactory.java d66f1b6b53f6d35151f53c6076ebd0eb92136034 YELLOW
ModeAutomatonVisualFactory.java a9b82127b572bf9533474bcf22168e79922b2f16 YELLOW
ModeComponentStructureSpecificationFXEditorBinding.java 7f17fdb5186f7cc370b549faac96e0721a49db01 YELLOW
ModeComponentStructureSpecificationModelFactory.java 2f81c1c64e51d7a27daf534c34457002f5c6fe9f YELLOW
......@@ -15,6 +15,14 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.mode.ui.editor.fx;
import org.fortiss.af3.mode.model.Mode;
import org.fortiss.af3.mode.model.ModeAutomaton;
import org.fortiss.af3.mode.model.SwitchSegment;
import org.fortiss.af3.mode.model.SwitchSegmentConnector;
import org.fortiss.af3.mode.ui.editor.fx.visual.ModeVisual;
import org.fortiss.af3.mode.ui.editor.fx.visual.SwitchSegmentContentConnectorVisual;
import org.fortiss.af3.mode.ui.editor.fx.visual.SwitchSegmentDiagramConnectorVisual;
import org.fortiss.tooling.base.ui.editor.fx.visual.NamedLayoutedCurveLinkVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IContentMVCBundle;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IDiagramAnchorageMVCBundle;
......@@ -24,14 +32,6 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IDiagramAnchorageVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.ILinkVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
import org.fortiss.af3.mode.model.Mode;
import org.fortiss.af3.mode.model.ModeAutomaton;
import org.fortiss.af3.mode.model.SwitchSegment;
import org.fortiss.af3.mode.model.SwitchSegmentConnector;
import org.fortiss.af3.mode.ui.editor.fx.visual.ModeVisual;
import org.fortiss.af3.mode.ui.editor.fx.visual.SwitchSegmentContentConnectorVisual;
import org.fortiss.af3.mode.ui.editor.fx.visual.SwitchSegmentDiagramConnectorVisual;
import org.fortiss.tooling.base.ui.editor.fx.visual.LayoutedCurveLinkVisual;
/**
* Implementation of the {@link IVisualFactory} for the {@link ModeAutomaton} editor.
......@@ -77,7 +77,8 @@ public class ModeAutomatonVisualFactory implements IVisualFactory {
public ILinkVisual createLinkVisual(ILinkMVCBundle modelBundle) {
Object linkObj = modelBundle.getModel();
if(linkObj instanceof SwitchSegment) {
return new LayoutedCurveLinkVisual<SwitchSegment>(modelBundle, SwitchSegment.class);
return new NamedLayoutedCurveLinkVisual<SwitchSegment>(modelBundle,
SwitchSegment.class);
}
return null;
}
......
......@@ -4,6 +4,6 @@ StateAutomatonFXEditorBase.java 788601b7fa8ba9bb9ca0b5d946d78ec4db220fbe YELLOW
StateAutomatonFXEditorBinding.java 5fae7a8e04236c07d176a2b1ed22f7043e3a09fe YELLOW
StateAutomatonFXEditorBindingBase.java 840654754a8ba240762cd8ebf7d4ed5b94450a87 YELLOW
StateAutomatonModelFactory.java 07989fa95608fc8ce25e977cba898cf94932e0ae YELLOW
StateAutomatonVisualFactory.java 1fcaa9aeeceb49fd2425b68773ddd644820cf16f YELLOW
StateAutomatonVisualFactory.java c6a118c966f2ac5692a3077b168501ba12267cf9 YELLOW
StateFXEditor.java 88e2e7b328650f045c9465b314c30b271edebda3 YELLOW
StateFXEditorBinding.java 999bb18112d5ffe35642b475e2cc7d231b822d02 YELLOW
......@@ -15,6 +15,13 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.state.ui.editor.fx;
import org.fortiss.af3.state.model.State;
import org.fortiss.af3.state.model.TransitionSegment;
import org.fortiss.af3.state.model.TransitionSegmentConnector;
import org.fortiss.af3.state.ui.editor.fx.visual.DiagramStateTransitionSegmentConnectorVisual;
import org.fortiss.af3.state.ui.editor.fx.visual.StateTransitionSegmentConnectorVisual;
import org.fortiss.af3.state.ui.editor.fx.visual.StateVisual;
import org.fortiss.tooling.base.ui.editor.fx.visual.NamedLayoutedCurveLinkVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IContentAnchorageMVCBundle;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IContentMVCBundle;
import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IDiagramAnchorageMVCBundle;
......@@ -24,13 +31,6 @@ import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IContentVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IDiagramAnchorageVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.ILinkVisual;
import org.fortiss.tooling.common.ui.javafx.lwfxef.visual.IVisualFactory;
import org.fortiss.af3.state.model.State;
import org.fortiss.af3.state.model.TransitionSegment;
import org.fortiss.af3.state.model.TransitionSegmentConnector;
import org.fortiss.af3.state.ui.editor.fx.visual.DiagramStateTransitionSegmentConnectorVisual;
import org.fortiss.af3.state.ui.editor.fx.visual.StateTransitionSegmentConnectorVisual;
import org.fortiss.af3.state.ui.editor.fx.visual.StateVisual;
import org.fortiss.tooling.base.ui.editor.fx.visual.LayoutedCurveLinkVisual;
/**
* The implementation of the {@link IVisualFactory} for the component editor.
......@@ -81,7 +81,7 @@ final class StateAutomatonVisualFactory implements IVisualFactory {
public ILinkVisual createLinkVisual(ILinkMVCBundle modelBundle) {
Object linkObj = modelBundle.getModel();
if(linkObj instanceof TransitionSegment) {
return new LayoutedCurveLinkVisual<TransitionSegment>(modelBundle,
return new NamedLayoutedCurveLinkVisual<TransitionSegment>(modelBundle,
TransitionSegment.class);
}
return null;
......
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