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 44a336c833c1d318f7d565cd3323a7ff2ad78d19 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 15:08:33 2016 +0100 Introduce jaxx-widgets-hidor module (Fixes #4111) Introduce jaxx-widgets-error module (Fixes #4110) Remove jaxx-widgets module (Fixes #4103) --- jaxx-demo/pom.xml | 18 +++++--- .../src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx | 2 - .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 51 ++++----------------- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 8 +--- .../jaxx/demo/component/swing/HidorButtonDemo.jaxx | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 2 +- jaxx-widgets-datetime/pom.xml | 7 ++- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 2 +- .../datetime}/ExtendedBasicDatePickerUI.java | 4 +- .../jaxx/widgets/datetime/JAXXDatePicker.jaxx | 1 - .../nuiton/jaxx/widgets/datetime/TimeEditor.jaxx | 2 +- {jaxx-widgets => jaxx-widgets-error}/LICENSE.txt | 0 {jaxx-widgets => jaxx-widgets-error}/README.md | 0 {jaxx-widgets => jaxx-widgets-error}/changelog.txt | 0 {jaxx-widgets => jaxx-widgets-error}/pom.xml | 24 ++++------ .../src/license/THIRD-PARTY.properties | 0 .../nuiton/jaxx/widgets/error}/ErrorDialogUI.jaxx | 0 .../jaxx/widgets/error}/ErrorDialogUIHandler.java | 2 +- .../i18n/jaxx-widgets-error_en_GB.properties | 2 - .../i18n/jaxx-widgets-error_es_ES.properties | 2 - .../i18n/jaxx-widgets-error_fr_FR.properties | 2 - .../main/resources/icons/action-font-size-down.png | Bin 0 -> 300 bytes .../main/resources/icons/action-font-size-up.png | Bin 0 -> 356 bytes .../src/main/resources/icons/action-font-size.png | Bin 0 -> 295 bytes .../src/site/site.xml | 0 {jaxx-widgets => jaxx-widgets-hidor}/LICENSE.txt | 0 {jaxx-widgets => jaxx-widgets-hidor}/README.md | 0 {jaxx-widgets => jaxx-widgets-hidor}/changelog.txt | 0 {jaxx-widgets => jaxx-widgets-hidor}/pom.xml | 24 ++++------ .../src/license/THIRD-PARTY.properties | 0 .../nuiton/jaxx/widgets/hidor}/HidorButton.jaxx | 0 .../jaxx/widgets/hidor}/HidorButtonHandler.java | 2 +- .../i18n/jaxx-widgets-hidor_en_GB.properties | 2 + .../i18n/jaxx-widgets-hidor_es_ES.properties | 2 + .../i18n/jaxx-widgets-hidor_fr_FR.properties | 2 + .../src/main/resources/icons/action-collapse.png | Bin .../src/main/resources/icons/action-expand.png | Bin .../src/site/site.xml | 0 .../org/nuiton/jaxx/runtime/swing/package.html | 46 ------------------- .../src/main/resources/icons/action-add.png | Bin 733 -> 0 bytes .../src/main/resources/icons/action-open.png | Bin 606 -> 0 bytes .../src/main/resources/icons/action-remove.png | Bin 715 -> 0 bytes .../src/main/resources/icons/action-select.png | Bin 733 -> 0 bytes .../src/main/resources/icons/action-unselect.png | Bin 715 -> 0 bytes pom.xml | 3 +- 45 files changed, 63 insertions(+), 151 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index ab9a91c..703419a 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -86,12 +86,6 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${project.version}</version> </dependency> @@ -122,6 +116,18 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-hidor</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-error</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx index f9931b2..55ae721 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx @@ -74,8 +74,6 @@ public boolean acceptLocale(Locale l, String expected) { </JMenu> <JMenu id='menuHelp'> - <JMenuItem id='menuHelpLogs' - onActionPerformed="handler.showLogs(this)"/> <JMenuItem id='menuHelpHelp' onActionPerformed="handler.showHelp(this, null)"/> <JMenuItem id='menuHelpSite' 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 d5acca8..62c6ea3 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 @@ -22,6 +22,13 @@ package org.nuiton.jaxx.demo; * #L% */ +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.runtime.JAXXContext; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; @@ -29,18 +36,10 @@ import org.nuiton.jaxx.runtime.context.DefaultApplicationContext; import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; -import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; import org.nuiton.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; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import javax.swing.AbstractAction; import javax.swing.InputMap; @@ -94,17 +93,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { } close(DemoApplicationContext.get()); }; - reloadLogAppenderCallback = () -> { - if (log.isInfoEnabled()) { - log.info("will reload log appender"); - } - DefaultApplicationContext context = DemoApplicationContext.get(); - DemoUI ui = getUI(context); - DemoConfig config = ui.getConfig(); - - // init jaxx logger - JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); - }; } /** @@ -408,8 +396,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { final Runnable reloadApplicationCallback; - final Runnable reloadLogAppenderCallback; - public void showConfig(JAXXContext context) { DemoUI ui = getUI(context); DemoConfig config = ui.getConfig(); @@ -426,11 +412,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { SwingUtil.createActionIcon("reload-application"), reloadApplicationCallback); - helper.registerCallBack("log", - n("demo.action.reload.logAppender"), - SwingUtil.createActionIcon("reload-log"), - reloadLogAppenderCallback); - // categorie repertoires helper.addCategory(n("jaxxdemo.config.category.directories"), @@ -466,14 +447,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { setOptionPropertyName(DemoConfig.PROPERTY_KEY_OPEN_CONFIG). setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.LOG_LEVEL). - setOptionPropertyName(DemoConfig.PROPERTY_LOG_LEVEL). - setOptionCallBack("log"); - - helper.addOption(DemoConfig.Option.LOG_PATTERN_LAYOUT). - setOptionPropertyName(DemoConfig.PROPERTY_LOG_PATTERN_LAYOUT). - setOptionCallBack("log"); - helper.buildUI(context, "jaxxdemo.config.category.other"); helper.displayUI(ui, false); @@ -496,14 +469,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { // mainUI.getHelp().setCurrentID(helpId); } - public void showLogs(DemoUI ui) { - - JAXXLog4jUI log4jUI = new JAXXLog4jUI(); - String title = t("jaxxdemo.title.showLog"); - log4jUI.setTitle(title); - log4jUI.showInDialog(ui, false); - } - public void gotoSite(JAXXContext context) { DemoUI ui = getUI(context); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java index 83fa270..02acd26 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java @@ -22,9 +22,6 @@ package org.nuiton.jaxx.demo; -import org.nuiton.jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; -import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; @@ -33,6 +30,8 @@ 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.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.util.StringUtil; import java.util.Arrays; @@ -96,9 +95,6 @@ public class RunDemo { log.info(t("jaxxdemo.message.config.loaded", config.getVersion())); - // init jaxx logger - JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); - // prepare ui look&feel and load ui properties try { SwingUtil.initNimbusLoookAndFeel(); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx index 125573f..b06b2a7 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx @@ -24,7 +24,7 @@ <HBox horizontalAlignment='center' verticalAlignment='middle'> - <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor1}' showText="show label1" + <org.nuiton.jaxx.widgets.hidor.HidorButton target='{hidor1}' showText="show label1" hideText='hide label1' targetVisible='{true}'/> @@ -32,7 +32,7 @@ </HBox> <HBox horizontalAlignment='center' verticalAlignment='middle'> - <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor2}' showText="show label2" + <org.nuiton.jaxx.widgets.hidor.HidorButton target='{hidor2}' showText="show label2" hideText='hide label2' targetVisible='{false}'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index 111144c..6b9bbd5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -25,7 +25,7 @@ import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.CardLayout2; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 9fc5365..7106e5b 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -68,13 +68,12 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets-common</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> <version>${project.version}</version> </dependency> @@ -149,7 +148,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx index 44c1507..2277c46 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - org.nuiton.jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.widgets.hidor.HidorButton javax.swing.DefaultBoundedRangeModel org.jdesktop.swingx.JXDatePicker diff --git a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java similarity index 96% rename from jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java index 189a9fb..f89e5b7 100644 --- a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java @@ -19,7 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.jdesktop.swingx.plaf.basic; +package org.nuiton.jaxx.widgets.datetime; + +import org.jdesktop.swingx.plaf.basic.BasicDatePickerUI; import java.beans.PropertyChangeSupport; import java.beans.PropertyVetoException; diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx index 5e30a40..fa584e5 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx @@ -24,7 +24,6 @@ <import> java.beans.PropertyChangeEvent java.beans.PropertyChangeListener - org.jdesktop.swingx.plaf.basic.ExtendedBasicDatePickerUI java.text.SimpleDateFormat </import> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx index ef3f99e..eaed512 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - org.nuiton.jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.widgets.hidor.HidorButton javax.swing.DefaultBoundedRangeModel </import> diff --git a/jaxx-widgets/LICENSE.txt b/jaxx-widgets-error/LICENSE.txt similarity index 100% copy from jaxx-widgets/LICENSE.txt copy to jaxx-widgets-error/LICENSE.txt diff --git a/jaxx-widgets/README.md b/jaxx-widgets-error/README.md similarity index 100% copy from jaxx-widgets/README.md copy to jaxx-widgets-error/README.md diff --git a/jaxx-widgets/changelog.txt b/jaxx-widgets-error/changelog.txt similarity index 100% copy from jaxx-widgets/changelog.txt copy to jaxx-widgets-error/changelog.txt diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets-error/pom.xml similarity index 89% copy from jaxx-widgets/pom.xml copy to jaxx-widgets-error/pom.xml index b4766c6..71213ac 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets-error/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JAXX :: Widgets + JAXX :: Widgets File $Id$ $HeadURL$ @@ -35,10 +35,10 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-error</artifactId> - <name>JAXX :: Widgets</name> - <description>Collection of swing widgets wrote with JAXX</description> + <name>JAXX :: Widgets Error</name> + <description>Collection of widgets around Error managmenet</description> <properties> @@ -58,11 +58,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <!--Should use this--> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency--> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -80,11 +81,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> diff --git a/jaxx-widgets/src/license/THIRD-PARTY.properties b/jaxx-widgets-error/src/license/THIRD-PARTY.properties similarity index 100% copy from jaxx-widgets/src/license/THIRD-PARTY.properties copy to jaxx-widgets-error/src/license/THIRD-PARTY.properties diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUI.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx rename to jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUI.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java rename to jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java index 1578a94..e3df4d6 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java +++ b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.error; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties similarity index 70% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties index d83d44e..6e4c10a 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties @@ -1,5 +1,3 @@ errorUI.action.close=Close errorUI.message=An error wad detected... errorUI.title=Error... -hidor.hideTip=Hide -hidor.showTip=Show diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties similarity index 68% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties index ffbb5a0..055ceb1 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties @@ -1,5 +1,3 @@ errorUI.action.close=Cerrar errorUI.message=ha habido un error \! errorUI.title=Error... -hidor.hideTip=Ocultar -hidor.showTip=Ver diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties similarity index 70% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties index 57c76a8..2d9e9d9 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties @@ -1,5 +1,3 @@ errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -hidor.hideTip=Cacher -hidor.showTip=Voir diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png new file mode 100644 index 0000000..66e5e5f Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png differ diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png new file mode 100644 index 0000000..ac7160e Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png differ diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size.png new file mode 100644 index 0000000..ef125e9 Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size.png differ diff --git a/jaxx-widgets/src/site/site.xml b/jaxx-widgets-error/src/site/site.xml similarity index 100% copy from jaxx-widgets/src/site/site.xml copy to jaxx-widgets-error/src/site/site.xml diff --git a/jaxx-widgets/LICENSE.txt b/jaxx-widgets-hidor/LICENSE.txt similarity index 100% rename from jaxx-widgets/LICENSE.txt rename to jaxx-widgets-hidor/LICENSE.txt diff --git a/jaxx-widgets/README.md b/jaxx-widgets-hidor/README.md similarity index 100% rename from jaxx-widgets/README.md rename to jaxx-widgets-hidor/README.md diff --git a/jaxx-widgets/changelog.txt b/jaxx-widgets-hidor/changelog.txt similarity index 100% rename from jaxx-widgets/changelog.txt rename to jaxx-widgets-hidor/changelog.txt diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets-hidor/pom.xml similarity index 89% rename from jaxx-widgets/pom.xml rename to jaxx-widgets-hidor/pom.xml index b4766c6..5e88648 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets-hidor/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JAXX :: Widgets + JAXX :: Widgets File $Id$ $HeadURL$ @@ -35,10 +35,10 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> - <name>JAXX :: Widgets</name> - <description>Collection of swing widgets wrote with JAXX</description> + <name>JAXX :: Widgets Hidor</name> + <description>Hidor widget</description> <properties> @@ -58,11 +58,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <!--Should use this--> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency--> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -80,11 +81,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> diff --git a/jaxx-widgets/src/license/THIRD-PARTY.properties b/jaxx-widgets-hidor/src/license/THIRD-PARTY.properties similarity index 100% rename from jaxx-widgets/src/license/THIRD-PARTY.properties rename to jaxx-widgets-hidor/src/license/THIRD-PARTY.properties diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButton.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx rename to jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButton.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java rename to jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java index b379aae..b15020c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java +++ b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.hidor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties new file mode 100644 index 0000000..f5ea6ab --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Hide +hidor.showTip=Show diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties new file mode 100644 index 0000000..54e0ad5 --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Ocultar +hidor.showTip=Ver diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties new file mode 100644 index 0000000..8740bbe --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Cacher +hidor.showTip=Voir diff --git a/jaxx-widgets/src/main/resources/icons/action-collapse.png b/jaxx-widgets-hidor/src/main/resources/icons/action-collapse.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-collapse.png rename to jaxx-widgets-hidor/src/main/resources/icons/action-collapse.png diff --git a/jaxx-widgets/src/main/resources/icons/action-expand.png b/jaxx-widgets-hidor/src/main/resources/icons/action-expand.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-expand.png rename to jaxx-widgets-hidor/src/main/resources/icons/action-expand.png diff --git a/jaxx-widgets/src/site/site.xml b/jaxx-widgets-hidor/src/site/site.xml similarity index 100% rename from jaxx-widgets/src/site/site.xml rename to jaxx-widgets-hidor/src/site/site.xml diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html deleted file mode 100644 index 0cd995d..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html +++ /dev/null @@ -1,46 +0,0 @@ -<!-- - #%L - JAXX :: Widgets - %% - Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> -<html> -<body> -<h1>Package jaxx.runtime.swing</h1> - -<p> - Base package of the project <strong>jaxx-widgets</strong>. -</p> - -In this package, we can find several simple widgets : - -<ul> - <li>AboutPanel : an About dialog ui</li> - <li>ClockWidget : a widget which displays time</li> - <li>EntityComboBox : a rich drop list of beans based on Decorator api</li> - <li>ErrordialogUI : error dialog to use each time there is an error</li> - <li>FontSizor : a widget to change font size</li> - <li>HidorButton : a simple widget to show and hide components</li> - <li>ListSelectorUI :</li> - <li>MemoryStatusWidget : a widget to display memory usage</li> - <li>StatusMessagePanel : a panel to display messages and show status of - application (busy, waking, ...) - </li> -</ul> -</body> -</html> diff --git a/jaxx-widgets/src/main/resources/icons/action-add.png b/jaxx-widgets/src/main/resources/icons/action-add.png deleted file mode 100644 index 6332fef..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-add.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-open.png b/jaxx-widgets/src/main/resources/icons/action-open.png deleted file mode 100755 index e9c4476..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-open.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-remove.png b/jaxx-widgets/src/main/resources/icons/action-remove.png deleted file mode 100644 index 08f2493..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-remove.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-select.png b/jaxx-widgets/src/main/resources/icons/action-select.png deleted file mode 100644 index 6332fef..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-select.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-unselect.png b/jaxx-widgets/src/main/resources/icons/action-unselect.png deleted file mode 100644 index 08f2493..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-unselect.png and /dev/null differ diff --git a/pom.xml b/pom.xml index 9a3ac8a..af97e83 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,8 @@ <module>jaxx-widgets-about</module> <module>jaxx-widgets-number</module> <module>jaxx-widgets-select</module> - <module>jaxx-widgets</module> + <module>jaxx-widgets-hidor</module> + <module>jaxx-widgets-error</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> <module>jaxx-config</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.