Author: echatellier Date: 2014-09-26 16:17:10 +0200 (Fri, 26 Sep 2014) New Revision: 4117 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4117 Log: Remove unused filter UI Removed: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties Deleted: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -1,125 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.simulator; - -import fr.ifremer.isisfish.ui.widget.filter.DateInterval; -import fr.ifremer.isisfish.ui.widget.filter.FilterAcceptor; -import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; -import fr.ifremer.isisfish.ui.widget.filter.ValueGetter; - -import static org.nuiton.i18n.I18n.t; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * This enum represents all properties on which we can perform search. - * - * Each constant is also used as acceptor for the property it represents (using {@link FilterAcceptor#accept(Object, Object)} - * and permit to access SimulationProperties values with methods - * {@link #getValue(SimulationProperties)} - * and {@link #getDateValue(SimulationProperties)} - */ -public enum SimulationMeta implements ValueGetter<SimulationProperties, Object> { - // text - isisFishVersion(String.class), - description(String.class), - simulationName(String.class), - simulatorName(String.class), - simulationPlanName(String.class), - regionName(String.class), - otherInfo(String.class), - - // int - numberOfYear(Integer.class), - simulationPlanNumber(Integer.class), - - // date interval - simulationInterval(DateInterval.class) { - @Override - public DateInterval getValue(SimulationProperties sim) { - return new DateInterval(simulationStart.getDateValue(sim), simulationEnd.getDateValue(sim)); - } - }, - - // date - simulationStart(Long.class), - simulationEnd(Long.class), - exportTime(Long.class), - - // boolean - useOptimization(Boolean.class), - useSimulationPlan(Boolean.class), - useStatistic(Boolean.class), - usePreScript(Boolean.class), - onlyExport(Boolean.class), - local(Boolean.class); - - // others - //statistic(klazz), - //optimizationUsage(klazz), - //exception(klazz); - - private static final Log log = LogFactory.getLog(SimulationMeta.class); - - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); - private final Class<?> klazz; - - SimulationMeta(Class<?> klazz) { - this.klazz = klazz; - } - - @SuppressWarnings({"unchecked"}) - public FilterParamModel<SimulationProperties, ?> createParamModel() { - return new FilterParamModel<SimulationProperties, Object>(name(), (Class<Object>) getKlazz(), this); - } - - public Class<?> getKlazz() { - return klazz; - } - - public Object getValue(SimulationProperties sim) { - return sim.getData().getProperty(name()); - } - - public long getDateValue(SimulationProperties sim) { - String d = (String) getValue(sim); - Date result = null; - if (d != null) { - try { - result = dateFormat.parse(d); - } catch (ParseException eee) { - if (log.isWarnEnabled()) { - log.warn(t("isisfish.error.parse.date", d), eee); - } - } - } - return result == null ? -1 : result.getTime(); - } -} Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -49,9 +49,6 @@ * <p> * The class is only a properties container, no method to access a data directly * (except to obtain name of underlying simulation). - * <p> - * For this purpose use {@link SimulationMeta#getValue(SimulationProperties)} - * and {@link SimulationMeta#getDateValue(SimulationProperties)} */ public class SimulationProperties { @@ -64,7 +61,7 @@ File simulationDirectory = SimulationStorage.getSimulationDirectory(name); this.name = simulationDirectory.getName(); this.data = new Properties(); - data.put(SimulationMeta.simulationName.name(), this.name); + data.put("simulationName", this.name); loadProperties(SimulationStorage.getSimulationParametersFile(simulationDirectory)); loadProperties(SimulationStorage.getSimulationInformationFile(simulationDirectory)); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -89,7 +89,6 @@ import fr.ifremer.isisfish.ui.models.common.GenericComboModel; import fr.ifremer.isisfish.ui.sensitivity.wizard.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.vcs.VCSException; /** @@ -320,11 +319,10 @@ */ public void importRegionFromSimulation(InputUI inputUI) { - setStatusMessage(inputUI, t("isisfish.message.import"), true); + /*setStatusMessage(inputUI, t("isisfish.message.import"), true); // first step select a simulation and new region name try { - //TODO Should use a shared model ? List<String> simulationNames = SimulationStorage.getSimulationNames(); String simulationName = SimulationFilterUtil.selectSimulation(simulationNames); if (simulationName != null) { @@ -352,7 +350,7 @@ throw new IsisFishRuntimeException(t("isisfish.error.no.select.simulation"), eee); } - setStatusMessage(inputUI, t("isisfish.message.export.done")); + setStatusMessage(inputUI, t("isisfish.message.export.done"));*/ } /** Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-09-26 14:17:10 UTC (rev 4117) @@ -32,7 +32,7 @@ <JMenu text="isisfish.common.region"> <JMenuItem text="isisfish.input.menu.importRegion" onActionPerformed="getHandler().importRegion(this)" /> <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="getHandler().importRegionAndRename(this)" /> - <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" /> + <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" enabled="false"/> <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().exportRegion(this)" /> <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().copyRegion(this)" /> <JSeparator/> Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 14:17:10 UTC (rev 4117) @@ -288,24 +288,6 @@ simulAction.setStrategies(listSimulParamsStrategies.getSelectedValues()); } -protected void selectFilter() { - try { - java.util.List<String> simulationsNames = fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()); - // TODO add " " to not triger event (need to be fixed) - simulationsNames.add(0, " "); - simulAction.setOldSimulatorNames(simulationsNames); - fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); - } catch (ParseException ex) { - if (log.isErrorEnabled()) { - log.error("Can't select simulation filter", ex); - } - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't select simulation filter", ex); - } - } -} - protected ComboBoxModel<String> getSimulParamsSelectModel() { return getSimulParamsSelectModel(false); } Deleted: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -1,64 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.ui.widget; - -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; - -import javax.swing.JComponent; - -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.jxlayer.plaf.AbstractLayerUI; - -public class DummyLayerUI extends AbstractLayerUI<JComponent> { - - /** serialVersionUID. */ - private static final long serialVersionUID = 309245880711380974L; - - @Override - protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { - super.paintLayer(g2, l); - - // position - //g2.translate(-35, 90); // top left - g2.translate(l.getBounds().getMaxX() - 160, l.getBounds().getMaxY()); // bottom right - - // yellow backgroung - g2.rotate(Math.PI * -42 / 180); - g2.setColor(Color.YELLOW); - g2.fillRect(10, 10, 200, 30); - - // text - g2.translate(70, 15); - g2.setFont(new Font("Dialog", Font.BOLD, 16)); - g2.setColor(Color.BLACK); - g2.drawString("Maquette",10,10); - - // for test only - g2.translate(-3, 10); - g2.setFont(new Font("Dialog", Font.ITALIC, 10)); - g2.setColor(Color.BLACK); - g2.drawString("(non fonctionnelle)",10,10); - } -} Modified: branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-09-26 14:17:10 UTC (rev 4117) @@ -598,7 +598,7 @@ isisfish.message.import=Importer %1$s isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé -isisfish.message.import.region.name=Entre le nom de la réegion à importer +isisfish.message.import.region.name=Entrer le nom de la région à importer isisfish.message.import.region.xml=Région XML (ISIS-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file=Importer des scripts depuis une archive zip