November 2014 - Jaxx-commits - mailman.cloud.codelutin.com

06/16: add icons
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 57b380d1a2eee636a9ec392c809811260be1310d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:20:37 2014 +0100 add icons --- .../src/main/resources/icons/action-bean-sort-down.png | Bin 0 -> 594 bytes .../src/main/resources/icons/action-bean-sort-up.png | Bin 0 -> 599 bytes .../src/main/resources/icons/action-bean-sort.png | Bin 0 -> 463 bytes .../resources/icons/action-numbereditor-calculator.png | Bin 0 -> 543 bytes .../main/resources/icons/action-numbereditor-reset.png | Bin 0 -> 396 bytes .../resources/icons/action-numbereditor-validate.png | Bin 0 -> 537 bytes .../src/main/resources/icons/action-doublelist-down.png | Bin 0 -> 379 bytes .../main/resources/icons/action-doublelist-filter.png | Bin 0 -> 3615 bytes .../src/main/resources/icons/action-doublelist-reset.png | Bin 0 -> 396 bytes .../main/resources/icons/action-doublelist-select.png | Bin 0 -> 349 bytes .../src/main/resources/icons/action-doublelist-sort.png | Bin 0 -> 574 bytes .../main/resources/icons/action-doublelist-unselect.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-doublelist-up.png | Bin 0 -> 372 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-down.png b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-down.png new file mode 100644 index 0000000..e1d8816 Binary files /dev/null and b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-down.png differ diff --git a/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-up.png b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-up.png new file mode 100644 index 0000000..94fa577 Binary files /dev/null and b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort-up.png differ diff --git a/jaxx-widgets-common/src/main/resources/icons/action-bean-sort.png b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort.png new file mode 100644 index 0000000..f86aafd Binary files /dev/null and b/jaxx-widgets-common/src/main/resources/icons/action-bean-sort.png differ diff --git a/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-calculator.png b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-calculator.png new file mode 100644 index 0000000..701a60a Binary files /dev/null and b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-calculator.png differ diff --git a/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-reset.png b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-reset.png new file mode 100644 index 0000000..0fb00f9 Binary files /dev/null and b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-reset.png differ diff --git a/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-validate.png b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-validate.png new file mode 100644 index 0000000..a9925a0 Binary files /dev/null and b/jaxx-widgets-number/src/main/resources/icons/action-numbereditor-validate.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-down.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-down.png new file mode 100644 index 0000000..2c4e279 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-down.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-filter.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-filter.png new file mode 100644 index 0000000..397e078 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-filter.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-reset.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-reset.png new file mode 100644 index 0000000..0fb00f9 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-reset.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-select.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-select.png new file mode 100644 index 0000000..b1a1819 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-select.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-sort.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-sort.png new file mode 100644 index 0000000..188e1c1 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-sort.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-unselect.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-unselect.png new file mode 100644 index 0000000..5dc6967 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-unselect.png differ diff --git a/jaxx-widgets-select/src/main/resources/icons/action-doublelist-up.png b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-up.png new file mode 100644 index 0000000..1ebb193 Binary files /dev/null and b/jaxx-widgets-select/src/main/resources/icons/action-doublelist-up.png differ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

