Author: tchemit Date: 2008-02-18 23:01:34 +0000 (Mon, 18 Feb 2008) New Revision: 1092 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java Log: fix bug on pagination nbPages computation. little things... Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -153,8 +153,7 @@ protected Integer getVersionIndex(Version version) { if (versions != null && version != null) { for (int i = 0; i < versions.length; i++) { - Version version1 = versions[i]; - if (version1.equals(version)) { + if (versions[i].equals(version)) { return i; } } @@ -180,8 +179,8 @@ public void resetSelectedNode() { selectedNode = null; versions = null; - resetSelectedVersion(); detail = null; + resetSelectedVersion(); } public void resetSelectedVersion() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -138,8 +138,7 @@ } protected PaginationModel initPagination(SimExplorerContext context) { - QueryModel queryModel; - queryModel = getQuery(); + QueryModel queryModel = getQuery(); String query = queryModel.getQuery(); // get size list Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-02-18 21:04:30 UTC (rev 1091) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-02-18 23:01:34 UTC (rev 1092) @@ -50,6 +50,12 @@ return size - firstIndex > width; } + @Override + public String toString() { + String s = super.toString(); + return s.substring(s.indexOf('@')) + "<size:" + size + ", firstIndex:" + firstIndex + ", width:" + width + ", nbPages:" + getNbPages() + ">"; + } + public boolean hasPrevious() { return firstIndex >= width; } @@ -63,8 +69,8 @@ } public int getNbPages() { - int nbPages = (int) (size / width); - if (nbPages==0 && size>0) { + int nbPages = (int) (size / width); + if ((size%width!=0) || (nbPages == 0 && size > 0)) { nbPages++; } return nbPages;