From 7005918ba196ce6e5b082b76eae0435acae13c38 Mon Sep 17 00:00:00 2001 From: Fabienne Ducroquet Date: Wed, 5 Oct 2016 16:02:40 +0200 Subject: [PATCH] gs-reactor: Rename packages to make compilation with maven work This is a workaround for a bug in javac, where compilation fails or succeeds depending on the order of imports. --- .../genericsystem/carcolor/CarColorApp.java | 20 ++--- .../genericsystem/carcolor/GSUserGuide.java | 12 +-- .../reactor/example/AppHtml.java | 18 ++-- .../reactor/example/AppHtml3.java | 12 +-- .../reactor/example/AppHtml4.java | 10 +-- .../reactor/example/AppHtml5.java | 12 +-- .../java/org/genericsystem/reactor/Tag.java | 18 ++-- .../ActionDefaults.java | 2 +- .../AttributesDefaults.java | 2 +- .../ComponentsDefaults.java | 2 +- .../ContextProperty.java | 2 +- .../ConvertedValueDefaults.java | 2 +- .../DisplayDefaults.java | 2 +- .../GSBuilderDefaults.java | 2 +- .../GenericStringDefaults.java | 2 +- .../MapStringDefaults.java | 2 +- .../SelectionDefaults.java | 2 +- .../StyleClassesDefaults.java | 2 +- .../StylesDefaults.java | 2 +- .../SwitchDefaults.java | 2 +- .../TextPropertyDefaults.java | 2 +- .../reactor/annotations/BindSelection.java | 2 +- .../reactor/annotations/DirectSelect.java | 2 +- .../reactor/annotations/ForEach.java | 2 +- .../reactor/annotations/Parent.java | 2 +- .../annotations/ReactorDependencies.java | 2 +- .../reactor/annotations/Select.java | 2 +- .../annotations/SetStringExtractor.java | 2 +- .../reactor/annotations/StyleClasses.java | 2 +- .../reactor/annotations/Styles.java | 4 +- .../reactor/appserver/ApplicationServer.java | 2 +- .../reactor/appserver/WebAppsConfig.java | 2 +- .../{gstag => ba_htmltag}/HtmlButton.java | 8 +- .../{gstag => ba_htmltag}/HtmlCheckBox.java | 4 +- .../{gstag => ba_htmltag}/HtmlDiv.java | 4 +- .../{gstag => ba_htmltag}/HtmlFooter.java | 4 +- .../reactor/{gstag => ba_htmltag}/HtmlH1.java | 4 +- .../reactor/{gstag => ba_htmltag}/HtmlH2.java | 4 +- .../{gstag => ba_htmltag}/HtmlHeader.java | 4 +- .../{gstag => ba_htmltag}/HtmlHyperLink.java | 10 +-- .../{gstag => ba_htmltag}/HtmlImg.java | 4 +- .../{gstag => ba_htmltag}/HtmlInputText.java | 6 +- .../{gstag => ba_htmltag}/HtmlLabel.java | 4 +- .../reactor/{gstag => ba_htmltag}/HtmlLi.java | 4 +- .../{gstag => ba_htmltag}/HtmlOption.java | 4 +- .../reactor/{gstag => ba_htmltag}/HtmlP.java | 4 +- .../{gstag => ba_htmltag}/HtmlRadio.java | 4 +- .../{gstag => ba_htmltag}/HtmlSection.java | 4 +- .../{gstag => ba_htmltag}/HtmlSpan.java | 4 +- .../{gstag => ba_htmltag}/HtmlStrong.java | 4 +- .../reactor/{gstag => ba_htmltag}/HtmlUl.java | 4 +- .../FlexDirection.java | 2 +- .../{az => ca_gscomponents}/GSApp.java | 2 +- .../GSAttributeOfInstanceEditor.java | 8 +- .../GSBooleanHolderEditor.java | 6 +- .../GSCheckBoxWithValue.java | 6 +- .../{az => ca_gscomponents}/GSComposite.java | 10 +-- .../{az => ca_gscomponents}/GSDiv.java | 8 +- .../{az => ca_gscomponents}/GSEditor.java | 8 +- .../{az => ca_gscomponents}/GSHeader.java | 4 +- .../GSHolderEditor.java | 6 +- .../GSInputTextWithConversion.java | 8 +- .../GSInstanceBuilder.java | 12 +-- .../{az => ca_gscomponents}/GSLinkEditor.java | 10 +-- .../{az => ca_gscomponents}/GSLogo.java | 4 +- .../{az => ca_gscomponents}/GSModal.java | 6 +- .../GSModalButton.java | 4 +- .../{az => ca_gscomponents}/GSMonitor.java | 6 +- .../GSMonitorExtended.java | 6 +- .../GSMultiCheckBox.java | 4 +- .../{az => ca_gscomponents}/GSResponsive.java | 4 +- .../GSRowDisplayer.java | 6 +- .../{az => ca_gscomponents}/GSSelect.java | 8 +- .../GSSingleLinkComponentEditor.java | 8 +- .../{az => ca_gscomponents}/GSStepEditor.java | 8 +- .../GSSubcellDisplayer.java | 18 ++-- .../{az => ca_gscomponents}/GSTable.java | 8 +- .../{az => ca_gscomponents}/GSTagImpl.java | 2 +- .../StepNavigator.java | 4 +- .../TitledSection.java | 4 +- .../DivWithTitle.java} | 20 ++--- .../{az3 => ca_gscomponents2}/GSCellDiv.java | 8 +- .../GSComposite.java | 18 ++-- .../{az3 => ca_gscomponents2}/GSEditor.java | 84 ++++++++++--------- .../GSInstanceBuilder.java | 37 ++++---- .../{az3 => ca_gscomponents2}/GSTable.java | 44 +++++----- .../InstanceEditor.java | 48 +++++------ .../InstancesTable.java | 36 ++++---- .../{az3 => ca_gscomponents2}/Table.java | 6 +- .../model/ObservableModelSelector.java | 2 +- .../org/genericsystem/todomvc/TodoApp.java | 30 +++---- .../org/genericsystem/todomvc/TodoApp2.java | 30 +++---- 92 files changed, 398 insertions(+), 397 deletions(-) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/ActionDefaults.java (89%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/AttributesDefaults.java (88%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/ComponentsDefaults.java (90%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/ContextProperty.java (96%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/ConvertedValueDefaults.java (95%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/DisplayDefaults.java (89%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/GSBuilderDefaults.java (96%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/GenericStringDefaults.java (96%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/MapStringDefaults.java (94%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/SelectionDefaults.java (98%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/StyleClassesDefaults.java (93%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/StylesDefaults.java (95%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/SwitchDefaults.java (98%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{modelproperties => aa_modelproperties}/TextPropertyDefaults.java (95%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlButton.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlCheckBox.java (90%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlDiv.java (70%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlFooter.java (71%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlH1.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlH2.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlHeader.java (68%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlHyperLink.java (76%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlImg.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlInputText.java (85%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlLabel.java (82%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlLi.java (70%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlOption.java (67%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlP.java (69%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlRadio.java (86%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlSection.java (68%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlSpan.java (70%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlStrong.java (71%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{gstag => ba_htmltag}/HtmlUl.java (70%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/FlexDirection.java (89%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSApp.java (91%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSAttributeOfInstanceEditor.java (90%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSBooleanHolderEditor.java (83%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSCheckBoxWithValue.java (87%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSComposite.java (93%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSDiv.java (93%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSEditor.java (86%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSHeader.java (88%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSHolderEditor.java (85%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSInputTextWithConversion.java (92%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSInstanceBuilder.java (91%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSLinkEditor.java (72%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSLogo.java (74%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSModal.java (87%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSModalButton.java (69%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSMonitor.java (89%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSMonitorExtended.java (83%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSMultiCheckBox.java (95%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSResponsive.java (86%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSRowDisplayer.java (93%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSSelect.java (92%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSSingleLinkComponentEditor.java (88%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSStepEditor.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSSubcellDisplayer.java (93%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSTable.java (89%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/GSTagImpl.java (97%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/StepNavigator.java (79%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az => ca_gscomponents}/TitledSection.java (82%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3/TitledDiv.java => ca_gscomponents2/DivWithTitle.java} (69%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/GSCellDiv.java (90%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/GSComposite.java (67%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/GSEditor.java (77%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/GSInstanceBuilder.java (79%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/GSTable.java (75%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/InstanceEditor.java (87%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/InstancesTable.java (81%) rename gs-reactor/src/main/java/org/genericsystem/reactor/{az3 => ca_gscomponents2}/Table.java (77%) diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java index 5d0003845..52ca05b6b 100644 --- a/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java +++ b/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java @@ -7,20 +7,20 @@ import org.genericsystem.carcolor.model.Power; import org.genericsystem.common.Generic; import org.genericsystem.common.Root; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.RunScript; import org.genericsystem.reactor.appserver.ApplicationServer; import org.genericsystem.reactor.appserver.Script; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az.GSEditor; -import org.genericsystem.reactor.az.GSHeader; -import org.genericsystem.reactor.az.GSLogo; -import org.genericsystem.reactor.az.GSModal; -import org.genericsystem.reactor.az.GSMonitor; -import org.genericsystem.reactor.az.GSResponsive; -import org.genericsystem.reactor.az.GSTable; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSEditor; +import org.genericsystem.reactor.ca_gscomponents.GSHeader; +import org.genericsystem.reactor.ca_gscomponents.GSLogo; +import org.genericsystem.reactor.ca_gscomponents.GSModal; +import org.genericsystem.reactor.ca_gscomponents.GSMonitor; +import org.genericsystem.reactor.ca_gscomponents.GSResponsive; +import org.genericsystem.reactor.ca_gscomponents.GSTable; /** * @author Nicolas Feybesse diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java index edcf62945..87fc3e14d 100644 --- a/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java +++ b/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java @@ -1,12 +1,12 @@ package org.genericsystem.carcolor; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az.GSModalButton; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.gstag.HtmlLi; -import org.genericsystem.reactor.gstag.HtmlUl; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlLi; +import org.genericsystem.reactor.ba_htmltag.HtmlUl; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSModalButton; public class GSUserGuide extends GSDiv { diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java index ba717dae8..24dde9c62 100644 --- a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java +++ b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java @@ -10,21 +10,21 @@ import org.genericsystem.common.Generic; import org.genericsystem.common.Root; import org.genericsystem.kernel.Engine; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.RunScript; import org.genericsystem.reactor.appserver.ApplicationServer; import org.genericsystem.reactor.appserver.Script; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az.GSEditor; -import org.genericsystem.reactor.az.GSMonitorExtended; -import org.genericsystem.reactor.az.GSStepEditor; -import org.genericsystem.reactor.az.GSTable; -import org.genericsystem.reactor.az.GSComposite.ColorCompositeRadio; -import org.genericsystem.reactor.az.GSComposite.ColorTitleCompositeFlexElement; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSEditor; +import org.genericsystem.reactor.ca_gscomponents.GSMonitorExtended; +import org.genericsystem.reactor.ca_gscomponents.GSStepEditor; +import org.genericsystem.reactor.ca_gscomponents.GSTable; +import org.genericsystem.reactor.ca_gscomponents.GSComposite.ColorCompositeRadio; +import org.genericsystem.reactor.ca_gscomponents.GSComposite.ColorTitleCompositeFlexElement; import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; import org.genericsystem.reactor.model.ObservableListExtractor; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) @RunScript(ExampleReactorScript.class) 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 50efd0338..d9f33f4cd 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 @@ -6,16 +6,16 @@ import org.genericsystem.carcolor.model.Color; import org.genericsystem.carcolor.model.Power; import org.genericsystem.carcolor.model.UsedCar; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.RunScript; import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az3.GSEditor; -import org.genericsystem.reactor.az3.GSTable; -import org.genericsystem.reactor.az3.GSEditor.HorizontalGSEditor; -import org.genericsystem.reactor.az3.GSTable.HorizontalTable; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSTable; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.HorizontalGSEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.HorizontalTable; import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) @RunScript(ExampleReactorScript.class) diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java index b2c7f9f7c..970b6c706 100644 --- a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java +++ b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java @@ -8,6 +8,7 @@ import org.genericsystem.carcolor.model.UsedCar; import org.genericsystem.reactor.annotations.ForEach; import org.genericsystem.reactor.annotations.ReactorDependencies; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.DirectSelect; import org.genericsystem.reactor.annotations.RunScript; @@ -18,9 +19,10 @@ import org.genericsystem.reactor.annotations.Styles.FlexWrap; import org.genericsystem.reactor.annotations.Styles.Overflow; import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az.GSDiv; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; import org.genericsystem.reactor.example.AppHtml4.GSAttributesComposite; import org.genericsystem.reactor.example.AppHtml4.GSAttributesComposite.GSAttributesContentComponent; @@ -41,10 +43,8 @@ import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite; import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite.GSHeaderComponent; import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite.GSHeaderComponent.GSHeaderComponentLabel; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.ObservableListExtractor.ATTRIBUTES_OF_INSTANCES; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) @RunScript(ExampleReactorScript.class) 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 index 575918a87..503d8d064 100644 --- 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 @@ -6,6 +6,7 @@ import org.genericsystem.carcolor.model.Color; import org.genericsystem.carcolor.model.Power; import org.genericsystem.carcolor.model.UsedCar; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.annotations.DirectSelect; import org.genericsystem.reactor.annotations.ReactorDependencies; @@ -15,18 +16,17 @@ import org.genericsystem.reactor.annotations.Styles.FlexDirectionStyle; import org.genericsystem.reactor.annotations.Styles.FlexWrap; import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az3.InstanceEditor; -import org.genericsystem.reactor.az3.TitledDiv.TitledInstanceEditor; -import org.genericsystem.reactor.az3.TitledDiv.TitledInstancesTable; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents2.InstanceEditor; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.TitledInstanceEditor; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.TitledInstancesTable; import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript; import org.genericsystem.reactor.example.AppHtml5.CarInstancesTable; import org.genericsystem.reactor.example.AppHtml5.ColorInstancesTable; import org.genericsystem.reactor.example.AppHtml5.ColumnSelectedInstanceEditor; import org.genericsystem.reactor.example.AppHtml5.SelectedInstanceEditor; import org.genericsystem.reactor.model.ObservableModelSelector; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class }) @RunScript(ExampleReactorScript.class) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java b/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java index eaf2aa242..43ad5635a 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java @@ -17,6 +17,13 @@ import org.genericsystem.common.Generic; import org.genericsystem.defaults.tools.BindingsTools; import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode; +import org.genericsystem.reactor.aa_modelproperties.AttributesDefaults; +import org.genericsystem.reactor.aa_modelproperties.DisplayDefaults; +import org.genericsystem.reactor.aa_modelproperties.GenericStringDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.StyleClassesDefaults; +import org.genericsystem.reactor.aa_modelproperties.StylesDefaults; +import org.genericsystem.reactor.aa_modelproperties.TextPropertyDefaults; import org.genericsystem.reactor.annotations.BindSelection; import org.genericsystem.reactor.annotations.DirectSelect; import org.genericsystem.reactor.annotations.ForEach; @@ -41,18 +48,11 @@ import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection; import org.genericsystem.reactor.annotations.Styles.Style; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.ObservableListExtractor.NO_FOR_EACH; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.AttributesDefaults; -import org.genericsystem.reactor.modelproperties.DisplayDefaults; -import org.genericsystem.reactor.modelproperties.GenericStringDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; -import org.genericsystem.reactor.modelproperties.StyleClassesDefaults; -import org.genericsystem.reactor.modelproperties.StylesDefaults; -import org.genericsystem.reactor.modelproperties.TextPropertyDefaults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ActionDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ActionDefaults.java similarity index 89% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ActionDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ActionDefaults.java index f48aff676..d0efca171 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ActionDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ActionDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.util.function.Consumer; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/AttributesDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/AttributesDefaults.java similarity index 88% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/AttributesDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/AttributesDefaults.java index b1ceff671..a9b1ac8ae 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/AttributesDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/AttributesDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import javafx.collections.ObservableMap; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ComponentsDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ComponentsDefaults.java similarity index 90% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ComponentsDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ComponentsDefaults.java index 416a3ad4c..ca5d8e10a 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ComponentsDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ComponentsDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.util.ArrayList; import java.util.List; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ContextProperty.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ContextProperty.java similarity index 96% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ContextProperty.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ContextProperty.java index ddd3a1bee..54063f943 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ContextProperty.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ContextProperty.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.io.Serializable; import java.util.function.BiConsumer; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ConvertedValueDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ConvertedValueDefaults.java similarity index 95% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ConvertedValueDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ConvertedValueDefaults.java index 37c7fbfda..d9600e10d 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/ConvertedValueDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/ConvertedValueDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.io.Serializable; import java.util.function.BiConsumer; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/DisplayDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/DisplayDefaults.java similarity index 89% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/DisplayDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/DisplayDefaults.java index 202d77ded..cc57e0ee5 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/DisplayDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/DisplayDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import org.genericsystem.reactor.Context; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GSBuilderDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GSBuilderDefaults.java similarity index 96% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GSBuilderDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GSBuilderDefaults.java index fa7387585..694236bf3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GSBuilderDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GSBuilderDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.io.Serializable; import java.util.ArrayList; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GenericStringDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GenericStringDefaults.java similarity index 96% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GenericStringDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GenericStringDefaults.java index e0c71e599..dddfa4e5d 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/GenericStringDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/GenericStringDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import javafx.beans.property.Property; import javafx.beans.property.ReadOnlyObjectWrapper; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/MapStringDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/MapStringDefaults.java similarity index 94% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/MapStringDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/MapStringDefaults.java index 1449daf50..9ab1c1abf 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/MapStringDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/MapStringDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.util.function.Function; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SelectionDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SelectionDefaults.java similarity index 98% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SelectionDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SelectionDefaults.java index b0f336f26..839417002 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SelectionDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SelectionDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.util.Optional; import java.util.stream.Collectors; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StyleClassesDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StyleClassesDefaults.java similarity index 93% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StyleClassesDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StyleClassesDefaults.java index 5b0aba314..3f8219d51 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StyleClassesDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StyleClassesDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StylesDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StylesDefaults.java similarity index 95% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StylesDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StylesDefaults.java index d926e2c56..09f7cbf17 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StylesDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/StylesDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import javafx.beans.property.Property; import javafx.collections.ObservableMap; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SwitchDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SwitchDefaults.java similarity index 98% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SwitchDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SwitchDefaults.java index c06d580f7..eb61058dc 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SwitchDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/SwitchDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/TextPropertyDefaults.java b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/TextPropertyDefaults.java similarity index 95% rename from gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/TextPropertyDefaults.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/TextPropertyDefaults.java index b6446ba33..b853584eb 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/TextPropertyDefaults.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/aa_modelproperties/TextPropertyDefaults.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.modelproperties; +package org.genericsystem.reactor.aa_modelproperties; import java.util.function.Function; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java index 1abe32a2d..526c0644f 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java index 75667be5f..b7e95a5c0 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import org.genericsystem.reactor.annotations.DirectSelect.DirectSelects; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java index 299d912d2..336fb4221 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import org.genericsystem.reactor.annotations.ForEach.ForEachs; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import org.genericsystem.reactor.model.ObservableListExtractor; /** diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java index 0b9517b56..bfd753b81 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java index fb375e8cb..dea8e9b32 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import org.genericsystem.reactor.annotations.ReactorDependencies.ReactorDependenciesMult; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java index 2d36bf2eb..189e53273 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import org.genericsystem.reactor.annotations.Select.Selects; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import org.genericsystem.reactor.model.ObservableModelSelector; import org.genericsystem.reactor.model.ObservableValueSelector; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java index 2353bd4c7..0d7302810 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import org.genericsystem.reactor.annotations.SetStringExtractor.SetStringExtractors; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import org.genericsystem.reactor.model.StringExtractor; @Retention(RetentionPolicy.RUNTIME) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java index 7eaff5926..842b21bb1 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java index a181af5fa..6cbedc6ee 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java index 3d9519f9b..ac9ff2ffc 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java @@ -21,7 +21,7 @@ import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode; import org.genericsystem.reactor.appserver.WebAppsConfig.SimpleWebAppConfig; -import org.genericsystem.reactor.az.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSApp; import io.vertx.core.Context; import io.vertx.core.Handler; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java index dfbf67db3..a35172984 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java @@ -15,7 +15,7 @@ import org.genericsystem.reactor.Tag; import org.genericsystem.reactor.Tag.RootTag; import org.genericsystem.reactor.annotations.DependsOnModel; -import org.genericsystem.reactor.az.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSApp; import org.genericsystem.reactor.model.RootModel; /** diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlButton.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlButton.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlButton.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlButton.java index e274924ee..f29d49551 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlButton.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlButton.java @@ -1,11 +1,11 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; -import org.genericsystem.reactor.modelproperties.ActionDefaults; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.aa_modelproperties.ActionDefaults; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlCheckBox.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlCheckBox.java similarity index 90% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlCheckBox.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlCheckBox.java index dbe85cc83..693c0e15d 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlCheckBox.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlCheckBox.java @@ -1,10 +1,10 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.ReactorStatics; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlDiv.java similarity index 70% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlDiv.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlDiv.java index a0480ea32..a35854591 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlDiv.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlFooter.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlFooter.java similarity index 71% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlFooter.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlFooter.java index 51722928b..282b05afc 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlFooter.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlFooter.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH1.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH1.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH1.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH1.java index bd3df70e6..c3a29d7f3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH1.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH1.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH2.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH2.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH2.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH2.java index 58881bb4a..55b74561f 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlH2.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlH2.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHeader.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHeader.java similarity index 68% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHeader.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHeader.java index 21028a98f..080594ff6 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHeader.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHeader.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; public class HtmlHeader extends GSTagImpl { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHyperLink.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHyperLink.java similarity index 76% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHyperLink.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHyperLink.java index 4b7bcd1a5..576ce1534 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlHyperLink.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlHyperLink.java @@ -1,14 +1,14 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import java.util.function.Consumer; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; -import org.genericsystem.reactor.modelproperties.ActionDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; -import org.genericsystem.reactor.modelproperties.SwitchDefaults; +import org.genericsystem.reactor.aa_modelproperties.ActionDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.SwitchDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlImg.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlImg.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlImg.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlImg.java index 4a0efe1be..6f1d65650 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlImg.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlImg.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; public class HtmlImg extends GSTagImpl { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlInputText.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlInputText.java similarity index 85% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlInputText.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlInputText.java index 05d6d7eaf..21265e1b3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlInputText.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlInputText.java @@ -1,10 +1,10 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; -import org.genericsystem.reactor.modelproperties.ActionDefaults; +import org.genericsystem.reactor.aa_modelproperties.ActionDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLabel.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLabel.java similarity index 82% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLabel.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLabel.java index 2cf4f9f21..f302dcf82 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLabel.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLabel.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLi.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLi.java similarity index 70% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLi.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLi.java index 00305c1f3..cd2175f68 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlLi.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlLi.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlOption.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlOption.java similarity index 67% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlOption.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlOption.java index f1ed371ab..2ab1720d2 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlOption.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlOption.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; public class HtmlOption extends GSTagImpl { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlP.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlP.java similarity index 69% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlP.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlP.java index a9eaf3dae..4c8878f52 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlP.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlP.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlRadio.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlRadio.java similarity index 86% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlRadio.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlRadio.java index a6b47dca9..313fee5ec 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlRadio.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlRadio.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSection.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSection.java similarity index 68% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSection.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSection.java index 376e05767..f489aacc3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSection.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSection.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; public class HtmlSection extends GSTagImpl { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSpan.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSpan.java similarity index 70% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSpan.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSpan.java index c9a73af0a..1d266ed24 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlSpan.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlSpan.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlStrong.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlStrong.java similarity index 71% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlStrong.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlStrong.java index ba69970f2..fd0fe4ae3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlStrong.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlStrong.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlUl.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlUl.java similarity index 70% rename from gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlUl.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlUl.java index bc663f4c3..062874cb9 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/gstag/HtmlUl.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ba_htmltag/HtmlUl.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.gstag; +package org.genericsystem.reactor.ba_htmltag; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSTagImpl; +import org.genericsystem.reactor.ca_gscomponents.GSTagImpl; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/FlexDirection.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/FlexDirection.java similarity index 89% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/FlexDirection.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/FlexDirection.java index 33092297a..825d3d031 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/FlexDirection.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/FlexDirection.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; public enum FlexDirection { COLUMN, ROW; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSApp.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSApp.java similarity index 91% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSApp.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSApp.java index 66ffaa25f..f4ba8d236 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSApp.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSApp.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSAttributeOfInstanceEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSAttributeOfInstanceEditor.java similarity index 90% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSAttributeOfInstanceEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSAttributeOfInstanceEditor.java index 9bd37d637..ee4d40b82 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSAttributeOfInstanceEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSAttributeOfInstanceEditor.java @@ -1,12 +1,12 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.api.core.ApiStatics; import org.genericsystem.common.Generic; import org.genericsystem.defaults.tools.BindingsTools; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSSubcellAdder; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSSubcellEditor; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSSubcellEditorWithRemoval; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSSubcellAdder; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSSubcellEditor; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSSubcellEditorWithRemoval; import org.genericsystem.reactor.model.ObservableListExtractor; import javafx.beans.binding.Bindings; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSBooleanHolderEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSBooleanHolderEditor.java similarity index 83% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSBooleanHolderEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSBooleanHolderEditor.java index 8c9f2ff62..080b03cc2 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSBooleanHolderEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSBooleanHolderEditor.java @@ -1,8 +1,8 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxEditor; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxEditor; public class GSBooleanHolderEditor extends GSDiv { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSCheckBoxWithValue.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSCheckBoxWithValue.java similarity index 87% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSCheckBoxWithValue.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSCheckBoxWithValue.java index febd1556c..de0aaa618 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSCheckBoxWithValue.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSCheckBoxWithValue.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.ReactorStatics; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlCheckBox; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlCheckBox; public class GSCheckBoxWithValue extends HtmlCheckBox implements ConvertedValueDefaults { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSComposite.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSComposite.java similarity index 93% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSComposite.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSComposite.java index 9686fd980..6a6b6cd78 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSComposite.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSComposite.java @@ -1,14 +1,14 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.ReactorStatics; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlH1; -import org.genericsystem.reactor.gstag.HtmlLabel; -import org.genericsystem.reactor.gstag.HtmlRadio; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlH1; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlRadio; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; import io.vertx.core.json.JsonObject; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSDiv.java similarity index 93% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSDiv.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSDiv.java index fb6687fc5..9dd9993e1 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSDiv.java @@ -1,12 +1,12 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.function.BiConsumer; import java.util.function.Consumer; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlDiv; -import org.genericsystem.reactor.gstag.HtmlH1; -import org.genericsystem.reactor.gstag.HtmlH2; +import org.genericsystem.reactor.ba_htmltag.HtmlDiv; +import org.genericsystem.reactor.ba_htmltag.HtmlH1; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSEditor.java similarity index 86% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSEditor.java index ec6fd2263..56e5c9f0b 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSEditor.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSSubcellEditor; -import org.genericsystem.reactor.az.GSSubcellDisplayer.InstanceLinkTitleDisplayer; -import org.genericsystem.reactor.gstag.HtmlH2; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSSubcellEditor; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.InstanceLinkTitleDisplayer; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.StringExtractor; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHeader.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHeader.java similarity index 88% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHeader.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHeader.java index b57c5a648..c8bcbe6e6 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHeader.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHeader.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.TagConstructor; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.TagConstructor; public class GSHeader extends GSDiv { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHolderEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHolderEditor.java similarity index 85% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHolderEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHolderEditor.java index e4f6a2821..93ddf0dfd 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSHolderEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSHolderEditor.java @@ -1,8 +1,8 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSInputTextWithConversion.GSInputTextEditorWithConversion; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion.GSInputTextEditorWithConversion; public class GSHolderEditor extends GSDiv { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInputTextWithConversion.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInputTextWithConversion.java similarity index 92% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInputTextWithConversion.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInputTextWithConversion.java index 29e5233fe..61f9a956c 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInputTextWithConversion.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInputTextWithConversion.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.io.Serializable; @@ -6,9 +6,9 @@ import org.genericsystem.common.Generic; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlInputText; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlInputText; import io.vertx.core.logging.Logger; import io.vertx.core.logging.LoggerFactory; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInstanceBuilder.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInstanceBuilder.java similarity index 91% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInstanceBuilder.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInstanceBuilder.java index f1c84067f..9a0f0d3b8 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSInstanceBuilder.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSInstanceBuilder.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.io.Serializable; import java.util.List; @@ -9,12 +9,12 @@ import org.genericsystem.reactor.Context; import org.genericsystem.reactor.ReactorStatics; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSAttributeBuilder; -import org.genericsystem.reactor.az.GSSubcellDisplayer.LinkTitleDisplayer; -import org.genericsystem.reactor.gstag.HtmlButton; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.aa_modelproperties.SwitchDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSAttributeBuilder; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.LinkTitleDisplayer; import org.genericsystem.reactor.model.ObservableListExtractor; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; -import org.genericsystem.reactor.modelproperties.SwitchDefaults; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLinkEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLinkEditor.java similarity index 72% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLinkEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLinkEditor.java index afa83d4ae..4480dbac1 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLinkEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLinkEditor.java @@ -1,10 +1,10 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSingleLinkComponentEditor.GSLinkComponentBuilder; -import org.genericsystem.reactor.az.GSSingleLinkComponentEditor.GSLinkComponentEditor; -import org.genericsystem.reactor.modelproperties.ComponentsDefaults; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.aa_modelproperties.ComponentsDefaults; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSSingleLinkComponentEditor.GSLinkComponentBuilder; +import org.genericsystem.reactor.ca_gscomponents.GSSingleLinkComponentEditor.GSLinkComponentEditor; public class GSLinkEditor extends GSDiv implements ComponentsDefaults { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLogo.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLogo.java similarity index 74% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLogo.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLogo.java index 0fa34fd9a..27c28e74e 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSLogo.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSLogo.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlImg; +import org.genericsystem.reactor.ba_htmltag.HtmlImg; public class GSLogo extends GSDiv { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModal.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModal.java similarity index 87% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModal.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModal.java index a838dcfcb..cace7df76 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModal.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModal.java @@ -1,10 +1,10 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.function.Consumer; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; import javafx.beans.binding.Bindings; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModalButton.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModalButton.java similarity index 69% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModalButton.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModalButton.java index 64a270004..35f39a420 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSModalButton.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSModalButton.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; public class GSModalButton extends HtmlButton { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitor.java similarity index 89% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitor.java index f369de23b..ef6ad5d3c 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitor.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.time.Instant; import java.time.LocalDateTime; @@ -9,8 +9,8 @@ import org.genericsystem.common.Statics; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; import javafx.beans.binding.Bindings; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitorExtended.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitorExtended.java similarity index 83% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitorExtended.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitorExtended.java index de54932dd..1e67113d3 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMonitorExtended.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMonitorExtended.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; import javafx.beans.binding.Bindings; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMultiCheckBox.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMultiCheckBox.java similarity index 95% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMultiCheckBox.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMultiCheckBox.java index 06d05fad0..3b951b1df 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSMultiCheckBox.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSMultiCheckBox.java @@ -1,8 +1,8 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.common.Generic; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.StringExtractor; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSResponsive.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSResponsive.java similarity index 86% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSResponsive.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSResponsive.java index b12c72c11..8b82e80a6 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSResponsive.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSResponsive.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.function.UnaryOperator; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; public class GSResponsive extends GSDiv implements SelectionDefaults { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSRowDisplayer.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSRowDisplayer.java similarity index 93% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSRowDisplayer.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSRowDisplayer.java index f18871d3b..00f5eebd9 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSRowDisplayer.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSRowDisplayer.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.StringExtractor; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSelect.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSelect.java similarity index 92% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSelect.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSelect.java index b8e8f9d95..55fca55ea 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSelect.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSelect.java @@ -1,15 +1,15 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.Map; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.HtmlDomNode; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlOption; +import org.genericsystem.reactor.aa_modelproperties.ComponentsDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlOption; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.ComponentsDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; import io.vertx.core.json.JsonObject; import javafx.beans.value.ChangeListener; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSingleLinkComponentEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSingleLinkComponentEditor.java similarity index 88% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSingleLinkComponentEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSingleLinkComponentEditor.java index cfc76152e..f60382d23 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSingleLinkComponentEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSingleLinkComponentEditor.java @@ -1,12 +1,12 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.List; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSelect.CompositeSelectWithEmptyEntry; -import org.genericsystem.reactor.az.GSSelect.InstanceCompositeSelect; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.CompositeSelectWithEmptyEntry; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.InstanceCompositeSelect; import org.genericsystem.reactor.model.ObservableListExtractor; import javafx.beans.property.Property; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSStepEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSStepEditor.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSStepEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSStepEditor.java index 6b743fb92..e53026c90 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSStepEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSStepEditor.java @@ -1,9 +1,9 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.GSSubcellEditor; -import org.genericsystem.reactor.az.GSSubcellDisplayer.InstanceLinkTitleDisplayer; -import org.genericsystem.reactor.modelproperties.SwitchDefaults; +import org.genericsystem.reactor.aa_modelproperties.SwitchDefaults; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.GSSubcellEditor; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.InstanceLinkTitleDisplayer; public class GSStepEditor extends GSEditor implements SwitchDefaults { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSubcellDisplayer.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSubcellDisplayer.java similarity index 93% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSubcellDisplayer.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSubcellDisplayer.java index df823c74b..2aaa45e12 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSSubcellDisplayer.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSSubcellDisplayer.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.io.Serializable; import java.util.List; @@ -8,15 +8,15 @@ import org.genericsystem.common.Generic; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSBooleanHolderEditor.GSBooleanHolderBuilder; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxDisplayer; -import org.genericsystem.reactor.az.GSHolderEditor.GSHolderBuilder; -import org.genericsystem.reactor.az.GSLinkEditor.GSLinkBuilder; -import org.genericsystem.reactor.az.GSSingleLinkComponentEditor.GSLinkComponentAdder; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.GSBooleanHolderEditor.GSBooleanHolderBuilder; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxDisplayer; +import org.genericsystem.reactor.ca_gscomponents.GSHolderEditor.GSHolderBuilder; +import org.genericsystem.reactor.ca_gscomponents.GSLinkEditor.GSLinkBuilder; +import org.genericsystem.reactor.ca_gscomponents.GSSingleLinkComponentEditor.GSLinkComponentAdder; import org.genericsystem.reactor.model.ObservableListExtractor; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; import javafx.beans.property.Property; import javafx.beans.value.ChangeListener; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTable.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTable.java similarity index 89% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTable.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTable.java index 23afef55c..6eed0a146 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTable.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTable.java @@ -1,11 +1,11 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.az.GSSubcellDisplayer.LinkTitleDisplayer; -import org.genericsystem.reactor.gstag.HtmlH2; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; +import org.genericsystem.reactor.ca_gscomponents.GSSubcellDisplayer.LinkTitleDisplayer; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; /** * @author Nicolas Feybesse diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTagImpl.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTagImpl.java similarity index 97% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTagImpl.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTagImpl.java index 3fa207da6..4d5c92171 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/GSTagImpl.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/GSTagImpl.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import java.util.ArrayList; import java.util.List; diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/StepNavigator.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/StepNavigator.java similarity index 79% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/StepNavigator.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/StepNavigator.java index 809a79dca..0f5a0fff4 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/StepNavigator.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/StepNavigator.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; public class StepNavigator extends GSDiv { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az/TitledSection.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/TitledSection.java similarity index 82% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az/TitledSection.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/TitledSection.java index 6be1520ba..70c2b59ae 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az/TitledSection.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents/TitledSection.java @@ -1,7 +1,7 @@ -package org.genericsystem.reactor.az; +package org.genericsystem.reactor.ca_gscomponents; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.gstag.HtmlSection; +import org.genericsystem.reactor.ba_htmltag.HtmlSection; public class TitledSection extends HtmlSection { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/TitledDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/DivWithTitle.java similarity index 69% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/TitledDiv.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/DivWithTitle.java index b64bb1268..185ccdb27 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/TitledDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/DivWithTitle.java @@ -1,5 +1,6 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.SetStringExtractor; import org.genericsystem.reactor.annotations.Styles.AlignItems; @@ -10,18 +11,17 @@ import org.genericsystem.reactor.annotations.Styles.MarginBottom; import org.genericsystem.reactor.annotations.Styles.MarginRight; import org.genericsystem.reactor.annotations.Styles.Style; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az3.TitledDiv.GSTitleDiv; -import org.genericsystem.reactor.az3.TitledDiv.GSTitleDiv.TitleContent; -import org.genericsystem.reactor.gstag.HtmlH2; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.GSTitleDiv; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.GSTitleDiv.TitleContent; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @Style(name = "margin", value = "4px") @FlexDirectionStyle(FlexDirection.COLUMN) @ReactorDependencies(GSTitleDiv.class) -public class TitledDiv extends GSDiv { +public class DivWithTitle extends GSDiv { @BackgroundColor("#EA4500") @MarginRight("1px") @@ -41,13 +41,13 @@ public void init() { @ReactorDependencies({ GSTitleDiv.class, InstancesTable.class }) @SetStringExtractor(path = GSTitleDiv.class, value = StringExtractor.MANAGEMENT.class) - public static class TitledInstancesTable extends TitledDiv { + public static class TitledInstancesTable extends DivWithTitle { } @ReactorDependencies({ GSTitleDiv.class, InstanceEditor.class }) @SetStringExtractor(path = GSTitleDiv.class, value = StringExtractor.TYPE_INSTANCE_EXTRACTOR.class) - public static class TitledInstanceEditor extends TitledDiv implements SelectionDefaults { + public static class TitledInstanceEditor extends DivWithTitle implements SelectionDefaults { } } diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSCellDiv.java similarity index 90% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSCellDiv.java index 829dc9f38..7703d28a5 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSCellDiv.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSCellDiv.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import org.genericsystem.reactor.annotations.Styles.AlignItems; import org.genericsystem.reactor.annotations.Styles.BackgroundColor; @@ -13,9 +13,9 @@ import org.genericsystem.reactor.annotations.Styles.MarginRight; import org.genericsystem.reactor.annotations.Styles.Overflow; import org.genericsystem.reactor.annotations.Styles.Style; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.gstag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; @Flex("1") @Overflow("hidden") diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSComposite.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSComposite.java similarity index 67% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSComposite.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSComposite.java index 758d56d29..3380de082 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSComposite.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSComposite.java @@ -1,17 +1,17 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.Styles.Flex; import org.genericsystem.reactor.annotations.Styles.FlexDirectionStyle; import org.genericsystem.reactor.annotations.Styles.Overflow; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az3.GSComposite.Content; -import org.genericsystem.reactor.az3.GSComposite.Footer; -import org.genericsystem.reactor.az3.GSComposite.Footer.FooterLabel; -import org.genericsystem.reactor.az3.GSComposite.Header; -import org.genericsystem.reactor.az3.GSComposite.Header.HeaderLabel; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Content; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Footer; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Header; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Footer.FooterLabel; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Header.HeaderLabel; @Flex("1 1 0%") @Overflow("hidden") diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSEditor.java similarity index 77% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSEditor.java index a4e38847a..935626d2f 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSEditor.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import java.io.Serializable; import java.util.List; @@ -10,6 +10,9 @@ import org.genericsystem.defaults.tools.BindingsTools; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; +import org.genericsystem.reactor.aa_modelproperties.ComponentsDefaults; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.ForEach; import org.genericsystem.reactor.annotations.Parent; import org.genericsystem.reactor.annotations.ReactorDependencies; @@ -24,49 +27,48 @@ import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection; import org.genericsystem.reactor.annotations.Styles.Style; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSCheckBoxWithValue; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxEditor; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az.GSInputTextWithConversion; -import org.genericsystem.reactor.az.GSInputTextWithConversion.GSInputTextEditorWithConversion; -import org.genericsystem.reactor.az.GSSelect.CompositeSelectWithEmptyEntry; -import org.genericsystem.reactor.az.GSSelect.InstanceCompositeSelect; -import org.genericsystem.reactor.az3.GSCellDiv.CenteredFlexDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSActionLink; -import org.genericsystem.reactor.az3.GSCellDiv.GSComponentEditorDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSSubcellEditorDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSTitleLineCellDiv; -import org.genericsystem.reactor.az3.GSCellDiv.SubcellEditorContainerDiv; -import org.genericsystem.reactor.az3.GSCellDiv.WrappedColumnDiv; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.BooleanHolderAdder.BooleanHolderAdditionLink; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.BooleanHolderAdder.CheckboxContainerAddDiv.BooleanHolderAdderInput; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.HolderAdder.HolderAdderInput; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.HolderAdder.HolderAdditionLink; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.LinkAdder.ComponentAdder.ComponentAdderSelect; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.BooleanHolderEditor.CheckboxContainerDiv.BooleanHolderEditorInput; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.HolderEditor.HolderEditorInput; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor.ComponentEditor.DirectRelationComponentEditor; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor.ComponentEditor.ReversedRelationDisplayer; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.RemovalLink; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.MultiCheckbox.CheckboxLabel.Checkbox; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceNameEditorDiv.InstanceNameEditor; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.LinkTitles.InstanceType; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.LinkTitles.InstanceType.TypeNameDisplayer; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.LinkTitles.TypeAttribute.AttributeName.AttributeNameDisplayer; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.LinkTitles.TypeAttribute.RelationName.ComponentName.ComponentNameDisplayer; -import org.genericsystem.reactor.az3.GSEditor.EditorTitle.EditorTitleContent; -import org.genericsystem.reactor.az3.TitledDiv.GSTitleDiv; -import org.genericsystem.reactor.gstag.HtmlH2; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxEditor; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion.GSInputTextEditorWithConversion; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.CompositeSelectWithEmptyEntry; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.InstanceCompositeSelect; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.GSTitleDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.CenteredFlexDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSActionLink; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSComponentEditorDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSSubcellEditorDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSTitleLineCellDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.SubcellEditorContainerDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.WrappedColumnDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.BooleanHolderAdder.BooleanHolderAdditionLink; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.BooleanHolderAdder.CheckboxContainerAddDiv.BooleanHolderAdderInput; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.HolderAdder.HolderAdderInput; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.HolderAdder.HolderAdditionLink; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.LinkAdder.ComponentAdder.ComponentAdderSelect; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.BooleanHolderEditor.CheckboxContainerDiv.BooleanHolderEditorInput; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.HolderEditor.HolderEditorInput; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor.ComponentEditor.DirectRelationComponentEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor.ComponentEditor.ReversedRelationDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.RemovalLink; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.MultiCheckbox.CheckboxLabel.Checkbox; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceNameEditorDiv.InstanceNameEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.LinkTitles.InstanceType; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.LinkTitles.InstanceType.TypeNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.LinkTitles.TypeAttribute.AttributeName.AttributeNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.LinkTitles.TypeAttribute.RelationName.ComponentName.ComponentNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorTitle.EditorTitleContent; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.ObservableListExtractor.ATTRIBUTES_OF_INSTANCES; import org.genericsystem.reactor.model.ObservableListExtractor.OTHER_COMPONENTS_2; import org.genericsystem.reactor.model.ObservableValueSelector.RELATION_SELECTOR; import org.genericsystem.reactor.model.ObservableValueSelector.STRICT_ATTRIBUTE_SELECTOR; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; @@ -197,7 +199,7 @@ public void init() { @JustifyContent("center") @AlignItems("center") @Style(name = "text-align", value = "center") - public static class CheckboxLabel extends org.genericsystem.reactor.gstag.HtmlLabel { + public static class CheckboxLabel extends HtmlLabel { @Override public void init() { @@ -292,7 +294,7 @@ public static class BooleanHolderEditorInput extends GSCheckBoxEditor { // Edition of links. @Flex("1") @FlexDirectionStyle(FlexDirection.ROW) - public static class LinkEditor extends GSDiv implements org.genericsystem.reactor.modelproperties.ComponentsDefaults { + public static class LinkEditor extends GSDiv implements ComponentsDefaults { @Override public void init() { @@ -433,7 +435,7 @@ public void postfix() { // Addition of links. @Flex("1") @FlexDirectionStyle(FlexDirection.ROW) - public static class LinkAdder extends GSDiv implements org.genericsystem.reactor.modelproperties.ComponentsDefaults { + public static class LinkAdder extends GSDiv implements ComponentsDefaults { @Override public void init() { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSInstanceBuilder.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSInstanceBuilder.java similarity index 79% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSInstanceBuilder.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSInstanceBuilder.java index 16a49150b..f23f7558c 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSInstanceBuilder.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSInstanceBuilder.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import java.io.Serializable; import java.util.List; @@ -8,30 +8,29 @@ import org.genericsystem.common.Generic; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.ReactorStatics; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.aa_modelproperties.GSBuilderDefaults; import org.genericsystem.reactor.annotations.Parent; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.Styles.Flex; import org.genericsystem.reactor.annotations.Styles.Height; import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.GSCheckBoxWithValue; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az.GSInputTextWithConversion; -import org.genericsystem.reactor.az3.GSCellDiv.CenteredFlexDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSComponentEditorDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSSubcellEditorDiv; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.LinkAdder.ComponentAdder.ComponentAdderSelect; -import org.genericsystem.reactor.az3.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor; -import org.genericsystem.reactor.az3.GSInstanceBuilder.AddButtonDiv.AddButton; -import org.genericsystem.reactor.az3.GSInstanceBuilder.BuilderCell.BooleanHolderBuilder.CheckboxContainerBuildDiv.BooleanHolderBuilderInput; -import org.genericsystem.reactor.az3.GSInstanceBuilder.BuilderCell.HolderBuilder.HolderBuilderInput; -import org.genericsystem.reactor.az3.GSInstanceBuilder.BuilderCell.LinkBuilder.ComponentBuilder.ComponentBuilderSelect; -import org.genericsystem.reactor.az3.GSInstanceBuilder.InstanceNameBuilder.InstanceNameBuilderInput; -import org.genericsystem.reactor.az3.InstancesTable.ButtonDiv; -import org.genericsystem.reactor.gstag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.CenteredFlexDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSComponentEditorDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSSubcellEditorDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellAdder.LinkAdder.ComponentAdder.ComponentAdderSelect; +import org.genericsystem.reactor.ca_gscomponents2.GSEditor.EditorContent.InstanceEdition.InstanceAttributeEditor.AttributeEditionColumn.SubcellEditor.LinkEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSInstanceBuilder.AddButtonDiv.AddButton; +import org.genericsystem.reactor.ca_gscomponents2.GSInstanceBuilder.BuilderCell.BooleanHolderBuilder.CheckboxContainerBuildDiv.BooleanHolderBuilderInput; +import org.genericsystem.reactor.ca_gscomponents2.GSInstanceBuilder.BuilderCell.HolderBuilder.HolderBuilderInput; +import org.genericsystem.reactor.ca_gscomponents2.GSInstanceBuilder.BuilderCell.LinkBuilder.ComponentBuilder.ComponentBuilderSelect; +import org.genericsystem.reactor.ca_gscomponents2.GSInstanceBuilder.InstanceNameBuilder.InstanceNameBuilderInput; import org.genericsystem.reactor.model.ObservableListExtractor; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; -import org.genericsystem.reactor.modelproperties.GSBuilderDefaults; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; @@ -132,7 +131,7 @@ public void init() { // Creation of links. @Parent(BuilderCell.class) - public static class LinkBuilder extends LinkEditor implements org.genericsystem.reactor.modelproperties.GSBuilderDefaults { + public static class LinkBuilder extends LinkEditor implements GSBuilderDefaults { @Override public void init() { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSTable.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSTable.java similarity index 75% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSTable.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSTable.java index 4a716fdbd..bc221c3f4 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/GSTable.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/GSTable.java @@ -1,7 +1,9 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; +import org.genericsystem.reactor.aa_modelproperties.GenericStringDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.ForEach; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.Select; @@ -13,25 +15,25 @@ import org.genericsystem.reactor.annotations.Styles.MarginRight; import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxDisplayer; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az3.GSCellDiv.GSTitleLineCellDiv; -import org.genericsystem.reactor.az3.GSTable.Row.Cell.SubCell.BooleanValueSubCell.BooleanDisplayer; -import org.genericsystem.reactor.az3.GSTable.Row.Cell.SubCell.ComponentSubCell.ComponentLabel; -import org.genericsystem.reactor.az3.GSTable.Row.Cell.SubCell.ValueSubCell.ValueDisplayer; -import org.genericsystem.reactor.az3.GSTable.Row.RemoveButtonDiv.RemoveButton; -import org.genericsystem.reactor.az3.GSTable.Row.RowName.RowNameDisplayer; -import org.genericsystem.reactor.az3.GSTable.TableTitle.TableTitleContent; -import org.genericsystem.reactor.az3.GSTable.TitleRow.EmptyCell; -import org.genericsystem.reactor.az3.GSTable.TitleRow.TypeAttribute.AttributeName.AttributeNameDisplayer; -import org.genericsystem.reactor.az3.GSTable.TitleRow.TypeAttribute.RelationName.ComponentName.ComponentNameDisplayer; -import org.genericsystem.reactor.az3.GSTable.TitleRow.TypeName.TypeNameDisplayer; -import org.genericsystem.reactor.az3.TitledDiv.GSTitleDiv; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlH2; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlH2; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxDisplayer; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.GSTitleDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSTitleLineCellDiv; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.Row.Cell.SubCell.BooleanValueSubCell.BooleanDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.Row.Cell.SubCell.ComponentSubCell.ComponentLabel; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.Row.Cell.SubCell.ValueSubCell.ValueDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.Row.RemoveButtonDiv.RemoveButton; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.Row.RowName.RowNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.TableTitle.TableTitleContent; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.TitleRow.EmptyCell; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.TitleRow.TypeAttribute.AttributeName.AttributeNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.TitleRow.TypeAttribute.RelationName.ComponentName.ComponentNameDisplayer; +import org.genericsystem.reactor.ca_gscomponents2.GSTable.TitleRow.TypeName.TypeNameDisplayer; import org.genericsystem.reactor.model.ObservableListExtractor.ATTRIBUTES_OF_INSTANCES; import org.genericsystem.reactor.model.ObservableListExtractor.ATTRIBUTES_OF_TYPE; import org.genericsystem.reactor.model.ObservableListExtractor.HOLDERS; @@ -43,8 +45,6 @@ import org.genericsystem.reactor.model.ObservableValueSelector.RELATION_SELECTOR; import org.genericsystem.reactor.model.ObservableValueSelector.STRICT_ATTRIBUTE_SELECTOR; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.GenericStringDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @ReactorDependencies({ TableTitleContent.class, TypeNameDisplayer.class, AttributeNameDisplayer.class, ComponentNameDisplayer.class, GSInstanceBuilder.class, RowNameDisplayer.class, ComponentLabel.class, EmptyCell.class, BooleanDisplayer.class, ValueDisplayer.class, RemoveButton.class }) diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstanceEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstanceEditor.java similarity index 87% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstanceEditor.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstanceEditor.java index 2b7339222..80a9d58d7 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstanceEditor.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstanceEditor.java @@ -1,4 +1,4 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import java.io.Serializable; import java.util.List; @@ -7,6 +7,9 @@ import org.genericsystem.api.core.exceptions.RollbackException; import org.genericsystem.common.Generic; import org.genericsystem.reactor.Context; +import org.genericsystem.reactor.aa_modelproperties.ComponentsDefaults; +import org.genericsystem.reactor.aa_modelproperties.ConvertedValueDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.ForEach; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.Select; @@ -21,25 +24,25 @@ import org.genericsystem.reactor.annotations.Styles.Overflow; import org.genericsystem.reactor.annotations.Styles.Style; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSCheckBoxWithValue; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxEditor; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az.GSInputTextWithConversion; -import org.genericsystem.reactor.az.GSInputTextWithConversion.GSInputTextEditorWithConversion; -import org.genericsystem.reactor.az.GSSelect.CompositeSelectWithEmptyEntry; -import org.genericsystem.reactor.az.GSSelect.InstanceCompositeSelect; -import org.genericsystem.reactor.az3.GSCellDiv.GSActionLink; -import org.genericsystem.reactor.az3.GSComposite.Content; -import org.genericsystem.reactor.az3.GSComposite.Header; -import org.genericsystem.reactor.az3.InstanceEditor.GSHoldersEditor; -import org.genericsystem.reactor.az3.InstanceEditor.GSMultiCheckbox; -import org.genericsystem.reactor.az3.InstanceEditor.GSValueComponentsEditor; -import org.genericsystem.reactor.az3.InstancesTable.GSHolders; -import org.genericsystem.reactor.az3.InstancesTable.GSValueComponents; -import org.genericsystem.reactor.az3.Table.ContentRow; -import org.genericsystem.reactor.az3.Table.HeaderRow; -import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxEditor; +import org.genericsystem.reactor.ca_gscomponents.GSInputTextWithConversion.GSInputTextEditorWithConversion; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.CompositeSelectWithEmptyEntry; +import org.genericsystem.reactor.ca_gscomponents.GSSelect.InstanceCompositeSelect; +import org.genericsystem.reactor.ca_gscomponents2.GSCellDiv.GSActionLink; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Content; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Header; +import org.genericsystem.reactor.ca_gscomponents2.InstanceEditor.GSHoldersEditor; +import org.genericsystem.reactor.ca_gscomponents2.InstanceEditor.GSMultiCheckbox; +import org.genericsystem.reactor.ca_gscomponents2.InstanceEditor.GSValueComponentsEditor; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.GSHolders; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.GSValueComponents; +import org.genericsystem.reactor.ca_gscomponents2.Table.ContentRow; +import org.genericsystem.reactor.ca_gscomponents2.Table.HeaderRow; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.ObservableListExtractor.NO_FOR_EACH; import org.genericsystem.reactor.model.ObservableListExtractor.SUBINSTANCES_OF_COMPONENT; @@ -52,9 +55,6 @@ import org.genericsystem.reactor.model.ObservableValueSelector.REVERSED_RELATION_SELECTOR; import org.genericsystem.reactor.model.ObservableValueSelector.STRICT_ATTRIBUTE_SELECTOR; import org.genericsystem.reactor.model.StringExtractor; -import org.genericsystem.reactor.modelproperties.ComponentsDefaults; -import org.genericsystem.reactor.modelproperties.ConvertedValueDefaults; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; @@ -94,7 +94,7 @@ public static class GSMultiCheckbox extends GSDiv { @AlignItems("center") @Style(name = "text-align", value = "center") @ReactorDependencies(Checkbox.class) - public static class CheckboxLabel extends org.genericsystem.reactor.gstag.HtmlLabel { + public static class CheckboxLabel extends org.genericsystem.reactor.ba_htmltag.HtmlLabel { @Override public void init() { diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstancesTable.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstancesTable.java similarity index 81% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstancesTable.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstancesTable.java index 3a2a9d532..790b8753b 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/InstancesTable.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/InstancesTable.java @@ -1,6 +1,7 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import org.genericsystem.reactor.Context; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import org.genericsystem.reactor.annotations.BindSelection; import org.genericsystem.reactor.annotations.ForEach; import org.genericsystem.reactor.annotations.ReactorDependencies; @@ -17,25 +18,24 @@ import org.genericsystem.reactor.annotations.Styles.MarginBottom; import org.genericsystem.reactor.annotations.Styles.MarginRight; import org.genericsystem.reactor.annotations.Styles.Width; -import org.genericsystem.reactor.az.FlexDirection; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxDisplayer; -import org.genericsystem.reactor.az.GSCheckBoxWithValue.GSCheckBoxEditor; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az3.GSComposite.Content; -import org.genericsystem.reactor.az3.GSComposite.Header; -import org.genericsystem.reactor.az3.GSComposite.Header.HeaderLabel; -import org.genericsystem.reactor.az3.InstancesTable.ButtonDiv; -import org.genericsystem.reactor.az3.InstancesTable.GSHolders; -import org.genericsystem.reactor.az3.InstancesTable.GSValueComponents; -import org.genericsystem.reactor.az3.InstancesTable.InstanceNameLink; -import org.genericsystem.reactor.az3.InstancesTable.RemoveButton; -import org.genericsystem.reactor.az3.Table.ContentRow; -import org.genericsystem.reactor.az3.Table.HeaderRow; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ca_gscomponents.FlexDirection; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxDisplayer; +import org.genericsystem.reactor.ca_gscomponents.GSCheckBoxWithValue.GSCheckBoxEditor; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Content; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Header; +import org.genericsystem.reactor.ca_gscomponents2.GSComposite.Header.HeaderLabel; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.ButtonDiv; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.GSHolders; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.GSValueComponents; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.InstanceNameLink; +import org.genericsystem.reactor.ca_gscomponents2.InstancesTable.RemoveButton; +import org.genericsystem.reactor.ca_gscomponents2.Table.ContentRow; +import org.genericsystem.reactor.ca_gscomponents2.Table.HeaderRow; import org.genericsystem.reactor.model.ObservableListExtractor; import org.genericsystem.reactor.model.ObservableValueSelector; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; @BindSelection(ContentRow.class) @Styles.Color(path = HeaderRow.class, value = "white") diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/Table.java b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/Table.java similarity index 77% rename from gs-reactor/src/main/java/org/genericsystem/reactor/az3/Table.java rename to gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/Table.java index 77cffa3a9..7d19f2c02 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/az3/Table.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/ca_gscomponents2/Table.java @@ -1,11 +1,11 @@ -package org.genericsystem.reactor.az3; +package org.genericsystem.reactor.ca_gscomponents2; import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.Styles.Flex; import org.genericsystem.reactor.annotations.Styles.Overflow; import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.az3.Table.ContentRow; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; +import org.genericsystem.reactor.ca_gscomponents2.Table.ContentRow; @Flex("1 1 0%") @Overflow("hidden") diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/model/ObservableModelSelector.java b/gs-reactor/src/main/java/org/genericsystem/reactor/model/ObservableModelSelector.java index 60c8cc9ea..de2cb9af4 100644 --- a/gs-reactor/src/main/java/org/genericsystem/reactor/model/ObservableModelSelector.java +++ b/gs-reactor/src/main/java/org/genericsystem/reactor/model/ObservableModelSelector.java @@ -7,7 +7,7 @@ import org.genericsystem.defaults.tools.BindingsTools; import org.genericsystem.reactor.Context; import org.genericsystem.reactor.Tag; -import org.genericsystem.reactor.modelproperties.SelectionDefaults; +import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults; import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; diff --git a/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp.java b/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp.java index dc7331c10..8c61e482f 100644 --- a/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp.java +++ b/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp.java @@ -12,21 +12,21 @@ import org.genericsystem.reactor.ReactorStatics; import org.genericsystem.reactor.annotations.DependsOnModel; import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlCheckBox; -import org.genericsystem.reactor.gstag.HtmlDiv; -import org.genericsystem.reactor.gstag.HtmlFooter; -import org.genericsystem.reactor.gstag.HtmlH1; -import org.genericsystem.reactor.gstag.HtmlHeader; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.gstag.HtmlInputText; -import org.genericsystem.reactor.gstag.HtmlLabel; -import org.genericsystem.reactor.gstag.HtmlLi; -import org.genericsystem.reactor.gstag.HtmlSpan; -import org.genericsystem.reactor.gstag.HtmlStrong; -import org.genericsystem.reactor.gstag.HtmlUl; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlCheckBox; +import org.genericsystem.reactor.ba_htmltag.HtmlDiv; +import org.genericsystem.reactor.ba_htmltag.HtmlFooter; +import org.genericsystem.reactor.ba_htmltag.HtmlH1; +import org.genericsystem.reactor.ba_htmltag.HtmlHeader; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlInputText; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlLi; +import org.genericsystem.reactor.ba_htmltag.HtmlSpan; +import org.genericsystem.reactor.ba_htmltag.HtmlStrong; +import org.genericsystem.reactor.ba_htmltag.HtmlUl; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; import org.genericsystem.todomvc.Todos.Completed; import javafx.beans.Observable; diff --git a/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp2.java b/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp2.java index 1e5e9c967..236cf6c81 100644 --- a/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp2.java +++ b/gs-todomvc/src/main/java/org/genericsystem/todomvc/TodoApp2.java @@ -13,21 +13,21 @@ import org.genericsystem.reactor.annotations.ReactorDependencies; import org.genericsystem.reactor.annotations.StyleClasses.StyleClass; import org.genericsystem.reactor.appserver.ApplicationServer; -import org.genericsystem.reactor.az.GSApp; -import org.genericsystem.reactor.az.GSDiv; -import org.genericsystem.reactor.gstag.HtmlButton; -import org.genericsystem.reactor.gstag.HtmlCheckBox; -import org.genericsystem.reactor.gstag.HtmlDiv; -import org.genericsystem.reactor.gstag.HtmlFooter; -import org.genericsystem.reactor.gstag.HtmlH1; -import org.genericsystem.reactor.gstag.HtmlHeader; -import org.genericsystem.reactor.gstag.HtmlHyperLink; -import org.genericsystem.reactor.gstag.HtmlInputText; -import org.genericsystem.reactor.gstag.HtmlLabel; -import org.genericsystem.reactor.gstag.HtmlLi; -import org.genericsystem.reactor.gstag.HtmlSpan; -import org.genericsystem.reactor.gstag.HtmlStrong; -import org.genericsystem.reactor.gstag.HtmlUl; +import org.genericsystem.reactor.ba_htmltag.HtmlButton; +import org.genericsystem.reactor.ba_htmltag.HtmlCheckBox; +import org.genericsystem.reactor.ba_htmltag.HtmlDiv; +import org.genericsystem.reactor.ba_htmltag.HtmlFooter; +import org.genericsystem.reactor.ba_htmltag.HtmlH1; +import org.genericsystem.reactor.ba_htmltag.HtmlHeader; +import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink; +import org.genericsystem.reactor.ba_htmltag.HtmlInputText; +import org.genericsystem.reactor.ba_htmltag.HtmlLabel; +import org.genericsystem.reactor.ba_htmltag.HtmlLi; +import org.genericsystem.reactor.ba_htmltag.HtmlSpan; +import org.genericsystem.reactor.ba_htmltag.HtmlStrong; +import org.genericsystem.reactor.ba_htmltag.HtmlUl; +import org.genericsystem.reactor.ca_gscomponents.GSApp; +import org.genericsystem.reactor.ca_gscomponents.GSDiv; import org.genericsystem.todomvc.TodoApp2.MyHtmlDiv; import org.genericsystem.todomvc.TodoApp2.MyHtmlDiv.MyDiv; import org.genericsystem.todomvc.TodoApp2.MyHtmlDiv.MyDiv.MyDiv2;