05/16: move number editor + some common classes
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 125e1375f6e971cf08269a2e0d8220ee44a9cf58 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:55:55 2014 +0100 move number editor + some common classes --- jaxx-widgets-common/pom.xml | 50 ------- .../nuiton/jaxx/widgets/DecoratorPopupHandler.java | 164 +++++++++++++++++++++ .../jaxx/widgets/JaxxWidgetRuntimeException.java | 28 ++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 2 +- .../MutateOnConditionalPropertyChangeListener.java | 27 +++- .../i18n/jaxx-widgets-common_en_GB.properties | 8 + .../i18n/jaxx-widgets-common_es_ES.properties | 8 + .../i18n/jaxx-widgets-common_fr_FR.properties | 8 + jaxx-widgets-number/pom.xml | 68 ++++----- .../nuiton/jaxx/widgets}/number/NumberEditor2.css | 0 .../nuiton/jaxx/widgets}/number/NumberEditor2.jaxx | 0 .../jaxx/widgets}/number/NumberEditor2Config.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Handler.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Model.java | 2 +- .../i18n/jaxx-widgets-number_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-number_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-number_fr_FR.properties | 14 ++ 17 files changed, 313 insertions(+), 98 deletions(-) diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 356e6f4..20c9642 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -48,76 +48,26 @@ </dependency> <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java new file mode 100644 index 0000000..8ae145c --- /dev/null +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java @@ -0,0 +1,164 @@ +package org.nuiton.jaxx.widgets; + +import jaxx.runtime.swing.JAXXButtonGroup; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.MultiJXPathDecorator; + +import javax.swing.AbstractButton; +import javax.swing.ButtonGroup; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPopupMenu; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JSeparator; +import javax.swing.SwingUtilities; +import java.awt.Dimension; +import java.beans.Introspector; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 11/30/14. + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 2.18 + */ +public abstract class DecoratorPopupHandler implements Runnable { + + /** Logger. */ + public static final Log log = LogFactory.getLog(DecoratorPopupHandler.class); + + public static final String DEFAULT_POPUP_LABEL = n("bean.popup.label"); + + public static final String DEFAULT_SELECTED_TOOLTIP = n("bean.sort.on"); + + public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("bean.sort.off"); + + public abstract JPopupMenu getPopup(); + + public abstract JComponent getInvoker(); + + @Override + public void run() { + + updatePopup(); + + Dimension dim = getPopup().getPreferredSize(); + + JComponent invoker = getInvoker(); + getPopup().show( + invoker, + (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()), + invoker.getHeight() + ); + } + + /** Toggle the popup visible state. */ + public void togglePopup() { + boolean newValue = !getPopup().isVisible(); + + if (log.isTraceEnabled()) { + log.trace(newValue); + } + + if (!newValue) { + if (getPopup() != null) { + getPopup().setVisible(false); + } + return; + } + SwingUtilities.invokeLater(this); + } + + protected void updatePopup() { + getPopup().pack(); + } + + /** + * Creation de l'ui pour modifier le décorateur. + * + * @param selectedTip + * @param notSelectedTip + * @param i18nPrefix + * @param title + * @param indexes + * @param popupLabel + * @param sortUp + * @param sortDown + * @param decorator le decorateur a utiliser + */ + public void preparePopup(String selectedTip, + String notSelectedTip, + String i18nPrefix, + String title, + ButtonGroup indexes, + JSeparator popupSeparator, + JLabel popupLabel, + AbstractButton sortUp, + AbstractButton sortDown, + MultiJXPathDecorator<?> decorator) { + if (selectedTip == null) { + // use default selected tip text + selectedTip = DEFAULT_SELECTED_TOOLTIP; + } + if (notSelectedTip == null) { + // use default selected tip text + notSelectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; + } + JPopupMenu popup = getPopup(); + + //Container container = ui.getIndexesContainer(); + + int nbContext = decorator.getNbContext(); + if (nbContext > 1) { + for (int i = 0; i < nbContext; i++) { + String property = i18nPrefix + decorator.getProperty(i); + String propertyI18n = t(property); + JRadioButtonMenuItem button = new JRadioButtonMenuItem(propertyI18n); + button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, indexes); + button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, i); + popup.add(button); + if (selectedTip != null) { + button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t(selectedTip, propertyI18n)); + } + if (notSelectedTip != null) { + button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t(notSelectedTip, propertyI18n)); + } + button.setSelected(false); + indexes.add(button); + } + } + if (title == null) { + // use default popup title + title = DEFAULT_POPUP_LABEL; + + Class<?> type = decorator.getType(); + String beanI18nKey; + if (type == null) { + beanI18nKey = n("bean.unknown.type"); + } else { + beanI18nKey = i18nPrefix + Introspector.decapitalize(type.getSimpleName()); + } + String beanI18n = t(beanI18nKey); + title = t(title, beanI18n); + } else { + title = t(title); + } + + sortDown.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.tip")); + sortDown.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.toSelect.tip")); + + sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.tip")); + sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.toSelect.tip")); + + if (nbContext < 2) { + getPopup().remove(popupSeparator); + getPopup().remove(popupLabel); + } + popupLabel.setText(title); + getPopup().setLabel(title); + getPopup().invalidate(); + } +} \ No newline at end of file diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java new file mode 100644 index 0000000..0bcdd6d --- /dev/null +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java @@ -0,0 +1,28 @@ +package org.nuiton.jaxx.widgets; + +/** + * A none checked exception to use in widgets. + * + * Created on 11/30/14. + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 2.18 + */ +public class JaxxWidgetRuntimeException extends RuntimeException { + private static final long serialVersionUID = -2963740979386945340L; + + public JaxxWidgetRuntimeException() { + } + + public JaxxWidgetRuntimeException(String message) { + super(message); + } + + public JaxxWidgetRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public JaxxWidgetRuntimeException(Throwable cause) { + super(cause); + } +} \ No newline at end of file diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java rename to jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java index 13d4081..4e941df 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java @@ -26,7 +26,7 @@ package org.nuiton.jaxx.widgets; * Created on 11/23/14. * * @author Tony Chemit - chemit(a)codelutin.com - * @since 2.17 + * @since 2.18 */ public interface ModelToBean { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java similarity index 70% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java rename to jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java index 4fe5ca4..e81f3ba 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java @@ -22,33 +22,47 @@ package org.nuiton.jaxx.widgets; * #L% */ +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import jaxx.runtime.swing.JAXXRuntimeException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; /** - * A property change listener to mutate to a bean after a predicate is applied. + * A property change listener to mutate to a bean after a predicate was applied. * * Created on 11/23/14. * * @author Tony Chemit - chemit(a)codelutin.com - * @since 2.17 + * @since 2.18 */ public class MutateOnConditionalPropertyChangeListener<M extends ModelToBean> implements PropertyChangeListener { + /** Logger. */ + private static final Log log = LogFactory.getLog(MutateOnConditionalPropertyChangeListener.class); + private final M model; private final Method mutator; private final Predicate<M> canMutatePredicate; + private final String propertyName; + public MutateOnConditionalPropertyChangeListener(M model, Method mutator, Predicate<M> canMutatePredicate) { + + Preconditions.checkNotNull(model); + Preconditions.checkNotNull(mutator); + Preconditions.checkNotNull(canMutatePredicate); + this.model = model; this.mutator = mutator; this.canMutatePredicate = canMutatePredicate; + this.propertyName = mutator.getName(); + } @Override @@ -58,12 +72,17 @@ public class MutateOnConditionalPropertyChangeListener<M extends ModelToBean> im Object newValue = evt.getNewValue(); + + if (log.isDebugEnabled()) { + log.debug("Mutates property " + propertyName + " with value " + newValue + " on " + model); + } + try { mutator.invoke(model.getBean(), newValue); } catch (Exception e) { - throw new JAXXRuntimeException(e); + throw new JaxxWidgetRuntimeException("Can't mutate property " + propertyName + " on " + model, e); } } diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties new file mode 100644 index 0000000..56c28ff --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties @@ -0,0 +1,8 @@ +bean.popup.label=Object '%1$s' +bean.sort.down.tip=Actually, sort order is descending +bean.sort.down.toSelect.tip=To sort in Descending order +bean.sort.off=Click to activate the sort on this property +bean.sort.on=This is the property actually used +bean.sort.up.tip=Actually, sort order is acending +bean.sort.up.toSelect.tip=Click here to sort in ascending order +bean.unknown.type=Object of unkown type diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties new file mode 100644 index 0000000..ed64e0a --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties @@ -0,0 +1,8 @@ +bean.popup.label=Objeto '%1$s' +bean.sort.down.tip=Clasificación decreciente actualmente utilizada +bean.sort.down.toSelect.tip=Clic para clasificar según orden decreciente +bean.sort.off=Click para activar la clasificación de la propiedad '%1$s' +bean.sort.on=Clasificación realizada sobre la propiedad '%1$s' +bean.sort.up.tip=Clasificación creciente actualmente utilizada +bean.sort.up.toSelect.tip=Clic para clasificar según orden creciente +bean.unknown.type=Objeto de tipo desconocido diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties new file mode 100644 index 0000000..2c9371d --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties @@ -0,0 +1,8 @@ +bean.popup.label=Objet '%1$s' +bean.sort.down.tip=Tri décroissant actuellement utilisé +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre décroissant +bean.sort.off=Cliquer pour activer le tri sur la propriété '%1$s' +bean.sort.on=Le tri est effectué sur la propriété '%1$s' +bean.sort.up.tip=Tri croissant actuellement utilisé +bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant +bean.unknown.type=Objet de type inconnu diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 40610c1..7ca62f2 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -37,6 +37,14 @@ <name>JAXX :: Widgets Number</name> <description>Widget to edit numbers</description> + <properties> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> +  + </properties> + <dependencies>  @@ -57,16 +65,6 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -79,16 +77,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -99,31 +87,11 @@ </dependency> <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> @@ -150,8 +118,28 @@ <plugins> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> <executions> <execution> <goals> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java index b9bce69..b9470ec 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java index d0cbf6f..91d8bae 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java index 20de0dc..c168b7c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties new file mode 100644 index 0000000..67f8ca8 --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reset +numbereditor.action.show.tip=Show numeric panel +numbereditor.clearAll=C +numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties new file mode 100644 index 0000000..f8fe076 --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reinicializar +numbereditor.action.show.tip=Mostar el teclado numérico +numbereditor.clearAll=C +numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties new file mode 100644 index 0000000..9a34ded --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Réinitialiser +numbereditor.action.show.tip=Afficher le pavé numérique +numbereditor.clearAll=C +numbereditor.toggleSign=+/- -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

04/16: add jaxx-widgets-select module structure
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 9c5dc9c212a18ccfaf76555533c3424504a565d1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:10:24 2014 +0100 add jaxx-widgets-select module structure --- jaxx-widgets-select/LICENSE.txt | 165 ++++++++++++++++++++ jaxx-widgets-select/README.txt | 2 + jaxx-widgets-select/pom.xml | 168 +++++++++++++++++++++ jaxx-widgets-select/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ pom.xml | 1 + 6 files changed, 413 insertions(+) diff --git a/jaxx-widgets-select/LICENSE.txt b/jaxx-widgets-select/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-select/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-select/README.txt b/jaxx-widgets-select/README.txt new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-select/README.txt @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml new file mode 100644 index 0000000..3854dc3 --- /dev/null +++ b/jaxx-widgets-select/pom.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-select</artifactId> + + <name>JAXX :: Widgets Select</name> + <description>Widgets to select data (using combobox, jlist, doublelist...)</description> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-doublelist</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/jaxx-widgets-select/src/site/site.xml b/jaxx-widgets-select/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-select/src/site/site.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets-select/src/test/resources/log4j.properties b/jaxx-widgets-select/src/test/resources/log4j.properties new file mode 100644 index 0000000..a9515ea --- /dev/null +++ b/jaxx-widgets-select/src/test/resources/log4j.properties @@ -0,0 +1,31 @@ +### +# #%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% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +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.runtime.swing=DEBUG +#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG +log4j.logger.org.nuiton=WARN diff --git a/pom.xml b/pom.xml index cac3fa6..4b77d99 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ <module>jaxx-maven-plugin</module> <module>jaxx-widgets-common</module> <module>jaxx-widgets-number</module> + <module>jaxx-widgets-select</module> <module>jaxx-widgets</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

03/16: add jaxx-widgets-number module structure
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 6777b878e30923536c87cf406127266ea5af3d1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:10:03 2014 +0100 add jaxx-widgets-number module structure --- jaxx-widgets-number/LICENSE.txt | 165 ++++++++++++++++++++ jaxx-widgets-number/README.txt | 2 + jaxx-widgets-number/pom.xml | 168 +++++++++++++++++++++ jaxx-widgets-number/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ pom.xml | 1 + 6 files changed, 413 insertions(+) diff --git a/jaxx-widgets-number/LICENSE.txt b/jaxx-widgets-number/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-number/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-number/README.txt b/jaxx-widgets-number/README.txt new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-number/README.txt @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml new file mode 100644 index 0000000..40610c1 --- /dev/null +++ b/jaxx-widgets-number/pom.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + + <name>JAXX :: Widgets Number</name> + <description>Widget to edit numbers</description> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/jaxx-widgets-number/src/site/site.xml b/jaxx-widgets-number/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-number/src/site/site.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets-number/src/test/resources/log4j.properties b/jaxx-widgets-number/src/test/resources/log4j.properties new file mode 100644 index 0000000..a9515ea --- /dev/null +++ b/jaxx-widgets-number/src/test/resources/log4j.properties @@ -0,0 +1,31 @@ +### +# #%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% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +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.runtime.swing=DEBUG +#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG +log4j.logger.org.nuiton=WARN diff --git a/pom.xml b/pom.xml index dcd1b15..cac3fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ <module>jaxx-compiler</module> <module>jaxx-maven-plugin</module> <module>jaxx-widgets-common</module> + <module>jaxx-widgets-number</module> <module>jaxx-widgets</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

02/16: add module structure
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit f215c1a189b77e3befecdea68ad7d54e677d36ff Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 08:51:46 2014 +0100 add module structure --- jaxx-widgets-common/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-common/README.txt | 2 + jaxx-widgets-common/pom.xml | 162 ++++++++++++++++++++ jaxx-widgets-common/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ pom.xml | 1 + 6 files changed, 407 insertions(+) diff --git a/jaxx-widgets-common/LICENSE.txt b/jaxx-widgets-common/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-common/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-common/README.txt b/jaxx-widgets-common/README.txt new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-common/README.txt @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml new file mode 100644 index 0000000..356e6f4 --- /dev/null +++ b/jaxx-widgets-common/pom.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-common</artifactId> + + <name>JAXX :: Widgets Common</name> + <description>Commons API used by JAXX Widgets</description> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/jaxx-widgets-common/src/site/site.xml b/jaxx-widgets-common/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-common/src/site/site.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets-common/src/test/resources/log4j.properties b/jaxx-widgets-common/src/test/resources/log4j.properties new file mode 100644 index 0000000..a9515ea --- /dev/null +++ b/jaxx-widgets-common/src/test/resources/log4j.properties @@ -0,0 +1,31 @@ +### +# #%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% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +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.runtime.swing=DEBUG +#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG +log4j.logger.org.nuiton=WARN diff --git a/pom.xml b/pom.xml index 44505c6..dcd1b15 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ <module>jaxx-widgets-extra</module> <module>jaxx-compiler</module> <module>jaxx-maven-plugin</module> + <module>jaxx-widgets-common</module> <module>jaxx-widgets</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

01/16: fixes #3584: Improve gis editor layout
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 9932e3150531490350209f953b886dbdfa1b35a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 08:40:23 2014 +0100 fixes #3584: Improve gis editor layout --- .../widgets/gis/absolute/CoordinatesEditor.jaxx | 97 +++++++++++----------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index 1f7187f..eae9c6b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<JPanel id='coordinateEditorTopPanel'> +<Table id="coordinateEditorTopPanel" insets="0"> <import> jaxx.runtime.swing.CardLayout2Ext @@ -55,52 +55,49 @@ public void setShowResetButton(boolean showResetButton) { model.setShowResetButt <CardLayout2Ext id='latitudeLayout' constructorParams='this, "latitudeEditor"'/> <CardLayout2Ext id='longitudeLayout' constructorParams='this, "longitudeEditor"'/> - <Table id="coordinateEditorContainer" insets="0"> - <row> - <cell anchor="west"> - <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> - <JToggleButton id='quadrant4'/> - <JToggleButton id='quadrant1'/> - <JToggleButton id='quadrant3'/> - <JToggleButton id='quadrant2'/> - </JPanel> - </cell> - <cell weightx='1'> - <Table id='coordinatesPanel'> - <row> - <cell anchor='east'> - <JLabel id='latitudeLabel'/> - </cell> - <cell> - <JPanel id='latitudeEditor'> - <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> - </JPanel> - </cell> - </row> - <row> - <cell anchor='east'> - <JLabel id='longitudeLabel'/> - </cell> - <cell> - <JPanel id='longitudeEditor'> - <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()'/> - </JPanel> - </cell> - </row> - </Table> - </cell> - <cell> - <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> - <JRadioButton id='ddFormat'/> - <JRadioButton id='dmsFormat'/> - <JRadioButton id='dmdFormat'/> - </JPanel> - </cell> - </row> - </Table> - -</JPanel> \ No newline at end of file + <row> + <cell anchor="west"> + <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> + <JToggleButton id='quadrant4'/> + <JToggleButton id='quadrant1'/> + <JToggleButton id='quadrant3'/> + <JToggleButton id='quadrant2'/> + </JPanel> + </cell> + <cell fill="both" weightx='1'> + <Table id='coordinatesPanel' insets="0"> + <row> + <cell anchor='east'> + <JLabel id='latitudeLabel'/> + </cell> + <cell fill="both" weightx='1'> + <JPanel id='latitudeEditor'> + <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> + <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> + <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + </JPanel> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel id='longitudeLabel'/> + </cell> + <cell fill="both" weightx='1'> + <JPanel id='longitudeEditor'> + <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> + <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> + <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + </JPanel> + </cell> + </row> + </Table> + </cell> + <cell> + <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> + <JRadioButton id='ddFormat'/> + <JRadioButton id='dmsFormat'/> + <JRadioButton id='dmdFormat'/> + </JPanel> + </cell> + </row> +</Table> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

branch develop updated (3b49b43 -> 13a6581)
by nuiton.org scm 29 Nov '14

29 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 3b49b43 refs #3580 improve enabled new 13a6581 fixes #3583: Pass a predicate to BooleanCellRenderer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 13a6581dde15969d9cf2ecb686be3169faf86335 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 29 14:27:06 2014 +0100 fixes #3583: Pass a predicate to BooleanCellRenderer Summary of changes: .../src/main/java/jaxx/runtime/SwingUtil.java | 6 +++ .../swing/renderer/BooleanCellRenderer.java | 46 +++++++++++++++++----- 2 files changed, 42 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

branch develop updated (05cc639 -> 3b49b43)
by nuiton.org scm 28 Nov '14

28 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 05cc639 fixes #3581: Fix absolute coordinate editor labels fixes #3582: Improve the dmd editor pattern new 3b49b43 refs #3580 improve enabled The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3b49b431fb3e8a13d020f5614a531d54fff2e408 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 28 17:47:28 2014 +0100 refs #3580 improve enabled Summary of changes: .../org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.css | 6 ++++-- .../org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.jaxx | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

branch develop updated (73fc491 -> 05cc639)
by nuiton.org scm 28 Nov '14

28 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 73fc491 fixes #3580: Introduce a new FilterableDoubleList widget (use Collection api for inputs) new 05cc639 fixes #3581: Fix absolute coordinate editor labels fixes #3582: Improve the dmd editor pattern The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 05cc6396ef99f56e602511b1a81ab938c81f50a3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 28 15:53:27 2014 +0100 fixes #3581: Fix absolute coordinate editor labels fixes #3582: Improve the dmd editor pattern Summary of changes: .../org/nuiton/jaxx/widgets/gis/DmdCoordinate.java | 5 +-- .../AbsoluteDdCoordinateEditorHandler.java | 47 ++++++++++----------- .../AbsoluteDmdCoordinateEditorHandler.java | 49 ++++++++++------------ .../AbsoluteDmsCoordinateEditorHandler.java | 34 +++++++-------- .../signed/SignedDmdCoordinateEditorHandler.java | 2 +- .../i18n/jaxx-widgets-gis_fr_FR.properties | 4 +- .../widgets/gis/DmdCoordinateConverterTest.java | 34 +++++++-------- 7 files changed, 81 insertions(+), 94 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

branch develop updated (9a8bdfd -> 73fc491)
by nuiton.org scm 28 Nov '14

28 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 9a8bdfd fixes #3580: Introduce a new FilterableDoubleList widget new 73fc491 fixes #3580: Introduce a new FilterableDoubleList widget (use Collection api for inputs) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 73fc4911a0860239d48da6fb337fbcaa46524a79 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 28 14:35:24 2014 +0100 fixes #3580: Introduce a new FilterableDoubleList widget (use Collection api for inputs) Summary of changes: .../org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.jaxx | 5 +++-- .../nuiton/jaxx/widgets/editor/bean/FilterableDoubleListModel.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1