Author: tchemit Date: 2008-02-11 17:09:51 +0000 (Mon, 11 Feb 2008) New Revision: 817 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.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/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx Log: mise en place de l'onglet de synchronisation suppression actions non utilises Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 17:09:51 UTC (rev 817) @@ -66,7 +66,7 @@ impl = JApplicationSynchronizeTab.class, parentImpl = JTabbedPane.class, model = SynchronizeTabModel.class, - useToogle = true, + useToogle = false, name = "simexplorer.tab.synchronize", shortDescription = "simexplorer.tab.synchronize.tooltip" )synchronize; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 17:09:51 UTC (rev 817) @@ -107,6 +107,33 @@ }); } + public static void refreshListTablePopupMenu(final JApplicationListTab ui,final ListTabModel model) { + int index = model.getSelectedIndex(); + if (index ==-1) { + // disable popupmenu + ui.getTablePopupMenu().setEnabled(false); + return; + } + ui.getTablePopupMenu().setEnabled(true); + MetaData data = model.get(index); + // récupération de l'uuid à traiter + String uuid = data.getUuid(); + // récupération de la version à traiter + Version version = data.getVersion(); + String text = data.getName() + " [" + data.getVersion() + "]"; + + String tooltip = _("simexplorer.action.downloadLoggableElement.tooltip", text); + updateButton(ui.getDownloadLoggableElement(), true, tooltip); + + tooltip = _("simexplorer.action.deleteLoggableElement.tooltip", text); + updateButton(ui.getDeleteLoggableElement(), true, tooltip); + + tooltip = _("simexplorer.action.export.tooltip", text); + updateButton(ui.getExportApplication(), true, tooltip); + + tooltip = _("simexplorer.action.synchronize.tooltip", text); + updateButton(ui.getLaunchSynchronize(), true, tooltip); + } /** * Rafraichit les actions i18n dans le menu en fonction de la locale * actuellement utilisée. @@ -283,7 +310,7 @@ ui.getCurrentPage().setEnabled(b); } - protected static void updateButton(JButton button, boolean enabled, String tooltip) { + protected static void updateButton(AbstractButton button, boolean enabled, String tooltip) { button.setEnabled(enabled); button.setToolTipText(tooltip); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 17:09:51 UTC (rev 817) @@ -304,8 +304,7 @@ // change the selection, and we don't want the model to be updated // again setEnabled(false); - SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); - SimExplorerUIRefreshHelper.refreshDeleteAttachmentAction(ui, model); + SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); setEnabled(wasEnable); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-11 17:09:51 UTC (rev 817) @@ -43,6 +43,8 @@ protected int dateOrder; + protected int selectedIndex; + private static final long serialVersionUID = -3623331875470531459L; public String getName() { @@ -82,6 +84,10 @@ return isEmpty() ? 0 : list.length; } + public int getSelectedIndex() { + return selectedIndex; + } + public int getDateOrder() { return dateOrder; } @@ -102,6 +108,11 @@ return s.substring(s.lastIndexOf(".") + 1) + "<size: " + size() + ">"; } + public void setSelectedIndex(int selectedIndex) { + this.selectedIndex = selectedIndex; + //TODO should fire a property_changed + } + public void setQuery(String query) { this.query = query; } 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-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-11 17:09:51 UTC (rev 817) @@ -31,6 +31,9 @@ protected SimExplorerTab tab; + /** flag pour savoir si la source est remote ou non */ + protected boolean remote; + protected MetaData[] listLocal; protected MetaData[] listRemote; @@ -44,6 +47,10 @@ return tab; } + public boolean isRemote() { + return remote; + } + public MetaData[] getListLocal() { return listLocal; } @@ -63,4 +70,8 @@ public void setListRemote(MetaData[] listRemote) { this.listRemote = listRemote; } + + public void setRemote(boolean remote) { + this.remote = remote; + } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 17:08:25 UTC (rev 816) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 17:09:51 UTC (rev 817) @@ -1,24 +1,22 @@ <Table> <style source="/../common.css"/> - <row> - <cell fill='horizontal' insets='0,0,0,0'> - <JToolBar> - <JButton id='launchSynchronize'/> - </JToolBar> - </cell> - </row> <row fill="both" weightx="1" weighty="1"> <cell insets='0,0,0,0'> <JScrollPane > - <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> - <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentLocal'/> - </JScrollPane> - <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentRemote'/> - </JScrollPane> - </JSplitPane> - </JScrollPane> + <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentLocal'/> + </JScrollPane> + </cell> + <cell fill='vertical' insets='0,0,0,0'> + <JToolBar> + <JButton id='exportToRemote'/> + <JButton id='exportToLocale'/> + </JToolBar> + </cell> + <cell insets='0,0,0,0' weightx="1" weighty="1"> + <JScrollPane > + <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentRemote'/> + </JScrollPane> + </cell> </row> </Table>