Author: tchemit Date: 2008-02-19 00:41:00 +0000 (Tue, 19 Feb 2008) New Revision: 1112 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: fixbug : on ne doit pas utiliser model.synch(null) : cela supprime aussi la propri?\195?\169t?\195?\169 remote du model, ce qui n'est pas voulu sinon le model n'est plus 'typ?\195?\169' Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -22,6 +22,7 @@ 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.ListTableModel; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import java.awt.event.ActionEvent; @@ -67,12 +68,14 @@ @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); + ListTabModel model = (ListTabModel) getModel(); // reset query in model model.setQuery(null); - + // reset selected item + model.synch(model.isRemote(), (MetaData) null); + log.info("sync "+model.getSelectedItem()); // pagination a vide model.setPagination(null); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -22,6 +22,7 @@ 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.ListTableModel; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import javax.swing.JTextField; import java.awt.event.ActionEvent; @@ -43,8 +44,8 @@ ) public class SearchAction extends SimExplorerAbstractTabAction { + protected String query; private static final long serialVersionUID = -8537587629478588257L; - String query; public SearchAction(String name) { super(name); @@ -60,12 +61,11 @@ @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); ListTabModel model = (ListTabModel) getModel(); model.getQuery().setQuery(query); // on supprime la selection courante avant tout - model.synch(null); + model.synch(model.isRemote(), (MetaData) null); model.setSelectedIndex(-1); // pagination a vide @@ -83,7 +83,6 @@ @Override protected void clear() { - super.clear(); query = null; setTab(null); } 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-02-19 00:40:02 UTC (rev 1111) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-19 00:41:00 UTC (rev 1112) @@ -150,7 +150,7 @@ // if empty list, this is quick if (model.isEmpty()) { model.setSelectedIndex(-1); - model.synch(null); + model.synch(model.isRemote(), (MetaData) null); return; } DataEntityModel entityModel;