branch develop updated (0b7ec40 -> 8309aac)
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 0b7ec40 [jgitflow-maven-plugin]updating poms for 2.18-SNAPSHOT development new ba0f158 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b0cfde6 add license headers new 0304fb7 [jgitflow-maven-plugin]updating poms for branch'release/2.17' with non-snapshot versions new be79f3c Merge branch 'release/2.17' new 4f4c452 Merge branch 'master' into develop new 8309aac [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 8309aac7dd61bb0e90dd6ceb4ddb319d3d9b92ea Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:32 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4f4c45200362251d8c9a4f8df8d3a2345982938e Merge: ba0f158 be79f3c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:32 2014 +0000 Merge branch 'master' into develop commit ba0f158446b73f49d68bedd337859ab5c9ac9be2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:31 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit be79f3c9c7e3c8e47f9279884d338caf15b05585 Merge: a165579 0304fb7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:28 2014 +0000 Merge branch 'release/2.17' commit 0304fb75f43efb806d3156bbc70c7a2bca22c12e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:04:55 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.17' with non-snapshot versions commit b0cfde6db67b75e0c2ce0fd47b0d0068646fe692 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:04:44 2014 +0000 add license headers Summary of changes: .../component/jaxx/editor/NumberEditor2Demo.css | 21 +++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoHandler.java | 22 ++++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoModel.java | 22 ++++++++++++++++++++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 22 ++++++++++++++++++++++ .../MutateOnConditionalPropertyChangeListener.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/cell/NumberCellEditor.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/number/NumberEditor2.css | 21 +++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Config.java | 22 ++++++++++++++++++++++ .../editor/number/NumberEditor2Handler.java | 22 ++++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Model.java | 22 ++++++++++++++++++++++ 10 files changed, 218 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 b0cfde6db67b75e0c2ce0fd47b0d0068646fe692 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:04:44 2014 +0000 add license headers --- .../component/jaxx/editor/NumberEditor2Demo.css | 21 +++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoHandler.java | 22 ++++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoModel.java | 22 ++++++++++++++++++++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 22 ++++++++++++++++++++++ .../MutateOnConditionalPropertyChangeListener.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/cell/NumberCellEditor.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/number/NumberEditor2.css | 21 +++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Config.java | 22 ++++++++++++++++++++++ .../editor/number/NumberEditor2Handler.java | 22 ++++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Model.java | 22 ++++++++++++++++++++++ 10 files changed, 218 insertions(+) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css index 64fabf5..281503f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css @@ -1,3 +1,24 @@ +/* + * #%L + * JAXX :: Demo + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ NumberEditor2 { bean: {model}; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java index 26129ee..768b4ce 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java @@ -1,5 +1,27 @@ package jaxx.demo.component.jaxx.editor; +/* + * #%L + * JAXX :: Demo + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import jaxx.runtime.spi.UIHandler; /** diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java index 4291267..ec8de51 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java @@ -1,5 +1,27 @@ package jaxx.demo.component.jaxx.editor; +/* + * #%L + * JAXX :: Demo + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import org.jdesktop.beans.AbstractSerializableBean; /** diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java index 95f8af2..13d4081 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + /** * Created on 11/23/14. * diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java index c5c4c1b..4fe5ca4 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import com.google.common.base.Predicate; import jaxx.runtime.swing.JAXXRuntimeException; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java index 8c53b2c..97866c3 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets.editor.cell; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import jaxx.runtime.swing.editor.NumberEditor; import org.nuiton.jaxx.widgets.editor.number.NumberEditor2; import org.nuiton.jaxx.widgets.editor.number.NumberEditor2Model; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css index 8813c4d..5274057 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css @@ -1,3 +1,24 @@ +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ .enabled { enabled:{isEnabled()}; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java index 40ccfb7..b9bce69 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets.editor.number; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import java.io.Serializable; /** diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java index ae04ff7..d0cbf6f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets.editor.number; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java index 24572d0..20de0dc 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.widgets.editor.number; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import com.google.common.base.Predicate; import org.apache.commons.lang3.StringUtils; import org.jdesktop.beans.AbstractSerializableBean; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 0304fb75f43efb806d3156bbc70c7a2bca22c12e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:04:55 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.17' with non-snapshot versions --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index bdd3058..f272b81 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 3d79f20..502ba5c 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 3476f7a..e73cc7a 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index c6d0a9f..d3e8f71 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 01e0ee2..6bfed72 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index bbf69ba..ca7176e 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 9f87f03..2d2a5d6 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 61021c9..9435aaa 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index b138160..f2c69c7 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 2ae2a18..38b8157 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 365a5e2..58c6c49 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index edd12e0..7a732ac 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 7326550..cd8e2af 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.17-SNAPSHOT</version> + <version>2.17</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 be79f3c9c7e3c8e47f9279884d338caf15b05585 Merge: a165579 0304fb7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:28 2014 +0000 Merge branch 'release/2.17' jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- .../swing/action/AbstractApplicationAction.java | 95 ++- .../swing/action/ApplicationActionSwingWorker.java | 13 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- .../jaxx/runtime/swing/config/ConfigCategoryUI.css | 23 + .../runtime/swing/config/ConfigCategoryUI.jaxx | 8 +- .../swing/config/ConfigCategoryUIHandler.java | 149 ++++- .../resources/i18n/jaxx-config_en_GB.properties | 4 + .../resources/i18n/jaxx-config_es_ES.properties | 4 + .../resources/i18n/jaxx-config_fr_FR.properties | 5 + .../main/resources/icons/action-config-copy.png | Bin 0 -> 309 bytes .../resources/icons/action-config-reset-option.png | Bin 0 -> 396 bytes jaxx-demo/pom.xml | 2 +- .../component/jaxx/editor/NumberEditor2Demo.css | 115 ++++ .../component/jaxx/editor/NumberEditor2Demo.jaxx | 110 ++++ .../jaxx/editor/NumberEditor2DemoHandler.java | 56 ++ .../jaxx/editor/NumberEditor2DemoModel.java | 72 +++ .../main/java/jaxx/demo/tree/DemoDataProvider.java | 14 +- .../main/resources/i18n/jaxx-demo_en_GB.properties | 6 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 6 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 6 + jaxx-demo/src/main/resources/log4j.properties | 1 + jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- .../src/main/java/jaxx/runtime/JAXXUtil.java | 18 + .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 73 ++- jaxx-validator/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- .../jaxx/runtime/swing/editor/NumberEditor2.css | 149 ----- .../jaxx/runtime/swing/editor/NumberEditor2.jaxx | 94 --- .../runtime/swing/editor/NumberEditor2Handler.java | 321 ---------- .../runtime/swing/editor/NumberEditor2Model.java | 196 ------ .../swing/editor/cell/NumberCellEditor.java | 3 +- .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 35 ++ .../MutateOnConditionalPropertyChangeListener.java | 72 +++ .../widgets}/editor/cell/NumberCellEditor.java | 59 +- .../jaxx/widgets/editor/number/NumberEditor2.css | 161 +++++ .../jaxx/widgets/editor/number/NumberEditor2.jaxx | 131 ++++ .../widgets/editor/number/NumberEditor2Config.java | 104 ++++ .../editor/number/NumberEditor2Handler.java | 689 +++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Model.java | 198 ++++++ pom.xml | 6 +- 47 files changed, 2195 insertions(+), 825 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 ba0f158446b73f49d68bedd337859ab5c9ac9be2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:31 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 7e49a29..f272b81 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 3d091f1..502ba5c 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index cc4d5d3..e73cc7a 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 47d9db2..d3e8f71 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 068b4db..6bfed72 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 66ac4fa..ca7176e 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 271e8fb..2d2a5d6 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 477ad8e..9435aaa 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index ff03979..f2c69c7 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index dfa2279..38b8157 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 60ec5dc..58c6c49 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index c987112..7a732ac 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 44505c6..cd8e2af 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.17</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 4f4c45200362251d8c9a4f8df8d3a2345982938e Merge: ba0f158 be79f3c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:32 2014 +0000 Merge branch 'master' into develop .../component/jaxx/editor/NumberEditor2Demo.css | 21 +++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoHandler.java | 22 ++++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoModel.java | 22 ++++++++++++++++++++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 22 ++++++++++++++++++++++ .../MutateOnConditionalPropertyChangeListener.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/cell/NumberCellEditor.java | 22 ++++++++++++++++++++++ .../jaxx/widgets/editor/number/NumberEditor2.css | 21 +++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Config.java | 22 ++++++++++++++++++++++ .../editor/number/NumberEditor2Handler.java | 22 ++++++++++++++++++++++ .../widgets/editor/number/NumberEditor2Model.java | 22 ++++++++++++++++++++++ 10 files changed, 218 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 8309aac7dd61bb0e90dd6ceb4ddb319d3d9b92ea Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:08:32 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index f272b81..7e49a29 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 502ba5c..3d091f1 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index e73cc7a..cc4d5d3 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index d3e8f71..47d9db2 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 6bfed72..068b4db 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index ca7176e..66ac4fa 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 2d2a5d6..271e8fb 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 9435aaa..477ad8e 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index f2c69c7..ff03979 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 38b8157..dfa2279 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 58c6c49..60ec5dc 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 7a732ac..c987112 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index cd8e2af..44505c6 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.17</version> + <version>2.18-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm