[Jaxx-commits] 01/01: Move jaxx-config to jaxx-widgets-config (See #4103)

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 2d84205a731a0d9eff489395e532559b4ba906e6 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 15:44:30 2016 +0100 Move jaxx-config to jaxx-widgets-config (See #4103) --- jaxx-demo/pom.xml | 2 +- .../src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java | 2 +- {jaxx-config => jaxx-widgets-config}/LICENSE.txt | 0 {jaxx-config => jaxx-widgets-config}/README.md | 0 {jaxx-config => jaxx-widgets-config}/changelog.txt | 0 {jaxx-config => jaxx-widgets-config}/pom.xml | 8 +++----- .../src/license/THIRD-PARTY.properties | 0 .../org/nuiton/jaxx/widgets}/config/ConfigCallBackUI.jaxx | 0 .../jaxx/widgets}/config/ConfigCallBackUIHandler.java | 8 ++++---- .../org/nuiton/jaxx/widgets}/config/ConfigCategoryUI.jaxx | 6 +++--- .../org/nuiton/jaxx/widgets}/config/ConfigCategoryUI.jcss | 0 .../jaxx/widgets}/config/ConfigCategoryUIHandler.java | 6 +++--- .../org/nuiton/jaxx/widgets}/config/ConfigTableEditor.java | 6 +++--- .../nuiton/jaxx/widgets}/config/ConfigTableRenderer.java | 6 +++--- .../main/java/org/nuiton/jaxx/widgets}/config/ConfigUI.jaxx | 2 +- .../main/java/org/nuiton/jaxx/widgets}/config/ConfigUI.jcss | 0 .../org/nuiton/jaxx/widgets}/config/ConfigUIHandler.java | 10 +++++----- .../org/nuiton/jaxx/widgets}/config/ConfigUIHelper.java | 12 ++++++------ .../nuiton/jaxx/widgets}/config/model/CallBackEntry.java | 2 +- .../jaxx/widgets}/config/model/CallBackFinalizer.java | 2 +- .../org/nuiton/jaxx/widgets}/config/model/CallBackMap.java | 2 +- .../nuiton/jaxx/widgets}/config/model/CallBacksManager.java | 2 +- .../nuiton/jaxx/widgets}/config/model/CategoryModel.java | 2 +- .../nuiton/jaxx/widgets}/config/model/ConfigTableModel.java | 2 +- .../nuiton/jaxx/widgets}/config/model/ConfigUIModel.java | 2 +- .../jaxx/widgets}/config/model/ConfigUIModelBuilder.java | 2 +- .../jaxx/widgets}/config/model/MainCallBackFinalizer.java | 2 +- .../org/nuiton/jaxx/widgets}/config/model/OptionModel.java | 2 +- .../java/org/nuiton/jaxx/widgets}/config/model/package.html | 0 .../main/java/org/nuiton/jaxx/widgets}/config/package.html | 0 .../resources/i18n/jaxx-widgets-config_en_GB.properties | 0 .../resources/i18n/jaxx-widgets-config_es_ES.properties | 0 .../resources/i18n/jaxx-widgets-config_fr_FR.properties | 0 .../src/main/resources/icons/action-add.png | Bin .../src/main/resources/icons/action-config-copy.png | Bin .../src/main/resources/icons/action-config-quit.png | Bin .../src/main/resources/icons/action-config-reset-option.png | Bin .../src/main/resources/icons/action-config-reset.png | Bin .../src/main/resources/icons/action-config-save.png | Bin {jaxx-config => jaxx-widgets-config}/src/site/site.xml | 0 .../nuiton/jaxx/widgets}/config/model/MyDelegateConfig.java | 2 +- .../jaxx/widgets}/config/model/MyDelegateConfigTest.java | 10 +++++----- .../jaxx/widgets}/config/model/MyInheritedConfig.java | 2 +- .../jaxx/widgets}/config/model/MyInheritedConfigTest.java | 2 +- .../src/test/resources/log4j.properties | 0 pom.xml | 2 +- 46 files changed, 52 insertions(+), 54 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 84468a0..79c8300 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -147,7 +147,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-config</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index 62c6ea3..962069c 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -26,7 +26,7 @@ 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.widgets.config.ConfigUIHelper; import org.nuiton.jaxx.demo.tree.DemoNode; import org.nuiton.jaxx.demo.tree.DemoTreeHelper; import org.nuiton.jaxx.runtime.JAXXContext; diff --git a/jaxx-config/LICENSE.txt b/jaxx-widgets-config/LICENSE.txt similarity index 100% rename from jaxx-config/LICENSE.txt rename to jaxx-widgets-config/LICENSE.txt diff --git a/jaxx-config/README.md b/jaxx-widgets-config/README.md similarity index 100% rename from jaxx-config/README.md rename to jaxx-widgets-config/README.md diff --git a/jaxx-config/changelog.txt b/jaxx-widgets-config/changelog.txt similarity index 100% rename from jaxx-config/changelog.txt rename to jaxx-widgets-config/changelog.txt diff --git a/jaxx-config/pom.xml b/jaxx-widgets-config/pom.xml similarity index 96% rename from jaxx-config/pom.xml rename to jaxx-widgets-config/pom.xml index 8e84522..3b1d733 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-widgets-config/pom.xml @@ -35,12 +35,10 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-config</artifactId> - <name>JAXX :: Config</name> - <description> - Config UI based on org.nuiton.config.ApplicationConfig - </description> + <name>JAXX :: Widgets Config</name> + <description>Widget to manage Configuration</description> <properties> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> diff --git a/jaxx-config/src/license/THIRD-PARTY.properties b/jaxx-widgets-config/src/license/THIRD-PARTY.properties similarity index 100% rename from jaxx-config/src/license/THIRD-PARTY.properties rename to jaxx-widgets-config/src/license/THIRD-PARTY.properties diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUI.jaxx similarity index 100% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUI.jaxx diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java similarity index 96% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java index 3957114..13afde6 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -23,9 +23,9 @@ package org.nuiton.jaxx.config; */ import org.nuiton.jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.config.model.CallBackEntry; -import org.nuiton.jaxx.config.model.CallBackMap; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.CallBackEntry; +import org.nuiton.jaxx.widgets.config.model.CallBackMap; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx similarity index 94% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx index 57ea543..5853aa5 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUI.jaxx +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx @@ -25,9 +25,9 @@ java.awt.Color javax.swing.DefaultListSelectionModel javax.swing.ScrollPaneConstants - org.nuiton.jaxx.config.model.CategoryModel - org.nuiton.jaxx.config.model.ConfigTableModel - org.nuiton.jaxx.config.model.ConfigUIModel + org.nuiton.jaxx.widgets.config.model.CategoryModel + org.nuiton.jaxx.widgets.config.model.ConfigTableModel + org.nuiton.jaxx.widgets.config.model.ConfigUIModel org.jdesktop.swingx.JXTable </import> diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUI.jcss b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jcss similarity index 100% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUI.jcss rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jcss diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java similarity index 98% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java index 6c0e831..62fdf3f 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -24,8 +24,8 @@ package org.nuiton.jaxx.config; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.config.model.ConfigTableModel; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.nuiton.jaxx.runtime.swing.renderer.ClassTableCellRenderer; import org.nuiton.jaxx.runtime.swing.renderer.ColorCellRenderer; import org.apache.commons.lang3.ArrayUtils; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java similarity index 97% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java index 4309f5e..1ec429e 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -24,8 +24,8 @@ package org.nuiton.jaxx.config; import com.google.common.io.Files; import org.apache.commons.lang3.StringUtils; -import org.nuiton.jaxx.config.model.ConfigTableModel; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.nuiton.jaxx.runtime.swing.editor.ClassCellEditor; import org.nuiton.jaxx.runtime.swing.editor.ColorCellEditor; import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableRenderer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java similarity index 96% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableRenderer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java index 76afe16..c628ed7 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableRenderer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -22,8 +22,8 @@ package org.nuiton.jaxx.config; * #L% */ -import org.nuiton.jaxx.config.model.ConfigTableModel; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.JComponent; import javax.swing.JTable; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx similarity index 96% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx index 664c9c7..3b94091 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUI.jaxx +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx @@ -22,7 +22,7 @@ <JPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.config.model.ConfigUIModel + org.nuiton.jaxx.widgets.config.model.ConfigUIModel </import> <script><![CDATA[ diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUI.jcss b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jcss similarity index 100% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUI.jcss rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jcss diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java similarity index 98% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java index 5f64274..a2ef559 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -25,10 +25,10 @@ package org.nuiton.jaxx.config; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import org.nuiton.jaxx.config.model.CallBackMap; -import org.nuiton.jaxx.config.model.CategoryModel; -import org.nuiton.jaxx.config.model.ConfigUIModel; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.CallBackMap; +import org.nuiton.jaxx.widgets.config.model.CategoryModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java similarity index 95% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java index bf96726..2bbbbf5 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -26,11 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import org.nuiton.jaxx.config.model.CallBackFinalizer; -import org.nuiton.jaxx.config.model.CategoryModel; -import org.nuiton.jaxx.config.model.ConfigUIModel; -import org.nuiton.jaxx.config.model.ConfigUIModelBuilder; -import org.nuiton.jaxx.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.CallBackFinalizer; +import org.nuiton.jaxx.widgets.config.model.CategoryModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModelBuilder; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java similarity index 97% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java index 9f0e4c2..2dc3ae6 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackFinalizer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java similarity index 96% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackFinalizer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java index 3b8ad0b..1bd41bb 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackFinalizer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackMap.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java similarity index 97% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackMap.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java index f4fb8e0..a2eba86 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackMap.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java similarity index 99% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java index 063b037..5c2a460 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java similarity index 99% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java index 039965f..7204fe2 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java similarity index 98% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java index d7559ba..1b2f337 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java similarity index 99% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java index e41aab7..aae69dc 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModelBuilder.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java similarity index 99% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModelBuilder.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java index 3ce3e3a..8b132e9 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModelBuilder.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java similarity index 97% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java index 7b738c1..da8f246 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/OptionModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java similarity index 99% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/OptionModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java index 6505bb4..aea375e 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/OptionModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/package.html b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/package.html similarity index 100% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/model/package.html rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/package.html diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/package.html b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/package.html similarity index 100% rename from jaxx-config/src/main/java/org/nuiton/jaxx/config/package.html rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/package.html diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_en_GB.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_en_GB.properties diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_es_ES.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_es_ES.properties diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_fr_FR.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_fr_FR.properties diff --git a/jaxx-config/src/main/resources/icons/action-add.png b/jaxx-widgets-config/src/main/resources/icons/action-add.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-add.png rename to jaxx-widgets-config/src/main/resources/icons/action-add.png diff --git a/jaxx-config/src/main/resources/icons/action-config-copy.png b/jaxx-widgets-config/src/main/resources/icons/action-config-copy.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-copy.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-copy.png diff --git a/jaxx-config/src/main/resources/icons/action-config-quit.png b/jaxx-widgets-config/src/main/resources/icons/action-config-quit.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-quit.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-quit.png diff --git a/jaxx-config/src/main/resources/icons/action-config-reset-option.png b/jaxx-widgets-config/src/main/resources/icons/action-config-reset-option.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-reset-option.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-reset-option.png diff --git a/jaxx-config/src/main/resources/icons/action-config-reset.png b/jaxx-widgets-config/src/main/resources/icons/action-config-reset.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-reset.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-reset.png diff --git a/jaxx-config/src/main/resources/icons/action-config-save.png b/jaxx-widgets-config/src/main/resources/icons/action-config-save.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-save.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-save.png diff --git a/jaxx-config/src/site/site.xml b/jaxx-widgets-config/src/site/site.xml similarity index 100% rename from jaxx-config/src/site/site.xml rename to jaxx-widgets-config/src/site/site.xml diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java similarity index 99% rename from jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java index c8e924e..e4cde25 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java similarity index 97% rename from jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java index f3c0617..20cec1b 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L @@ -259,10 +259,10 @@ public class MyDelegateConfigTest { public void testSetOptionEditor() throws Exception { TableCellEditor cellEditor = MyDefaultCellEditor.newBooleanEditor(); OptionModel optionModel = builder.createModel(config) - .addCategory("cat0", "cat0 label") - .addOption(MyDelegateConfig.Option.LOCALE) - .setOptionEditor(cellEditor) - .flushOption(); + .addCategory("cat0", "cat0 label") + .addOption(MyDelegateConfig.Option.LOCALE) + .setOptionEditor(cellEditor) + .flushOption(); Assert.assertNotNull(optionModel); Assert.assertEquals(MyDelegateConfig.Option.LOCALE, optionModel.def); Assert.assertNull(optionModel.propertyName); diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java similarity index 99% rename from jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java index d45abbc..fbf7e5a 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java similarity index 99% rename from jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java index 9404d80..c9e3472 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/resources/log4j.properties b/jaxx-widgets-config/src/test/resources/log4j.properties similarity index 100% rename from jaxx-config/src/test/resources/log4j.properties rename to jaxx-widgets-config/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index af97e83..880e570 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ <module>jaxx-widgets-error</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> - <module>jaxx-config</module> + <module>jaxx-widgets-config</module> </modules> <developers> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.