Author: chatellier Date: 2010-02-02 10:04:26 +0000 (Tue, 02 Feb 2010) New Revision: 2969 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Remove all filtering functionalities (too long). Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/changelog.txt 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,7 @@ isis-fish (3.3.0.0-rc2) stable; urgency=low + * Disable all list filtering functionalities (don't work anymore with a lot of simulations) + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.ui; -import java.io.IOException; -import java.text.ParseException; import java.util.ArrayList; import java.util.List; @@ -28,9 +26,6 @@ import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.SimulationProperties; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; -import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** * Welcome.java @@ -74,17 +69,21 @@ */ public static Object[] getOldSimulationItem() { - try { + //try { List<String> oldSimul = new ArrayList<String>(); - FilterModel<SimulationProperties, String> filterModel; + //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimul.addAll(SimulationStorage.getSimulationNames()); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(oldSimul); + //filterModel = SimulationFilterUtil.createFilterModel(oldSimul); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); Object[] result = oldSimul.toArray(); // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection @@ -92,7 +91,7 @@ oldSimul.add(0, " "); return result; - } catch (ParseException ex) { + /*} catch (ParseException ex) { if (log.isErrorEnabled()) { log.error("Can't get old simulations", ex); } @@ -101,7 +100,7 @@ log.error("Can't get old simulations", ex); } } - return null; + return null;*/ } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -39,6 +39,9 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; + /* + * FIXME this code reload ALL simulation (too long) + */ SimulationServiceListener listener = new SimulationServiceListener() { @Override @@ -78,11 +81,15 @@ private void initSimulation() throws IOException, ParseException { // keep in context list of old simulation names (for filter process) java.util.List<String> value = SimulationStorage.getSimulationNames(); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(value); + //filterModel = SimulationFilterUtil.createFilterModel(value); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); getSimulation().setEditable(false); model = new DefaultComboBoxModel(value.toArray()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -358,6 +358,9 @@ JButton result = new JButton(_("isisfish.filter"), icon); + // TODO disabled, filtering is too long + result.setEnabled(false); + result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:04:26 UTC (rev 2969) @@ -404,7 +404,7 @@ <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> - <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/>