diff --git a/AlgebraicDataflowArchitectureModel/models/SSDStore.model b/AlgebraicDataflowArchitectureModel/models/SSDStore.model new file mode 100644 index 0000000..ced0165 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/models/SSDStore.model @@ -0,0 +1,23 @@ +channel capacityIn { + out capacity(cap:int, setCapacity(cap2)) == cap2 +} + +channel priceIn { + out price(pri:int, setPrice(pri2)) == pri2 +} + +channel siteAIn { + out siteAProducts(pro:List, addProduct(price:Int, capacity:Int)) == cons({"price": price, "capacity": capacity}, pro) +} + +channel capacityUpdate { + in siteAProducts(pro:List, updateList(pro2, cap2)) == pro2 + in capacity(cap:int, updateList(pro2, cap2)) == cap2 + out itemsByCapacity(items:List, updateList(pro2, cap2)) == selectGE(pro2, "capacity", cap2) +} + +channel priceUpdate { + in siteAProducts(pro:List, updateList(pro2, pri2)) == pro2 + in price(pri:int, updateList(pro2, pri2)) == pri2 + out itemsByPrice(items:List, updateList(pro2, pri2)) == selectLE(pro2, "price", pri2) +} \ No newline at end of file diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties new file mode 100644 index 0000000..27f8a2b --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties @@ -0,0 +1,44 @@ +# File +file=File +new=New +open=Open +save=Save +saveAs=Save As... +exit=Exit + +# New +newModel=Model +newResources=Resources... +newChannel=Channel... +newEventChannel=Event Channel +newFormulaChannel=Formula Channel + +# Edit +edit=Edit +delete=Delete + +# Layout +layout=Layout +dagLayout=DAG Layout +treeLayout=Tree Layout +circleLayout=Circle Layout + +# View +view=View +zoomIn=Zoom In +zoomOut=Zoom Out + +# Generate +generate=Generate +generateJava=Generate Plain Java Prototype +generateJAX_RS=Generate Plain JAX-RS Prototype + +# Window +window=Window +showNavigation=Show Navigation +showFlowLayer=Show Flow Layer + +# PopUp Actions +changeCallOrder=Change Call Order +insertMediator=Produce Mediator +dependOnMediator=Depend On Mediator diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties new file mode 100644 index 0000000..1e0bb46 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties @@ -0,0 +1,44 @@ +# File +file=\u30D5\u30A1\u30A4\u30EB +new=\u65B0\u898F +open=\u958B\u304F +save=\u4FDD\u5B58 +saveAs=\u4E0A\u66F8\u304D\u4FDD\u5B58 +exit=\u9589\u3058\u308B + +# New +newModel=\u30E2\u30C7\u30EB +newResources=\u30EA\u30BD\u30FC\u30B9 +newChannel=\u30C1\u30E3\u30F3\u30CD\u30EB +newEventChannel=\u30A4\u30D9\u30F3\u30C8\u30C1\u30E3\u30F3\u30CD\u30EB +newFormulaChannel=\u30D5\u30A9\u30FC\u30DF\u30E5\u30E9\u30C1\u30E3\u30F3\u30CD\u30EB + +# Edit +edit=\u7DE8\u96C6 +delete=\u524A\u9664 + +# Layout +layout=\u30EC\u30A4\u30A2\u30A6\u30C8 +dagLayout=DAG \u30EC\u30A4\u30A2\u30A6\u30C8 +treeLayout=\u30C4\u30EA\u30FC\u30EC\u30A4\u30A2\u30A6\u30C8 +circleLayout=\u30B5\u30FC\u30AF\u30EB\u30EC\u30A4\u30A2\u30A6\u30C8 + +# View +view=\u8868\u793A +zoomIn=\u62E1\u5927 +zoomOut=\u7E2E\u5C0F + +# Generate +generate=\u30D7\u30ED\u30C8\u30BF\u30A4\u30D7\u751F\u6210 +generateJava=Java\u30D7\u30ED\u30C8\u30BF\u30A4\u30D7\u306E\u751F\u6210 +generateJAX_RS=JAX-RS\u30D7\u30ED\u30C8\u30BF\u30A4\u30D7\u306E\u751F\u6210 + +# Window +window=\u30A6\u30A3\u30F3\u30C9\u30A6 +showNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3 +showFlowLayer=\u30D5\u30ED\u30FC\u30EC\u30A4\u30E4\u30FC + +# PopUp Actions +changeCallOrder=\u547C\u3073\u51FA\u3057\u9806\u306E\u5909\u66F4 +insertMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u5C0E\u5165 +dependOnMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3078\u4F9D\u5B58 \ No newline at end of file diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java new file mode 100644 index 0000000..b99952d --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java @@ -0,0 +1,72 @@ +package application; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.nio.file.Paths; +import java.util.Locale; +import java.util.ResourceBundle; + +/*********************************************************************** + * + * + */ +public class ApplicationLanguage { + private Locale locale = null; + private ResourceBundle resBundle = null; + + private static ApplicationLanguage instance = null; + + private final static String RESOURCE_PATH = ".\\resources\\locales"; + + public final static String JP = "ja"; + public final static String EN = "en"; + + /*********************************************************************** + * [ *constructor ] + /*********************************************************************** + * + * @return + */ + private ApplicationLanguage() { + this.locale = Locale.getDefault(); + setLocaleLanguage(this.locale.getLanguage()); + } + + /*********************************************************************** + * [ *public static] + * /*********************************************************************** + * + * @return + */ + public static ApplicationLanguage getInstance() { + if (instance == null) + instance = new ApplicationLanguage(); + return instance; + } + + /*********************************************************************** + * + /*********************************************************************** + * + */ + public void setLocaleLanguage(final String language) { + File dicDirectory = Paths.get(RESOURCE_PATH).toFile(); + URLClassLoader urlLoader = null; + try { + urlLoader = new URLClassLoader(new URL[] { dicDirectory.toURI().toURL() }); + } catch (MalformedURLException e) { + return; + } + + this.resBundle = ResourceBundle.getBundle(language, this.locale, urlLoader); + } + + /*********************************************************************** + * + */ + public String getOptionByPropName(final String propName) { + return this.resBundle.getString(propName); + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationMenuBar.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationMenuBar.java index 95b0b7f..b63e9f8 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationMenuBar.java +++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationMenuBar.java @@ -18,7 +18,7 @@ import application.actions.SaveAction; import application.actions.SaveAsAction; import application.actions.ShowNavigationAction; -import application.actions.ShowSwitchLayerWindowAction; +import application.actions.ShowFlowLayerWindowAction; import application.actions.TreeLayoutAction; import application.actions.ZoomInAction; import application.actions.ZoomOutAction; @@ -42,7 +42,7 @@ public ApplicationMenuBar(ApplicationWindow applicationWindow) { this.applicationWindow = applicationWindow; - JMenu newMenu = new JMenu("New"); + JMenu newMenu = new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("new")); newMenu.add(new NewModelAction(applicationWindow)); @@ -52,7 +52,7 @@ newMenu.add(newFormulaChannelAction = new NewFormulaChannelAction(applicationWindow.getEditor())); JMenu menu = null; - menu = add(new JMenu("File")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("file"))); menu.add(newMenu); menu.add(new OpenAction(applicationWindow)); menu.addSeparator(); @@ -61,26 +61,26 @@ menu.addSeparator(); menu.add(new ExitAction()); - menu = add(new JMenu("Edit")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("edit"))); menu.add(deleteAction = new DeleteAction(applicationWindow.getEditor())); - menu = add(new JMenu("Layout")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("layout"))); menu.add(dagLayoutAction = new DAGLayoutAction(applicationWindow.getEditor())); menu.add(treeLayoutAction = new TreeLayoutAction(applicationWindow.getEditor())); menu.add(circleLayoutAction = new CircleLayoutAction(applicationWindow.getEditor())); - menu = add(new JMenu("View")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("view"))); menu.add(new ZoomInAction(applicationWindow.getGraphComponent())); menu.add(new ZoomOutAction(applicationWindow.getGraphComponent())); - menu = add(new JMenu("Generate")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("generate"))); menu.add(javaPrototypeGenerateAction = new JavaPrototypeGenerateAction(applicationWindow.getEditor())); menu.add(jerseyPrototypeGenerateAction = new JerseyPrototypeGenerateAction(applicationWindow.getEditor())); - menu = add(new JMenu("Window")); + menu = add(new JMenu(ApplicationLanguage.getInstance().getOptionByPropName("window"))); menu.add(new ShowNavigationAction(applicationWindow)); - menu.add(new ShowSwitchLayerWindowAction(applicationWindow)); + menu.add(new ShowFlowLayerWindowAction(applicationWindow)); } public Editor getEditor() { diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java index 4611a57..b96cbe4 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java +++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java @@ -14,13 +14,13 @@ /** * Application main window * - * @author Nitta + * @author Nitta Lab. * */ public class ApplicationWindow extends JFrame { private static final long serialVersionUID = -8690140317781055614L; public static final String title = "Visual Modeling Tool"; - + private Editor editor = null; private mxGraph graph = null; private mxGraphComponent graphComponent = null; @@ -33,6 +33,9 @@ setTitle(title); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + // If you want to change the language, change here. + ApplicationLanguage.getInstance().setLocaleLanguage(ApplicationLanguage.EN); + this.graph = new mxGraph() { public boolean isPort(Object cell) { mxGeometry geo = getCellGeometry(cell); diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractEditorAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractEditorAction.java index 8b09b17..d73b326 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractEditorAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractEditorAction.java @@ -1,18 +1,15 @@ package application.actions; import javax.swing.AbstractAction; -import javax.swing.Icon; -import com.mxgraph.view.mxGraph; - +import application.ApplicationLanguage; import application.editor.Editor; public abstract class AbstractEditorAction extends AbstractAction { - protected Editor editor; - - public AbstractEditorAction(String name, Editor editor) { - super(name); + + public AbstractEditorAction(String propName, Editor editor) { + super(ApplicationLanguage.getInstance().getOptionByPropName(propName)); this.editor = editor; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java index 4fea18c..a21f03d 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java @@ -5,12 +5,14 @@ import com.mxgraph.model.mxCell; import com.mxgraph.swing.mxGraphComponent; +import application.ApplicationLanguage; + public abstract class AbstractPopupAction extends AbstractAction { protected mxGraphComponent graphComponent = null; protected mxCell targetCell = null; - public AbstractPopupAction(final String name, final mxCell targetCell, final mxGraphComponent graphComponent) { - super(name); + public AbstractPopupAction(final String propName, final mxCell targetCell, final mxGraphComponent graphComponent) { + super(ApplicationLanguage.getInstance().getOptionByPropName(propName)); this.graphComponent = graphComponent; this.targetCell = targetCell; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractSystemAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractSystemAction.java index f734ae0..54c0452 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractSystemAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractSystemAction.java @@ -4,6 +4,7 @@ import javax.swing.AbstractAction; +import application.ApplicationLanguage; import application.ApplicationWindow; import application.editor.Editor; @@ -11,8 +12,8 @@ protected ApplicationWindow frame; - public AbstractSystemAction(String name, ApplicationWindow frame) { - super(name); + public AbstractSystemAction(String propName, ApplicationWindow frame) { + super(ApplicationLanguage.getInstance().getOptionByPropName(propName)); this.frame = frame; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractViewerAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractViewerAction.java index 422c537..b3fe223 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractViewerAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractViewerAction.java @@ -6,12 +6,14 @@ import com.mxgraph.swing.mxGraphComponent; +import application.ApplicationLanguage; + public abstract class AbstractViewerAction extends AbstractAction { protected mxGraphComponent graphComponent = null; - public AbstractViewerAction(String name, mxGraphComponent graphComponent) { - super(name); + public AbstractViewerAction(String propName, mxGraphComponent graphComponent) { + super(ApplicationLanguage.getInstance().getOptionByPropName(propName)); this.graphComponent = graphComponent; } } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ChangeCallOrderAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ChangeCallOrderAction.java index b415a3d..4d17faf 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ChangeCallOrderAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ChangeCallOrderAction.java @@ -19,7 +19,7 @@ /************************************************************* */ public ChangeCallOrderAction(final mxGraphComponent graphComponent ,final mxCell cell) { - super("Change Call Order", cell, graphComponent); + super(/*propName*/"changeCallOrder", cell, graphComponent); } /************************************************************* diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/CircleLayoutAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/CircleLayoutAction.java index ba643bc..c42c485 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/CircleLayoutAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/CircleLayoutAction.java @@ -7,7 +7,7 @@ public class CircleLayoutAction extends AbstractEditorAction { public CircleLayoutAction(Editor editor) { - super("Circle Layout", editor); + super(/*propName*/"circleLayout", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/DAGLayoutAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/DAGLayoutAction.java index 8dcc54f..c869bcb 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/DAGLayoutAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/DAGLayoutAction.java @@ -7,7 +7,7 @@ public class DAGLayoutAction extends AbstractEditorAction { public DAGLayoutAction(Editor editor) { - super("DAG Layout", editor); + super(/*propName*/"dagLayout", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/DeleteAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/DeleteAction.java index 23225f1..3a13cfe 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/DeleteAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/DeleteAction.java @@ -2,6 +2,7 @@ import java.awt.event.ActionEvent; +import application.ApplicationLanguage; import application.editor.Editor; public class DeleteAction extends AbstractEditorAction { @@ -12,7 +13,7 @@ private static final long serialVersionUID = -4410145389391154784L; public DeleteAction(Editor editor) { - super("Delete", editor); + super(/*propName*/ "delete", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ExitAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ExitAction.java index 4069533..1b1787e 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ExitAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ExitAction.java @@ -4,6 +4,8 @@ import javax.swing.AbstractAction; +import application.ApplicationLanguage; + public class ExitAction extends AbstractAction { /** * @@ -11,7 +13,7 @@ private static final long serialVersionUID = -8733766417378036850L; public ExitAction() { - super("Exit"); + super(ApplicationLanguage.getInstance().getOptionByPropName("exit")); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/InsertStatelessObjectAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/InsertStatelessObjectAction.java index 42160a2..f7b3e34 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/InsertStatelessObjectAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/InsertStatelessObjectAction.java @@ -23,7 +23,7 @@ /************************************************************* */ public InsertStatelessObjectAction(final ControlFlowDelegationStage stage, final mxGraphComponent graphComponent ,final mxCell cell) { - super("Insert Mediator", cell, graphComponent); + super(/*propName*/"insertMediator", cell, graphComponent); this.stage = stage; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java index 074a336..047d4ce 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java @@ -35,7 +35,7 @@ private String lastDir = null; public JavaPrototypeGenerateAction(Editor editor) { - super("Generate Plain Java Prototype", editor); + super(/*propName*/"generateJava", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/JerseyPrototypeGenerateAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/JerseyPrototypeGenerateAction.java index d1a8031..b3eb8a4 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/JerseyPrototypeGenerateAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/JerseyPrototypeGenerateAction.java @@ -31,7 +31,7 @@ private String lastDir = null; public JerseyPrototypeGenerateAction(Editor editor) { - super("Generate JAX-RS Prototype", editor); + super(/*propName*/"generateJAX_RS", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/NewChannelAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/NewChannelAction.java index 6ee664c..8367921 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/NewChannelAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/NewChannelAction.java @@ -15,7 +15,7 @@ private static final long serialVersionUID = 5979007029473101802L; public NewChannelAction(Editor editor) { - super("Channel...", editor); + super(/*propName*/"newChannel", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/NewFormulaChannelAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/NewFormulaChannelAction.java index 068c758..79a1690 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/NewFormulaChannelAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/NewFormulaChannelAction.java @@ -29,7 +29,7 @@ private static final long serialVersionUID = 5345875219049178252L; public NewFormulaChannelAction(Editor editor) { - super("FormulaChannel...", editor); + super(/*propName*/"newFormulaChannel", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/NewIOChannelAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/NewIOChannelAction.java index 85e48de..a83e3ab 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/NewIOChannelAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/NewIOChannelAction.java @@ -15,7 +15,7 @@ private static final long serialVersionUID = -1657072017390171313L; public NewIOChannelAction(Editor editor) { - super("I/O Channel", editor); + super(/*propName*/"newEventChannel", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/NewModelAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/NewModelAction.java index 517f525..4cc2b0a 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/NewModelAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/NewModelAction.java @@ -12,7 +12,7 @@ private static final long serialVersionUID = 8484493203589724589L; public NewModelAction(ApplicationWindow frame) { - super("Model", frame); + super(/*propName*/"newModel", frame); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/NewResourceAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/NewResourceAction.java index 50b1512..8d4a01a 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/NewResourceAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/NewResourceAction.java @@ -15,7 +15,7 @@ private static final long serialVersionUID = -4439207504700741286L; public NewResourceAction(Editor editor) { - super("Resource...", editor); + super(/*propName*/"newResources", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/OpenAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/OpenAction.java index d01c518..dbda083 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/OpenAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/OpenAction.java @@ -19,7 +19,7 @@ private String lastDir = null; public OpenAction(ApplicationWindow frame) { - super("Open...", frame); + super(/*propName*/"open", frame); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAction.java index 0b41331..173a522 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAction.java @@ -12,7 +12,7 @@ private static final long serialVersionUID = 5660460585305281982L; public SaveAction(ApplicationWindow frame) { - super("Save", frame); + super(/*propName*/"save", frame); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAsAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAsAction.java index 9542cdb..40294a0 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAsAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/SaveAsAction.java @@ -20,7 +20,7 @@ private String lastDir = null; public SaveAsAction(ApplicationWindow frame) { - super("Save As...", frame); + super(/*propName*/"saveAs", frame); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java index cd3cf8b..e16ab25 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java @@ -17,7 +17,7 @@ /************************************************************* */ public ShowDependentableMediatorAction(final ControlFlowDelegationStage stage, final mxGraphComponent graphComponent, final mxCell targetCell) { - super("Dependent on Mediator", targetCell, graphComponent); + super(/*propName*/"dependOnMediator", targetCell, graphComponent); this.stage = stage; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowFlowLayerWindowAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowFlowLayerWindowAction.java new file mode 100644 index 0000000..e924850 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowFlowLayerWindowAction.java @@ -0,0 +1,16 @@ +package application.actions; + +import java.awt.event.ActionEvent; + +import application.ApplicationWindow; + +public class ShowFlowLayerWindowAction extends AbstractSystemAction { + public ShowFlowLayerWindowAction(ApplicationWindow frame) { + super(/*propName*/"showFlowLayer", frame); + } + + @Override + public void actionPerformed(ActionEvent e) { + frame.showSwitchLayerWindow(); + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowNavigationAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowNavigationAction.java index ac58b48..8219219 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowNavigationAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowNavigationAction.java @@ -7,7 +7,7 @@ public class ShowNavigationAction extends AbstractSystemAction { public ShowNavigationAction(ApplicationWindow frame) { - super("Show Navigation", frame); + super(/*propName*/"showNavigation", frame); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowSwitchLayerWindowAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowSwitchLayerWindowAction.java deleted file mode 100644 index 9a68279..0000000 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowSwitchLayerWindowAction.java +++ /dev/null @@ -1,16 +0,0 @@ -package application.actions; - -import java.awt.event.ActionEvent; - -import application.ApplicationWindow; - -public class ShowSwitchLayerWindowAction extends AbstractSystemAction { - public ShowSwitchLayerWindowAction(ApplicationWindow frame) { - super("Show Flow Layer", frame); - } - - @Override - public void actionPerformed(ActionEvent e) { - frame.showSwitchLayerWindow(); - } -} diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/TreeLayoutAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/TreeLayoutAction.java index c2324c8..735d3ef 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/TreeLayoutAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/TreeLayoutAction.java @@ -7,7 +7,7 @@ public class TreeLayoutAction extends AbstractEditorAction { public TreeLayoutAction(Editor editor) { - super("Tree Layout", editor); + super(/*propName*/"treeLayout", editor); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomInAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomInAction.java index d3b2c85..c8f9e68 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomInAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomInAction.java @@ -17,7 +17,7 @@ private static final long serialVersionUID = 6758532166946195926L; public ZoomInAction(mxGraphComponent graphComponent) { - super("Zoom In", graphComponent); + super(/*propName*/"zoomIn", graphComponent); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomOutAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomOutAction.java index 032e8b2..7cd3bf8 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomOutAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ZoomOutAction.java @@ -15,7 +15,7 @@ private static final long serialVersionUID = 8657530769383486605L; public ZoomOutAction(mxGraphComponent graphComponent) { - super("Zoom Out", graphComponent); + super(/*propName*/"zoomOut", graphComponent); } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java index 87e78c1..fe71d44 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java +++ b/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java @@ -17,7 +17,7 @@ import application.editor.stages.DataFlowModelingStage; import application.editor.stages.PushPullSelectionStage; -public class NavigationWindow extends JDialog implements IStageChangeListener { +public class NavigationWindow extends JDialog implements IStageChangeListener { private String title = "Navigation"; private Editor editor; private JToggleButton dataFlowModelingButton;