Author: tchemit Date: 2008-01-27 15:17:50 +0000 (Sun, 27 Jan 2008) New Revision: 549 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/action/application/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: lterminer l'accessibilite des actions de recherche 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-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-27 15:17:50 UTC (rev 549) @@ -91,6 +91,9 @@ // refresh search text ui.getSearchText().setText(model.getQuery()); + // refresh search actions + refreshSearchActions(ui,model); + // refresh changePage combobox refreshChangePageCombo(ui, model); @@ -109,6 +112,12 @@ }); } + 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() { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-27 15:17:50 UTC (rev 549) @@ -53,11 +53,17 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { ListTabModel model = (ListTabModel) getModel(); - String query = model.getQuery(); - // always clean the input text (should be done in jaxx) - ((JApplicationListTab)getUI()).getSearchText().setText(model.getQuery()); + JApplicationListTab ui = (JApplicationListTab) getUI(); + // always clean the input text (should be done in jaxx) + ui.getSearchText().setText(null); + if (!model.hasQuery()) { + // directly refresh search actions + // but do not realised action + getMainUI().refreshSearchActions(ui,model); + return false; + } // only reset search if something was previously search - return query != null && !query.isEmpty(); + return true; } @Override @@ -83,4 +89,10 @@ // refresh ui getMainUI().refreshListTabUI(model, container); } + + @Override + protected void clear() { + super.clear(); + setTab(null); + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-27 15:17:50 UTC (rev 549) @@ -85,5 +85,6 @@ protected void clear() { super.clear(); query = null; + setTab(null); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-27 15:17:50 UTC (rev 549) @@ -28,6 +28,8 @@ import javax.swing.JTabbedPane; import java.awt.Component; import java.awt.event.ActionEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; /** * Action pour afficher le tab local @@ -80,13 +82,20 @@ @Override protected void afterAction(ActionEvent e) { - ListTabModel model = (ListTabModel) getModel(); if (firstTime) { + final ListTabModel model = (ListTabModel) getModel(); + // push model into tableModel - JApplicationListTab container = (JApplicationListTab) getUI(); + final JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); modelTab.setData(model.getList()); - + // add search actions listeners + container.getSearchText().addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + getMainUI().refreshSearchActions(container, model); + } + }); // refresh ui getMainUI().refreshListTabUI(model, container); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-27 15:17:50 UTC (rev 549) @@ -28,6 +28,8 @@ import javax.swing.JTabbedPane; import java.awt.Component; import java.awt.event.ActionEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; /** * Action pour afficher le tab local @@ -76,27 +78,35 @@ if (data == null) { // first coming here, init model - model.initTabModel(true,getContext()); + model.initTabModel(true, getContext()); } return true; } @Override protected void afterAction(ActionEvent e) { - ListTabModel model = (ListTabModel) getModel(); if (firstTime) { - + final ListTabModel model = (ListTabModel) getModel(); // push model into TableModel - JApplicationListTab container = (JApplicationListTab) getUI(); + final JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); modelTab.setData(model.getList()); + // add search actions listeners + container.getSearchText().addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + getMainUI().refreshSearchActions(container, model); + } + }); + // refresh ui getMainUI().refreshListTabUI(model, container); } } + @Override protected void clear() { super.clear(); Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-27 14:27:31 UTC (rev 548) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-27 15:17:50 UTC (rev 549) @@ -16,10 +16,8 @@ <JTextField id='searchText' toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> - <JButton id='searchApplication' - enabled='{!searchText.getText().isEmpty()}' /> - <JButton id='resetSearchApplication' - enabled='{!searchText.getText().isEmpty()}'/> + <JButton id='searchApplication'/> + <JButton id='resetSearchApplication'/> <JButton id='advancedSearchApplication' enabled='false'/> <JComboBox id='changeSizor' enabled='false' font-size='9'