February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1115 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 13:54:22 +0000 (Tue, 19 Feb 2008) New Revision: 1115 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 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/ExportToLocalAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: refactor code, utilisation factory Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -27,7 +27,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import javax.swing.AbstractAction; -import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -106,14 +105,14 @@ newPage = null; } - protected JComboBox getChangePageComboBox(JAXXTab myTab) { + //TODO Suppress this code + protected JComboBox getChangePageComboBox(JAXXTab myTab) { JComponent uiObject = getUIObject((String) getValue(Action.ACTION_COMMAND_KEY), (JAXXObject) myTab); if (uiObject instanceof JComboBox) { return (JComboBox) uiObject; } - // find with hard name - AbstractAction action = SimExplorerActionManager.newAction("goPage", (AbstractButton) null); + AbstractAction action = SimExplorerActionManager.newAction("goPage"); uiObject = getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY)); if (uiObject instanceof JComboBox) { return (JComboBox) uiObject; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -33,18 +33,23 @@ shortDescription = "simexplorer.action.closeTab.tooltip", longDescription = "simexplorer.action.closeTab.help", smallIcon = "closeTab.png", - hideActionText = true + hideActionText = true, + enabled = true ) public class CloseTabAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -3088257073806742313L; + public CloseTabAction() { + super("closeTab"); + } + public CloseTabAction(String name) { super(name, "closeTab"); } @Override protected void doAction(ActionEvent e) throws Exception { - getTab().closeTab(getMainUI().getContent()); + getTab().closeTab(getTabContainer()); } } 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-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.DetailTabRefreshHelper; @@ -97,6 +98,9 @@ */ @Override public void updateUI() { + if (!getContext().isConnected()) { + return; + } SimExplorerMainUI ui = getMainUI(); //SwingUtilities.invokeLater(new Runnable() { @@ -147,7 +151,12 @@ */ protected boolean connect(String login, String password) { String token; - token = StorageServiceHelper.loginUser(getContext(), true,login, password); + + try { + token = StorageServiceHelper.loginUser(getContext(), true,login, password); + } catch (UnreachableServiceException e1) { + return failedToReachService(); + } getContext().setToken(token); boolean isConnected = getContext().isConnected(); if (isConnected) { @@ -172,9 +181,32 @@ } } + protected boolean cancel; + + protected boolean failedToReachService() { + int result = JOptionPane.showConfirmDialog(ui, _("simexplorer.login.retry"), _("simexplorer.service.failed"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE); + return result == JOptionPane.NO_OPTION; + } protected boolean failedToConnect() { int result = JOptionPane.showConfirmDialog(ui, _("simexplorer.login.retry"), _("simexplorer.login.failed"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE); return result == JOptionPane.NO_OPTION; } + + public void doConnect() { + cancel = false; + if (!connect(ui.getLogin().getText(), ui.getPassword().getPassword())) { + if (failedToConnect()) { + cancel = true; + } + } else { + cancel = true; + } + } + + public void doCancel() { + cancel = false; + ui.getLogin().setText(null); + ui.getPassword().setText(null); + } } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -24,7 +24,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import javax.swing.AbstractButton; import java.awt.event.ActionEvent; /** @@ -68,7 +67,6 @@ public void updateUI() { super.updateUI(); // reinit de l'onglet synchronize - ShowSynchronizeTabAction synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); - synchronizeAction.actionPerformed((new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_synchronize"))); + SimExplorerActionManager.fireAction("showTab_synchronize",e.getSource()); } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -24,7 +24,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import javax.swing.AbstractButton; import java.awt.event.ActionEvent; /** @@ -68,7 +67,7 @@ public void updateUI() { super.updateUI(); // reinit de l'onglet synchronize - ShowSynchronizeTabAction synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); - synchronizeAction.actionPerformed((new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_synchronize"))); + SimExplorerActionManager.fireAction("showTab_synchronize",e.getSource()); + //synchronizeAction.actionPerformed((new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_synchronize"))); } } \ No newline at end of file Copied: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java (from rev 1113, trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -0,0 +1,61 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.actions; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; + +import javax.swing.AbstractButton; + +/** + * Action pour afficher la dialogue de modification de configuration + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "resetPassword", + name = "simexplorer.action.resetPassword", + shortDescription = "simexplorer.action.resetPassword.tooltip", + longDescription = "simexplorer.action.resetPassword.help", + smallIcon = "action/reset-password.png", + mnemonic = 'R', + hideActionText = false +) +public class ResetPasswordAction extends SimExplorerAbstractAction { + + private static final long serialVersionUID = 1449553547444065616L; + + public ResetPasswordAction(String name) { + super(name); + } + + @Override + public void doAction(java.awt.event.ActionEvent e) { + + getContext().getConfig().setRemotePassword(null); + getContext().getConfig().saveSafely(); + + if (getContext().isConnected()) { + // unconnect + SimExplorerActionManager.fireAction("unconnect", e.getSource(), (AbstractButton) null); + } + // reconnect ? + //SimExplorerActionManager.fireAction("connect", e.getSource(), (AbstractButton) null); + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -89,45 +89,8 @@ listMetaSelectionListener = new ListMetaSelectionListener(ui, model); ui.getTable().getSelectionModel().addListSelectionListener(listMetaSelectionListener); - ui.getTable().addMouseListener(new MouseAdapter() { + ui.getTable().addMouseListener(new ListMetaMouseListener(ui, model)); - @Override - public void mousePressed(MouseEvent e) { - super.mousePressed(e); - initPopup(e); - } - - @Override - public void mouseReleased(MouseEvent e) { - super.mouseReleased(e); - initPopup(e); - } - - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - try { - // synchronization du meta selectionne - synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); - // lancement de l'action d'affichage de l'onglet de detail - ActionEvent e1 = new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail"); - SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null).actionPerformed(e1); - } catch (Exception e1) { - throw new SimExplorerRuntimeException(e1); - } - } - } - - protected void initPopup(MouseEvent e) { - if (e.isPopupTrigger()) { - // synchronization du meta selectionne - synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); - // affichage de la popup - ui.getTablePopupMenu().show(ui.getTable(), e.getX(), e.getY()); - } - } - }); - // add search actions listeners ui.getSearchText().addKeyListener(new KeyAdapter() { @Override @@ -197,4 +160,50 @@ } } } + + private class ListMetaMouseListener extends MouseAdapter { + private final JListTab ui; + private final ListTabModel model; + + public ListMetaMouseListener(JListTab ui, ListTabModel model) { + this.ui = ui; + this.model = model; + } + + @Override + public void mousePressed(MouseEvent e) { + super.mousePressed(e); + initPopup(e); + } + + @Override + public void mouseReleased(MouseEvent e) { + super.mouseReleased(e); + initPopup(e); + } + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + try { + // synchronization du meta selectionne + synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); + // lancement de l'action d'affichage de l'onglet de detail + //ActionEvent e1 = new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail"); + SimExplorerActionManager.fireAction("showTab_detail", e.getSource(),(AbstractButton) null); + } catch (Exception e1) { + throw new SimExplorerRuntimeException(e1); + } + } + } + + protected void initPopup(MouseEvent e) { + if (e.isPopupTrigger()) { + // synchronization du meta selectionne + synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); + // affichage de la popup + ui.getTablePopupMenu().show(ui.getTable(), e.getX(), e.getY()); + } + } + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -105,6 +105,10 @@ public void updateUI() { // nothing by default } + + public void disposeUI() { + // nothing by default + } protected void clear() { // nothing by default Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -51,25 +51,28 @@ if (prefixPatternName == null) { throw new IllegalArgumentException("prefixPatternName can not be null, but was."); } + if (name.equals(prefixPatternName)) { + param = name; + } else { + Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); + Matcher matcher = patternName.matcher(name); + if (!matcher.matches()) { + throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); + } - Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); - Matcher matcher = patternName.matcher(name); - if (!matcher.matches()) { - throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); + param = prefixPatternName; + + Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); + tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); } - param = prefixPatternName; - - Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); - tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); - - log.debug(">>> " + this); + log.info(">>> " + this); } protected SimExplorerAbstractTabAction(String name) { super(name); param = name; - log.debug(">>> " + this); + log.info(">>> " + this); } public String getParam() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-02-19 13:54:22 UTC (rev 1115) @@ -21,7 +21,6 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import javax.swing.AbstractAction; -import javax.swing.AbstractButton; import javax.swing.JTabbedPane; import java.awt.event.ActionEvent; @@ -63,15 +62,26 @@ public AbstractAction getCloseAction() { if (closeAction == null) { - closeAction = SimExplorerActionManager.newAction("closeTab_" + getTab().name(), (AbstractButton) null); + closeAction = SimExplorerActionManager.newAction("closeTab_" + getTab().name()); } return closeAction; } public AbstractAction getShowAction() { if (showAction == null) { - showAction = SimExplorerActionManager.newAction("showTab_" + getTab().name(), (AbstractButton) null); + showAction = SimExplorerActionManager.newAction("showTab_" + getTab().name()); } return showAction; } + + @Override + protected void clear() { + action = null; + } + + @Override + public void disposeUI() { + super.disposeUI(); + showAction = closeAction = null; + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-19 13:54:22 UTC (rev 1115) @@ -11,10 +11,10 @@ <JMenuItem id='deleteElement'/> </JPopupMenu> <JToolBar> - <JButton id='importElement'/> + <JButton id='importElement'/> + <JButton id='resetSearch'/> <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> <JButton id='search'/> - <JButton id='resetSearch'/> <JButton id='advancedSearch'/> <JComboBox id='changeSizor' enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'> <item value='5'/> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx 2008-02-19 13:54:22 UTC (rev 1115) @@ -9,23 +9,10 @@ protected abstract boolean failedToConnect(); - public void doConnect() { - cancel = false; - if (!connect(ui.getLogin().getText(),ui.getPassword().getPassword())) { - if (failedToConnect()) { - cancel = true; - } - } else { - cancel = true; - } - } + public abstract void doConnect(); - public void doCancel() { - cancel = false; - ui.login.setText(null); - ui.password.setText(null); - } - + public abstract void doCancel(); + protected void setUi(LoginUI ui) { this.ui = ui; } @@ -48,6 +35,7 @@ // block close operation setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); } + protected void doConnect() { handler.doConnect(); if (handler.cancel) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-19 13:53:43 UTC (rev 1114) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-19 13:54:22 UTC (rev 1115) @@ -20,6 +20,7 @@ <JMenuItem id="i18n_en_GB"/> </JMenu> <JMenuItem id="config"/> + <JMenuItem id="resetPassword"/> </JMenu>  <JMenu text='simexplorer.help.menu' mnemonic="{'e'}">

1 0

r1114 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui java/fr/cemagref/simexplorer/is/ui/swing resources resources/i18n resources/icons resources/icons/action resources/jaxx
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 13:53:43 +0000 (Tue, 19 Feb 2008) New Revision: 1114 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties Removed: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 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/SimExplorerActionManager.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-search.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties Log: utilisation de la factory simple d'actions de jaxx ajustement actions Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -22,15 +22,12 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.util.ErrorDialog; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; import org.codelutin.option.ui.ConfigUI; -import javax.swing.AbstractButton; import java.awt.event.ActionEvent; import java.io.IOException; import java.io.PrintWriter; @@ -88,10 +85,8 @@ for (SimExplorerTab tab : SimExplorerTab.values()) { tab.removePropertyChangeListeners(); } - ConnectAction connectAction = (ConnectAction) SimExplorerActionManager.newAction("connect", (AbstractButton) null); - connectAction.disposeUI(); - ImportAction importAction = (ImportAction) SimExplorerActionManager.newAction("importElement", (AbstractButton) null); - importAction.disposeUI(); + // on nettoye les ui cachees dans les actions + SimExplorerActionManager.disposeUI(); } /** 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-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -39,6 +39,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.service.StorageServiceClient; @@ -89,9 +90,12 @@ } } - public static String loginUser(SimExplorerContext context, boolean remote,String login,String hashPassword) { + public static String loginUser(SimExplorerContext context, boolean remote,String login,String hashPassword) throws UnreachableServiceException { StorageService service = getService(context, remote); try { + if (service==null) { + throw new UnreachableServiceException("could not find service "+(remote?"remote":"local")); + } String token; token = service.loginUser(login, hashPassword); return token; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -18,21 +18,17 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.ActionFactory; +import jaxx.runtime.builder.SimpleActionFactoryImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.JComboBox; -import java.io.IOException; -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; +import java.awt.event.ActionEvent; /** * La classe responsable de l'enregistrement des actions disponibles @@ -48,11 +44,6 @@ private static final Log log = LogFactory.getLog(SimExplorerActionManager.class); - /** path in classpath where to find actions mapping */ - protected static final String ACTIONS_FILE_PATH = "/actions.properties"; - - protected static final String ACTION_KEY_PREFIX = "action."; - /** l'usine d'actions */ private static ActionFactory factory; @@ -94,45 +85,58 @@ */ protected static ActionFactory getFactory() { if (factory == null) { - factory = new ActionFactory() { - @SuppressWarnings({"unchecked"}) - protected Map<String, Class<? extends AbstractAction>> init() { - Properties properties = new Properties(); - try { - properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); - } catch (IOException e) { - throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.file", e.getMessage())); - } - Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); - int prefix = ACTION_KEY_PREFIX.length(); - for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { - String key = objectObjectEntry.getKey() + ""; - String qfn = objectObjectEntry.getValue() + ""; - try { - Class<? extends AbstractAction> implCass; - implCass = (Class<? extends SimExplorerAbstractAction>) Class.forName(qfn); - log.debug("found action " + implCass); - cache.put(key.substring(prefix), implCass); - } catch (ClassNotFoundException e) { - throw new SimExplorerRuntimeException(_("simexplorer.error.load.actions.class", key, qfn)); - } - } - return cache; - } - }; + // used a simple factory implementation + factory = new SimpleActionFactoryImpl(); } return factory; } - public static AbstractAction newAction(String actionKey, AbstractButton component) { - return getFactory().newAction(actionKey, component); + public static void fireAction(String actionKey, Object source) { + fireAction(actionKey,source, (AbstractButton) null); } - public static AbstractAction newAction(String actionKey, JComboBox component) { - return getFactory().newAction(actionKey, component); + public static AbstractAction newAction(String actionKey) { + return newAction(actionKey, (AbstractButton) null); } public static void resetCache() { getFactory().resetCache(); } + + public static void disposeUI() { + for (String actionKey : getFactory().getActionNames()) { + SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey); + if (action!=null) { + action.disposeUI(); + } + } + } + + + public static void fireAction(String actionKey, Object source, AbstractButton component) { + AbstractAction action = newAction(actionKey, component); + fireAction0(actionKey, source, action); + } + + public static void fireAction(String actionKey, Object source, JComboBox component) { + AbstractAction action = newAction(actionKey, component); + fireAction0(actionKey, source, action); + } + + protected static AbstractAction newAction(String actionKey, AbstractButton component) { + return getFactory().newAction(actionKey, component); + } + + protected static AbstractAction newAction(String actionKey, JComboBox component) { + return getFactory().newAction(actionKey, component); + } + + protected static void fireAction0(String actionKey, Object source, AbstractAction action) { + if (action == null) { + log.warn("could not find action " + actionKey); + return; + } + ActionEvent event = new ActionEvent(source, ActionEvent.ACTION_FIRST, actionKey); + action.actionPerformed(event); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-19 13:53:43 UTC (rev 1114) @@ -23,14 +23,10 @@ import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.JComponent; -import javax.swing.JTabbedPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import java.awt.Component; -import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.util.regex.Matcher; @@ -49,25 +45,11 @@ SimExplorerActionManager.loadActions(this, null); // add Ctrl-W to close current tab - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeSelectedTab"); - getRootPane().getActionMap().put("closeSelectedTab", new AbstractAction() { - private static final long serialVersionUID = -3166738263954350322L; - - public void actionPerformed(ActionEvent e) { - JTabbedPane container = getContent(); - Component header = container.getSelectedComponent(); - - for (SimExplorerTab tab : SimExplorerTab.values()) { - if (tab.isTabVisible(container) && header.equals(tab.getUI())) { - // this is the actually selected tab - tab.closeTab(container); - } - } - } - }); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeTab"); + getRootPane().getActionMap().put("closeTab", SimExplorerActionManager.newAction("closeTab")); // override Ctrl-F4 close application getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.CTRL_MASK), "quit"); - getRootPane().getActionMap().put("quit", SimExplorerActionManager.newAction("quit", (AbstractButton) null)); + getRootPane().getActionMap().put("quit", SimExplorerActionManager.newAction("quit")); // repaint i18n actions refreshI18nActions(); Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -1,77 +0,0 @@ -# authentication actions -action.connect=fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction -action.unconnect=fr.cemagref.simexplorer.is.ui.swing.actions.UnconnectAction - -# config action -action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction - -# quit action -action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction - -# i18n actions -action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nFRAction -action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nGBAction - -# close tab actions -action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction -action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction - -# show tab actions -action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowLocalTabAction -action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowRemoteTabAction -action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction -action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction - -# toggle tab actions -action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction -action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleRemoteTabAction - -# search actions -action.search=fr.cemagref.simexplorer.is.ui.swing.actions.SearchAction -action.resetSearch=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchAction -action.advancedSearch=fr.cemagref.simexplorer.is.ui.swing.actions.AdvancedSearchAction - -# list navigation actions -action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoFirstPageAction -action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoPreviousPageAction -action.goPage=fr.cemagref.simexplorer.is.ui.swing.actions.ChangePageAction -action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoNextPageAction -action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoLastPageAction -action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeSizorAction - -# collapse tree node actions -action.collapseAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction -action.collapseAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction -action.collapseAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction - -# expand tree node actions -action.expandAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction -action.expandAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction -action.expandAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction - -# download actions -action.downloadElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadElementAction -action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction - -# delete action -action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction - -# detail to tree action -action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction - -# navigation history actions -action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryNextAction -action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryPreviousAction - -# import- export actions -action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction -action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction -action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToRemoteAction -action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction - -# help actions -action.site=fr.cemagref.simexplorer.is.ui.swing.actions.SiteAction -action.help=fr.cemagref.simexplorer.is.ui.swing.actions.HelpAction -action.about=fr.cemagref.simexplorer.is.ui.swing.actions.AboutAction \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -90,6 +90,9 @@ simexplorer.action.quit=Quit simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Quit SimExplorer SI +simexplorer.action.resetPassword=Reset password +simexplorer.action.resetPassword.help= +simexplorer.action.resetPassword.tooltip=Reset you remote connexion password (a new password will be asked at next connexion) simexplorer.action.resetSearch=reset simexplorer.action.resetSearch.help= simexplorer.action.resetSearch.tooltip=reset search @@ -160,8 +163,6 @@ simexplorer.entities.library=Library simexplorer.error.dialog.message=An error was found simexplorer.error.dialog.title=Error detected\! -simexplorer.error.load.actions.class=could not found for action key {0} class {1} -simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Help simexplorer.login.failed=Authentication failed @@ -182,6 +183,7 @@ simexplorer.option.description.resetConfig=Reset user configuration. simexplorer.option.description.showConfig=See configuration details simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.service.failed= simexplorer.tab.detail=Detail simexplorer.tab.detail.tooltip=Screen of details of an element simexplorer.tab.local=Local elements Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -90,6 +90,9 @@ simexplorer.action.quit=Quitter simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Pour quitter l'application +simexplorer.action.resetPassword=R\u00E9initialiser mot de passe +simexplorer.action.resetPassword.help= +simexplorer.action.resetPassword.tooltip=R\u00E9initialiser votre mot de passe (un novueau vous sera demand\u00E9 \u00E0 la prochainne connexion) simexplorer.action.resetSearch=r\u00E9initialiser simexplorer.action.resetSearch.help= simexplorer.action.resetSearch.tooltip=R\u00E9initialiser la recherche @@ -160,8 +163,6 @@ simexplorer.entities.library=Librairie simexplorer.error.dialog.message=Une erreur est survenue\! simexplorer.error.dialog.title=Erreur detect\u00E9e -simexplorer.error.load.actions.class=could not found for action key {0} class {1} -simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide simexplorer.login.failed=L'authentification a \u00E9chou\u00E9e @@ -182,6 +183,7 @@ simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration simexplorer.option.description.ui=launch or not user interface (value) +simexplorer.service.failed= simexplorer.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Liste locale Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-password.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/reset-search.png =================================================================== (Binary files differ) Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/reset-search.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties (from rev 1113, trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -0,0 +1,79 @@ +# authentication actions +action.connect=fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction +action.unconnect=fr.cemagref.simexplorer.is.ui.swing.actions.UnconnectAction +action.resetPassword=fr.cemagref.simexplorer.is.ui.swing.actions.ResetPasswordAction + +# config action +action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction + +# quit action +action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction + +# i18n actions +action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nFRAction +action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nGBAction + +# close tab actions +action.closeTab=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction +action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction + +# show tab actions +action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowLocalTabAction +action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowRemoteTabAction +action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction +action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction + +# toggle tab actions +action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction +action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleRemoteTabAction + +# search actions +action.search=fr.cemagref.simexplorer.is.ui.swing.actions.SearchAction +action.resetSearch=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchAction +action.advancedSearch=fr.cemagref.simexplorer.is.ui.swing.actions.AdvancedSearchAction + +# list navigation actions +action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoFirstPageAction +action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoPreviousPageAction +action.goPage=fr.cemagref.simexplorer.is.ui.swing.actions.ChangePageAction +action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoNextPageAction +action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoLastPageAction +action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeSizorAction + +# collapse tree node actions +action.collapseAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction +action.collapseAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction +action.collapseAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction + +# expand tree node actions +action.expandAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction +action.expandAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction +action.expandAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction + +# download actions +action.downloadElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadElementAction +action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction + +# delete action +action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction + +# detail to tree action +action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction + +# navigation history actions +action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryNextAction +action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryPreviousAction + +# import- export actions +action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction +action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction +action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToRemoteAction +action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportAction + +# help actions +action.site=fr.cemagref.simexplorer.is.ui.swing.actions.SiteAction +action.help=fr.cemagref.simexplorer.is.ui.swing.actions.HelpAction +action.about=fr.cemagref.simexplorer.is.ui.swing.actions.AboutAction \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2008-02-19 00:42:43 UTC (rev 1113) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2008-02-19 13:53:43 UTC (rev 1114) @@ -8,5 +8,6 @@ # package level log4j.logger.fr.cemagref.simexplorer.is=INFO log4j.logger.org.codelutin=INFO +log4j.logger.jaxx=INFO

1 0

r1113 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 00:42:43 +0000 (Tue, 19 Feb 2008) New Revision: 1113 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java Log: passage en debug apres debugage :) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-19 00:41:00 UTC (rev 1112) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-19 00:42:43 UTC (rev 1113) @@ -43,12 +43,12 @@ public void actionPerformed(java.awt.event.ActionEvent e) { - log.info("------------------------------------------------------------"); + log.debug("------------------------------------------------------------"); log.debug("event : " + e); log.debug("source : " + e.getSource()); try { boolean accepted = beforeAction(e); - log.info("action : " + this); + log.debug("action : " + this); if (accepted) { log.info(getActionName()+" (treate:" + accepted + ") : " + this); } else {

1 0

r1112 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . util
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 00:41:00 +0000 (Tue, 19 Feb 2008) New Revision: 1112 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: fixbug : on ne doit pas utiliser model.synch(null) : cela supprime aussi la propri?\195?\169t?\195?\169 remote du model, ce qui n'est pas voulu sinon le model n'est plus 'typ?\195?\169' Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import java.awt.event.ActionEvent; @@ -67,12 +68,14 @@ @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); + ListTabModel model = (ListTabModel) getModel(); // reset query in model model.setQuery(null); - + // reset selected item + model.synch(model.isRemote(), (MetaData) null); + log.info("sync "+model.getSelectedItem()); // pagination a vide model.setPagination(null); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import javax.swing.JTextField; import java.awt.event.ActionEvent; @@ -43,8 +44,8 @@ ) public class SearchAction extends SimExplorerAbstractTabAction { + protected String query; private static final long serialVersionUID = -8537587629478588257L; - String query; public SearchAction(String name) { super(name); @@ -60,12 +61,11 @@ @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); ListTabModel model = (ListTabModel) getModel(); model.getQuery().setQuery(query); // on supprime la selection courante avant tout - model.synch(null); + model.synch(model.isRemote(), (MetaData) null); model.setSelectedIndex(-1); // pagination a vide @@ -83,7 +83,6 @@ @Override protected void clear() { - super.clear(); query = null; setTab(null); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -150,7 +150,7 @@ // if empty list, this is quick if (model.isEmpty()) { model.setSelectedIndex(-1); - model.synch(null); + model.synch(model.isRemote(), (MetaData) null); return; } DataEntityModel entityModel;

1 0

r1111 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 00:40:02 +0000 (Tue, 19 Feb 2008) New Revision: 1111 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java Log: javadoc Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-18 23:57:38 UTC (rev 1110) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-19 00:40:02 UTC (rev 1111) @@ -29,7 +29,7 @@ import java.io.File; /** - * Action pour downloader un résultat ou une librairie + * Action pour downloader un fichier attachéà un LoggableElement * * @author chemit */ @@ -86,6 +86,4 @@ super.clear(); attachment = null; } - - } \ No newline at end of file

1 0

r1110 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:57:38 +0000 (Mon, 18 Feb 2008) New Revision: 1110 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: delete action revisit?\195?\169 et utilise maintenant l'?\195?\169l?\195?\169ment s?\195?\169lectionn?\195?\169 du model incrimin?\195?\169. l'action fonctionne aux endroits voulus (onglet list + detail) TODO : supprimer l'?\195?\169l?\195?\169ment de l'historique de l'onglet detail TODO : affiner le updateUI selon ce qu'il y a dans l'onglet detail et synchronize Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-18 23:57:32 UTC (rev 1109) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-18 23:57:38 UTC (rev 1110) @@ -27,6 +27,8 @@ simexplorer.action.detailToTree=Synchronize detail to tree simexplorer.action.detailToTree.help= simexplorer.action.detailToTree.tooltip=Synchronize element ''{0}'' as navigation root node +simexplorer.action.download.attachment=Directory where to download attachment ''{0}'' of element ''{1}'' +simexplorer.action.download.le=Directory where to download element ''{0}'' simexplorer.action.downloadAttachment=Download Attachment simexplorer.action.downloadAttachment.help= simexplorer.action.downloadAttachment.tooltip=Download attachment ''{0}'' @@ -116,6 +118,7 @@ simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choose a application's exploration (*.zip) +simexplorer.choose.dir=Choose this directory simexplorer.choose.import.label=Import type simexplorer.choose.library=Choose a library file (*.?) simexplorer.common.apply=Apply Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-18 23:57:32 UTC (rev 1109) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-18 23:57:38 UTC (rev 1110) @@ -27,6 +27,8 @@ simexplorer.action.detailToTree=Afficher dans l'arbre simexplorer.action.detailToTree.help= simexplorer.action.detailToTree.tooltip=Positionne l''\u00E9l\u00E9ment ''{0}'' comme racine de l''arbre de navigation +simexplorer.action.download.attachment=R\u00E9pertoire o\u00F9 t\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' de l''\u00E9l\u00E9ment ''{1}'' +simexplorer.action.download.le=R\u00E9pertoire o\u00F9 t\u00E9l\u00E9charger le zip de l''\u00E9l\u00E9ment ''{0}'' simexplorer.action.downloadAttachment=T\u00E9l\u00E9charger le fichier attach\u00E9 simexplorer.action.downloadAttachment.help= simexplorer.action.downloadAttachment.tooltip=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' @@ -116,6 +118,7 @@ simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choisir une exploration d'application (*.zip) +simexplorer.choose.dir=Choisir ce r\u00E9pertoire simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer simexplorer.choose.library=Choisir une librairie (*.?) simexplorer.common.apply=Appliquer

1 0

r1109 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . util
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:57:32 +0000 (Mon, 18 Feb 2008) New Revision: 1109 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java Log: delete action revisit?\195?\169 et utilise maintenant l'?\195?\169l?\195?\169ment s?\195?\169lectionn?\195?\169 du model incrimin?\195?\169. l'action fonctionne aux endroits voulus (onglet list + detail) TODO : supprimer l'?\195?\169l?\195?\169ment de l'historique de l'onglet detail TODO : affiner le updateUI selon ce qu'il y a dans l'onglet detail et synchronize Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-18 23:55:44 UTC (rev 1108) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-18 23:57:32 UTC (rev 1109) @@ -22,12 +22,12 @@ import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import org.codelutin.util.FileUtil; +import static org.codelutin.i18n.I18n._; import java.io.BufferedInputStream; import java.io.File; -import org.codelutin.util.FileUtil; - /** * Action pour downloader un résultat ou une librairie * @@ -51,19 +51,17 @@ super(name); } - @Override - protected void initModel(DetailTabModel model) { - super.initModel(model); - Integer selectedAttachment = model.getSelectedAttachmentIndex(); - attachment = getElement().getAttachment(selectedAttachment); - } - protected File getFile() { - if (attachment==null) { + // here is a trick : select now the attachment + // and we are sure to be on detail tab + DetailTabModel model = (DetailTabModel) getModel(); + Integer selectedAttachment = model.getSelectedAttachmentIndex(); + attachment = selected.getMeta().getAttachment(selectedAttachment); + if (attachment == null) { return null; } // ask user path where to save data - String dir = FileUtil.getDirectory("select directory where to download attachment '" + attachment.getFileName() + "' of element "+getElement().getName()+" - "+getVersion(),"choose a dir"); + String dir = FileUtil.getDirectory(_("simexplorer.action.download.attachment", attachment.getFileName(),selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); if (dir == null) { // user cancel action return null; @@ -79,7 +77,7 @@ protected BufferedInputStream getInputStream() { BufferedInputStream bis; - bis = StorageServiceHelper.retrieveElementData(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString(), attachment); + bis = StorageServiceHelper.retrieveElementData(getContext(), selected.isRemote(), selected.getUuid(), selected.getVersion().toString(), attachment); return bis; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-02-18 23:55:44 UTC (rev 1108) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-02-18 23:57:32 UTC (rev 1109) @@ -19,15 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; +import static org.codelutin.i18n.I18n._; +import org.codelutin.util.FileUtil; import java.io.BufferedInputStream; import java.io.File; import java.text.MessageFormat; -import org.codelutin.util.FileUtil; - /** * Action pour downloader un Loggable Element * @@ -52,7 +51,7 @@ } protected File getFile() { - String dir = FileUtil.getDirectory("select directory where to download a Zip of '" + getElement().getName()+"-"+getVersion() + "'","choose a dir"); + String dir = FileUtil.getDirectory(_("simexplorer.action.download.le", selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); if (dir == null) { // user cancel action return null; @@ -62,13 +61,13 @@ parent.mkdirs(); } File file; - file = new File(parent, FILENAME_PATTERN.format(new Object[]{getElement().getName() + "-" + getVersion()})); + file = new File(parent, FILENAME_PATTERN.format(new Object[]{selected.getMeta().getName() + "-" + selected.getVersion()})); return file; } protected BufferedInputStream getInputStream() { BufferedInputStream bis; - bis = StorageServiceHelper.retrieveElementFull(getContext(), ((DetailTabModel) getModel()).isRemote(), getUuid(), getVersion().toString()); + bis = StorageServiceHelper.retrieveElementFull(getContext(), selected.isRemote(), selected.getUuid(), selected.getVersion().toString()); return bis; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-02-18 23:55:44 UTC (rev 1108) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-02-18 23:57:32 UTC (rev 1109) @@ -18,9 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions.util; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import java.awt.event.ActionEvent; import java.io.BufferedInputStream; @@ -39,11 +37,10 @@ public static final int BUFFER_SIZE = 8 * 1024; private static final long serialVersionUID = 7535647131305304738L; - File file; - MetaData element; - String uuid; - Version version; + protected File file; + protected DataEntityModel selected; + protected DownloadAbstractAction(String name) { super(name); } @@ -52,42 +49,19 @@ protected abstract BufferedInputStream getInputStream(); - protected void initModel(DetailTabModel model) { - element = model.getDetail(); - version = model.getSelectedVersion(); - uuid = element.getUuid(); - } - - protected MetaData getElement() { - return element; - } - - protected String getUuid() { - return uuid; - } - - protected Version getVersion() { - return version; - } - @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { return false; } - DetailTabModel model = ((DetailTabModel) getModel()); - boolean result; - // init from model - initModel(model); - result = element != null && version != null; - if (result) { - // ask user path where to save data - file = getFile(); - if (file == null) { - return false; - } + selected = findSelectedItem(e); + boolean selectedUuid = selected != null && selected.getUuid() != null; + if (!selectedUuid) { + return false; } - return result; + // ask user path where to save data + file = getFile(); + return file != null; } @Override @@ -108,16 +82,16 @@ protected void clear() { super.clear(); file = null; - element = null; - version = null; - uuid = null; + selected = null; + // action multi-tab + setTab(null); } private void storeStream(BufferedInputStream bis) throws IOException { BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file)); try { if (bis == null) { - log.warn("could not get incoming data for " + uuid); + log.warn("could not get incoming data for " + selected.getUuid()); return; } byte[] buffer = new byte[BUFFER_SIZE];

1 0

r1108 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:55:44 +0000 (Mon, 18 Feb 2008) New Revision: 1108 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java Log: fixbug : le rafraichissement des onglet de list est ok d?\195?\169sormais :le fait de juste rafrachir l'onglet ne suffit pas, (va savoir pk?), on rafraichit donc toute la frame et ?\195?\167a marche... Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 23:19:31 UTC (rev 1107) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 23:55:44 UTC (rev 1108) @@ -78,8 +78,8 @@ // table data model may have changed, must revalidate ui.getTable().invalidate(); - // parent must be repaint (will revalidate layout for table) - ui.repaint(); + // repaint the frame + SimExplorer.getUI().repaint(); } }); }

1 0

r1107 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:19:31 +0000 (Mon, 18 Feb 2008) New Revision: 1107 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java Log: action showTab_synchronize revisit?\195?\169 pour utiliser uniquement le selected du model incrimin?\195?\169 : ainsi l'action est bien stateless et on peut la r?\195?\169utilis?\195?\169 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-18 23:19:09 UTC (rev 1106) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-18 23:19:31 UTC (rev 1107) @@ -26,7 +26,6 @@ import fr.cemagref.simexplorer.is.ui.swing.SynchronizeTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; @@ -57,8 +56,10 @@ private static final long serialVersionUID = -3901398502496915785L; + /** le listener sur la navigation dans l'arbre local */ protected TreeSelectionListener navigationLocalListener; + /** le listener sur la navigation dans l'arbre distant */ protected TreeSelectionListener navigationRemoteListener; public ShowSynchronizeTabAction(String name) { @@ -67,34 +68,25 @@ navigationRemoteListener = new NavigationRemoteSelectionListener(); } - public void setSelected(DataEntityModel selected) { - this.selected = selected; - } - @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { return false; } - if (selected == null) { - //FIXME: ce la ne fonctionne pas bien, a revoir... - // trick : quand c'est null, cela veut dire que l'on vient de - // l'onglet de detail, car dans les onglets de list, l'action est - // toujours initialisée avant d'arriver ici, alors que dans le cas - // de l'onglet de detail on ne prepare pas l'action car cela n'est - // pas pertinent (par exemple si on a déjà exécuté cette action depuis - // l'onglet de detail, et que l'on veut la relancer sur un retour sur - // l'onglet de detail, on a pas de moyen simple de reinitialiser cette - // action, donc on ne l'initialise jamais d'avance dans ce cas. - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - - selected = model.getSelectedItem(); - - } - if (selected == null) { - // on restete l'accessibilite de l'action + selected = findSelectedItem(e); + boolean selectedUuid = selected != null && selected.getUuid() != null; + if (!selectedUuid) { return false; } + + // init synchronize tab model + initTabModel(); + + return true; + } + + protected void initTabModel() { + boolean remote = selected.isRemote(); String uuid = selected.getUuid(); @@ -111,7 +103,6 @@ LoggableElement source = save.getLe(getContext()); model.setSelectedItem(null); - LoggableElement destination; // recuperation des versions de l'element destination Version[] versions = StorageServiceHelper.getVersions(getContext(), !remote, uuid); Version requiredVersion = null; @@ -123,7 +114,7 @@ model.synch(!remote, uuid, requiredVersion); - destination = model.getSelectedItem().getLe(getContext()); + LoggableElement destination = model.getSelectedItem().getLe(getContext()); // sauvegarde de la source model.setSource(source); @@ -131,7 +122,6 @@ model.setDestination(destination); model.setSelectedItem(save); - return true; } protected void initFirstUsage(JSynchronizeTab ui, SynchronizeTabModel model) {

1 0

r1106 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 23:19:09 +0000 (Mon, 18 Feb 2008) New Revision: 1106 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java Log: action export revisit?\195?\169 pour utiliser uniquement le selected du model incrimin?\195?\169 : ainsi l'action est bien stateless et on peut la r?\195?\169utilis?\195?\169 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-18 23:13:30 UTC (rev 1105) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-18 23:19:09 UTC (rev 1106) @@ -18,14 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.entities.EntityHelper; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; @@ -52,10 +50,10 @@ private static final long serialVersionUID = 7535647131305304738L; - protected String uuid; - protected Version version; + protected DataEntityModel selected; + protected StorageService fromService, toService; - protected Boolean remote = null; + protected ActionEvent e; public ExportAction(String name) { @@ -68,39 +66,41 @@ return false; } - MetaData element = null; // on retrouve l'onglet concerné à partir de son model TabModel tabModel = getModel(); if (tabModel instanceof DetailTabModel) { DetailTabModel model = (DetailTabModel) tabModel; - element = model.getDetail(); - remote = model.isRemote(); - uuid = element.getUuid(); - version = model.getSelectedVersion(); + selected = model.getSelectedItem(); } else if (tabModel instanceof ListTabModel) { ListTabModel model = (ListTabModel) getModel(); - element = model.get(model.getSelectedIndex()); - uuid = element.getUuid(); - version = element.getVersion(); - remote = model.isRemote(); + selected = model.getSelectedItem(); } else if (tabModel instanceof SimExplorerTabModel) { - // the real test will be in extends class + // on doit traiter ça dans les classes étendues + // car cela ne depend pas uniquement du model mais aussi de l'action + // choisie return true; } boolean result; - result = remote != null && version != null && uuid != null && EntityHelper.Action.EXPORT.accept(element); + result = selected != null && selected.getUuid() != null; + if (result) { + // on garde toujours une copie, pas l'original + selected = selected.clone(); + } + //TODO normalement pas besoin de tester l'accessibilite ici + //result = selected != null && selected.getUuid() != null && EntityHelper.Action.EXPORT.accept(selected.getMeta()); return result; } @Override protected void doAction(ActionEvent e) throws Exception { + boolean remote = selected.isRemote(); StorageService fromService = StorageServiceHelper.getService(getContext(), remote); StorageService toService = StorageServiceHelper.getService(getContext(), !remote); - log.info("fromService : " + fromService); - log.info("toService : " + toService); - log.info("uuid - version : " + uuid + " - " + version); - fr.cemagref.simexplorer.is.service.StorageServiceHelper.exportElementTo(getContext().getToken(), fromService, toService, uuid, version.toString()); + log.info("fromService : " + fromService); + log.info("toService : " + toService); + log.info("selected : " + selected); + fr.cemagref.simexplorer.is.service.StorageServiceHelper.exportElementTo(getContext().getToken(), fromService, toService, selected.getUuid(), selected.getVersion().toString()); this.e = e; } @@ -110,7 +110,7 @@ ListTabModel model; JListTab ui; SimExplorerTab tab; - if (remote) { + if (selected.isRemote()) { // reinit de la liste locale tab = SimExplorerTab.local; model = (ListTabModel) tab.getModel(); @@ -121,20 +121,15 @@ model = (ListTabModel) tab.getModel(); ui = (JListTab) tab.getUI(); } - updateList(model, ui,tab); - } - - private void updateList(ListTabModel model, JListTab ui, SimExplorerTab tab) { + // pour reforcer le calcul de la liste + model.setPagination(null); model.updateTabModel(getContext(), (ListTableModel) ui.getTable().getModel()); tab.updateUI(); } @Override protected void clear() { - super.clear(); - version = null; - uuid = null; - remote = null; + selected = null; fromService = toService = null; e = null; // l'action est multi-tab, et est stateless! Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-18 23:13:30 UTC (rev 1105) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java 2008-02-18 23:19:09 UTC (rev 1106) @@ -21,6 +21,7 @@ import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import javax.swing.AbstractButton; @@ -57,9 +58,8 @@ LoggableElement element = model.getRemoteSelectedNode(); boolean result; if (result = EntityHelper.Action.EXPORT.accept(element)) { - uuid = element.getMetaData().getUuid(); - version = element.getMetaData().getVersion(); - remote = true; + selected = new DataEntityModel(); + selected.synch(true,element); } return result; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-18 23:13:30 UTC (rev 1105) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java 2008-02-18 23:19:09 UTC (rev 1106) @@ -21,6 +21,7 @@ import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import javax.swing.AbstractButton; @@ -57,9 +58,8 @@ LoggableElement element = model.getLocalSelectedNode(); boolean result; if (result = EntityHelper.Action.EXPORT.accept(element)) { - uuid = element.getMetaData().getUuid(); - version = element.getMetaData().getVersion(); - remote = false; + selected = new DataEntityModel(); + selected.synch(false,element); } return result; }

1 0