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 8a000adb21a7c48d568492f9c0294aee13fa7c6e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 09:29:58 2016 +0100 Rename demo package to org.nuiton.jaxx.demo (See #3669) --- jaxx-demo/pom.xml | 4 +- .../nuiton}/jaxx/demo/DemoApplicationContext.java | 4 +- .../{ => org/nuiton}/jaxx/demo/DemoConfig.java | 14 +-- .../{ => org/nuiton}/jaxx/demo/DemoHelpBroker.java | 2 +- .../java/{ => org/nuiton}/jaxx/demo/DemoPanel.jaxx | 2 +- .../{ => org/nuiton}/jaxx/demo/DemoSources.jaxx | 4 +- .../{ => org/nuiton}/jaxx/demo/DemoSources.jcss | 0 .../nuiton}/jaxx/demo/DemoSourcesHandler.java | 6 +- .../java/{ => org/nuiton}/jaxx/demo/DemoTab.jaxx | 0 .../java/{ => org/nuiton}/jaxx/demo/DemoUI.jaxx | 4 +- .../java/{ => org/nuiton}/jaxx/demo/DemoUI.jcss | 0 .../{ => org/nuiton}/jaxx/demo/DemoUIHandler.java | 8 +- .../java/{ => org/nuiton}/jaxx/demo/RunDemo.java | 8 +- .../demo/component/jaxx/BoxedDecoratorDemo.jaxx | 4 +- .../demo/component/jaxx/BoxedDecoratorDemo.jcss | 0 .../component/jaxx/StatusMessagePanelDemo.jaxx | 4 +- .../component/jaxx/editor/BeanComboBoxDemo.jaxx | 6 +- .../component/jaxx/editor/BeanComboBoxDemo.jcss | 0 .../jaxx/editor/BeanComboBoxDemoHandler.java | 10 +-- .../component/jaxx/editor/BeanDoubleListDemo.jaxx | 6 +- .../component/jaxx/editor/BeanDoubleListDemo.jcss | 0 .../jaxx/editor/BeanDoubleListDemoHandler.java | 10 +-- .../jaxx/editor/BeanFilterableComboBoxDemo.jaxx | 6 +- .../jaxx/editor/BeanFilterableComboBoxDemo.jcss | 0 .../editor/BeanFilterableComboBoxDemoHandler.java | 10 +-- .../component/jaxx/editor/ComboEditorDemo.jaxx | 6 +- .../demo/component/jaxx/editor/DatePickerDemo.jaxx | 10 +-- .../demo/component/jaxx/editor/FileEditorDemo.jaxx | 4 +- .../demo/component/jaxx/editor/I18nEditorDemo.jaxx | 12 +-- .../component/jaxx/editor/ListSelectorDemo.jaxx | 15 ++-- .../component/jaxx/editor/NumberEditorDemo.jaxx | 18 ++-- .../jaxx/editor/NumberEditorDemoModel.java | 2 +- .../jaxx/editor/SimpleTimeEditorDemo.jaxx | 6 +- .../jaxx/editor/SimpleTimeEditorDemo.jcss | 0 .../jaxx/editor/SimpleTimeEditorDemoHandler.java | 2 +- .../jaxx/editor/SimpleTimeEditorDemoModel.java | 2 +- .../demo/component/jaxx/editor/TimeEditorDemo.jaxx | 14 +-- .../demo/component/jaxx/editor/TimeEditorDemo.jcss | 0 .../component/jaxx/editor/TimeEditorDemoModel.java | 2 +- .../component/jaxx/editor/gis/CoordinateDemo.jaxx | 4 +- .../component/jaxx/editor/gis/CoordinateDemo.jcss | 0 .../jaxx/editor/gis/CoordinateDemoHandler.java | 2 +- .../jaxx/editor/gis/CoordinateDemoModel.java | 2 +- .../jaxx/widgets/datetime/DateTimeEditorDemo.jaxx | 4 +- .../jaxx/widgets/datetime/DateTimeEditorDemo.jcss | 0 .../datetime/DateTimeEditorDemoHandler.java | 2 +- .../widgets/datetime/DateTimeEditorDemoModel.java | 2 +- .../jaxx/widgets/datetime/TimeEditorDemo.jaxx | 10 ++- .../jaxx/widgets/datetime/TimeEditorDemo.jcss | 0 .../widgets/datetime/TimeEditorDemoHandler.java | 2 +- .../jaxx/widgets/datetime/TimeEditorDemoModel.java | 2 +- .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 4 +- .../jaxx/widgets/gis/CoordinatesEditorDemo.jcss | 0 .../widgets/gis/CoordinatesEditorDemoHandler.java | 2 +- .../widgets/gis/CoordinatesEditorDemoModel.java | 2 +- .../jaxx/widgets/number/NumberEditorDemo.jaxx | 7 +- .../jaxx/widgets/number/NumberEditorDemo.jcss | 0 .../widgets/number/NumberEditorDemoHandler.java | 2 +- .../jaxx/widgets/number/NumberEditorDemoModel.java | 2 +- .../widgets/select/FilterableDoubleListDemo.jaxx | 6 +- .../widgets/select/FilterableDoubleListDemo.jcss | 0 .../select/FilterableDoubleListDemoHandler.java | 8 +- .../select/FilterableDoubleListDemoModel.java | 4 +- .../jaxx/demo/component/swing/HidorButtonDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JButtonDemo.jaxx | 6 +- .../jaxx/demo/component/swing/JButtonDemo.jcss | 0 .../jaxx/demo/component/swing/JCheckBoxDemo.jaxx | 4 +- .../component/swing/JCheckBoxMenuItemDemo.jaxx | 0 .../jaxx/demo/component/swing/JComboBoxDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JDialogDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JListDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JMenuItemDemo.jaxx | 4 +- .../demo/component/swing/JPasswordFieldDemo.jaxx | 4 +- .../demo/component/swing/JProgressBarDemo.jaxx | 4 +- .../demo/component/swing/JRadioButtonDemo.jaxx | 6 +- .../component/swing/JRadioButtonMenuItemDemo.jaxx | 0 .../jaxx/demo/component/swing/JSliderDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JSpinnerDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JSplitPaneDemo.jaxx | 8 +- .../jaxx/demo/component/swing/JTextAreaDemo.jaxx | 4 +- .../jaxx/demo/component/swing/JTextFieldDemo.jaxx | 4 +- .../demo/component/swing/JToggleButtonDemo.jaxx | 6 +- .../jaxx/demo/entities/AbstractDemoBean.java | 2 +- .../jaxx/demo/entities/DemoDataProvider.java | 16 ++-- .../jaxx/demo/entities/DemoDecoratorProvider.java | 2 +- .../nuiton}/jaxx/demo/entities/Identity.java | 2 +- .../{ => org/nuiton}/jaxx/demo/entities/Model.java | 2 +- .../{ => org/nuiton}/jaxx/demo/entities/Movie.java | 2 +- .../nuiton}/jaxx/demo/entities/People.java | 2 +- .../feature/databinding/BaseBeanDataBinding.jaxx | 4 +- .../feature/databinding/BeanDataBindingDemo.jaxx | 0 .../feature/databinding/BindingExtremeDemo.jaxx | 6 +- .../feature/databinding/DefaultDemoUIModel.java | 2 +- .../jaxx/demo/feature/databinding/DemoUIModel.java | 2 +- .../nuiton}/jaxx/demo/feature/nav/NavDemo.jaxx | 10 +-- .../jaxx/demo/feature/nav/NavDemoHandler.java | 28 +++--- .../feature/nav/content/AbstractContentUI.jaxx | 6 +- .../demo/feature/nav/content/ActorContentUI.jaxx | 2 +- .../demo/feature/nav/content/ActorsContentUI.jaxx | 14 +-- .../demo/feature/nav/content/MovieContentUI.jaxx | 8 +- .../demo/feature/nav/content/MoviesContentUI.jaxx | 12 +-- .../feature/nav/tree/ActorsTreeNodeLoador.java | 6 +- .../feature/nav/tree/MoviesTreeNodeLoador.java | 8 +- .../feature/nav/tree/NavDemoTreeCellRenderer.java | 12 +-- .../demo/feature/nav/tree/NavDemoTreeHelper.java | 6 +- .../demo/feature/nav/tree/NavDemoTreeNode.java | 2 +- .../nav/treetable/ActorsTreeTableNodeLoador.java | 6 +- .../nav/treetable/MoviesTreeTableNodeLoador.java | 8 +- .../nav/treetable/NavDemoTreeTableHelper.java | 6 +- .../nav/treetable/NavDemoTreeTableModel.java | 12 +-- .../nav/treetable/NavDemoTreeTableNode.java | 2 +- .../validation/list/ListBeanValidationDemo.jaxx | 14 +-- .../validation/list/ListBeanValidationDemo.jcss | 0 .../list/ListBeanValidationDemoHandler.java | 20 ++--- .../feature/validation/list/PeopleTableModel.java | 6 +- .../simple/SimpleBeanValidationByListDemo.jaxx | 24 +++--- .../simple/SimpleBeanValidationByTableDemo.jaxx | 28 +++--- .../demo/feature/validation/simple/Validation.jcss | 0 .../nuiton}/jaxx/demo/fun/CalculatorDemo.jaxx | 4 +- .../nuiton}/jaxx/demo/fun/CalculatorDemo.jcss | 0 .../nuiton}/jaxx/demo/fun/CalculatorEngine.java | 6 +- .../nuiton}/jaxx/demo/fun/CounterDemo.jaxx | 4 +- .../nuiton}/jaxx/demo/fun/LabelStyleDemo.jaxx | 12 +-- .../nuiton}/jaxx/demo/fun/LabelStyleDemo.jcss | 0 .../nuiton}/jaxx/demo/tree/DemoCellRenderer.java | 10 +-- .../nuiton}/jaxx/demo/tree/DemoDataProvider.java | 96 ++++++++++----------- .../{ => org/nuiton}/jaxx/demo/tree/DemoNode.java | 2 +- .../nuiton}/jaxx/demo/tree/DemoNodeLoador.java | 2 +- .../nuiton}/jaxx/demo/tree/DemoTreeHelper.java | 2 +- jaxx-demo/src/main/resources/log4j.properties | 9 -- .../demo/entities/Identity-error-validation.xml | 0 .../demo/entities/Identity-info-validation.xml | 0 .../demo/entities/Identity-warning-validation.xml | 0 .../jaxx/demo/entities/Model-error-validation.xml | 0 .../jaxx/demo/entities/Model-info-validation.xml | 0 .../demo/entities/Model-warning-validation.xml | 0 .../jaxx/demo/entities/People-error-validation.xml | 0 .../jaxx/demo/entities/People-info-validation.xml | 0 .../demo/entities/People-warning-validation.xml | 0 .../{ => org/nuiton}/jaxx/demo/images/Amethyst.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/Lynx.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/Tomato.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/ana.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/hector.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/jack.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/jim.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/joe.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/joker.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/nacho.jpg | Bin .../{ => org/nuiton}/jaxx/demo/images/nacho2.png | Bin .../nuiton}/jaxx/demo/images/pencil_black.gif | Bin .../jaxx/demo/BeanValidatorDetectorTest.java | 8 +- 152 files changed, 389 insertions(+), 394 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 9d1b70f..654183a 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -41,7 +41,7 @@ <properties> - <maven.jar.main.class>jaxx.demo.RunDemo</maven.jar.main.class> + <maven.jar.main.class>org.nuiton.jaxx.demo.RunDemo</maven.jar.main.class> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> @@ -56,7 +56,7 @@ <jaxx.mergeIdsToInput>true</jaxx.mergeIdsToInput> <jaxx.inputHelpDirectory>src/main/resources</jaxx.inputHelpDirectory> <jaxx.inputHelpFilenamePrefix>jaxxdemo-help</jaxx.inputHelpFilenamePrefix> - <jaxx.helpBrokerFQN>jaxx.demo.DemoHelpBroker</jaxx.helpBrokerFQN> + <jaxx.helpBrokerFQN>org.nuiton.jaxx.demo.DemoHelpBroker</jaxx.helpBrokerFQN> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java index 4826d6c..ac3554c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java @@ -1,4 +1,4 @@ -package jaxx.demo; +package org.nuiton.jaxx.demo; /* * #%L @@ -115,7 +115,7 @@ public class DemoApplicationContext extends DefaultApplicationContext implements } catch (Exception eee) { log.error("Failed to load help mapping file at '" + - mappingProperties + "'", eee); + mappingProperties + "'", eee); } } diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java index be27f34..aecde1d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java @@ -20,10 +20,9 @@ * #L% */ -package jaxx.demo; +package org.nuiton.jaxx.demo; import com.google.common.base.Supplier; -import jaxx.demo.component.swing.JButtonDemo; import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,6 +30,7 @@ import org.jdesktop.beans.AbstractBean; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.config.ConfigOptionDef; +import org.nuiton.jaxx.demo.component.swing.JButtonDemo; import org.nuiton.version.Version; import org.nuiton.version.Versions; @@ -160,8 +160,8 @@ public class DemoConfig extends AbstractBean implements Supplier<ApplicationConf } else { if (log.isDebugEnabled()) { log.debug("Saving configuration fired by property [" + - evt.getPropertyName() + "] at " + - new Date()); + evt.getPropertyName() + "] at " + + new Date()); } saveForUser(); } @@ -187,7 +187,7 @@ public class DemoConfig extends AbstractBean implements Supplier<ApplicationConf // add a listener if (log.isDebugEnabled()) { log.debug("register saveUserAction on property [" + - propertyKey + ']'); + propertyKey + ']'); } addPropertyChangeListener(propertyKey, saveUserAction); } @@ -354,8 +354,8 @@ public class DemoConfig extends AbstractBean implements Supplier<ApplicationConf public String getHelpResourceWithLocale(String value) { String result = getHelpLocation() + "/" + - getLocale().getLanguage() + "/" + - value; + getLocale().getLanguage() + "/" + + value; return result; } diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java similarity index 99% rename from jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java index 4b595be..c1d9af9 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java @@ -1,4 +1,4 @@ -package jaxx.demo; +package org.nuiton.jaxx.demo; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoPanel.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoPanel.jaxx index 1d5b923..cd23d16 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoPanel.jaxx @@ -23,7 +23,7 @@ <JPanel id='top' abstract='true'> <import> - jaxx.demo.DemoHelpBroker + org.nuiton.jaxx.demo.DemoHelpBroker org.nuiton.util.StringUtil </import> diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx index 207fe2f..29e3a4a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx @@ -23,7 +23,7 @@ <JPanel layout='{new BorderLayout()}' decorator='help'> <import> - jaxx.demo.DemoHelpBroker + org.nuiton.jaxx.demo.DemoHelpBroker jaxx.runtime.SwingUtil jaxx.runtime.swing.FontSizor @@ -65,7 +65,7 @@ public DemoConfig getConfig() { model='{new DefaultComboBoxModel()}' onItemStateChanged='if(event.getStateChange() == ItemEvent.SELECTED) { handler.updateSource(event); }'/> <javax.swing.Box.Filler - constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> + constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> <FontSizor id='fontSizor' opaque='false' showFontSize='true' fontSize='{getConfig().getFontSize()}'/> </JToolBar> diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/DemoSources.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java index cded567..b5bc06e 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo; +package org.nuiton.jaxx.demo; import com.google.common.collect.Lists; import jaxx.runtime.JAXXObject; @@ -101,7 +101,7 @@ public class DemoSourcesHandler implements UIHandler<DemoSources> { if (log.isDebugEnabled()) { log.debug(name + " from " + ui.getIncomingClass()); } - int lastDotIndex = name.lastIndexOf("."); + int lastDotIndex = name.lastIndexOf(""); String path = "/" + name.substring(0, lastDotIndex).replaceAll("\\.", "/"); path += name.substring(lastDotIndex); result = IOUtils.toString(ui.getIncomingClass().getResourceAsStream(path)); @@ -175,7 +175,7 @@ public class DemoSourcesHandler implements UIHandler<DemoSources> { List<String> toFill = new ArrayList<String>(); String prefix = ui.getIncomingClass() == null ? "" : - ui.getIncomingClass().getPackage().getName() + "."; + ui.getIncomingClass().getPackage().getName() + ""; for (String source : sources) { String path; if (source.startsWith("/")) { diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoTab.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoTab.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx index 1faf8c3..344f384 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx @@ -24,8 +24,8 @@ decorator='help' onWindowClosing='handler.close(mainFrame)'> <import> - jaxx.demo.tree.DemoTreeHelper - jaxx.demo.tree.DemoCellRenderer + org.nuiton.jaxx.demo.tree.DemoTreeHelper + org.nuiton.jaxx.demo.tree.DemoCellRenderer jaxx.runtime.SwingUtil jaxx.runtime.swing.CardLayout2 diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/DemoUI.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java similarity index 99% rename from jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index 714bca0..04558f6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo; +package org.nuiton.jaxx.demo; /* * #%L @@ -22,8 +22,6 @@ package jaxx.demo; * #L% */ -import jaxx.demo.tree.DemoNode; -import jaxx.demo.tree.DemoTreeHelper; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; @@ -32,13 +30,15 @@ import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.ErrorDialogUI; -import org.nuiton.jaxx.config.ConfigUIHelper; import jaxx.runtime.swing.log.JAXXLog4jUI; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; import org.nuiton.i18n.I18n; +import org.nuiton.jaxx.config.ConfigUIHelper; +import org.nuiton.jaxx.demo.tree.DemoNode; +import org.nuiton.jaxx.demo.tree.DemoTreeHelper; import org.nuiton.jaxx.widgets.about.AboutUI; import org.nuiton.jaxx.widgets.about.AboutUIBuilder; diff --git a/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/RunDemo.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java index ddfe7de..7ad817b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java @@ -20,11 +20,8 @@ * #L% */ -package jaxx.demo; +package org.nuiton.jaxx.demo; -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.tree.DemoDataProvider; -import jaxx.demo.tree.DemoTreeHelper; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.log.JAXXLog4jUI; @@ -33,6 +30,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.tree.DemoDataProvider; +import org.nuiton.jaxx.demo.tree.DemoTreeHelper; import org.nuiton.util.StringUtil; import java.util.Arrays; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx index 61582a5..6f7530d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx @@ -21,7 +21,7 @@ --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.SwingUtil @@ -119,4 +119,4 @@ protected void accept(ActionEvent e, String suffix) { </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx index 24bd58f..5179db6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <JPanel layout='{new GridLayout(0,1)}' constraints='BorderLayout.CENTER'> <JButton text='Fool me once' onActionPerformed='p.setStatus(((JButton)event.getSource()).getText() + " ? shame on you!")'/> @@ -29,4 +29,4 @@ </JPanel> <jaxx.runtime.swing.StatusMessagePanel id='p' constraints='BorderLayout.SOUTH'/> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx index 056e7a8..9bc639c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx @@ -19,10 +19,10 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanComboBox </import> @@ -50,4 +50,4 @@ </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java similarity index 90% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java index b426a8c..2080706 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; /* * #%L @@ -22,16 +22,16 @@ package jaxx.demo.component.jaxx.editor; * #L% */ -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.entities.People; import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.entities.People; import java.util.List; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Handlerof {@link BeanComboBoxDemo}. diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx index 35f424a..fe50a7a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx @@ -19,10 +19,10 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanDoubleList </import> @@ -45,4 +45,4 @@ </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java similarity index 90% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java index df9bb67..3c4419b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; /* * #%L @@ -27,12 +27,12 @@ package jaxx.demo.component.jaxx.editor; */ import com.google.common.base.Predicate; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.entities.People; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx index 4c40b27..e9f13f3 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx @@ -19,10 +19,10 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> @@ -51,4 +51,4 @@ </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java index bd623a3..2befe1d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; /* * #%L @@ -22,16 +22,16 @@ package jaxx.demo.component.jaxx.editor; * #L% */ -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.entities.People; import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.entities.People; import java.util.List; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Handlerof {@link BeanComboBoxDemo}. diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx similarity index 86% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx index ee63828..c6ddf41 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx @@ -21,7 +21,7 @@ --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.i18n.LanguageEnum @@ -59,8 +59,8 @@ <row> <cell columns="2"> <JTextArea - text='{"locale : "+ localeEditor.getSelectedItem() + "\nlanguage : "+ languageEditor.getSelectedItem() + "\ncountry : " + countryEditor.getSelectedItem()}'/> + text='{"locale : "+ localeEditor.getSelectedItem() + "\nlanguage : "+ languageEditor.getSelectedItem() + "\ncountry : " + countryEditor.getSelectedItem()}'/> </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx index 41e2db7..fa6e577 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.beans.PropertyChangeEvent @@ -88,9 +88,9 @@ <cell> <JLabel text='jaxxdemo.datePickerEditor.dateResult'/> </cell> - <cell fill='horizontal' weightx='1'> - <JLabel id='resultView' text='{dateFormat.format(date)}'/> - </cell> + <cell fill='horizontal' weightx='1'> + <JLabel id='resultView' text='{dateFormat.format(date)}'/> + </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx index e0e642c..c56c537 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.FileEditor </import> @@ -118,4 +118,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx similarity index 87% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx index 24a1c45..787392a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx @@ -21,7 +21,7 @@ --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> javax.swing.border.Border jaxx.runtime.swing.editor.I18nEditor @@ -41,8 +41,8 @@ protected Border getPopupBorder(String text) { <row> <cell> <JPanel - border='{new TitledBorder(t("jaxxdemo.i18neditor.configuration"))}' - layout='{new GridLayout(0,1)}'> + border='{new TitledBorder(t("jaxxdemo.i18neditor.configuration"))}' + layout='{new GridLayout(0,1)}'> <JCheckBox id='showText' text='jaxxdemo.i18neditor.showText' @@ -84,9 +84,9 @@ protected Border getPopupBorder(String text) { <row> <cell> <JLabel - border='{new TitledBorder(t("jaxxdemo.i18neditor.selected.locale"))}' - text='{editor.getSelectedLocale().toString()}'/> + border='{new TitledBorder(t("jaxxdemo.i18neditor.selected.locale"))}' + text='{editor.getSelectedLocale().toString()}'/> </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx similarity index 89% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx index ac81728..4d1461c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx @@ -19,21 +19,22 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.ListSelector com.google.common.collect.Lists java.util.List - jaxx.demo.entities.People - jaxx.demo.entities.Movie - jaxx.demo.entities.DemoDataProvider - jaxx.demo.entities.DemoDecoratorProvider + org.nuiton.jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.Movie + org.nuiton.jaxx.demo.entities.DemoDataProvider + org.nuiton.jaxx.demo.entities.DemoDecoratorProvider jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer java.util.Collection jaxx.runtime.swing.model.GenericListModel </import> - <ListCellRenderer id='listCellRenderer' initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> + <ListCellRenderer id='listCellRenderer' + initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> <DemoDataProvider id='dataProvider'/> <String id='addToolTip' javaBean='"Add"'/> @@ -98,4 +99,4 @@ public List<People> getActors(Collection<Movie> movies) { </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx similarity index 83% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx index af20e9f..5c2c4cb 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.NumberEditor @@ -48,8 +48,8 @@ void $afterCompleteSetup() { <row> <cell> <JPanel - border='{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}' - layout='{new GridLayout(0,1)}'> + border='{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}' + layout='{new GridLayout(0,1)}'> <JCheckBox id='useFloat' text='jaxxdemo.numbereditor.useFloat' @@ -71,8 +71,8 @@ void $afterCompleteSetup() { text='jaxxdemo.numbereditor.autoPopup' selected='false'/> <JPanel - border='{new TitledBorder(t("jaxxdemo.numbereditor.numberPattern.configuration"))}' - layout='{new GridLayout(1,0)}'> + border='{new TitledBorder(t("jaxxdemo.numbereditor.numberPattern.configuration"))}' + layout='{new GridLayout(1,0)}'> <JTextField id='numberPattern' text='{"\\d{0,3}"}'/> <JButton id='applyNumberPattern' text='jaxxdemo.numbereditor.applyNumberPattern' @@ -99,15 +99,15 @@ void $afterCompleteSetup() { <JPanel border='{new TitledBorder(t("jaxxdemo.numbereditor.model"))}' layout='{new GridLayout(0,1)}'> <JLabel - text='{t("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> + text='{t("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> <JLabel - text='{t("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> + text='{t("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> <JLabel - text='{t("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> + text='{t("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> </JPanel> </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java index 4f5a45e..ca40750 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx index 3d94c0d..c44c9b2 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.SimpleTimeEditor @@ -61,7 +61,7 @@ <row> <cell> <SimpleTimeEditor id='editor' constructorParams='this' - border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}'/> + border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}'/> </cell> </row> <row> @@ -78,4 +78,4 @@ </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java index 4fd6699..37894de 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java index 8e5789a..96d96e5 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; import jaxx.runtime.swing.editor.SimpleTimeEditor; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx similarity index 78% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx index ba8fd3c..ecdfcf0 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.TimeEditor @@ -27,7 +27,7 @@ </import> <!-- model --> - <jaxx.demo.component.jaxx.editor.TimeEditorDemoModel id='demoModel'/> + <org.nuiton.jaxx.demo.component.jaxx.editor.TimeEditorDemoModel id='demoModel'/> <script><![CDATA[ @@ -61,10 +61,10 @@ void $afterCompleteSetup() { <row> <cell> <jaxx.runtime.swing.editor.TimeEditor id='editor' constructorParams='this' property='time' - border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}' - bean='{demoModel}' - date="{demoModel.getTime()}" - label="{labelConfig.getText()}"/> + border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}' + bean='{demoModel}' + date="{demoModel.getTime()}" + label="{labelConfig.getText()}"/> </cell> </row> <row> @@ -81,4 +81,4 @@ void $afterCompleteSetup() { </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java index ac58cac..eca3722 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.component.jaxx.editor; +package org.nuiton.jaxx.demo.component.jaxx.editor; import jaxx.runtime.swing.editor.TimeEditor; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx index 84ec02a..625a093 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.NumberEditor @@ -94,4 +94,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java similarity index 99% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java index 34c4b51..aa12447 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.gis; +package org.nuiton.jaxx.demo.component.jaxx.editor.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java index 5d56865..33dc68d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.gis; +package org.nuiton.jaxx.demo.component.jaxx.editor.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx similarity index 95% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx index 4bb8a86..2ade9cf 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.jaxx.widgets.datetime.DateTimeEditor @@ -73,4 +73,4 @@ <JTextField id='resultTimeDate'/> </JPanel> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java index 8ff7746..6baeee6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.datetime; +package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java index da62607..04ba351 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.datetime; +package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx similarity index 78% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx index da5f3b0..d6e30f8 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jaxx @@ -19,13 +19,14 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.jaxx.widgets.datetime.TimeEditor </import> - <jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemoModel id='model' initializer='getContextValue(TimeEditorDemoModel.class)'/> + <org.nuiton.jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemoModel id='model' + initializer='getContextValue(TimeEditorDemoModel.class)'/> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> <Table id="configPanel" constraints='BorderLayout.NORTH'> @@ -43,7 +44,8 @@ </cell> </row> </Table> - <org.nuiton.jaxx.widgets.datetime.TimeEditor id='editor' constructorParams='this' constraints='BorderLayout.CENTER'/> + <org.nuiton.jaxx.widgets.datetime.TimeEditor id='editor' constructorParams='this' + constraints='BorderLayout.CENTER'/> </JPanel> <JPanel id='result' layout='{new GridLayout(0,2)}' constraints='BorderLayout.CENTER'> @@ -51,4 +53,4 @@ <JTextField id='resultTime'/> </JPanel> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java index a0ad6de..2470efa 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.datetime; +package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java similarity index 95% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java index b6834bf..b5cadd7 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.datetime; +package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx index 5fa3d0d..b32fc64 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor @@ -52,4 +52,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java index 3bbb968..f4760f7 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.gis; +package org.nuiton.jaxx.demo.component.jaxx.widgets.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java index d420326..3585f32 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.gis; +package org.nuiton.jaxx.demo.component.jaxx.widgets.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx index 0ec83fb..3cf9faf 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.jaxx.widgets.number.NumberEditor @@ -28,7 +28,8 @@ static org.nuiton.i18n.I18n.t </import> - <jaxx.demo.component.jaxx.widgets.number.NumberEditorDemoModel id='model' initializer="getContextValue(NumberEditorDemoModel.class)"/> + <org.nuiton.jaxx.demo.component.jaxx.widgets.number.NumberEditorDemoModel id='model' + initializer="getContextValue(NumberEditorDemoModel.class)"/> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <!-- config --> @@ -107,5 +108,5 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java index c053d2d..498dc41 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.number; +package org.nuiton.jaxx.demo.component.jaxx.widgets.number; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java index b1c80c0..86635aa 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.number; +package org.nuiton.jaxx.demo.component.jaxx.widgets.number; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx index 94be1e83..3c36b43 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx @@ -19,10 +19,10 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People org.nuiton.jaxx.widgets.select.FilterableDoubleList </import> @@ -52,4 +52,4 @@ </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/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.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java index c6edefc..7e9040e 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.select; +package org.nuiton.jaxx.demo.component.jaxx.widgets.select; /* * #%L @@ -22,11 +22,11 @@ package jaxx.demo.component.jaxx.widgets.select; * #L% */ -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.entities.People; import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.entities.People; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java index a0fb5ee..80c8fdf 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.widgets.select; +package org.nuiton.jaxx.demo.component.jaxx.widgets.select; /* * #%L @@ -22,8 +22,8 @@ package jaxx.demo.component.jaxx.widgets.select; * #L% */ -import jaxx.demo.entities.People; import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.demo.entities.People; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/HidorButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/HidorButtonDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx index c016fa5..c3a6a5d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/HidorButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new GridLayout(0,1)}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new GridLayout(0,1)}'> <HBox horizontalAlignment='center' verticalAlignment='middle'> @@ -39,4 +39,4 @@ <JLabel id='hidor2' text='Label 2'/> </HBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx index c5d013d..1337c0f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel id='topDemoPanel' decorator='help'> +<org.nuiton.jaxx.demo.DemoPanel id='topDemoPanel' decorator='help'> <style> JButton.fancy { foreground: blue; @@ -50,7 +50,7 @@ <String id='helpDefaultId' initializer='"ui.component.swing.buttons.JButtonDemo"'/> <javax.swing.ImageIcon id='pencil' - constructorParams='getClass().getResource("/jaxx/demo/images/pencil_black.gif")'/> + constructorParams='getClass().getResource("/org/nuiton/jaxx/demo/images/pencil_black.gif")'/> <VBox horizontalAlignment='center' verticalAlignment='middle'> <JButton id='simpleButon' text='Simple Button' @@ -58,4 +58,4 @@ <JButton id='fancyButon' text='Fancy Button' styleClass='fancy' icon='{pencil}' onActionPerformed='buttonClicked((JButton) event.getSource())'/> </VBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JCheckBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JCheckBoxDemo.jaxx similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JCheckBoxDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JCheckBoxDemo.jaxx index 273f5c3..f22293d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JCheckBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JCheckBoxDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> java.awt.Font </import> @@ -59,4 +59,4 @@ </row> </Table> </VBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JCheckBoxMenuItemDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JCheckBoxMenuItemDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JCheckBoxMenuItemDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JCheckBoxMenuItemDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JComboBoxDemo.jaxx similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JComboBoxDemo.jaxx index 0daf4c2..d7ffc33 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JComboBoxDemo.jaxx @@ -21,7 +21,7 @@ --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.DefaultComboBoxModel static org.nuiton.i18n.I18n.n @@ -67,4 +67,4 @@ private void $afterCompleteSetup() { </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JDialogDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JDialogDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JDialogDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JDialogDemo.jaxx index c6cf5e9..59bf458 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JDialogDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JDialogDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.JRootPane javax.swing.JComponent @@ -107,4 +107,4 @@ </Table> </JDialog> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JListDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JListDemo.jaxx index 9778fc2..ac8f51d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JListDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <Table> <row> <cell> @@ -78,4 +78,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JMenuItemDemo.jaxx similarity index 95% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JMenuItemDemo.jaxx index 4da75f2..592b85f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JMenuItemDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.JOptionPane </import> @@ -46,4 +46,4 @@ </JInternalFrame> </JDesktopPane> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx index 20ea025..84d018b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JPasswordFieldDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <VBox horizontalAlignment='center' verticalAlignment='middle'> <HBox> <JLabel text='Password:' displayedMnemonic='P' labelFor='{password}'/> @@ -29,4 +29,4 @@ <JLabel text='You entered: {new String(password.getPassword())}'/> </VBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JProgressBarDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JProgressBarDemo.jaxx index 9d59cdf..c62f8c0 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JProgressBarDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.awt.Color javax.swing.Timer @@ -117,4 +117,4 @@ protected void changeBlueValue() { </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx similarity index 86% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx index 633f296..d77bcea 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.ImageIcon </import> @@ -36,6 +36,6 @@ </VBox> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/" + radioButtons.getSelectedValue()))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/" + radioButtons.getSelectedValue()))}'/> </HBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSliderDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSliderDemo.jaxx index c5e45b7..ca2859d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSliderDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> java.awt.Color </import> @@ -36,4 +36,4 @@ height='64' background='{new Color(red.getValue(), green.getValue(), blue.getValue())}'/> </HBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSpinnerDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSpinnerDemo.jaxx index a057e24..0513863 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSpinnerDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <JLabel text='Spacing:' displayedMnemonic='S' labelFor='{spinner}'/> @@ -31,4 +31,4 @@ <JLabel text='adjust the spacing'/> <JLabel text='between these lines'/> </VBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSplitPaneDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx similarity index 77% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JSplitPaneDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx index c566abc..eee2371 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSplitPaneDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx @@ -20,19 +20,19 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.ImageIcon </import> <JSplitPane> <JScrollPane> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/Amethyst.jpg"))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/Amethyst.jpg"))}'/> </JScrollPane> <JScrollPane> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/Lynx.jpg"))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/Lynx.jpg"))}'/> </JScrollPane> </JSplitPane> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextAreaDemo.jaxx similarity index 95% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextAreaDemo.jaxx index f3f2dda..b947632 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextAreaDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <Table constraints='BorderLayout.CENTER'> <row> <cell> @@ -48,4 +48,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextFieldDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextFieldDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextFieldDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextFieldDemo.jaxx index 9abd879..519891c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextFieldDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JTextFieldDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <import> javax.swing.JOptionPane </import> @@ -42,4 +42,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JToggleButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JToggleButtonDemo.jaxx similarity index 84% rename from jaxx-demo/src/main/java/jaxx/demo/component/swing/JToggleButtonDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JToggleButtonDemo.jaxx index dae7d02..8264f7f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JToggleButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JToggleButtonDemo.jaxx @@ -20,13 +20,13 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <HBox horizontalAlignment='center' verticalAlignment='middle'> <JToggleButton text='1' id='one'/> <JToggleButton text='2' id='two'/> <JToggleButton text='3' id='three'/> <JLabel - text='Total: {(one.isSelected() ? 1 : 0) + (two.isSelected() ? 2 : 0) + (three.isSelected() ? 3 : 0)}'/> + text='Total: {(one.isSelected() ? 1 : 0) + (two.isSelected() ? 2 : 0) + (three.isSelected() ? 3 : 0)}'/> </HBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/AbstractDemoBean.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/AbstractDemoBean.java index a5571ef..bd561b6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/AbstractDemoBean.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java similarity index 81% rename from jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java index e853b40..fb434f3 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; @@ -52,18 +52,18 @@ public class DemoDataProvider implements NavDataProvider { if (log.isDebugEnabled()) { log.debug("for " + this); } - People a = new People("0", "Jack", "Black", 35, "/jaxx/demo/images/jack.jpg"); - People a2 = new People("1", "Héctor", "Jiménez", 28, "/jaxx/demo/images/hector.jpg"); - People a3 = new People("2", "Ana", "de la Reguera", 34, "/jaxx/demo/images/ana.jpg"); - People a4 = new People("3", "Jack", "Nicholson", 76, "/jaxx/demo/images/joker.jpg"); - People a5 = new People("4", "Jim", "Parsons", 30, "/jaxx/demo/images/jim.jpg"); + People a = new People("0", "Jack", "Black", 35, "/org/nuiton/jaxx/demo/images/jack.jpg"); + People a2 = new People("1", "Héctor", "Jiménez", 28, "/org/nuiton/jaxx/demo/images/hector.jpg"); + People a3 = new People("2", "Ana", "de la Reguera", 34, "/org/nuiton/jaxx/demo/images/ana.jpg"); + People a4 = new People("3", "Jack", "Nicholson", 76, "/org/nuiton/jaxx/demo/images/joker.jpg"); + People a5 = new People("4", "Jim", "Parsons", 30, "/org/nuiton/jaxx/demo/images/jim.jpg"); - Movie m = new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/nacho.jpg"); + Movie m = new Movie("0", "Nacho libre", 1996, "/org/nuiton/jaxx/demo/images/nacho.jpg"); m.addActor(a); m.addActor(a2); m.addActor(a3); - Movie m2 = new Movie("1", "Nacho 2", 2009, "/jaxx/demo/images/nacho2.png"); + Movie m2 = new Movie("1", "Nacho 2", 2009, "/org/nuiton/jaxx/demo/images/nacho2.png"); m2.addActor(a); m2.addActor(a2); diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDecoratorProvider.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDecoratorProvider.java index 7b25a10..3fcc8b3 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDecoratorProvider.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Identity.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Identity.java index 69b2997..96b7192 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Identity.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Model.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/entities/Model.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Model.java index 6d0f0e2..fdbe93e 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Model.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java index 7fecda2..7355700 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/jaxx-demo/src/main/java/jaxx/demo/entities/People.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/People.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/entities/People.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/People.java index 63179b5..13dd011 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/entities/People.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/People.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.entities; +package org.nuiton.jaxx.demo.entities; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx similarity index 95% rename from jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx index 930e60a..bf9ff67 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <!-- a full java bean property of the class --> <Boolean id='editing' javaBean='false'/> @@ -45,4 +45,4 @@ } </script> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx index fbe7483..4e1bcbf 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx @@ -21,8 +21,8 @@ --> -<jaxx.demo.DemoPanel id='mainFrame' implements='DemoUIModel' - layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel id='mainFrame' implements='DemoUIModel' + layout='{new BorderLayout()}'> <import> jaxx.runtime.JAXXBinding @@ -287,4 +287,4 @@ protected String[] getSources() { </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DefaultDemoUIModel.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DefaultDemoUIModel.java index 22cea42..2fe4039 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DefaultDemoUIModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.feature.databinding; +package org.nuiton.jaxx.demo.feature.databinding; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DemoUIModel.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DemoUIModel.java index e210396..123d059 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/DemoUIModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.feature.databinding; +package org.nuiton.jaxx.demo.feature.databinding; import javax.swing.JToggleButton; import java.beans.PropertyChangeListener; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemo.jaxx similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemo.jaxx index 0ab267f..c296805 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemo.jaxx @@ -20,13 +20,13 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.feature.nav.tree.NavDemoTreeHelper - jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper + org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeHelper + org.nuiton.jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper org.jdesktop.swingx.JXTreeTable - jaxx.demo.entities.DemoDataProvider + org.nuiton.jaxx.demo.entities.DemoDataProvider </import> <CardLayout2 id='contentLayout'/> @@ -95,4 +95,4 @@ protected String[] getSources() { </JSplitPane> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index 174ac52..5ee50f8 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -19,20 +19,8 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.feature.nav; - -import jaxx.demo.entities.AbstractDemoBean; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; -import jaxx.demo.feature.nav.content.AbstractContentUI; -import jaxx.demo.feature.nav.content.ActorContentUI; -import jaxx.demo.feature.nav.content.ActorsContentUI; -import jaxx.demo.feature.nav.content.MovieContentUI; -import jaxx.demo.feature.nav.content.MoviesContentUI; -import jaxx.demo.feature.nav.tree.NavDemoTreeCellRenderer; -import jaxx.demo.feature.nav.tree.NavDemoTreeNode; -import jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode; +package org.nuiton.jaxx.demo.feature.nav; + import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; @@ -44,6 +32,18 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; import org.nuiton.decorator.DecoratorProvider; import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.jaxx.demo.entities.AbstractDemoBean; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.entities.People; +import org.nuiton.jaxx.demo.feature.nav.content.AbstractContentUI; +import org.nuiton.jaxx.demo.feature.nav.content.ActorContentUI; +import org.nuiton.jaxx.demo.feature.nav.content.ActorsContentUI; +import org.nuiton.jaxx.demo.feature.nav.content.MovieContentUI; +import org.nuiton.jaxx.demo.feature.nav.content.MoviesContentUI; +import org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeCellRenderer; +import org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeNode; +import org.nuiton.jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode; import javax.swing.ImageIcon; import javax.swing.JPanel; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx similarity index 88% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx index b17473c..7a2f4fe 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx @@ -23,9 +23,9 @@ <JPanel abstract='true' layout='{new BorderLayout()}' genericType='B'> <import> - jaxx.demo.feature.nav.NavDemoHandler - jaxx.demo.feature.nav.tree.NavDemoTreeHelper - jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper + org.nuiton.jaxx.demo.feature.nav.NavDemoHandler + org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeHelper + org.nuiton.jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper </import> <NavDemoTreeHelper id='treeHelper' diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorContentUI.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorContentUI.jaxx index ac51d2b..ada70cb 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorContentUI.jaxx @@ -23,7 +23,7 @@ <AbstractContentUI superGenericType='People'> <import> - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People static org.nuiton.i18n.I18n.t </import> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx similarity index 86% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx index 573849c..04252d2 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx @@ -24,10 +24,10 @@ <import> java.util.List - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer - + static org.nuiton.i18n.I18n.t </import> @@ -42,11 +42,11 @@ private void $afterCompleteSetup() { <JPanel layout='{new BorderLayout()}'> <JScrollPane - border='{new TitledBorder(t("jaxxdemo.navigation.actors.title"))}' - constraints='BorderLayout.CENTER' - columnHeaderView='{toolbar}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + border='{new TitledBorder(t("jaxxdemo.navigation.actors.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> <!-- list of actors --> <JList id='list' diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MovieContentUI.jaxx similarity index 88% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MovieContentUI.jaxx index 6a62da7..978b68c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MovieContentUI.jaxx @@ -23,7 +23,7 @@ <AbstractContentUI superGenericType='Movie'> <import> - jaxx.demo.entities.Movie + org.nuiton.jaxx.demo.entities.Movie static org.nuiton.i18n.I18n.t </import> @@ -38,9 +38,9 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> <JTextPane - border='{new TitledBorder(t("jaxxdemo.navigation.movie.title"))}' - editable='false' font-size='11' - text='{getHandler().getContent(getData())}'/> + border='{new TitledBorder(t("jaxxdemo.navigation.movie.title"))}' + editable='false' font-size='11' + text='{getHandler().getContent(getData())}'/> </JScrollPane> <JScrollPane border='{new TitledBorder("Picture")}' diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx similarity index 86% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx index ede7c80..a568a6a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx @@ -24,7 +24,7 @@ <import> java.util.List - jaxx.demo.entities.Movie + org.nuiton.jaxx.demo.entities.Movie jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer @@ -42,11 +42,11 @@ private void $afterCompleteSetup() { <JPanel layout='{new BorderLayout()}'> <JScrollPane - border='{new TitledBorder(t("jaxxdemo.navigation.movies.title"))}' - constraints='BorderLayout.CENTER' - columnHeaderView='{toolbar}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + border='{new TitledBorder(t("jaxxdemo.navigation.movies.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> <!-- list of movies --> <JList id='list' diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java index 7da65e0..770988d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.demo.feature.nav.tree; +package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.People; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java index da5369e..0b144c7 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.demo.feature.nav.tree; +package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java index 51ecbc8..69dd975 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.demo.feature.nav.tree; +package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.entities.People; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; @@ -84,8 +84,8 @@ public class NavDemoTreeCellRenderer extends AbstractNavTreeCellRenderer<Default if (log.isDebugEnabled()) { log.debug("Compute text for node " + - node + " return " + - decorated); + node + " return " + + decorated); } return decorated; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java index 0c0d7a1..d82a955 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.demo.feature.nav.tree; +package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.tree.NavTreeHelper; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; import javax.swing.tree.DefaultTreeModel; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java index 9586c6a..0759a8b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.feature.nav.tree; +package org.nuiton.jaxx.demo.feature.nav.tree; import jaxx.runtime.swing.nav.tree.NavTreeNode; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java index 2077d07..0f9bf90 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.demo.feature.nav.treetable; +package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.People; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java similarity index 92% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java index 1dc1c2a..d376236 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.demo.feature.nav.treetable; +package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; import java.util.List; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java index e566de1..8d7079d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.demo.feature.nav.treetable; +package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.treetable.NavTreeTableHelper; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; /** * @author Sylvain Lletellier diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java index 2af8a60..5155e3f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.feature.nav.treetable; +package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.demo.entities.DemoDataProvider; -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.NavNode; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; +import org.nuiton.jaxx.demo.entities.DemoDataProvider; +import org.nuiton.jaxx.demo.entities.Movie; +import org.nuiton.jaxx.demo.entities.People; import static org.nuiton.i18n.I18n.t; @@ -105,8 +105,8 @@ public class NavDemoTreeTableModel extends NavTreeTableModel.MyDefaultTreeTableM @Override public String[] getColumnsNames() { return new String[]{t("jaxxdemo.common.firstName"), - t("jaxxdemo.common.lastName"), - t("jaxxdemo.common.age")}; + t("jaxxdemo.common.lastName"), + t("jaxxdemo.common.age")}; } @Override diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java index ad6edd9..80c9850 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.demo.feature.nav.treetable; +package org.nuiton.jaxx.demo.feature.nav.treetable; import jaxx.runtime.swing.nav.treetable.NavTreeTableNode; import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx similarity index 89% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx index 8ba6969..f15bb25 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx @@ -20,13 +20,13 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.jdesktop.swingx.JXTable javax.swing.JOptionPane static org.nuiton.i18n.I18n.n - jaxx.demo.entities.People + org.nuiton.jaxx.demo.entities.People org.nuiton.validator.bean.list.BeanListValidator org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableModel @@ -38,10 +38,10 @@ protected String[] getSources() { return addDefaultSources( "ListBeanValidationDemo.css", - "/jaxx.demo.entities.People.java", - "/jaxx.demo.entities.People-error-validation.xml", - "/jaxx.demo.entities.People-info-validation.xml", - "/jaxx.demo.entities.People-warning-validation.xml", + "/org.nuiton.jaxx.demo.entities.People.java", + "/org.nuiton.jaxx.demo.entities.People-error-validation.xml", + "/org.nuiton.jaxx.demo.entities.People-info-validation.xml", + "/org.nuiton.jaxx.demo.entities.People-warning-validation.xml", "ListBeanValidationDemoHandler.java", "PeopleTableModel.java" ); @@ -100,4 +100,4 @@ protected String[] getSources() { </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java index b5b759d..a08f4a3 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.feature.validation.list; +package org.nuiton.jaxx.demo.feature.validation.list; /* * #%L * JAXX :: Demo @@ -21,16 +21,16 @@ package jaxx.demo.feature.validation.list; * #L% */ -import jaxx.demo.entities.DemoDecoratorProvider; -import jaxx.demo.entities.People; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; -import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; +import org.nuiton.jaxx.demo.entities.People; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; @@ -49,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 2.5.3 */ -public class ListBeanValidationDemoHandler implements UIHandler<ListBeanValidationDemo>{ +public class ListBeanValidationDemoHandler implements UIHandler<ListBeanValidationDemo> { private ListBeanValidationDemo ui; @@ -117,9 +117,9 @@ public class ListBeanValidationDemoHandler implements UIHandler<ListBeanValidati // add some datas in model - People a = new People("0", "Jack", "Black", 12, "/jaxx/demo/images/jack.jpg"); - People a2 = new People("1", "Héctor", "Jiménez", 28, "/jaxx/demo/images/hector.jpg"); - People a3 = new People("2", "Ana", "de la Reguera", 34, "/jaxx/demo/images/ana.jpg"); + People a = new People("0", "Jack", "Black", 12, "/org/nuiton/jaxx/demo/images/jack.jpg"); + People a2 = new People("1", "Héctor", "Jiménez", 28, "/org/nuiton/jaxx/demo/images/hector.jpg"); + People a3 = new People("2", "Ana", "de la Reguera", 34, "/org/nuiton/jaxx/demo/images/ana.jpg"); addPeople(a); addPeople(a2); diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/PeopleTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/PeopleTableModel.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java index 1e44463..47aa6eb 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/PeopleTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.feature.validation.list; +package org.nuiton.jaxx.demo.feature.validation.list; /* * #%L * JAXX :: Demo @@ -22,10 +22,10 @@ package jaxx.demo.feature.validation.list; */ import com.google.common.collect.Lists; -import jaxx.demo.entities.Identity; -import jaxx.demo.entities.People; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.tuple.Pair; +import org.nuiton.jaxx.demo.entities.Identity; +import org.nuiton.jaxx.demo.entities.People; import javax.swing.table.AbstractTableModel; import java.util.Arrays; diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx index a3f6970..379166a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx @@ -20,14 +20,14 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <style source="Validation.jcss"/> <import> javax.swing.JOptionPane static org.nuiton.i18n.I18n.n - jaxx.demo.entities.Identity - jaxx.demo.entities.Model + org.nuiton.jaxx.demo.entities.Identity + org.nuiton.jaxx.demo.entities.Model org.nuiton.jaxx.validator.swing.SwingValidatorMessageListRenderer org.nuiton.jaxx.validator.swing.SwingValidatorMessageListModel @@ -39,14 +39,14 @@ protected String[] getSources() { return addDefaultSources( "Validation.css", - "/jaxx.demo.entities.Identity.java", - "/jaxx.demo.entities.Identity-error-validation.xml", - "/jaxx.demo.entities.Identity-info-validation.xml", - "/jaxx.demo.entities.Identity-warning-validation.xml", - "/jaxx.demo.entities.Model.java", - "/jaxx.demo.entities.Model-error-validation.xml", - "/jaxx.demo.entities.Model-info-validation.xml", - "/jaxx.demo.entities.Model-warning-validation.xml" + "/org.nuiton.jaxx.demo.entities.Identity.java", + "/org.nuiton.jaxx.demo.entities.Identity-error-validation.xml", + "/org.nuiton.jaxx.demo.entities.Identity-info-validation.xml", + "/org.nuiton.jaxx.demo.entities.Identity-warning-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model.java", + "/org.nuiton.jaxx.demo.entities.Model-error-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model-info-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model-warning-validation.xml" ); } ]]> @@ -369,4 +369,4 @@ protected String[] getSources() { </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx index 454eed8..5d085ad 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx @@ -20,14 +20,14 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <style source="Validation.jcss"/> <import> javax.swing.JOptionPane static org.nuiton.i18n.I18n.n - jaxx.demo.entities.Identity - jaxx.demo.entities.Model + org.nuiton.jaxx.demo.entities.Identity + org.nuiton.jaxx.demo.entities.Model org.nuiton.jaxx.validator.swing.SwingValidatorUtil org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel @@ -44,14 +44,14 @@ void $afterCompleteSetup() { protected String[] getSources() { return addDefaultSources ( "Validation.css", - "/jaxx.demo.entities.Identity.java", - "/jaxx.demo.entities.Identity-error-validation.xml", - "/jaxx.demo.entities.Identity-info-validation.xml", - "/jaxx.demo.entities.Identity-warning-validation.xml", - "/jaxx.demo.entities.Model.java", - "/jaxx.demo.entities.Model-error-validation.xml", - "/jaxx.demo.entities.Model-info-validation.xml", - "/jaxx.demo.entities.Model-warning-validation.xml" + "/org.nuiton.jaxx.demo.entities.Identity.java", + "/org.nuiton.jaxx.demo.entities.Identity-error-validation.xml", + "/org.nuiton.jaxx.demo.entities.Identity-info-validation.xml", + "/org.nuiton.jaxx.demo.entities.Identity-warning-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model.java", + "/org.nuiton.jaxx.demo.entities.Model-error-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model-info-validation.xml", + "/org.nuiton.jaxx.demo.entities.Model-warning-validation.xml" ); } ]]></script> @@ -97,7 +97,7 @@ protected String[] getSources() { <JTextField id='text' text='{model1.getText()}' onKeyReleased='model1.setText(text.getText())' _validatorLabel='{n("form.text")}' - /> + /> </cell> </row> <row> @@ -108,7 +108,7 @@ protected String[] getSources() { <JTextField id='text2' text='{model1.getText2()}' onKeyReleased='model1.setText2(text2.getText())' _validatorLabel='{n("form.text2")}' - /> + /> </cell> </row> @@ -378,4 +378,4 @@ protected String[] getSources() { </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/Validation.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/Validation.jcss rename to jaxx-demo/src/main/java/org/nuiton/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/org/nuiton/jaxx/demo/fun/CalculatorDemo.jaxx similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorDemo.jaxx index 49a1303..ed26806 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.awt.Color @@ -140,4 +140,4 @@ protected String[] getSources() { </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorEngine.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorEngine.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java index b805f66..cc903a6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorEngine.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.fun; +package org.nuiton.jaxx.demo.fun; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -139,11 +139,11 @@ public class CalculatorEngine { public static String toString(BigDecimal decimal) { // can't use stripTrailingZeros, as it wasn't introduced until 1.5 String result = decimal.toString(); - if (result.indexOf(".") != -1) { + if (result.indexOf("") != -1) { while (result.endsWith("0")) { result = result.substring(0, result.length() - 1); } - if (result.endsWith(".")) { + if (result.endsWith("")) { result = result.substring(0, result.length() - 1); } } diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CounterDemo.jaxx similarity index 94% rename from jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CounterDemo.jaxx index 5bb8c82..b45a97f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CounterDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<org.nuiton.jaxx.demo.DemoPanel> <script>int count;</script> <JTextField text='{count+""}' constraints='BorderLayout.NORTH'/> <HBox constraints='BorderLayout.SOUTH'> @@ -28,4 +28,4 @@ <JButton text='Reset' onActionPerformed='count = 0'/> <JButton text='Inc (+)' onActionPerformed='count++'/> </HBox> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/LabelStyleDemo.jaxx similarity index 91% rename from jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/LabelStyleDemo.jaxx index 4b06ab3..57d9f7f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/LabelStyleDemo.jaxx @@ -20,7 +20,7 @@ #L% --> -<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> +<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.awt.Color @@ -82,10 +82,10 @@ height='90' layout='{new BorderLayout()}'> <VBox - background='{(Color)( backgroundCheckbox.isSelected() ? backgroundColor.getSelectedValue() : null)}' - margin='0' - horizontalAlignment='center' - verticalAlignment='middle'> + background='{(Color)( backgroundCheckbox.isSelected() ? backgroundColor.getSelectedValue() : null)}' + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> <JLabel text='{text.getText()}' font-size='{dummySize.getValue()}' foreground='{new Color(red.getValue(), green.getValue(), blue.getValue())}'/> @@ -118,4 +118,4 @@ </cell> </row> </Table> -</jaxx.demo.DemoPanel> +</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jcss b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/LabelStyleDemo.jcss similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jcss rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/LabelStyleDemo.jcss diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java similarity index 88% rename from jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java index f53565f..dff6af6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.tree; +package org.nuiton.jaxx.demo.tree; import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; @@ -43,13 +43,13 @@ public class DemoCellRenderer extends AbstractNavTreeCellRenderer<DefaultTreeMod LogFactory.getLog(DemoCellRenderer.class); - public DemoCellRenderer(jaxx.demo.tree.DemoDataProvider provider) { + public DemoCellRenderer(org.nuiton.jaxx.demo.tree.DemoDataProvider provider) { setDataProvider(provider); } @Override - public jaxx.demo.entities.DemoDataProvider getDataProvider() { - return (jaxx.demo.entities.DemoDataProvider) super.getDataProvider(); + public org.nuiton.jaxx.demo.entities.DemoDataProvider getDataProvider() { + return (org.nuiton.jaxx.demo.entities.DemoDataProvider) super.getDataProvider(); } @Override @@ -76,7 +76,7 @@ public class DemoCellRenderer extends AbstractNavTreeCellRenderer<DefaultTreeMod if (log.isDebugEnabled()) { log.debug("Compute text for node " + node + - " (" + node.getInternalClass() + ") = " + toDecorate); + " (" + node.getInternalClass() + ") = " + toDecorate); } return toDecorate; diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java similarity index 68% rename from jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java index 7f5e635..c425fb0 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java @@ -20,55 +20,55 @@ * #L% */ -package jaxx.demo.tree; - -import jaxx.demo.component.jaxx.BoxedDecoratorDemo; -import jaxx.demo.component.jaxx.StatusMessagePanelDemo; -import jaxx.demo.component.jaxx.editor.BeanComboBoxDemo; -import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; -import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; -import jaxx.demo.component.jaxx.editor.ComboEditorDemo; -import jaxx.demo.component.jaxx.editor.DatePickerDemo; -import jaxx.demo.component.jaxx.editor.FileEditorDemo; -import jaxx.demo.component.jaxx.editor.I18nEditorDemo; -import jaxx.demo.component.jaxx.editor.ListSelectorDemo; -import jaxx.demo.component.jaxx.editor.SimpleTimeEditorDemo; -import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; -import jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; -import jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemo; -import jaxx.demo.component.jaxx.widgets.gis.CoordinatesEditorDemo; -import jaxx.demo.component.jaxx.widgets.number.NumberEditorDemo; -import jaxx.demo.component.jaxx.widgets.select.FilterableDoubleListDemo; -import jaxx.demo.component.swing.HidorButtonDemo; -import jaxx.demo.component.swing.JButtonDemo; -import jaxx.demo.component.swing.JCheckBoxDemo; -import jaxx.demo.component.swing.JCheckBoxMenuItemDemo; -import jaxx.demo.component.swing.JComboBoxDemo; -import jaxx.demo.component.swing.JDialogDemo; -import jaxx.demo.component.swing.JListDemo; -import jaxx.demo.component.swing.JMenuItemDemo; -import jaxx.demo.component.swing.JPasswordFieldDemo; -import jaxx.demo.component.swing.JProgressBarDemo; -import jaxx.demo.component.swing.JRadioButtonDemo; -import jaxx.demo.component.swing.JRadioButtonMenuItemDemo; -import jaxx.demo.component.swing.JSliderDemo; -import jaxx.demo.component.swing.JSpinnerDemo; -import jaxx.demo.component.swing.JSplitPaneDemo; -import jaxx.demo.component.swing.JTextAreaDemo; -import jaxx.demo.component.swing.JTextFieldDemo; -import jaxx.demo.component.swing.JToggleButtonDemo; -import jaxx.demo.feature.databinding.BeanDataBindingDemo; -import jaxx.demo.feature.databinding.BindingExtremeDemo; -import jaxx.demo.feature.nav.NavDemo; -import jaxx.demo.feature.validation.list.ListBeanValidationDemo; -import jaxx.demo.feature.validation.simple.SimpleBeanValidationByListDemo; -import jaxx.demo.feature.validation.simple.SimpleBeanValidationByTableDemo; -import jaxx.demo.fun.CalculatorDemo; -import jaxx.demo.fun.CounterDemo; -import jaxx.demo.fun.LabelStyleDemo; +package org.nuiton.jaxx.demo.tree; + import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.demo.component.jaxx.BoxedDecoratorDemo; +import org.nuiton.jaxx.demo.component.jaxx.StatusMessagePanelDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.BeanComboBoxDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.ComboEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.DatePickerDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.FileEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.I18nEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.ListSelectorDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.SimpleTimeEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; +import org.nuiton.jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.widgets.gis.CoordinatesEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.widgets.number.NumberEditorDemo; +import org.nuiton.jaxx.demo.component.jaxx.widgets.select.FilterableDoubleListDemo; +import org.nuiton.jaxx.demo.component.swing.HidorButtonDemo; +import org.nuiton.jaxx.demo.component.swing.JButtonDemo; +import org.nuiton.jaxx.demo.component.swing.JCheckBoxDemo; +import org.nuiton.jaxx.demo.component.swing.JCheckBoxMenuItemDemo; +import org.nuiton.jaxx.demo.component.swing.JComboBoxDemo; +import org.nuiton.jaxx.demo.component.swing.JDialogDemo; +import org.nuiton.jaxx.demo.component.swing.JListDemo; +import org.nuiton.jaxx.demo.component.swing.JMenuItemDemo; +import org.nuiton.jaxx.demo.component.swing.JPasswordFieldDemo; +import org.nuiton.jaxx.demo.component.swing.JProgressBarDemo; +import org.nuiton.jaxx.demo.component.swing.JRadioButtonDemo; +import org.nuiton.jaxx.demo.component.swing.JRadioButtonMenuItemDemo; +import org.nuiton.jaxx.demo.component.swing.JSliderDemo; +import org.nuiton.jaxx.demo.component.swing.JSpinnerDemo; +import org.nuiton.jaxx.demo.component.swing.JSplitPaneDemo; +import org.nuiton.jaxx.demo.component.swing.JTextAreaDemo; +import org.nuiton.jaxx.demo.component.swing.JTextFieldDemo; +import org.nuiton.jaxx.demo.component.swing.JToggleButtonDemo; +import org.nuiton.jaxx.demo.feature.databinding.BeanDataBindingDemo; +import org.nuiton.jaxx.demo.feature.databinding.BindingExtremeDemo; +import org.nuiton.jaxx.demo.feature.nav.NavDemo; +import org.nuiton.jaxx.demo.feature.validation.list.ListBeanValidationDemo; +import org.nuiton.jaxx.demo.feature.validation.simple.SimpleBeanValidationByListDemo; +import org.nuiton.jaxx.demo.feature.validation.simple.SimpleBeanValidationByTableDemo; +import org.nuiton.jaxx.demo.fun.CalculatorDemo; +import org.nuiton.jaxx.demo.fun.CounterDemo; +import org.nuiton.jaxx.demo.fun.LabelStyleDemo; import java.util.Arrays; import java.util.HashMap; @@ -183,9 +183,9 @@ public class DemoDataProvider implements NavDataProvider { ); addMapping(n("jaxxdemo.component.jaxx.editor"), - jaxx.demo.component.jaxx.editor.TimeEditorDemo.class, + org.nuiton.jaxx.demo.component.jaxx.editor.TimeEditorDemo.class, SimpleTimeEditorDemo.class, - jaxx.demo.component.jaxx.editor.NumberEditorDemo.class, + org.nuiton.jaxx.demo.component.jaxx.editor.NumberEditorDemo.class, ComboEditorDemo.class, I18nEditorDemo.class, DatePickerDemo.class, diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java index 5590c97..f23b059 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.tree; +package org.nuiton.jaxx.demo.tree; import jaxx.runtime.swing.nav.tree.NavTreeNode; diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java index b4e5ea4..4cfde1c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.tree; +package org.nuiton.jaxx.demo.tree; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavNodeChildLoador; diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoTreeHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/tree/DemoTreeHelper.java rename to jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java index 8253f4d..62a061e 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoTreeHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.demo.tree; +package org.nuiton.jaxx.demo.tree; import jaxx.runtime.swing.nav.tree.NavTreeHelper; diff --git a/jaxx-demo/src/main/resources/log4j.properties b/jaxx-demo/src/main/resources/log4j.properties index a793374..259ff8a 100644 --- a/jaxx-demo/src/main/resources/log4j.properties +++ b/jaxx-demo/src/main/resources/log4j.properties @@ -26,14 +26,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.logger.jaxx=INFO -#log4j.logger.jaxx.demo=INFO -#log4j.logger.jaxx.demo.tree=DEBUG -#log4j.logger.jaxx.runtime.swing.tree=DEBUG -#log4j.logger.jaxx.demo.component.jaxx.tree=DEBUG -#log4j.logger.jaxx.demo.config.DemoConfig=DEBUG -#log4j.logger.jaxx.runtime.swing.editor.config=INFO -#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG log4j.logger.org.nuiton=WARN log4j.logger.org.nuiton.jaxx=INFO -#log4j.logger.jaxx.runtime.swing.help=DEBUG diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-error-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-error-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-info-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-info-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-warning-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Identity-warning-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-error-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-error-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-info-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-info-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-warning-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/Model-warning-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/People-error-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-error-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/People-error-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-error-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-info-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-info-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-warning-validation.xml similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/entities/People-warning-validation.xml diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/Amethyst.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Amethyst.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/Amethyst.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Amethyst.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/Lynx.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Lynx.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/Lynx.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Lynx.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/Tomato.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Tomato.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/Tomato.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/Tomato.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/ana.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/ana.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/ana.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/ana.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/hector.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/hector.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/hector.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/hector.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/jack.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/jack.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/jack.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/jack.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/jim.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/jim.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/jim.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/jim.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/joe.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/joe.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/joe.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/joe.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/joker.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/joker.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/joker.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/joker.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/nacho.jpg b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/nacho.jpg similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/nacho.jpg rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/nacho.jpg diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/nacho2.png b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/nacho2.png similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/nacho2.png rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/nacho2.png diff --git a/jaxx-demo/src/main/resources/jaxx/demo/images/pencil_black.gif b/jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/pencil_black.gif similarity index 100% rename from jaxx-demo/src/main/resources/jaxx/demo/images/pencil_black.gif rename to jaxx-demo/src/main/resources/org/nuiton/jaxx/demo/images/pencil_black.gif diff --git a/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java b/jaxx-demo/src/test/java/org/nuiton/jaxx/demo/BeanValidatorDetectorTest.java similarity index 95% rename from jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java rename to jaxx-demo/src/test/java/org/nuiton/jaxx/demo/BeanValidatorDetectorTest.java index 7d65eb8..a64a258 100644 --- a/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java +++ b/jaxx-demo/src/test/java/org/nuiton/jaxx/demo/BeanValidatorDetectorTest.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.demo; +package org.nuiton.jaxx.demo; -import jaxx.demo.entities.Identity; -import jaxx.demo.entities.Model; -import jaxx.demo.entities.People; +import org.nuiton.jaxx.demo.entities.Identity; +import org.nuiton.jaxx.demo.entities.Model; +import org.nuiton.jaxx.demo.entities.People; import org.junit.Assert; import org.junit.Test; import org.nuiton.validator.AbstractValidatorDetectorTest; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.