From e7ace97ee191582e2b7eefdf17898e82ad040f73 Mon Sep 17 00:00:00 2001 From: Fabienne Ducroquet Date: Thu, 13 Oct 2016 17:42:54 +0200 Subject: [PATCH] gs-carcolor: Simplify CarColorApp2 --- .../genericsystem/carcolor/CarColorApp2.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java index d1d2a35e7..a39bd5807 100644 --- a/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java +++ b/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java @@ -16,16 +16,15 @@ import org.genericsystem.reactor.gscomponents3.Responsive; import org.genericsystem.carcolor.CarColorApp.CarColorScript; -import org.genericsystem.carcolor.CarColorApp2.PageContent; import org.genericsystem.carcolor.CarColorApp2.PageHeader; import org.genericsystem.carcolor.model.Car; import org.genericsystem.carcolor.model.CarColor; import org.genericsystem.carcolor.model.Color; import org.genericsystem.carcolor.model.Power; import org.genericsystem.reactor.annotations.Attribute; +import org.genericsystem.reactor.annotations.Children; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.DirectSelect; -import org.genericsystem.reactor.annotations.Children; import org.genericsystem.reactor.annotations.RunScript; import org.genericsystem.reactor.annotations.SetText; import org.genericsystem.reactor.annotations.Style; @@ -35,7 +34,10 @@ @RunScript(CarColorScript.class) @DependsOnModel({ Car.class, Power.class, Color.class, CarColor.class }) @Style(name = "background-color", value = "#00afeb") -@Children({ ModalEditor.class, PageHeader.class, PageContent.class, Monitor.class }) +@Children({ ModalEditor.class, PageHeader.class, Responsive.class, Monitor.class }) +@Children(path = Responsive.class, value = { TitledInstancesTable.class, TitledInstancesTable.class }) +@DirectSelect(path = { Responsive.class, TitledInstancesTable.class }, pos = { 0, 0 }, value = Car.class) +@DirectSelect(path = { Responsive.class, TitledInstancesTable.class }, pos = { 0, 1 }, value = Color.class) public class CarColorApp2 extends GSApp implements SelectionDefaults { public static void main(String[] mainArgs) { ApplicationServer.startSimpleGenericApp(mainArgs, CarColorApp2.class, "/cars"); @@ -53,20 +55,6 @@ public void init() { public static class PageHeader extends GSDiv { } - @Children({ CarInstancesTable.class, ColorInstancesTable.class }) - public static class PageContent extends Responsive { - } - - @DirectSelect(Car.class) - public static class CarInstancesTable extends TitledInstancesTable { - - } - - @DirectSelect(Color.class) - public static class ColorInstancesTable extends TitledInstancesTable { - - } - @FlexDirectionStyle(FlexDirection.ROW) @Style(name = "flex", value = "0 1 auto") @Style(name = "align-items", value = "center")