Jaxx-commits

Download

jaxx-commits@list.nuiton.org

March 2014

5 participants
22 discussions

r2808 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session
by tchemit＠users.nuiton.org 03 Mar '14

03 Mar '14

Author: tchemit Date: 2014-03-03 11:16:14 +0100 (Mon, 03 Mar 2014) New Revision: 2808 Url: http://nuiton.org/projects/jaxx/repository/revisions/2808 Log: fixes #3108: NPE in JTableState Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java 2014-03-01 17:58:08 UTC (rev 2807) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java 2014-03-03 10:16:14 UTC (rev 2808) @@ -90,6 +90,8 @@ public State getState(Object o) { JTable table = checkComponent(o); + JTableState result = new JTableState(); + int[] columnWidths = new int[table.getColumnCount()]; boolean resizableColumnExists = false; @@ -101,21 +103,22 @@ } } - List<? extends RowSorter.SortKey> sortKeys = table.getRowSorter().getSortKeys(); - Map<Integer, String> sortKeysMap = null; - if (sortKeys != null) { - sortKeysMap = new HashMap<Integer, String>(); - for (RowSorter.SortKey sortKey : sortKeys) { - sortKeysMap.put(sortKey.getColumn(), String.valueOf(sortKey.getSortOrder())); - } - } - - JTableState result = new JTableState(); if (resizableColumnExists) { result.setColumnWidths(columnWidths); } - result.setSortKeys(sortKeysMap); + if (table.getRowSorter() != null) { + List<? extends RowSorter.SortKey> sortKeys = table.getRowSorter().getSortKeys(); + Map<Integer, String> sortKeysMap = null; + if (sortKeys != null) { + sortKeysMap = new HashMap<Integer, String>(); + for (RowSorter.SortKey sortKey : sortKeys) { + sortKeysMap.put(sortKey.getColumn(), String.valueOf(sortKey.getSortOrder())); + } + } + result.setSortKeys(sortKeysMap); + } + return result; } @@ -140,16 +143,15 @@ } } } - List<RowSorter.SortKey> sortKeys = null; Map<Integer, String> sortKeysMap = jTableState.getSortKeys(); if (sortKeysMap != null) { - sortKeys = new ArrayList<RowSorter.SortKey>(); + List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>(); for (Integer index : sortKeysMap.keySet()) { SortOrder sortOrder = SortOrder.valueOf(sortKeysMap.get(index)); RowSorter.SortKey sortKey = new RowSorter.SortKey(index, sortOrder); sortKeys.add(sortKey); } + table.getRowSorter().setSortKeys(sortKeys); } - table.getRowSorter().setSortKeys(sortKeys); } }

1 0

r2807 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/java jaxx-compiler/src/test/java/jaxx/compiler/java jaxx-compiler/src/test/java/jaxx/compiler/reflect jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin jaxx-runtime/src/main/java/jaxx/runtime jaxx-widgets/src/main/java/jaxx/runtime/swing/editor src/site/rst src/site/rst/tutos
by tchemit＠users.nuiton.org 01 Mar '14

01 Mar '14

