Author: tchemit Date: 2008-02-25 14:05:03 +0000 (Mon, 25 Feb 2008) New Revision: 1228 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java Log: mise en place des tris Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-25 09:30:34 UTC (rev 1227) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-25 14:05:03 UTC (rev 1228) @@ -152,6 +152,7 @@ public void initI18n() { I18n.initISO88591(getContext().getConfig().getUserLocale()); } + protected SimExplorer() { // protected restricted access } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-25 09:30:34 UTC (rev 1227) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-25 14:05:03 UTC (rev 1228) @@ -30,6 +30,7 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.service.StorageServiceClient; import static fr.cemagref.simexplorer.is.service.StorageServiceHelper.STORAGE_SERVICE_LOOKUP_NAME; +import fr.cemagref.simexplorer.is.storage.SortColumn; import javax.naming.Context; import javax.naming.InitialContext; @@ -102,15 +103,15 @@ } } - public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, String column, boolean ascending) { + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, SortColumn column, boolean ascending) { StorageService service = getService(context, remote); String token = context.getToken(); try { MetaData[] data; if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, column, ascending); + data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, column.name(), ascending); } else { - data = service.findFullText(token, query, "", onlyLatest, (int) newFirstIndex, width, column, ascending); + data = service.findFullText(token, query, "", onlyLatest, (int) newFirstIndex, width, column.name(), ascending); } return data; } catch (SimExplorerException e) {