Author: tchemit Date: 2008-07-27 10:06:51 +0000 (Sun, 27 Jul 2008) New Revision: 1523 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 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/util/ShowListTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabUpdater.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/java/fr/cemagref/simexplorer/is/ui/swing/ui/SynchronizeTabUpdater.java Log: use ContextProvider and ActionHelper from commandline Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -16,7 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; @@ -40,13 +39,8 @@ private static final Log log = LogFactory.getLog(SimExplorer.class); - /** le context principal de l'application */ - protected static SimExplorerContext context; - - public static SimExplorerContext getContext() { - checkInitContext(); - return context; + return (SimExplorerContext) ContextProvider.get(); } /** @@ -60,7 +54,7 @@ try { // instanciate context, parser and configs - context = (SimExplorerContext) ContextProvider.getContext(); + SimExplorerContext context = (SimExplorerContext) ContextProvider.init(); // init context context.init(args); @@ -88,13 +82,16 @@ // init ui SimExplorerMainUI mainUI = SimExplorerMainUI.getUI(); - SimExplorerConfigMain conf = getContext().getMainConfig(); + SimExplorerContext context = getContext(); + SimExplorerConfigMain conf = context.getMainConfig(); + if (conf.isShowLocalTab()) { // show local tab mainUI.getToggleTab_local().doClick(); } + if (conf.isAutoConnect()) { try { // try to connect @@ -134,6 +131,8 @@ // init application (parser,config,i18n,...) init(args); + SimExplorerContext context = getContext(); + // launch actions required context.getParser().getLastResult().doAllActions(context); @@ -151,12 +150,6 @@ } } - public static void checkInitContext() { - if (context == null) { - throw new SimExplorerRuntimeException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); - } - } - public void initI18n() { I18n.init(getContext().getMainConfig().getLocale(), getContext().getMainConfig().getEncoding()); } 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-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -24,8 +24,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper; import fr.cemagref.simexplorer.is.ui.swing.ui.JSynchronizeTab; -import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.TreeActionsUpdater; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.AbstractButton; import javax.swing.event.TreeSelectionEvent; @@ -166,7 +166,7 @@ super.valueChanged(e); EntityTreeNode node = EntityTreeNodeHelper.getSelectedNode(e); boolean enable = node != null && node.isLoggableElement(); - SimExplorerMainUI.UpdateButton(ui.getShowDetailButton(remote), enable, !enable ? null : node.getLoggableElement()); + ActionHelper.UpdateButton(ui.getShowDetailButton(remote), enable, !enable ? null : node.getLoggableElement()); } protected AbstractButton getExpandAction() { 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-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -20,8 +20,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import jaxx.runtime.swing.JAXXTab; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.JTabbedPane; import javax.swing.JTable; @@ -118,7 +118,7 @@ //FIXME : when we change locale, this is no more enabled ? - SimExplorerMainUI.EnableButton(ui.getImportElement()); + ActionHelper.EnableButton(ui.getImportElement()); //ImportElementAction action = (ImportElementAction) ui.getImportElement().getAction(); //ui.getImportElement().setToolTipText(_(action.getI18nToolTipText(model.isRemote()))); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -23,11 +23,12 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; import static org.codelutin.i18n.I18n._; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListModel; @@ -74,7 +75,7 @@ return; } - throw new IllegalStateException("could not treate property " + evtName+"\n"+evt); + throw new IllegalStateException("could not treate property " + evtName + "\n" + evt); } @@ -99,20 +100,20 @@ HistoryModel<EntityTreeNode> history = model.getHistory(); // reset history action - SimExplorerMainUI.UpdateButton(getMainUI().getHistoryReset(), history.size() > 0); + ActionHelper.UpdateButton(getMainUI().getHistoryReset(), history.size() > 0); // history next action if (history.size() > 1 && history.hasPrevious()) { - SimExplorerMainUI.EnableButton(ui.getHistoryPrevious(), history.getPrevious()); + ActionHelper.EnableButton(ui.getHistoryPrevious(), history.getPrevious()); } else { - SimExplorerMainUI.DisableButton(ui.getHistoryPrevious()); + ActionHelper.DisableButton(ui.getHistoryPrevious()); } // history previous action if (history.size() > 1 && history.hasNext()) { - SimExplorerMainUI.EnableButton(ui.getHistoryNext(), history.getNext()); + ActionHelper.EnableButton(ui.getHistoryNext(), history.getNext()); } else { - SimExplorerMainUI.DisableButton(ui.getHistoryNext()); + ActionHelper.DisableButton(ui.getHistoryNext()); } // select root node (will trigger fireNodeSelected) @@ -139,23 +140,23 @@ Version newVersion = newSelectedNode.getMetaData().getVersion(); Version[] versions = model.getVersions(); - Integer newIndex=null; + Integer newIndex = null; if (versions != null) { for (int i = 0; i < versions.length; i++) { Version version = versions[i]; historyModel.addElement(version); if (version.equals(newVersion)) { - newIndex=i; + newIndex = i; } } } - if (newIndex!=null) { + if (newIndex != null) { ui.getDetailVersions().setSelectedIndex(newIndex); } // add accessibility on combo boolean enabled = ui.getDetailVersions().getItemCount() > 1; - SimExplorerMainUI.UpdateCombo(ui.getDetailVersions(), enabled, !enabled ? null : _("simexplorer.action.changeVersion.tooltip")); + ActionHelper.UpdateCombo(ui.getDetailVersions(), enabled, !enabled ? null : _("simexplorer.action.changeVersion.tooltip")); } @@ -193,11 +194,11 @@ } else { ui.getDetailAttachments().getSelectionModel().clearSelection(); // if we had a previous empty list, no trigger to fireAttachmentSelected - SimExplorerMainUI.DisableButton(ui.getDownloadAttachment()); + ActionHelper.DisableButton(ui.getDownloadAttachment()); ui.getScrollAttachments().setVisible(false); } - if (ui.getDetailVersions().getSelectedIndex()!=index) { + if (ui.getDetailVersions().getSelectedIndex() != index) { ui.getDetailVersions().setSelectedIndex(index); } @@ -219,12 +220,12 @@ // refresh download LoggableElement button enabled = detail != null && EntityHelper.Action.DOWNLOAD.accept(node); - SimExplorerMainUI.UpdateButton(ui.getDownloadElement(), enabled, enabled ? detail == null ? node.getUserObject() : detail.getName() + " [" + model.getSelectedVersion() + "]" : null); + ActionHelper.UpdateButton(ui.getDownloadElement(), enabled, enabled ? detail == null ? node.getUserObject() : detail.getName() + " [" + model.getSelectedVersion() + "]" : null); // refresh delete button enabled = detail != null && EntityHelper.Action.DELETE.accept(detail); - SimExplorerMainUI.UpdateButton(ui.getDeleteElement(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null); + ActionHelper.UpdateButton(ui.getDeleteElement(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null); // refresh detail to tree button @@ -239,14 +240,14 @@ } enabled = detail != null && !(detail.getName().equals(data.getName()) && data.getVersion().equals(version)); - SimExplorerMainUI.UpdateButton(ui.getDetailToTree(), enabled, enabled ? detail.getName() + " [" + version + "]" : null); + ActionHelper.UpdateButton(ui.getDetailToTree(), enabled, enabled ? detail.getName() + " [" + version + "]" : null); } protected void fireAttachmentSelected(JDetailTab ui, DetailTabModel model, PropertyChangeEvent evt) { log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); Attachment attachment = model.getSelectedAttachment(); boolean enabled = model.getDetailNode() != null && attachment != null; - SimExplorerMainUI.UpdateButton(ui.getDownloadAttachment(), enabled, enabled ? attachment : null); + ActionHelper.UpdateButton(ui.getDownloadAttachment(), enabled, enabled ? attachment : null); } public void refreshWithConnectAction() { @@ -256,7 +257,7 @@ boolean enabled = b && context.isConnected(); MetaData detail = b ? model.getDetailNode().getMetaData() : null; - SimExplorerMainUI.UpdateButton(ui.getShowTab_synchronize(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null); + ActionHelper.UpdateButton(ui.getShowTab_synchronize(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null); LoggableElement sNode = model.getSelectedNode(); getMainUI().refreshExportElement(context, ui.getExportElement(), model.isRemote(), sNode); } @@ -278,9 +279,9 @@ ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); if (disable) { - versions.setVisible(false); + versions.setVisible(false); ui.getDetail().setVisible(false); - SimExplorerMainUI.DisableButton( + ActionHelper.DisableButton( ui.getDetailToTree(), ui.getShowTab_synchronize(), ui.getExportElement(), Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java 2008-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -16,31 +16,24 @@ */ package fr.cemagref.simexplorer.is.ui.swing.ui; -import java.util.ArrayDeque; -import java.util.Deque; +import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityVisitorTreeNode; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.AbstractButton; import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.tree.TreePath; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import fr.cemagref.simexplorer.is.entities.Composite; -import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.EntityVisitable; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; -import fr.cemagref.simexplorer.is.entities.EntityVisitorTreeNode; -import fr.cemagref.simexplorer.is.entities.Leaf; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; - /** * La classe responsable de la création des arbres de {@link fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode} à * partir de {@link LoggableElement} . <p/> La classe possède une instance cachée par thread qui délègue la construction * del'arbre de navigation à un visiteur de {@link LoggableElement}. <p/> - * + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ public class EntityTreeNodeHelper { @@ -49,8 +42,8 @@ /** * Construit un arbre de navigation à partir d'un {@link LoggableElement}. - * - * @param v la donnée à visiter + * + * @param v la donnée à visiter * @param remote flag pour indiquer si on travaille sur des données locales ou en remote. * @return le noeud parent de l'arbre de nivation construit. */ @@ -119,21 +112,21 @@ } public static void refreshTreeActions(AbstractButton collapseButton, AbstractButton expandButton, - EntityTreeNode node) { + EntityTreeNode node) { boolean enabled = node != null && !node.isLeaf() && node.getChildCount() > 0; Object o = enabled ? node.getUserObject() : null; - SimExplorerMainUI.UpdateButton(collapseButton, enabled, o); - SimExplorerMainUI.UpdateButton(expandButton, enabled, o); + ActionHelper.UpdateButton(collapseButton, enabled, o); + ActionHelper.UpdateButton(expandButton, enabled, o); } protected EntityTreeNodeHelper() { // no instance } - + public static class EntityVisitorBuilder extends EntityVisitorTreeNode<EntityTreeNode> { private boolean remote; - + public EntityVisitorBuilder(boolean remote) { super(); this.remote = remote; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabUpdater.java 2008-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabUpdater.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -16,18 +16,18 @@ */ package fr.cemagref.simexplorer.is.ui.swing.ui; -import java.beans.PropertyChangeEvent; -import java.text.SimpleDateFormat; - -import javax.swing.JComboBox; - import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; +import org.codelutin.option.ui.actions.ActionHelper; +import javax.swing.JComboBox; +import java.beans.PropertyChangeEvent; +import java.text.SimpleDateFormat; + /** * La classe responsable du rafrachissement des ui de l'onglet de liste. * @@ -100,7 +100,7 @@ // on selectionne le premier item if (!model.isEmpty()) { - ui.getTable().getSelectionModel().setSelectionInterval(0,0); + ui.getTable().getSelectionModel().setSelectionInterval(0, 0); } } @@ -110,7 +110,7 @@ } ui.getSearchText().setText(model.getQuery().getQuery()); - + refreshSearchActions(); refreshPaginationActions(model.getPagination()); @@ -118,7 +118,7 @@ ((ListTableModel) ui.getTable().getModel()).setData(model.getList()); if (!model.isEmpty()) { - ui.getTable().getSelectionModel().setSelectionInterval(0,0); + ui.getTable().getSelectionModel().setSelectionInterval(0, 0); } } @@ -172,7 +172,7 @@ public void resetSearch() { getUi().getSearchText().setText(null); - SimExplorerMainUI.DisableButton(getUi().getResetSearch(), getUi().getSearch()); + ActionHelper.DisableButton(getUi().getResetSearch(), getUi().getSearch()); } /** Rafraichit les actions de recherche d'un onglet de type liste. */ @@ -180,8 +180,8 @@ JListTab ui = getUi(); String text = ui.getSearchText().getText(); boolean hasQuery = getModel().hasQuery() || !text.isEmpty(); - SimExplorerMainUI.UpdateButton(ui.getSearch(), hasQuery); - SimExplorerMainUI.UpdateButton(ui.getResetSearch(), hasQuery); + ActionHelper.UpdateButton(ui.getSearch(), hasQuery); + ActionHelper.UpdateButton(ui.getResetSearch(), hasQuery); } public void refreshListTablePopupMenu(final ListTabModel model) { @@ -196,10 +196,10 @@ String text = data.getName() + " [" + data.getVersion() + "]"; - SimExplorerMainUI.UpdateButton(ui.getDownloadElement(), EntityHelper.Action.DOWNLOAD.accept(data), text); - SimExplorerMainUI.UpdateButton(ui.getDeleteElement(), EntityHelper.Action.DELETE.accept(data), text); - SimExplorerMainUI.UpdateButton(ui.getShowTab_detail(), true, text); - SimExplorerMainUI.UpdateButton(ui.getShowTab_synchronize(), getContext().isConnected(), text); + ActionHelper.UpdateButton(ui.getDownloadElement(), EntityHelper.Action.DOWNLOAD.accept(data), text); + ActionHelper.UpdateButton(ui.getDeleteElement(), EntityHelper.Action.DELETE.accept(data), text); + ActionHelper.UpdateButton(ui.getShowTab_detail(), true, text); + ActionHelper.UpdateButton(ui.getShowTab_synchronize(), getContext().isConnected(), text); getMainUI().refreshExportElement(getContext(), ui.getExportElement(), model.isRemote(), data); } 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-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -22,18 +22,15 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; 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.SimExplorerBaseAction; import static org.codelutin.i18n.I18n._; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.AbstractButton; -import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import java.util.Locale; -import java.util.regex.Matcher; /** * L'ui principale de l'application @@ -51,7 +48,7 @@ public SynchronizeTabUpdater synchronizeUpdater; public static SimExplorerMainUI getUI() { - SimExplorer.checkInitContext(); + if (ui == null) { ui = new SimExplorerMainUI(); } @@ -111,40 +108,15 @@ getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit")); // repaint i18n actions - refreshI18nActions(context); + ActionHelper.refreshI18nActions(context, context.getActionFactory(), this); if (!context.getMainConfig().isDebugMode()) { getDebug().setVisible(false); } - UpdateButton(getHistoryReset(), false); + ActionHelper.UpdateButton(getHistoryReset(), false); } - /** - * Rafraichit les actions i18n dans le menu en fonction de la locale - * actuellement utilisée. - * - * @param context application context - */ - public void refreshI18nActions(SimExplorerContext context) { - - Locale locale = context.getMainConfig().getLocale(); - //CountryEnum country = context.getConfig().getUserCountry(); - String[] actions = context.getActionFactory().getActionNames(); - for (String actionName : actions) { - Matcher matcher = org.codelutin.option.ui.actions.ChangeLocaleAction.PATTERN_NAME.matcher(actionName); - if (!matcher.matches()) { - continue; - } - AbstractButton button = (AbstractButton) getObjectById(actionName); - SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); - org.codelutin.option.ui.actions.ChangeLocaleAction realAction = (org.codelutin.option.ui.actions.ChangeLocaleAction) action.getDelegate(); - boolean enable = !realAction.equalsLocale(locale); - UpdateButton(button, enable, enable ? realAction.getLocale() : null); - //button.setEnabled(enable); - } - } - public void refreshExportElement(SimExplorerContext context, AbstractButton button, boolean remote, LoggableElement sNode) { boolean enabled = EntityHelper.Action.EXPORT.accept(sNode) && context.isConnected(); refreshExportElement(context, button, remote, enabled ? sNode.getMetaData() : null); @@ -161,40 +133,6 @@ button.setToolTipText(t); } - 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); - } - - public static void UpdateButton(AbstractButton button, boolean enabled, Object... params) { - button.setEnabled(enabled); - if (!enabled) { - button.setToolTipText(null); - } else { - SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); - String t = _(action.getI18nToolTipText(), params); - button.setToolTipText(t); - } - } - - public static void UpdateCombo(JComboBox button, boolean enabled, Object... params) { - button.setEnabled(enabled); - if (!enabled) { - button.setToolTipText(null); - } else { - SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); - if (action != null) { - String t = _(action.getI18nToolTipText(), params); - button.setToolTipText(t); - } - } - } - public DetailTabUpdater getDetailUpdater(SimExplorerContext context) { if (detailUpdater == null) { detailUpdater = new DetailTabUpdater(context); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SynchronizeTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SynchronizeTabUpdater.java 2008-07-26 11:48:02 UTC (rev 1522) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SynchronizeTabUpdater.java 2008-07-27 10:06:51 UTC (rev 1523) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; +import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; @@ -86,14 +87,14 @@ SimExplorerTab.synchronize.closeTab(getContext(), getMainUI(), getMainUI().getContent()); } - if (sources[0]==null && oldSources[0]==null) { + if (sources[0] == null && oldSources[0] == null) { // disable local - SimExplorerMainUI.DisableButton(getUi().getExportButton(false), getUi().getShowDetailButton(false),getUi().getCollapseButton(false),getUi().getExpandButton(false)); + ActionHelper.DisableButton(getUi().getExportButton(false), getUi().getShowDetailButton(false), getUi().getCollapseButton(false), getUi().getExpandButton(false)); } - if (sources[1]==null&& oldSources[1]==null) { + if (sources[1] == null && oldSources[1] == null) { // disable remote - SimExplorerMainUI.DisableButton(getUi().getExportButton(true), getUi().getShowDetailButton(true),getUi().getCollapseButton(true),getUi().getExpandButton(true)); + ActionHelper.DisableButton(getUi().getExportButton(true), getUi().getShowDetailButton(true), getUi().getCollapseButton(true), getUi().getExpandButton(true)); } }