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

r2414 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by fdesbois＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: fdesbois Date: 2012-07-17 19:15:53 +0200 (Tue, 17 Jul 2012) New Revision: 2414 Url: http://nuiton.org/repositories/revision/jaxx/2414 Log: refs #2195 : avoid NPE using empty string Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 17:06:54 UTC (rev 2413) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 17:15:53 UTC (rev 2414) @@ -121,7 +121,8 @@ // Reset previous data to avoid keeping it on other cell edition if (result) { numberEditor.setModel(null); - numberEditor.setModelText(null); + // Use empty string, otherwise there is a NPE in NumberEditorHandler + numberEditor.setModelText(""); } return result; }

1 0

r2413 - in trunk: . jaxx-compiler jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: maven-release Date: 2012-07-17 19:06:54 +0200 (Tue, 17 Jul 2012) New Revision: 2413 Url: http://nuiton.org/repositories/revision/jaxx/2413 Log: [maven-release-plugin] rollback the release of jaxx-2.5.2 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/jaxx-compiler/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/jaxx-runtime/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/jaxx-validator/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/jaxx-widgets/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) +++ trunk/pom.xml 2012-07-17 17:06:54 UTC (rev 2413) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.2-SNAPSHOT</version> <modules> <module>jaxx-runtime</module>

1 0

r2412 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: maven-release Date: 2012-07-17 19:03:35 +0200 (Tue, 17 Jul 2012) New Revision: 2412 Url: http://nuiton.org/repositories/revision/jaxx/2412 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-compiler/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-demo/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-runtime/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-validator/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/jaxx-widgets/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-17 17:03:33 UTC (rev 2411) +++ trunk/pom.xml 2012-07-17 17:03:35 UTC (rev 2412) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -126,11 +126,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.2 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5.2</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <distributionManagement>

1 0

r2411 - tags
by maven-release＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: maven-release Date: 2012-07-17 19:03:33 +0200 (Tue, 17 Jul 2012) New Revision: 2411 Url: http://nuiton.org/repositories/revision/jaxx/2411 Log: [maven-release-plugin] copy for tag jaxx-2.5.2 Added: tags/jaxx-2.5.2/

1 0

r2410 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: maven-release Date: 2012-07-17 19:03:31 +0200 (Tue, 17 Jul 2012) New Revision: 2410 Url: http://nuiton.org/repositories/revision/jaxx/2410 Log: [maven-release-plugin] prepare release jaxx-2.5.2 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-compiler/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-demo/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-runtime/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-validator/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/jaxx-widgets/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) +++ trunk/pom.xml 2012-07-17 17:03:31 UTC (rev 2410) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.5.2</version> <modules> <module>jaxx-runtime</module> @@ -126,11 +126,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5.2</url> </scm> <distributionManagement>

1 0

r2409 - trunk/jaxx-demo
by fdesbois＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: fdesbois Date: 2012-07-17 19:02:04 +0200 (Tue, 17 Jul 2012) New Revision: 2409 Url: http://nuiton.org/repositories/revision/jaxx/2409 Log: refs #2184 : missing swingx groupId change for jaxx demo Modified: trunk/jaxx-demo/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-17 16:08:06 UTC (rev 2408) +++ trunk/jaxx-demo/pom.xml 2012-07-17 17:02:04 UTC (rev 2409) @@ -94,7 +94,7 @@ </dependency> <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency>

1 0

r2408 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by fdesbois＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: fdesbois Date: 2012-07-17 18:08:06 +0200 (Tue, 17 Jul 2012) New Revision: 2408 Url: http://nuiton.org/repositories/revision/jaxx/2408 Log: refs #2195: null management with NumberCellEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 15:06:02 UTC (rev 2407) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 16:08:06 UTC (rev 2408) @@ -27,6 +27,7 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import javax.swing.AbstractCellEditor; +import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; @@ -73,6 +74,10 @@ return numberEditor; } + public NumberEditor getNumberEditor() { + return numberEditor; + } + @Override public E getCellEditorValue() { return (E)numberEditor.getModel();

1 0

r2407 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by fdesbois＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: fdesbois Date: 2012-07-17 17:06:02 +0200 (Tue, 17 Jul 2012) New Revision: 2407 Url: http://nuiton.org/repositories/revision/jaxx/2407 Log: refs #2195: Null management with NumberCellEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 14:37:53 UTC (rev 2406) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 15:06:02 UTC (rev 2407) @@ -63,9 +63,6 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - // Reset previous text (otherwise the previous value could be keeped) - numberEditor.setModelText(""); - E number = (E) value; numberEditor.setModel(number); @@ -112,4 +109,15 @@ @Override public void ancestorMoved(AncestorEvent event) { } + + @Override + public boolean stopCellEditing() { + boolean result = super.stopCellEditing(); + // Reset previous data to avoid keeping it on other cell edition + if (result) { + numberEditor.setModel(null); + numberEditor.setModelText(null); + } + return result; + } }

1 0

r2406 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by fdesbois＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: fdesbois Date: 2012-07-17 16:37:53 +0200 (Tue, 17 Jul 2012) New Revision: 2406 Url: http://nuiton.org/repositories/revision/jaxx/2406 Log: fixes #2195: Null management with NumberCellEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 13:47:19 UTC (rev 2405) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-17 14:37:53 UTC (rev 2406) @@ -63,10 +63,16 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - // FIXME sletellier 20120105 : we dont need to set modelText - E bd = (E) value; - numberEditor.setModel(bd); - numberEditor.setModelText(String.valueOf(bd)); + // Reset previous text (otherwise the previous value could be keeped) + numberEditor.setModelText(""); + + E number = (E) value; + numberEditor.setModel(number); + + // Check nullity and set the text that will be selected with the current value + if (number != null) { + numberEditor.setModelText(String.valueOf(number)); + } return numberEditor; }

1 0

r2405 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by echatellier＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: echatellier Date: 2012-07-17 15:47:19 +0200 (Tue, 17 Jul 2012) New Revision: 2405 Url: http://nuiton.org/repositories/revision/jaxx/2405 Log: refs #2194 : add ids Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-17 13:45:46 UTC (rev 2404) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-17 13:47:19 UTC (rev 2405) @@ -52,7 +52,7 @@ initializer='new ListSelectorModel()'/> <row> <cell fill='both' weightx='1' weighty='1' rows="2"> - <JScrollPane> + <JScrollPane id='fromScrollpane'> <JList id='from' model='{model.getFromModel()}' selectionModel='{model.getFromModel()}' @@ -69,7 +69,7 @@ </cell> <cell fill='both' weightx='1' weighty='1' rows="2"> - <JScrollPane> + <JScrollPane id='toScrollpane'> <JList id='to' model='{model.getToModel()}' selectionModel='{model.getToModel()}'

1 0