Author: tchemit Date: 2008-02-18 13:14:31 +0000 (Mon, 18 Feb 2008) New Revision: 1057 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java Log: la methode d'appel au service dans la classe dediee Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-18 10:34:07 UTC (rev 1056) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-18 13:14:31 UTC (rev 1057) @@ -50,7 +50,7 @@ */ public class StorageServiceHelper { - private final static boolean mock = true; + private final static boolean mock = false; private final static String PROVIDER_URL = "java.naming.provider.url"; private final static String FACTORY_INITIAL = "java.naming.factory.initial"; @@ -89,6 +89,17 @@ } } + public static String loginUser(SimExplorerContext context, boolean remote,String login,String hashPassword) { + StorageService service = getService(context, remote); + try { + String token; + token = service.loginUser(login, hashPassword); + return token; + } catch (SimExplorerException e) { + throw new SimExplorerRuntimeException(e); + } + } + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) { StorageService service = getService(context, remote); String token = context.getToken(); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-18 10:34:07 UTC (rev 1056) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-18 13:14:31 UTC (rev 1057) @@ -157,14 +157,8 @@ * @return <code>true</code> si l'utilisateur est connecté */ protected boolean connect(String login, String password) { - StorageService service = StorageServiceHelper.getService(getContext(), true); String token; - try { - token = service.loginUser(login, password); - } catch (SimExplorerException e) { - log.warn(e.getMessage(),e); - token = null; - } + token = StorageServiceHelper.loginUser(getContext(), true,login, password); getContext().setToken(token); boolean isConnected = getContext().isConnected(); if (isConnected) {