Author: tchemit Date: 2008-01-24 22:55:44 +0000 (Thu, 24 Jan 2008) New Revision: 531 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java Log: les actions avancent Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 22:55:00 UTC (rev 530) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 22:55:44 UTC (rev 531) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; import java.awt.event.ActionEvent; @@ -61,6 +62,7 @@ if (login == null || password == null) { //TODO show login ui password = "password"; + getContext().getConfig().setPassword(password); } return true; } @@ -71,7 +73,8 @@ StorageService service = getContext().getRemoteStorageService(); try { - service.loginUser(login, password); + String token = service.loginUser(login, password); + getContext().setToken(token); } catch (SimExplorerServiceException e1) { //TODO alert user of error log.warn("could not connect user for reason " + e1.getMessage()); @@ -81,7 +84,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); + SimExplorer.getUI().refreshConnnectState(true); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 22:55:00 UTC (rev 530) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 22:55:44 UTC (rev 531) @@ -19,11 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.action.auth; import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; -import javax.swing.JTabbedPane; import java.awt.event.ActionEvent; /** @@ -59,28 +56,10 @@ super.doAction(e); getContext().setToken(null); //TODO disconnect from server ? - - JTabbedPane container = SimExplorer.getUI().getContent(); - - if (SimExplorerTab.remote.isTabVisible(container)) { - // close tab - SimExplorerTab.remote.closeTab(container); - } - if (SimExplorerTab.synchronize.isTabVisible(container)) { - // close tab - SimExplorerTab.synchronize.closeTab(container); - } - if (SimExplorerTab.detail.isTabVisible(container)) { - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - if (model.isRemote()) { - // close tab - SimExplorerTab.detail.closeTab(container); - } - } } @Override protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); + SimExplorer.getUI().refreshConnnectState(false); } } \ No newline at end of file