Commit 3c1ec507 authored by Simon Barner's avatar Simon Barner

Merge branch '3938' into 'master'

[3938] Removed swt/gef editors which have been replaced by JavaFX ones

See merge request !297
parents c26d5893 355d6cd9
......@@ -125,16 +125,6 @@
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.component.ui.editor.ComponentStructureEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.component.model.Component"></modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.component.ui.editor.ComponentArchitectureEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.component.model.ComponentArchitecture"></modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.component.ui.editor.CodeSpecificationEditorBinding">
<modelElementClass
......
ComponentControllerFactory.java 57c48af3d6c2d51a9040a8b754a8b19b73525777 GREEN
ComponentModelFactory.java 9141373b9498b8e947ef1ca8921128bdf66ec308 GREEN
ComponentStructureFXEditor.java 2d7c0f40fffb4cfb918b60da5de3d5fc0c067916 GREEN
ComponentStructureFXEditorBinding.java 82516f6e6855be6336116f0ea5563f461d163fc5 GREEN
ComponentStructureFXEditorBinding.java 19ca73be6a4ea974994d26db537329878748b20d GREEN
ComponentVisualFactory.java 5422167d12bb5553ed816363d41e0288fe481056 GREEN
......@@ -15,11 +15,11 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.component.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.component.model.Component;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.component.model.Component;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
......@@ -55,12 +55,12 @@ public final class ComponentStructureFXEditorBinding extends ModelEditorBindingB
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Component Structure (FX)";
return "Component Structure";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 0;
}
}
......@@ -18,15 +18,6 @@
</modelElementClass>
</modelElementHandler>
</extension>
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.cosimulation.ui.editor.ExternalSpecificationEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.component.model.IReadOnlyBehaviorSpecification">
</modelElementClass>
</modelEditorBinding>
</extension>
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
......
ExternalSpecificationFXController.java 93296c80f8331d5ef5db210c113d6a29f0e2b5e6 GREEN
ExternalSpecificationFXEditor.java f96392509542fa312b9d535dd441644c4c591e2b GREEN
ExternalSpecificationFXEditorBinding.java 642a213c82baee68913c37ccdc0edeef2d3fddf5 GREEN
ExternalSpecificationFXEditorBinding.java 15ee822f8428aadf70f8b6307298a96630972124 GREEN
......@@ -37,12 +37,12 @@ public class ExternalSpecificationFXEditorBinding extends ModelEditorBindingBase
/** {@inheritDoc} */
@Override
public String getLabel() {
return "External Specification Editor (FX)";
return "External Specification Editor";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 0;
}
}
......@@ -86,17 +86,6 @@
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.expression.ui.editor.DataDictionaryEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.expression.model.DataDictionary"></modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.expression.ui.editor.DataDictionaryEvaluatorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.expression.model.DataDictionary">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.expression.ui.editor.fx.DataDictionaryFXEditorBinding">
<modelElementClass
......
DataDictionaryFXEditor.java 225c54161a107a8f17caa1f3ffdaee607ba19cfd GREEN
DataDictionaryFXEditorBinding.java 8c2d41b5ec9ea8564cad6a1d7c25a2839e1d071e GREEN
DataDictionaryFXEditorBinding.java 02fd7a3dfde670b9cfd09a783c090833444c418d GREEN
DataDictionaryFXEditorContentProvider.java 855cde53505172d1bf5743b9b4f53aaa50548962 GREEN
DataDictionaryFXEditorUIProvider.java 8d274efce83461d51a705938bc3dcd93bbf38107 GREEN
DataDictionaryFXEvaluator.java 55cbb923079b04ff66a7679904ec1c77a5a0b917 GREEN
DataDictionaryFXEvaluatorBinding.java a15f93c5fb7cd292460aa5bea0a57a9fea42d315 GREEN
DataDictionaryFXEvaluatorBinding.java aab93436c2b25c6b8673cec7526e2d40756c1e10 GREEN
......@@ -34,12 +34,12 @@ public final class DataDictionaryFXEditorBinding extends ModelEditorBindingBase<
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Data Dictionary (FX)";
return "Data Dictionary";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 1;
}
}
......@@ -35,12 +35,12 @@ public final class DataDictionaryFXEvaluatorBinding extends ModelEditorBindingBa
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Evaluator (FX)";
return "Evaluator";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -200;
return 0;
}
}
......@@ -44,41 +44,11 @@
</extension>
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.RequirementEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.Requirement">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.GlossaryEntryEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.glossary.GlossaryEntry">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.GlossaryEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.glossary.Glossary">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.AnalysisEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.Analysis">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.RequirementsContainerEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.RequirementsContainer">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editorbinding.RequirementsPackageEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mira.model.RequirementsPackage">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mira.ui.editor.overview.fx.RequirementsOverviewFXEditorBinding">
......
RequirementFXController.java c9bf90c21deb27f2be5115d2dc63eebc1063e55e GREEN
RequirementFXEditor.java cc8ce98225cfb7c6a3ea7a4578b5437f2e78e451 GREEN
RequirementFXEditorBinding.java 59e410e927d8ba2fc2ffd9329dc0938cd0b4beb6 GREEN
RequirementFXEditorBinding.java b3b44ea35c9d987d184915ddd54a8bf78fe44b4b GREEN
......@@ -17,6 +17,7 @@ package org.fortiss.af3.mira.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.mira.model.Requirement;
import org.fortiss.af3.mira.utils.MiraUtils;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
......@@ -35,12 +36,12 @@ public final class RequirementFXEditorBinding extends ModelEditorBindingBase<Req
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Requirement (FX)";
return "Requirement";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return MiraUtils.FIRSTEDITORPRIORITY;
}
}
RequirementsOverviewFXEditor.java 1dd6ec50837cd05bb8799466f8738b282b964e95 GREEN
RequirementsOverviewFXEditorBinding.java c8c5fedf3019b5668b18714f8a4884a94261085a GREEN
RequirementsOverviewFXEditorBinding.java 3346106642d7dbd68e6328e4cbd33f6569c6f6ff GREEN
RequirementsOverviewFXEditorContentProvider.java a3815c1d4211d9e7f2bea6be700904a6e02150ed GREEN
RequirementsOverviewFXEditorUIProvider.java adece2e83a54cb9094618cd7830358cb6e601d97 GREEN
......@@ -16,6 +16,7 @@
package org.fortiss.af3.mira.ui.editor.overview.fx;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.mira.utils.MiraUtils;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
......@@ -35,12 +36,12 @@ public class RequirementsOverviewFXEditorBinding
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Requirements Overview (FX)";
return "Requirements Overview";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return MiraUtils.FIRSTEDITORPRIORITY;
}
}
......@@ -55,24 +55,6 @@
<!-- Editors binding extension. -->
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.mode.ui.editor.ModeAutomatonEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mode.model.ModeAutomaton">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mode.ui.editor.ModeEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mode.model.Mode">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mode.ui.editor.ModeComponentStructureBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.mode.model.ModeComponentStructureSpecification">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.mode.ui.editor.fx.ModeAutomatonFXEditorBinding">
......
ModeAutomatonControllerFactory.java 3e60fb8432aef914d0c63e8dfeb18b6ac57ddb6f GREEN
ModeAutomatonFXEditor.java 2d70d6f9ad225ebb767d20009f3d7f9f9dda2be2 GREEN
ModeAutomatonFXEditorBinding.java af89d0d7698e7098a409bdced91f01953c1cef2c GREEN
ModeAutomatonFXEditorBinding.java d3503a20fc9fccc6a8805674bdabaa2135fd28c2 GREEN
ModeAutomatonModelFactory.java 90826e0ff88b73784e41cc71f473c11daa6bc36d GREEN
ModeAutomatonVisualFactory.java a9b82127b572bf9533474bcf22168e79922b2f16 GREEN
ModeComponentStructureSpecificationFXEditorBinding.java 7f17fdb5186f7cc370b549faac96e0721a49db01 GREEN
ModeComponentStructureSpecificationFXEditorBinding.java e61a148e77ebc62f4c278aeb98b3185f93efaa68 GREEN
ModeComponentStructureSpecificationModelFactory.java 2f81c1c64e51d7a27daf534c34457002f5c6fe9f GREEN
......@@ -56,12 +56,12 @@ public class ModeAutomatonFXEditorBinding extends ModelEditorBindingBase<ModeAut
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Mode Automaton (FX)";
return "Mode Automaton";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return 100;
return 10;
}
}
......@@ -15,14 +15,14 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.mode.ui.editor.fx;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.component.ui.editor.fx.ComponentControllerFactory;
import org.fortiss.af3.component.ui.editor.fx.ComponentStructureFXEditor;
import org.fortiss.af3.component.ui.editor.fx.ComponentVisualFactory;
import org.fortiss.af3.mode.model.ModeComponentStructureSpecification;
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;
/**
......@@ -60,12 +60,12 @@ public class ModeComponentStructureSpecificationFXEditorBinding
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Mode Component Structure (FX)";
return "Mode Component Structure";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 0;
}
}
......@@ -126,18 +126,6 @@
</extension>
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="org.fortiss.af3.operatorpanel.ui.editor.OperatorPanelEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.operatorpanel.model.OperatorPanelSpecification">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.operatorpanel.ui.editor.OP3DDisplayEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.operatorpanel.viewpanel.model.OP3DDisplay">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.operatorpanel.ui.editor.fx.OperatorPanelFXEditorBinding">
<modelElementClass
......
OP3DDisplayFXEditor.java b4fabe39853ecc881d353c0bccecaf8c2b42ccfd GREEN
OP3DDisplayFXEditorBinding.java 2345cef0a2c163771f09126e8b7b3f9004c27713 GREEN
OP3DDisplayFXEditorBinding.java 376b3569e467d5e782182dbdbd648aaacb9ae87a GREEN
OP3DDisplayFXEditorContentProvider.java bf0eb313b06b4ace9cd74676cf1b7dd1ff344fe3 GREEN
OP3DDisplayFXEditorUIProvider.java 4258601c3b7de3b3bcef19a01fd38407286fd8c1 GREEN
OperatorPanelControllerFactory.java f952a43ebe7fdc3306e6ec500597c3c289bf07c9 GREEN
OperatorPanelFXEditor.java f3f4a848984763fafdc57e4499f0318829d27e47 GREEN
OperatorPanelFXEditorBinding.java ef731fdb72b7fdfe0d732f60f1fe4b65f6fd2347 GREEN
OperatorPanelFXEditorBinding.java c7c24316d9f315a57509b84577bd7fee31cd54cb GREEN
OperatorPanelItemController.java c56be48244a1e8afc2ac508bf0a225cf155a8a3d GREEN
OperatorPanelModelFactory.java 0aac651a3e24464e90064d25edf194b188fb473c GREEN
OperatorPanelVisualFactory.java 972834b94f53efae21aeec2cc9cf47794c386a63 GREEN
......@@ -34,12 +34,12 @@ public final class OP3DDisplayFXEditorBinding extends ModelEditorBindingBase<OP3
/** {@inheritDoc} */
@Override
public String getLabel() {
return "3D Display Scene Editor (FX)";
return "3D Display Scene Editor";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 1;
}
}
......@@ -15,11 +15,11 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.operatorpanel.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.operatorpanel.model.OperatorPanelSpecification;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.operatorpanel.model.OperatorPanelSpecification;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
......@@ -57,12 +57,12 @@ public class OperatorPanelFXEditorBinding
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Operator Panel (FX)";
return "Operator Panel";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 0;
}
}
......@@ -22,9 +22,6 @@
</extension>
<extension point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding binding="org.fortiss.af3.partition.ui.editor.PartitionEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.partition.model.PartitionArchitecture"/>
</modelEditorBinding>
<modelEditorBinding binding="org.fortiss.af3.partition.ui.editor.ComponentToPartitionAllocationTableEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable"/>
</modelEditorBinding>
......
PartitionControllerFactory.java 4344a25817d430e2e311354cf87b0753107f9e79 GREEN
PartitionModelFactory.java 3ef78670e39599c365f79c4c12926d1cdbb244dd GREEN
PartitionStructureFXEditor.java 698364f7c536de966efe44c80450ba0196b5b140 GREEN
PartitionStructureFXEditorBinding.java 6456324614722b9c627d6d52e49e588ab51ca56a GREEN
PartitionStructureFXEditorBinding.java 13e7a89639e26ec012549bceabecff6d55353fc6 GREEN
PartitionVisualFactory.java f9bf5e8e98c2ae4c8d1bc8829d2dc1163f972e09 GREEN
......@@ -15,11 +15,11 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.partition.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.partition.model.Partition;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.partition.model.Partition;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
......@@ -55,12 +55,12 @@ public final class PartitionStructureFXEditorBinding extends ModelEditorBindingB
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Partition Structure (FX)";
return "Partition Structure";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 10;
}
}
......@@ -80,21 +80,6 @@
<modelEditorBinding binding="org.fortiss.af3.platform.hierarchic.ui.editor.fx.PlatformComponentFXEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.hierarchic.model.tile.Tile"/>
</modelEditorBinding>
<modelEditorBinding binding="org.fortiss.af3.platform.hierarchic.ui.editor.ClusterStructureEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.hierarchic.model.cluster.Cluster"/>
</modelEditorBinding>
<modelEditorBinding binding="org.fortiss.af3.platform.hierarchic.ui.editor.NodeStructureEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.hierarchic.model.node.Node"/>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.platform.hierarchic.ui.editor.OffChipNetworkStructureEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.platform.hierarchic.model.node.OffChipNetwork">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding binding="org.fortiss.af3.platform.hierarchic.ui.editor.TileStructureEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.hierarchic.model.tile.Tile"/>
</modelEditorBinding>
<!-- modelEditorBinding binding="org.fortiss.af3.platform.hierarchic.ui.editor.binding.OnChipNetworkStructureEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.hierarchic.model.tile.OnChipNetwork"/>
</modelEditorBinding-->
......
PlatformArchitectureControllerFactory.java fc6ff1477620155baeefeabd3a5a72dd29083b43 GREEN
PlatformArchitectureFXEditorBinding.java 9c3419eb7d878032840911feb79b2f78e958ec6a GREEN
PlatformArchitectureFXEditorBinding.java 69f0b26a1ee5945d5c2e5f7d231a7a7973b00a50 GREEN
PlatformComponentControllerFactory.java c353602118a17bdb9e78ad3d97ed9dbca5297a7f GREEN
PlatformComponentFXEditor.java 579bda140d6d490e40c49386957bf63af345f373 GREEN
PlatformComponentFXEditorBinding.java 2898d366f4fbbe7f6f974ac312f6c160cda714b2 GREEN
PlatformComponentFXEditorBinding.java 0cfd58f8ffdd9fd8faae854841cfd5fb8cde24a1 GREEN
PlatformComponentModelFactory.java 2075ee98896f6d26c3bf24045ccc8b3eb8f0d6aa GREEN
PlatformComponentVisualFactory.java e0a773856f7d037ff0f21234ed1884a49c1161c4 GREEN
......@@ -15,11 +15,11 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.hierarchic.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.tooling.kernel.ui.extension.IModelEditorBinding;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
......@@ -62,6 +62,6 @@ public class PlatformArchitectureFXEditorBinding<T extends PlatformArchitecture>
/** {@inheritDoc} */
@Override
public int getPriority() {
return -101;
return 0;
}
}
......@@ -17,12 +17,12 @@ package org.fortiss.af3.platform.hierarchic.ui.editor.fx;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getInterfaceType;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.platform.model.IPlatformArchitectureElement;
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.IModelEditorBinding;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
......@@ -62,12 +62,12 @@ public class PlatformComponentFXEditorBinding<T extends IPlatformArchitectureEle
/** {@inheritDoc} */
@Override
public String getLabel(T object) {
return getInterfaceType(object).getSimpleName() + " Structure (FX)";
return getInterfaceType(object).getSimpleName() + " Structure";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -101;
return 0;
}
}
......@@ -43,9 +43,6 @@
</extension>
<extension point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding binding="org.fortiss.af3.platform.ui.editor.PlatformArchitectureEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.model.PlatformArchitecture"/>
</modelEditorBinding>
<modelEditorBinding binding="org.fortiss.af3.platform.ui.editor.fx.PlatformArchitectureFXEditorBinding">
<modelElementClass modelElementClass="org.fortiss.af3.platform.model.PlatformArchitecture"/>
</modelEditorBinding>
......
PlatformArchitectureFXEditor.java b82ff79834fec792ad19a89ee594a9473e51f253 GREEN
PlatformArchitectureFXEditorBinding.java 54a5f10f5f6526a3ae3d418979bd8703226c4c7a GREEN
PlatformArchitectureFXEditor.java 40bfae198b562b291e8b203b50872d1ed6790b6d GREEN
PlatformArchitectureFXEditorBinding.java 045f273a65df5baabfe8627a12d24eabdedf0747 GREEN
PlatformControllerFactory.java 4532d4e47238dc20caa31477991404869d1665dd GREEN
PlatformModelFactory.java 45e11ea2eb8b8b6a69a1548f1dc8847e45d5a5fa GREEN
PlatformVisualFactory.java 99853f446d5d94a0cfee2a9b95590626566caf3c GREEN
......@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.ui.editor.fx;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.platform.model.IPlatformArchitectureElement;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.tooling.kernel.ui.extension.base.LWFXEFEditorBase;
......@@ -24,5 +26,10 @@ import org.fortiss.tooling.kernel.ui.extension.base.LWFXEFEditorBase;
* @author ponce
*/
public class PlatformArchitectureFXEditor extends LWFXEFEditorBase<PlatformArchitecture> {
// No impl needed. This class exists just for being referenced from a plugin.xml file.
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public Class<? extends EObject>[] getVisibleEObjectTypes() {
return new Class[] {PlatformArchitecture.class, IPlatformArchitectureElement.class};
}
}
......@@ -15,11 +15,11 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.platform.ui.editor.fx;
import org.eclipse.ui.IEditorPart;
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.eclipse.ui.IEditorPart;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
......@@ -57,12 +57,12 @@ public class PlatformArchitectureFXEditorBinding
/** {@inheritDoc} */
@Override
public String getLabel() {
return "Platform Architecture (FX)";
return "Platform Architecture";
}
/** {@inheritDoc} */
@Override
public int getPriority() {
return -100;
return 0;
}
}
ModelingPerspectiveFactory.java 56a155e17b402d454579fcf819dd9a38ba42fd77 GREEN
ModelingPerspectiveFactory.java 685367ff33ff67e3c79bcd35d1b263b294ba0811 GREEN
......@@ -88,6 +88,5 @@ public class ModelingPerspectiveFactory implements IPerspectiveFactory {
topRight = layout.createFolder(TOP_RIGHT_FOLDER_ID, IPageLayout.RIGHT,
1 - RIGHT_FOLDER_WITH, layout.getEditorArea());
topRight.addView(IModelElementHandlerService.MODEL_ELEMENT_LIBRARY_VIEW_FX);
topRight.addView(IModelElementHandlerService.MODEL_ELEMENT_LIBRARY_VIEW);
}
}
......@@ -20,30 +20,6 @@
<modelElementClass modelElementClass="org.fortiss.af3.safetycases.model.ContractModule">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.SafetyCasesEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.SafetyCase">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.ArgumentModuleEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.ArgumentModule">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.ContractModuleEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.ContractModule">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.ModuleRefEditorBindings">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.LibraryModule">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.fx.ModuleRefFXEditorBinding">
<modelElementClass
......
ArgumentModuleFXEditor.java e01566f22bf80abb13d429d5ce9697d61f423ee6 GREEN
ArgumentModuleFXEditorBinding.java 3c996503b822aa16615577f09183a79b58a12251 GREEN
ArgumentModuleFXEditorBinding.java bdd1868c9360aaf13c61ce34ecca72c4f86a1479 GREEN
ContractModuleFXEditor.java a83278c801f379cb57cba2b7ae416bda5e425aa5 GREEN
ContractModuleFXEditorBinding.java 26a2f34ffa6a23ba041db62320cc95e56fb6a559 GREEN
ContractModuleFXEditorBinding.java 44affdcff2783eb4425f36b90ca08be2f98b2846 GREEN
ModuleRefFXController.java c8eb3734050639550391b1f882d44557cbd9825b GREEN
ModuleRefFXEditor.java be6b5d86feb12f031b7b0d55aec838d1824a1c91 GREEN
ModuleRefFXEditorBinding.java 90f7dfa2e39fb0184b5aef4fcf5cf17a65382d9f GREEN
ModuleRefFXEditorBinding.java 46ce72f3632dbb14a036ca738bdd1774ee3f52bc GREEN
SafetyCaseControllerFactory.java dfa02ba553df3a2311b2c30175e5052bf0f310ba GREEN
SafetyCaseFXEditor.java 98d2175dbdf2d8e1b73cf65ac9d3211d4f08b5d0 GREEN