Author: tchemit Date: 2014-03-01 18:58:08 +0100 (Sat, 01 Mar 2014) New Revision: 2807 Url: http://nuiton.org/projects/jaxx/repository/revisions/2807 Log: changes forge urls Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java trunk/src/site/rst/index.rst trunk/src/site/rst/tutos/config.rst trunk/src/site/rst/tutos/css.rst trunk/src/site/rst/tutos/data-binding.rst trunk/src/site/rst/tutos/helloworld.rst trunk/src/site/rst/tutos/helloworld2.rst Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -108,7 +108,7 @@ String n1 = o1.getName(); String n2 = o2.getName(); - //FIXME-tchemit-2012-07-02 (see http://nuiton.org/issues/2154) + //FIXME-tchemit-2012-07-02 (see https://forge.nuiton.org/issues/2154) // Matcher matcher1 = NAME_PATTERN.matcher(n1); // Matcher matcher2 = NAME_PATTERN.matcher(n2); // if (matcher1.matches() && matcher2.matches()) { Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -94,7 +94,7 @@ } /** - * To test http://nuiton.org/issues/2154. + * To test https://forge.nuiton.org/issues/2154. * * @since 2.5.1 */ Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -103,7 +103,7 @@ assertNotNull(descriptor); ClassDescriptorHelper.ResolverType resolverType = descriptor.getResolverType(); - //FIXME-tchemit find out why ? (http://nuiton.org/issues/2203) + //FIXME-tchemit find out why ? (https://forge.nuiton.org/issues/2203) // using jdk 7 VM Server it found a FILE instead of a CLASS ? Wonder why? // Need to find out why // assertEquals(ClassDescriptorHelper.ResolverType.JAVA_CLASS, resolverType); Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -25,7 +25,7 @@ package jaxx.compiler.reflect; /** - * A child class to test the bug http://nuiton.org/issues/show/1470 + * A child class to test the bug https://forge.nuiton.org/issues/show/1470 * <p/> * To test if a child class obtains properties from his super class. * Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -25,7 +25,7 @@ package jaxx.compiler.reflect; /** - * To test the bug : http://nuiton.org/issues/show/1442 + * To test the bug : https://forge.nuiton.org/issues/show/1442 * * @author tchemit <chemit(a)codelutin.com> * @since 2.4.2 Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -39,7 +39,7 @@ import javax.swing.table.TableColumnModel; /** - * Fix the bug http://nuiton.org/issues/show/1124 + * Fix the bug https://forge.nuiton.org/issues/show/1124 * * @author tchemit <chemit(a)codelutin.com> * @since 2.2.4 Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -27,7 +27,7 @@ import org.junit.Test; /** - * Test the bug describe here http://nuiton.org/issues/show/1404 + * Test the bug describe here https://forge.nuiton.org/issues/show/1404 * * @author tchemit <chemit(a)codelutin.com> * @since 2.4.1 Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -224,7 +224,7 @@ // tchemit 2010-12-01 : we must the exact method found, some none javaBeans // api does use different signature for some of them listener // an exemple is the TableColumnModelListener : http://download.oracle.com/javase/6/docs/api/javax/swing/event/TableColumnM… - // This fix the bug http://nuiton.org/issues/show/1124 + // This fix the bug https://forge.nuiton.org/issues/show/1124 Class<?>[] parameterTypes; if (listenerMethodName != null) { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2014-03-01 17:58:08 UTC (rev 2807) @@ -41,7 +41,7 @@ protected FileEditor view; /** - * To set the dialog (see http://nuiton.org/issues/2578) + * To set the dialog (see https://forge.nuiton.org/issues/2578) * * @since 2.5.12 */ @@ -125,7 +125,7 @@ } // show dialog - // see http://nuiton.org/issues/2578 + // see https://forge.nuiton.org/issues/2578 boolean hackDialog = dialogOwner != null && dialogOwner.isAlwaysOnTop(); if (hackDialog) { dialogOwner.setAlwaysOnTop(false); Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/index.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -67,15 +67,15 @@ En résumé, pendant la méthode *beforeInit* il ne faut pas toucher aux UIs, elles ne sont pas encore construites. -Voir http://nuiton.org/issues/2946. +Voir https://forge.nuiton.org/issues/2946. Ajout de nouveaux éditeurs __________________________ De nouveaux éditeurs sont intégrés dans JAXX, à savoir : -- éditeur de temps (http://nuiton.org/issues/2924) -- éditeurs de coordonnées spatiales (http://nuiton.org/issues/2929) +- éditeur de temps (https://forge.nuiton.org/issues/2924) +- éditeurs de coordonnées spatiales (https://forge.nuiton.org/issues/2929) Ils sont intégrés dans la démo de JAXX. @@ -234,7 +234,7 @@ static java.io.File.separatorChar </import> -Voir http://nuiton.org/issues/show/685 +Voir https://forge.nuiton.org/issues/show/685 Meilleure gestion de l'héritage _______________________________ @@ -264,8 +264,8 @@ Voir - * http://nuiton.org/issues/show/625 - * http://nuiton.org/issues/show/626 + * https://forge.nuiton.org/issues/show/625 + * https://forge.nuiton.org/issues/show/626 Nouvelle api d'arbre ____________________ @@ -275,7 +275,7 @@ Cette api remplace celle du package **jaxx.runtime.swing.navigation**. -Voir http://nuiton.org/issues/show/666 +Voir https://forge.nuiton.org/issues/show/666 Nouvelle api d'assistant ________________________ @@ -285,7 +285,7 @@ Cette api remplace celle du **jaxx.runtime.swing.wizard.WizardOperationXXX**. -Voir http://nuiton.org/issues/show/665 +Voir https://forge.nuiton.org/issues/show/665 Ajout de tutoriaux __________________ @@ -294,9 +294,9 @@ Voir - * http://nuiton.org/issues/show/640 - * http://nuiton.org/issues/show/641 - * http://nuiton.org/issues/show/642 + * https://forge.nuiton.org/issues/show/640 + * https://forge.nuiton.org/issues/show/641 + * https://forge.nuiton.org/issues/show/642 Présentation ------------ @@ -355,6 +355,10 @@ * ObServe_ - Logiciel de saisie de données concernant la pèche thonière - GPL + * Tutti_ - Logiciel de saisie de données concernant la pèche - GPL + + * Sammoa_ - Logiciel de saisie de données d'observation de mannifères marins en vol - GPL + * Lima_ - Logiciel de comptabilité française adaptée aux PME - GPL * Vradi_ - Logiciel de traitement de flux XML - GPL @@ -367,10 +371,14 @@ .. _simExplorer-si: http://www.simexplorer.org -.. _ObServe: http://maven-site.forge.codelutin.com/observe/ +.. _ObServe: http://doc.codelutin.com/observe/ -.. _Lima: http://maven-site.chorem.org/lima/ +.. _Tutti: http://doc.codelutin.com/tutti/ +.. _Sammoa: http://doc.codelutin.com/sammoa/ + +.. _Lima: http://doc.chorem.org/lima/ + .. _Vradi: http://maven-site.forge.codelutin.com/vradi .. _Migration: ./migration.html @@ -387,9 +395,9 @@ .. _NavigationModel: ./NavigationModel.html -.. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator +.. _nuiton-validator: http://doc.nuiton.org/nuiton-validator -.. _eugene: http://maven-site.nuiton.org/eugene +.. _eugene: http://doc.nuiton.org/eugene .. _page des goals: ./jaxx-maven-plugin/plugin-info.html Modified: trunk/src/site/rst/tutos/config.rst =================================================================== --- trunk/src/site/rst/tutos/config.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/tutos/config.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -35,7 +35,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: https://forge.nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/css.rst =================================================================== --- trunk/src/site/rst/tutos/css.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/tutos/css.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -122,7 +122,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: https://forge.nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/data-binding.rst =================================================================== --- trunk/src/site/rst/tutos/data-binding.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/tutos/data-binding.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -113,7 +113,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: https://forge.nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/helloworld.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/tutos/helloworld.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -168,7 +168,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: https://forge.nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/helloworld2.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld2.rst 2014-02-25 15:04:31 UTC (rev 2806) +++ trunk/src/site/rst/tutos/helloworld2.rst 2014-03-01 17:58:08 UTC (rev 2807) @@ -122,7 +122,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: https://forge.nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------

1 0