[Jaxx-commits] 01/03: Use jcss extension instead of cc in jaxx widgets (Fixes #4032)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit d21d17cfcd88a780c997c6350b0ff3b9cdaf5521 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 14 18:52:52 2016 +0200 Use jcss extension instead of cc in jaxx widgets (Fixes #4032) --- jaxx-application-swing/pom.xml | 1 + ...cationActionUI.css => ApplicationActionUI.jcss} | 0 ...{ConfigCategoryUI.css => ConfigCategoryUI.jcss} | 0 .../swing/config/{ConfigUI.css => ConfigUI.jcss} | 0 .../demo/{DemoSources.css => DemoSources.jcss} | 0 .../java/jaxx/demo/{DemoUI.css => DemoUI.jcss} | 0 ...edDecoratorDemo.css => BoxedDecoratorDemo.jcss} | 0 ...{BeanComboBoxDemo.css => BeanComboBoxDemo.jcss} | 0 ...nDoubleListDemo.css => BeanDoubleListDemo.jcss} | 0 ...BoxDemo.css => BeanFilterableComboBoxDemo.jcss} | 0 ...imeEditorDemo.css => SimpleTimeEditorDemo.jcss} | 0 .../{TimeEditorDemo.css => TimeEditorDemo.jcss} | 0 .../{CoordinateDemo.css => CoordinateDemo.jcss} | 0 ...eTimeEditorDemo.css => DateTimeEditorDemo.jcss} | 0 .../{TimeEditorDemo.css => TimeEditorDemo.jcss} | 0 ...esEditorDemo.css => CoordinatesEditorDemo.jcss} | 0 ...{NumberEditorDemo.css => NumberEditorDemo.jcss} | 0 ...eListDemo.css => FilterableDoubleListDemo.jcss} | 0 .../swing/{JButtonDemo.css => JButtonDemo.jcss} | 0 .../ListBeanValidationDemo.jcss} | 0 .../simple/SimpleBeanValidationByListDemo.jaxx | 2 +- .../simple/SimpleBeanValidationByTableDemo.jaxx | 2 +- .../Validation.jcss} | 0 .../main/java/jaxx/demo/fun/CalculatorDemo.jaxx | 2 +- .../{CalculatorDemo.css => CalculatorDemo.jcss} | 0 .../{LabelStyleDemo.css => LabelStyleDemo.jcss} | 0 .../org/nuiton/jaxx/plugin/compilerTest/Errors.xml | 1 + .../plugin/compilerTest/errors/InvalidRootTag.jaxx | 2 +- .../plugin/compilerTest/errors/StyleNotFound.jaxx | 2 +- .../compilerTest/errors/StyleSourceAndInline.jaxx | 2 +- .../errors/dependencies/{test.css => test.jcss} | 0 jaxx-widgets-datetime/pom.xml | 1 + .../{DateTimeEditor.css => DateTimeEditor.jcss} | 0 .../datetime/{TimeEditor.css => TimeEditor.jcss} | 0 jaxx-widgets-gis/pom.xml | 1 + .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 2 +- .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 2 +- .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 2 +- ...{CoordinateEditor.css => CoordinateEditor.jcss} | 0 ...oordinatesEditor.css => CoordinatesEditor.jcss} | 0 .../gis/absolute/CoordinatesEditorHandler.java | 28 ++++++++++++++++++++++ ...{CoordinateEditor.css => CoordinateEditor.jcss} | 0 .../gis/signed/SignedDdCoordinateEditor.jaxx | 2 +- .../gis/signed/SignedDmdCoordinateEditor.jaxx | 2 +- .../gis/signed/SignedDmsCoordinateEditor.jaxx | 2 +- jaxx-widgets-number/pom.xml | 1 + .../number/{NumberEditor.css => NumberEditor.jcss} | 0 jaxx-widgets-select/pom.xml | 1 + ...bleDoubleList.css => FilterableDoubleList.jcss} | 0 jaxx-widgets/pom.xml | 1 + .../jaxx/runtime/swing/editor/NumberEditor.jaxx | 2 +- ...umberEditorPopup.css => NumberEditorPopup.jcss} | 0 ...{SimpleTimeEditor.css => SimpleTimeEditor.jcss} | 0 .../editor/{TimeEditor.css => TimeEditor.jcss} | 0 .../bean/{BeanComboBox.css => BeanComboBox.jcss} | 0 .../{BeanDoubleList.css => BeanDoubleList.jcss} | 0 ...bleComboBox.css => BeanFilterableComboBox.jcss} | 0 .../{BeanListHeader.css => BeanListHeader.jcss} | 0 ...ordinateEditor.css => DmdCoordinateEditor.jcss} | 0 ...ordinateEditor.css => DmsCoordinateEditor.jcss} | 0 60 files changed, 48 insertions(+), 13 deletions(-) diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index e7402b7..deb4d99 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -48,6 +48,7 @@ <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!-- FIXME ! --> <i18n.failsIfWarning>false</i18n.failsIfWarning> diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.css b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jcss similarity index 100% rename from jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.css rename to jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jcss diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css b/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.jcss similarity index 100% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css rename to jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.jcss diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.css b/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.jcss similarity index 100% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.css rename to jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoSources.css b/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/DemoSources.css rename to jaxx-demo/src/main/java/jaxx/demo/DemoSources.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css b/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/DemoUI.css rename to jaxx-demo/src/main/java/jaxx/demo/DemoUI.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.css b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.css rename to jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx index 38bc19a..8e9eb33 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx @@ -21,7 +21,7 @@ --> <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> - <style source="Validation.css"/> + <style source="Validation.jcss"/> <import> javax.swing.JOptionPane diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx index 02e450e..4f51ed8 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx @@ -21,7 +21,7 @@ --> <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> - <style source="Validation.css"/> + <style source="Validation.jcss"/> <import> javax.swing.JOptionPane diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.css b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx index 84304a9..49a1303 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx @@ -28,7 +28,7 @@ javax.swing.border.BevelBorder </import> - <!--<style source='CalculatorDemo.css'/>--> + <!--<style source='CalculatorDemo.jcss'/>--> <script><![CDATA[ plus.setText("+"); sign.setText("+/-"); diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.css b/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jcss diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml index 65833f0..c4b4265 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml @@ -34,6 +34,7 @@ <groupId>org.nuiton</groupId> <artifactId>jaxx-maven-plugin</artifactId> <configuration> + <cssExtension>jcss</cssExtension> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> <autoRecurseInCss>true</autoRecurseInCss> diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/InvalidRootTag.jaxx b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/InvalidRootTag.jaxx index a9c445a..398eeac 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/InvalidRootTag.jaxx +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/InvalidRootTag.jaxx @@ -19,4 +19,4 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<style source='test.css'/> +<style source='test.jcss'/> diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleNotFound.jaxx b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleNotFound.jaxx index 1d66b23..e81a1f0 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleNotFound.jaxx +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleNotFound.jaxx @@ -19,4 +19,4 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<style source='notfound.css'/> +<style source='notfound.jcss'/> diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleSourceAndInline.jaxx b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleSourceAndInline.jaxx index 35bba76..e4bd498 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleSourceAndInline.jaxx +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/StyleSourceAndInline.jaxx @@ -19,6 +19,6 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<style source='dependencies/test.css'> +<style source='dependencies/test.jcss'> JLabel { text: "this should not compile" } </style> diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/dependencies/test.css b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/dependencies/test.jcss similarity index 100% rename from jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/dependencies/test.css rename to jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/errors/dependencies/test.jcss diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 5690524..3fb6884 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -46,6 +46,7 @@ <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jcss similarity index 100% rename from jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jcss diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.css b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jcss similarity index 100% rename from jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.css rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jcss diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index aba56ca..652b4f1 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -45,6 +45,7 @@ <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx index 3f83715..105e76a 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx index 9f88bea..3acdb5b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx index b471b25..e003a4a 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.jcss similarity index 100% rename from jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css rename to jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.jcss diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jcss similarity index 100% rename from jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css rename to jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jcss diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java index bc63232..a4f2bdc 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java @@ -24,6 +24,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; import com.google.common.base.Preconditions; import jaxx.runtime.spi.UIHandler; +import jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.widgets.gis.CoordinateFormat; import org.nuiton.util.beans.BeanUtil; @@ -78,6 +79,33 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { } + public void resetQuadrant() { + + ui.setQuadrant(null); + JAXXButtonGroup quadrantBG = ui.getQuadrantBG(); + + quadrantBG.setSelectedValue(null); + quadrantBG.setSelectedButton(null); + + quadrantBG.remove(ui.getQuadrant1()); + quadrantBG.remove(ui.getQuadrant2()); + quadrantBG.remove(ui.getQuadrant3()); + quadrantBG.remove(ui.getQuadrant4()); + + ui.getQuadrant1().setSelected(false); + ui.getQuadrant2().setSelected(false); + ui.getQuadrant3().setSelected(false); + ui.getQuadrant4().setSelected(false); + + quadrantBG.add(ui.getQuadrant1()); + quadrantBG.add(ui.getQuadrant2()); + quadrantBG.add(ui.getQuadrant3()); + quadrantBG.add(ui.getQuadrant4()); + + // reset in model at the end + ui.setQuadrant(null); + } + public void init(CoordinatesEditor ui) { CoordinatesEditorModel model = ui.getModel(); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.jcss similarity index 100% rename from jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css rename to jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.jcss diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx index b644cb9..d4b19db 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx index 57c668d..09199fd 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx index ada9319..1003599 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx @@ -28,7 +28,7 @@ javax.swing.JFormattedTextField </import> - <style source="CoordinateEditor.css"/> + <style source="CoordinateEditor.jcss"/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 77fdbd6..7b25c6e 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -42,6 +42,7 @@ <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.css b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jcss similarity index 100% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.css rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jcss diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index b6797ac..0b05b10 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -42,6 +42,7 @@ <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jcss similarity index 100% rename from jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jcss diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 088e766..3914573 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -45,6 +45,7 @@ <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx index f77f4ca..2036113 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx @@ -84,7 +84,7 @@ onPopupMenuWillBecomeVisible='showPopUpButton.setSelected(true)' onPopupMenuWillBecomeInvisible='showPopUpButton.setSelected(false)' onPopupMenuCanceled='showPopUpButton.setSelected(false)'> - <style source='NumberEditorPopup.css'/> + <style source='NumberEditorPopup.jcss'/> <JPanel layout='{new GridLayout(4,4)}' border='{BorderFactory.createEmptyBorder(4, 4, 4, 4)}' background='{Color.WHITE}'> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.css rename to jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.