Author: tchemit Date: 2008-02-04 14:49:05 +0000 (Mon, 04 Feb 2008) New Revision: 630 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: utilisation SimExplorerUIRefreshHelper Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-04 14:49:05 UTC (rev 630) @@ -22,6 +22,7 @@ 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.SimExplorerUIRefreshHelper; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; @@ -115,7 +116,7 @@ boolean isConnected = context.isConnected(); // refresh ui accessibles actions - mainUI.refreshConnnectState(isConnected); + SimExplorerUIRefreshHelper.refreshConnnectState(mainUI,isConnected); if (isConnected) { if (conf.isShowRemoteTab()) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-04 14:49:05 UTC (rev 630) @@ -18,25 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; 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.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import org.codelutin.i18n.CountryEnum; -import org.codelutin.i18n.LanguageEnum; -import javax.swing.AbstractButton; -import javax.swing.DefaultListModel; -import javax.swing.JComboBox; -import javax.swing.JList; import javax.swing.JTabbedPane; -import javax.swing.JTree; import javax.swing.SwingUtilities; -import java.util.regex.Matcher; /** * L'ui principale de l'application @@ -52,169 +39,7 @@ SimExplorerActionManager.loadActions(this, null); // repaint i18n actions - refreshI18nActions(); + SimExplorerUIRefreshHelper.refreshI18nActions(this); } - public void refreshI18nActions() { - LanguageEnum language = SimExplorer.getContext().getConfig().getLanguage(); - CountryEnum country = SimExplorer.getContext().getConfig().getCountry(); - String[] actions = SimExplorerActionManager.getFactory().getActionNames(); - for (String actionName : actions) { - Matcher matcher = ChangeI18nAbstractAction.PATTERN_NAME.matcher(actionName); - if (!matcher.matches()) { - continue; - } - AbstractButton button = (AbstractButton) getObjectById(actionName); - ChangeI18nAbstractAction action = (ChangeI18nAbstractAction) button.getAction(); - boolean enable = !action.equalsLocale(language, country); - button.setEnabled(enable); - } - } - - public void refreshDetailTabUI(final JApplicationDetailTab ui, final DetailTabModel model) { - - SwingUtilities.invokeLater(new Runnable() { - public void run() { - JTree tree = ui.getNavigationTree(); - - // tree data model may have changed, must revalidate - tree.invalidate(); - - JList historyList = ui.getHistoryList(); - - DefaultListModel historyModel = (DefaultListModel) historyList.getModel(); - - Version[] versions = model.getVersions(); - historyList.setSelectedIndex(-1); - if (versions == null) { - historyModel.setSize(0); - } else { - Version currentVersion = model.getBean().getMetaData().getVersion(); - historyModel.setSize(versions.length); - - for (int i = 0; i < versions.length; i++) { - Version version = versions[i]; - historyModel.setElementAt(version, i); - if (version.equals(currentVersion)) { - historyList.setSelectedIndex(i); - } - } - } - - // history list may have changed, must revalidate - historyList.invalidate(); - - // parent must be repaint (will revalidate layout for tree) - ui.repaint(); - } - }); - } - - public void refreshListTabUI(final ListTabModel model, final JApplicationListTab ui) { - - SwingUtilities.invokeLater(new Runnable() { - public void run() { - - // refresh search text - ui.getSearchText().setText(model.getQuery()); - - // refresh search actions - refreshSearchActions(ui, model); - - // refresh changePage combobox - refreshChangePageCombo(ui, model); - - // refresh changeSizor combo - refreshChangeSizorCombo(ui, model); - - // refresh pagination buttons - refreshPagination(ui, model.getPagination()); - - // table data model may have changed, must revalidate - ui.getTable().invalidate(); - - // parent must be repaint (will revalidate layout for table) - ui.repaint(); - } - }); - } - - public void refreshSearchActions(JApplicationListTab container, ListTabModel model) { - String text = container.getSearchText().getText(); - container.getSearchApplication().setEnabled(model.hasQuery() || !text.isEmpty()); - container.getResetSearchApplication().setEnabled(model.hasQuery() || !text.isEmpty()); - } - - public void refreshConnnectState(final boolean isConnected) { - - //SwingUtilities.invokeLater(new Runnable() { - // public void run() { - getConnect().setEnabled(!isConnected); - getUnconnect().setEnabled(isConnected); - getShowTab_remote().setEnabled(isConnected); - getShowTab_synchronize().setEnabled(isConnected); - getToggleTab_remote().setEnabled(isConnected); - getToggleTab_synchronize().setEnabled(isConnected); - if (!isConnected) { - // close all connected ui - JTabbedPane container = getContent(); - - if (SimExplorerTab.remote.isTabVisible(container)) { - // close tab - SimExplorerTab.remote.closeTab(container); - } - if (SimExplorerTab.synchronize.isTabVisible(container)) { - // close tab - SimExplorerTab.synchronize.closeTab(container); - } - if (SimExplorerTab.detail.isTabVisible(container)) { - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - if (model.isRemote()) { - // close tab - SimExplorerTab.detail.closeTab(container); - } - } - } - // } - //}); - } - - protected void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { - int page = pagination.getCurrentPage(); - boolean notLast = page + 1 < pagination.getNbPages(); - ui.getGoNextPage().setEnabled(notLast); - ui.getGoLastPage().setEnabled(notLast); - } - - protected void refreshChangeSizorCombo(JApplicationListTab ui, ListTabModel model) { - JComboBox combo = ui.getChangeSizor(); - String s = model.getPagination().getWidth() + ""; - if (!s.equals(String.valueOf(combo.getSelectedItem()))) { - combo.setEnabled(false); - combo.setSelectedItem(s); - combo.setEnabled(true); - } - } - - protected void refreshChangePageCombo(JApplicationListTab ui, ListTabModel model) { - JComboBox combo = ui.getGoPage(); - long size = model.getPagination().getNbPages(); - combo.setEnabled(false); - //System.out.println("page old size : " + combo.getItemCount() + " new size : " + size); - if (size < combo.getItemCount()) { - while (size < combo.getItemCount()) { - combo.removeItemAt(combo.getItemCount() - 1); - } - } else { - while (size > combo.getItemCount()) { - combo.addItem(combo.getItemCount()); - } - } - //System.out.println("new page size : " + combo.getItemCount()); - - combo.setSelectedIndex(model.getPagination().getCurrentPage()); - boolean b = combo.getItemCount() > 1; - combo.setEnabled(b); - ui.getCurrentPage().setEnabled(b); - } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-02-04 14:49:05 UTC (rev 630) @@ -20,8 +20,8 @@ import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import java.awt.event.ActionEvent; @@ -84,7 +84,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { - SimExplorer.getUI().refreshConnnectState(true); + SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), true); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-02-04 14:49:05 UTC (rev 630) @@ -18,8 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; -import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import java.awt.event.ActionEvent; @@ -60,6 +60,6 @@ @Override protected void afterAction(ActionEvent e) throws Exception { - SimExplorer.getUI().refreshConnnectState(false); + SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), false); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-02-04 14:49:05 UTC (rev 630) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -91,7 +92,7 @@ modelTab.setData(model.getList()); // refresh ui - getMainUI().refreshListTabUI(model, container); + SimExplorerUIRefreshHelper.refreshListTabUI(container, model); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-02-04 14:47:45 UTC (rev 629) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-02-04 14:49:05 UTC (rev 630) @@ -23,6 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.Action; import javax.swing.JComboBox; @@ -88,7 +89,7 @@ modelTab.setData(model.getList()); // refresh ui - getMainUI().refreshListTabUI(model, container); + SimExplorerUIRefreshHelper.refreshListTabUI(container, model); } @Override
participants (1)
-
tchemit＠users.labs.libre-entreprise.org