From d132506f04f912ffb042904c6f7e506280ea9926 Mon Sep 17 00:00:00 2001 From: Fabienne Ducroquet Date: Thu, 13 Oct 2016 17:07:42 +0200 Subject: [PATCH] gs-example-reactor: Refactor: AppHtml3 -> AppHtml2, AppHtml5 -> AppHtml3 --- .../reactor/example/AppHtml2.java | 44 +++++++++++++++++ .../reactor/example/AppHtml3.java | 25 ++++++---- .../reactor/example/AppHtml5.java | 49 ------------------- 3 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml2.java delete mode 100644 gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml2.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml2.java new file mode 100644 index 000000000..6a535b048 --- /dev/null +++ b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml2.java @@ -0,0 +1,44 @@ +package org.genericsystem.reactor.example; + +import org.genericsystem.reactor.modelproperties.SelectionDefaults; + +import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; + +import org.genericsystem.carcolor.model.Car; +import org.genericsystem.carcolor.model.CarColor; +import org.genericsystem.carcolor.model.CarColor2; +import org.genericsystem.carcolor.model.Color; +import org.genericsystem.carcolor.model.Power; +import org.genericsystem.carcolor.model.UsedCar; +import org.genericsystem.reactor.annotations.DependsOnModel; +import org.genericsystem.reactor.annotations.DirectSelect; +import org.genericsystem.reactor.annotations.ReactorDependencies; +import org.genericsystem.reactor.annotations.RunScript; +import org.genericsystem.reactor.annotations.Select.SelectModel; +import org.genericsystem.reactor.annotations.Style; +import org.genericsystem.reactor.appserver.ApplicationServer; +import org.genericsystem.reactor.gscomponents.GSApp; +import org.genericsystem.reactor.gscomponents2.GSEditor; +import org.genericsystem.reactor.gscomponents2.GSEditor.HorizontalGSEditor; +import org.genericsystem.reactor.gscomponents2.GSTable; +import org.genericsystem.reactor.gscomponents2.GSTable.HorizontalTable; +import org.genericsystem.reactor.model.ObservableModelSelector; + +@DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) +@RunScript(ExampleReactorScript.class) +@ReactorDependencies({ GSTable.class, HorizontalTable.class, GSEditor.class, HorizontalGSEditor.class, GSTable.class }) +@DirectSelect(path = GSTable.class, pos = 0, value = Car.class) +@DirectSelect(path = HorizontalTable.class, value = Car.class) +@SelectModel(path = GSEditor.class, value = ObservableModelSelector.SELECTION_SELECTOR.class) +@DirectSelect(path = GSTable.class, pos = 2, value = Color.class) +@Style(name = "justify-content", value = "center") +public class AppHtml2 extends GSApp implements SelectionDefaults { + + public static void main(String[] mainArgs) { + ApplicationServer.startSimpleGenericApp(mainArgs, AppHtml2.class, "/example-reactor"); + } + + public AppHtml2() { + createSelectionProperty(); + } +} diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java index 3fdd151df..61861c7a0 100644 --- a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java +++ b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java @@ -18,20 +18,25 @@ import org.genericsystem.reactor.annotations.Style; import org.genericsystem.reactor.appserver.ApplicationServer; import org.genericsystem.reactor.gscomponents.GSApp; -import org.genericsystem.reactor.gscomponents2.GSEditor; -import org.genericsystem.reactor.gscomponents2.GSEditor.HorizontalGSEditor; -import org.genericsystem.reactor.gscomponents2.GSTable; -import org.genericsystem.reactor.gscomponents2.GSTable.HorizontalTable; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstanceEditor; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstanceStepEditor; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstancesTable; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstanceEditor; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstanceStepEditor; +import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstancesTable; +import org.genericsystem.reactor.gscomponents3.Monitor.MonitorExtended; import org.genericsystem.reactor.model.ObservableModelSelector; @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) @RunScript(ExampleReactorScript.class) -@ReactorDependencies({ GSTable.class, HorizontalTable.class, GSEditor.class, HorizontalGSEditor.class, GSTable.class }) -@DirectSelect(path = GSTable.class, pos = 0, value = Car.class) -@DirectSelect(path = HorizontalTable.class, value = Car.class) -@SelectModel(path = GSEditor.class, value = ObservableModelSelector.SELECTION_SELECTOR.class) -@DirectSelect(path = GSTable.class, pos = 2, value = Color.class) -@Style(name = "justify-content", value = "center") +@ReactorDependencies({ TitledInstancesTable.class, TitledHorizontalInstancesTable.class, TitledInstancesTable.class, TitledInstanceEditor.class, TitledHorizontalInstanceEditor.class, TitledInstanceStepEditor.class, TitledHorizontalInstanceStepEditor.class, + MonitorExtended.class }) +@DirectSelect(path = TitledInstancesTable.class, pos = 0, value = Car.class) +@DirectSelect(path = TitledHorizontalInstancesTable.class, pos = 0, value = Car.class) +@DirectSelect(path = TitledInstancesTable.class, pos = 2, value = Color.class) +@SelectModel(path = TitledInstanceEditor.class, value = ObservableModelSelector.SELECTION_SELECTOR.class) +@Style(name = "flex-wrap", value = "wrap") +@Style(name = "flex", value = "1 1 0%") public class AppHtml3 extends GSApp implements SelectionDefaults { public static void main(String[] mainArgs) { diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java deleted file mode 100644 index b56a7bf7f..000000000 --- a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.genericsystem.reactor.example; - -import org.genericsystem.reactor.modelproperties.SelectionDefaults; - -import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; - -import org.genericsystem.carcolor.model.Car; -import org.genericsystem.carcolor.model.CarColor; -import org.genericsystem.carcolor.model.CarColor2; -import org.genericsystem.carcolor.model.Color; -import org.genericsystem.carcolor.model.Power; -import org.genericsystem.carcolor.model.UsedCar; -import org.genericsystem.reactor.annotations.DependsOnModel; -import org.genericsystem.reactor.annotations.DirectSelect; -import org.genericsystem.reactor.annotations.ReactorDependencies; -import org.genericsystem.reactor.annotations.RunScript; -import org.genericsystem.reactor.annotations.Select.SelectModel; -import org.genericsystem.reactor.annotations.Style; -import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.gscomponents.GSApp; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstanceEditor; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstanceStepEditor; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledHorizontalInstancesTable; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstanceEditor; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstanceStepEditor; -import org.genericsystem.reactor.gscomponents3.DivWithTitle.TitledInstancesTable; -import org.genericsystem.reactor.gscomponents3.Monitor.MonitorExtended; -import org.genericsystem.reactor.model.ObservableModelSelector; - -@DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) -@RunScript(ExampleReactorScript.class) -@ReactorDependencies({ TitledInstancesTable.class, TitledHorizontalInstancesTable.class, TitledInstancesTable.class, TitledInstanceEditor.class, TitledHorizontalInstanceEditor.class, TitledInstanceStepEditor.class, TitledHorizontalInstanceStepEditor.class, - MonitorExtended.class }) -@DirectSelect(path = TitledInstancesTable.class, pos = 0, value = Car.class) -@DirectSelect(path = TitledHorizontalInstancesTable.class, pos = 0, value = Car.class) -@DirectSelect(path = TitledInstancesTable.class, pos = 2, value = Color.class) -@SelectModel(path = TitledInstanceEditor.class, value = ObservableModelSelector.SELECTION_SELECTOR.class) -@Style(name = "flex-wrap", value = "wrap") -@Style(name = "flex", value = "1 1 0%") -public class AppHtml5 extends GSApp implements SelectionDefaults { - - public static void main(String[] mainArgs) { - ApplicationServer.startSimpleGenericApp(mainArgs, AppHtml5.class, "/example-reactor"); - } - - public AppHtml5() { - createSelectionProperty(); - } -}