Author: tchemit Date: 2008-02-24 23:20:12 +0000 (Sun, 24 Feb 2008) New Revision: 1224 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/actions/ImportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/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 Log: mise en place import 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-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-24 23:20:12 UTC (rev 1224) @@ -170,11 +170,13 @@ } } - public static void importElement(SimExplorerContext context, boolean remote, File file) { + public static MetaData importElement(SimExplorerContext context, boolean remote, File file) { try { SerializableInputStream zipStream; zipStream = new SerializableInputStream(new FileInputStream(file)); - getService(context, remote).saveElement(context.getToken(), zipStream); + MetaData result; + result = getService(context, remote).saveElement(context.getToken(), zipStream); + return result; } catch (Exception e) { throw new SimExplorerRuntimeException(e); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-02-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-02-24 23:20:12 UTC (rev 1224) @@ -19,9 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog; +import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.StorageServiceHelper; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; 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.SynchronizeTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; @@ -60,6 +65,9 @@ } public void disposeUI() { + if (ui!=null) { + ui.dispose(); + } ui = null; } @@ -77,15 +85,24 @@ @Override protected void doAction(ActionEvent e) throws Exception { - StorageServiceHelper.importElement(getContext(), remote, f); - } + MetaData result = StorageServiceHelper.importElement(getContext(), remote, f); - @Override - public void updateUI() { - super.updateUI(); - //TODO should invalidate the 'remote' list - //TODO look if detail history is touch by this modification - //TODO look if synchronize is touched by this modification + DataEntityModel selected = new DataEntityModel(); + selected.synch(remote,result); + + // reload the list + getListModel(remote).reload(); + + + if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) { + SynchronizeTabModel model = getSynchronizeModel(); + + model.reloadSources(selected.getUuid(), false,false,!remote,remote); + } + + // suppression de l'élément de l'historique (si present) + + SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-24 23:20:12 UTC (rev 1224) @@ -148,7 +148,7 @@ localRootNode = remoteRootNode = null; } - public void reloadSources(SimExplorerContext context, String uuid, boolean deleteLocal, boolean deleteRemote, boolean treateLocal, boolean treateRemote) { + public void reloadSources(String uuid, boolean deleteLocal, boolean deleteRemote, boolean treateLocal, boolean treateRemote) { LoggableElement[] result = new LoggableElement[2]; result[0] =loadSource(context, uuid, deleteLocal, treateLocal, false); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-02-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-02-24 23:20:12 UTC (rev 1224) @@ -25,16 +25,16 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction; +import static org.codelutin.i18n.I18n._; import org.codelutin.i18n.LocaleEnum; -import static org.codelutin.i18n.I18n.*; import javax.swing.AbstractButton; +import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import javax.swing.JComboBox; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.util.regex.Matcher; @@ -48,7 +48,7 @@ /** l'ui principale de l'application */ public static SimExplorerMainUI ui; - + public DetailTabUpdater detailUpdater; public ListTabUpdater localUpdater; public ListTabUpdater remoteUpdater; @@ -83,18 +83,20 @@ ui = null; } - public void setStatus(final String msg) { + MyRunnable runnable; - Runnable runnable = new Runnable() { - public void run() { - //TODO il faut enlever le synchronize dans statusBar - //getStatusBar().setStatus(msg); - //System.out.println(msg); - } - }; - SwingUtilities.invokeLater(runnable); + private MyRunnable getRunnable(String msg) { + if (runnable == null) { + runnable = new MyRunnable(); + } + runnable.setMsg(msg); + return runnable; } + public void setStatus(final String msg) { + SwingUtilities.invokeLater(getRunnable(msg)); + } + protected SimExplorerMainUI() { super(); finalizeInit(SimExplorer.getContext()); @@ -137,7 +139,7 @@ AbstractButton button = (AbstractButton) getObjectById(actionName); ChangeLocaleAction action = (ChangeLocaleAction) button.getAction(); boolean enable = !action.equalsLocale(locale); - UpdateButton(button,enable, enable?action.getLocale():null); + UpdateButton(button, enable, enable ? action.getLocale() : null); //button.setEnabled(enable); } } @@ -161,11 +163,11 @@ public static void DisableButton(AbstractButton... buttons) { for (AbstractButton button : buttons) { UpdateButton(button, false); - } + } } public static void EnableButton(AbstractButton button, Object... params) { - UpdateButton(button,true,params); + UpdateButton(button, true, params); } public static void UpdateButton(AbstractButton button, boolean enabled, Object... params) { @@ -185,9 +187,9 @@ button.setToolTipText(null); } else { SimExplorerAbstractAction action = (SimExplorerAbstractAction) button.getAction(); - if (action!=null) { - String t = _(action.getI18nToolTipText(), params); - button.setToolTipText(t); + if (action != null) { + String t = _(action.getI18nToolTipText(), params); + button.setToolTipText(t); } } } @@ -200,7 +202,7 @@ } public ListTabUpdater getListUpdater(SimExplorerContext context, boolean remote) { - return remote?getRemoteUpdater(context):getLocalUpdater(context); + return remote ? getRemoteUpdater(context) : getLocalUpdater(context); } public ListTabUpdater getLocalUpdater(SimExplorerContext context) { @@ -223,4 +225,16 @@ } return synchronizeUpdater; } + + private class MyRunnable implements Runnable { + private String msg; + + public void setMsg(String msg) { + this.msg = msg; + } + + public void run() { + getStatusBar().setStatus(msg); + } + } } 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-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-24 23:20:12 UTC (rev 1224) @@ -9,7 +9,7 @@ simexplorer.action.changeSizor=Change Page size simexplorer.action.changeSizor.help= simexplorer.action.changeSizor.tooltip=Select the number of results to display in a page -simexplorer.action.changeVersion.tooltip=Choose another version +simexplorer.action.changeVersion.tooltip=Choose another version simexplorer.action.closeTab=close simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=close the tab @@ -29,6 +29,7 @@ simexplorer.action.detailToTree=Synchronize detail to tree simexplorer.action.detailToTree.help= simexplorer.action.detailToTree.tooltip=Synchronize element ''{0}'' as navigation root node +simexplorer.action.done=Action ''{0}'' done. 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 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-24 21:34:08 UTC (rev 1223) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-24 23:20:12 UTC (rev 1224) @@ -29,6 +29,7 @@ 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.done=Action ''{0}'' termin\u00E9e. 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