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

Merge branch '3938' into 'master'

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

See merge request af3/af3!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
......
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