- Isis-fish-commits - mailman.cloud.codelutin.com

r4118 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: simulator ui/sensitivity
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 16:49:54 +0200 (Fri, 26 Sep 2014) New Revision: 4118 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4118 Log: Use generics Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-09-26 14:17:10 UTC (rev 4117) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-09-26 14:49:54 UTC (rev 4118) @@ -73,7 +73,7 @@ private static Log log = LogFactory.getLog(MetierMonitor.class); protected Set<Metier> forbiddenMetier = new HashSet<Metier>(); - protected Set<MultiKey> forbiddenMetierMonth = new HashSet<MultiKey>(); + protected Set<MultiKey<Object>> forbiddenMetierMonth = new HashSet<>(); protected Map<TimeStep, MatrixND> noActivity = new HashMap<TimeStep, MatrixND>(); /** @@ -102,11 +102,11 @@ * @param month */ public void addforbiddenMetier(Metier metier, Month month) { - forbiddenMetierMonth.add(new MultiKey(metier, month)); + forbiddenMetierMonth.add(new MultiKey<Object>(metier, month)); } public void removeforbiddenMetier(Metier metier, Month month) { - forbiddenMetierMonth.remove(new MultiKey(metier, month)); + forbiddenMetierMonth.remove(new MultiKey<Object>(metier, month)); } public void addforbiddenMetier(Collection<Metier> metiers) { @@ -131,7 +131,7 @@ public boolean isForbidden(Metier metier, Month month) { boolean result = forbiddenMetier.contains(metier); if (!result) { - result = forbiddenMetierMonth.contains(new MultiKey(metier, month)); + result = forbiddenMetierMonth.contains(new MultiKey<Object>(metier, month)); } return result; } @@ -180,25 +180,25 @@ ////////////////////////////////////////////////////////////////////////// /** key <Metier, Month, Month> value: <Licence> */ - protected MultiKeyMap list = new MultiKeyMap(); + protected MultiKeyMap<Object, Licence> list = new MultiKeyMap<>(); - class Licence { + static class Licence { int nbLicences = 0; double proportionMaxTotal = 0; - Map<Month, Double> proportionsMonth = new HashMap<Month, Double>(); + Map<Month, Double> proportionsMonth = new HashMap<>(); } public Licence getLicence(Metier metier, Month month) { Licence result = null; - for (MapIterator i=list.mapIterator(); i.hasNext();) { - MultiKey keys = (MultiKey)i.next(); + for (MapIterator<MultiKey<? extends Object>, Licence> i = list.mapIterator(); i.hasNext();) { + MultiKey<? extends Object> keys = i.next(); Metier metierKey = (Metier)keys.getKey(0); Month firstMonth = (Month)keys.getKey(1); Month lastMonth = (Month)keys.getKey(2); if (metier.equals(metierKey) && firstMonth.compareTo(month) <= 0 && month.compareTo(lastMonth) <= 0) { - result = (Licence)i.getValue(); + result = i.getValue(); break; } } @@ -211,15 +211,13 @@ o.nbLicences = nbLicences; o.proportionMaxTotal = this.computeProportionMaxTotal(metier, nbLicences); - for (Month i=firstMonth; i.compareTo(lastMonth) <= 0; i=i.next()) { + for (Month i = firstMonth; i.compareTo(lastMonth) <= 0; i = i.next()) { o.proportionsMonth.put(i, computeProportionMonth(metier, i)); - } this.list.put(metier, firstMonth, lastMonth, o); - } - else{ + } else { log.warn("il existe deja une licence touchant le metier: " + metier + " sur la periode:"+ firstMonth + "-" + lastMonth); } @@ -293,7 +291,7 @@ try { // FIXME: Cette methode n'existe pas dans L'ECMAScript :( -// strategies = Regle_libUtil.getStrategiesMetier(metier); + // strategies = Regle_libUtil.getStrategiesMetier(metier); // Je l'ai traduit avec ce qui suit TopiaContext tx = metier.getTopiaContext(); List<SetOfVessels> res = null; @@ -301,7 +299,7 @@ res = tx.findAll("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", metier); - for(SetOfVessels sov : res){ + for(SetOfVessels sov : res) { nbBoat = nbBoat + sov.getNumberOfVessels(); } } catch (TopiaException eee) { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2014-09-26 14:17:10 UTC (rev 4117) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2014-09-26 14:49:54 UTC (rev 4118) @@ -74,14 +74,14 @@ private static Log log = LogFactory.getLog(TableBlockingLayerUI.class); /** Parent UI. */ - protected InputContentUI parent; + protected InputContentUI<?> parent; /** * Init layer with parent. * * @param parent parent */ - public TableBlockingLayerUI(InputContentUI parent) { + public TableBlockingLayerUI(InputContentUI<?> parent) { this.parent = parent; }

1 0

r4117 - in branches/4.3.0-log4j2/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

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

1 0

r4116 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: datastore ui/sensitivity ui/sensitivity/model ui/simulator util
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:57:59 +0200 (Fri, 26 Sep 2014) New Revision: 4116 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4116 Log: Fix deprecated Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 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/util/IsisCacheBackendOnGuava.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -53,7 +53,7 @@ * Mise a jour: $Date$ * par : $Author$ * - * @deprecated ResultStorageCSV now support no storage and in memory usage + * @deprecated ResultStorageCSV now support no storage and in memory usage, will be removed in version 4.4 */ public class ResultStorageInMemory extends ResultStorageAbstract { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -41,12 +41,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.logging.log4j.ThreadContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; import org.nuiton.util.ZipUtil; +import org.nuiton.util.version.Versions; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -525,11 +524,9 @@ // mais il faut pouvoir relire les anciennes simulations SimulationParameter param = getParameter(); String isisFishVersion = param.getIsisFishVersion(); - Version simuVersion = new Version(isisFishVersion); - Version version4200 = new Version(4, 2, 0, 0); // instancier un ResultStorage ou un ResultMappedStorage - if (simuVersion.before(version4200)) { + if (Versions.smallerThan(isisFishVersion, "4.2.0.0")) { resultStorage = new ResultDatabaseStorage(this); } else { // if user ask for ResultStorageInMemory, used it Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -77,7 +77,7 @@ return getContextValue(SimulAction.class); } - public ComboBoxModel getSensitivityAnalysisModel() { + public ComboBoxModel<String> getSensitivityAnalysisModel() { List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); SensitivityAnalysisComboModel model = new SensitivityAnalysisComboModel(sensitivityNames); return model; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FactorListModel extends DefaultListModel { +public class FactorListModel extends DefaultListModel<Factor> { /** serialVersionUID. */ private static final long serialVersionUID = 2281927104735245489L; @@ -73,7 +73,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Factor getElementAt(int index) { return factors.get(index); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 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:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -306,7 +306,7 @@ } } -protected ComboBoxModel getSimulParamsSelectModel() { +protected ComboBoxModel<String> getSimulParamsSelectModel() { return getSimulParamsSelectModel(false); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -94,7 +94,7 @@ // elle meme qu'elle soit dans le backend ou non est // certainement utilisee ailleur, donc seul la taille // des pointeurs dans la collection est prise ici - result += ((Collection)value).size() * POINTER_SIZE; + result += ((Collection<?>)value).size() * POINTER_SIZE; } else if (value instanceof Number) { // int| double // seulement une valeur, on ajoute 1 @@ -228,7 +228,7 @@ // to keep more memory for JVM sizeCache = Math.min(this.maxCache, amount); - CacheBuilder builder = CacheBuilder.newBuilder(); + CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder(); builder.maximumWeight(sizeCache); builder.weigher(isisWeigher); if (initialCapacity > 0) {

1 0

r4115 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:57:09 +0200 (Fri, 26 Sep 2014) New Revision: 4115 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4115 Log: Update libs Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-26 13:46:18 UTC (rev 4114) +++ branches/4.3.0-log4j2/pom.xml 2014-09-26 13:57:09 UTC (rev 4115) @@ -513,7 +513,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.12</jaxxVersion> + <jaxxVersion>2.13</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.2</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion>

1 0

r4114 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:46:18 +0200 (Fri, 26 Sep 2014) New Revision: 4114 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4114 Log: Replace ImmutableType by non deprecated UserType Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 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 as @@ -320,10 +320,12 @@ return cub; } + @Override public Class returnedClass() { return MatrixND.class; } + @Override public boolean equals(Object x, Object y) throws HibernateException { if (x == y) { return true; @@ -334,10 +336,12 @@ } } + @Override public int hashCode(Object x) throws HibernateException { return x.hashCode(); } + @Override public Object deepCopy(Object value) throws HibernateException { if (value == null) { return null; @@ -345,14 +349,17 @@ return MatrixFactory.getInstance().create((MatrixND)value); } + @Override public String[] getPropertyNames() { return propertyNames; } + @Override public Type[] getPropertyTypes() { return hibernateTypes; } + @Override public Object getPropertyValue(Object component, int property) throws HibernateException { MatrixND matrix = (MatrixND)component; switch (property) { @@ -365,6 +372,7 @@ } } + @Override public void setPropertyValue(Object component, int property, Object value) throws HibernateException { MatrixND matrix = (MatrixND)component; switch (property) { @@ -383,6 +391,7 @@ } } + @Override public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { MatrixND matrix = null; @@ -413,6 +422,7 @@ return matrix; } + @Override public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { if (value == null) { st.setString(index, null); @@ -431,6 +441,7 @@ } } + @Override public Serializable disassemble(Object value, SessionImplementor session) throws HibernateException { MatrixND matrix = (MatrixND)value; return new Serializable[] { @@ -442,6 +453,7 @@ }; } + @Override public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException { Serializable[] o = (Serializable[])cached; String name = (String)o[0]; @@ -458,6 +470,7 @@ return matrix; } + @Override public Object replace(Object original, Object target, SessionImplementor session, Object owner) throws HibernateException { return assemble( disassemble(original, session), session, owner); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 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 as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.Month; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class MonthType extends ImmutableType { +public class MonthType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = 6151047526309798890L; + @Override + public int[] sqlTypes() { + return new int[] {Types.INTEGER}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return Month.MONTH[rs.getInt(name)]; + public Class returnedClass() { + return Month.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setInt(index, ((Month) value).getMonthNumber()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.INTEGER; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((Month)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = Month.MONTH[rs.getInt(names[0])]; + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return Month.MONTH[Integer.parseInt(xml)]; + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setInt(index, ((Month) value).getMonthNumber()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return Month.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return MonthType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (Month)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 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 as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.RangeOfValues; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class RangeOfValuesType extends ImmutableType { +public class RangeOfValuesType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.VARCHAR}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new RangeOfValues(rs.getString(name)); + public Class returnedClass() { + return RangeOfValues.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setString(index, ((RangeOfValues) value).getAsString()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.VARCHAR; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((RangeOfValues)value).getAsString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new RangeOfValues(rs.getString(names[0])); + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new RangeOfValues(xml); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setString(index, ((RangeOfValues) value).getAsString()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return RangeOfValues.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return RangeOfValuesType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (RangeOfValues)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, 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 @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.TimeStep; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class TimeStepType extends ImmutableType { +public class TimeStepType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.INTEGER}; + } - /* - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new TimeStep(rs.getInt(name)); + public Class returnedClass() { + return TimeStep.class; } - /* - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setInt(index, ((TimeStep) value).getStep()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.INTEGER; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((TimeStep)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new TimeStep(rs.getInt(names[0])); + } + return result; } - /* - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new TimeStep(Integer.parseInt(xml)); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setInt(index, ((TimeStep) value).getStep()); + } } - /* - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return TimeStep.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return TimeStepType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (TimeStep)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 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 as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.TimeUnit; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class TimeUnitType extends ImmutableType { +public class TimeUnitType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.DOUBLE}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new TimeUnit(rs.getDouble(name)); + public Class returnedClass() { + return TimeUnit.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setDouble(index, ((TimeUnit) value).getTime()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.DOUBLE; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((TimeUnit)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new TimeUnit(rs.getDouble(names[0])); + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new TimeUnit(Double.parseDouble(xml)); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setDouble(index, ((TimeUnit) value).getTime()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return TimeUnit.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return TimeUnitType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (TimeUnit)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } }

1 0

r4113 - branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:45:20 +0200 (Fri, 26 Sep 2014) New Revision: 4113 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4113 Log: Remove unused mock Removed: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/ui/widget/filter/

1 0

r4112 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:43:42 +0200 (Fri, 26 Sep 2014) New Revision: 4112 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4112 Log: Update libs Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-09 14:14:28 UTC (rev 4111) +++ branches/4.3.0-log4j2/pom.xml 2014-09-26 13:43:42 UTC (rev 4112) @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2</version> <scope>compile</scope> </dependency> @@ -513,7 +513,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.11</jaxxVersion> + <jaxxVersion>2.12</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.2</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion>

1 0

r4111 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 16:14:28 +0200 (Tue, 09 Sep 2014) New Revision: 4111 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4111 Log: Update to openmap 5.1.3 Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-09 13:50:45 UTC (rev 4110) +++ branches/4.3.0-log4j2/pom.xml 2014-09-09 14:14:28 UTC (rev 4111) @@ -279,7 +279,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0.4</version> + <version>5.1.3</version> <scope>compile</scope> </dependency>

1 0

r4110 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: logging util
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 15:50:45 +0200 (Tue, 09 Sep 2014) New Revision: 4110 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4110 Log: Fix javadoc Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-09-09 13:19:26 UTC (rev 4109) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-09-09 13:50:45 UTC (rev 4110) @@ -45,17 +45,8 @@ * Usefull class for dealing with hot configuration of log4J. this is temporary * we must find a way to abstract this layer. * - * the class offers three public static methods : - * - * {@link #addSimulationAppender(String, String, String, String, String, String)} - * to add a logger for a given simulation in a given thread, with simulLogLevel, - * scriptLogLvel and libLogLevel given. - * * {@code #removeAppender(String, String)} to remove a appender of a simulation * - * {@link #showSimulationLogConsole(String)} to display the log console of - * a simulation, given his name. - * * @author chemit */ public class SimulationLoggerUtil { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-09 13:19:26 UTC (rev 4109) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-09 13:50:45 UTC (rev 4110) @@ -121,7 +121,7 @@ /** * Extrait les dépendences d'une class compilé à partir de son bytecode. * - * @param clazz la classe à analyser + * @param clazzStream la classe à analyser * @return extract class set */ protected static Set<String> extractDependencies(InputStream clazzStream) {

1 0

r4109 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 15:19:26 +0200 (Tue, 09 Sep 2014) New Revision: 4109 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4109 Log: Remove sysout Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 13:17:25 UTC (rev 4108) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 13:19:26 UTC (rev 4109) @@ -92,7 +92,6 @@ } public int getValueAsRGB(double value) { - System.out.println(value); return (int) (value / (getMax() / 255.0)); }

1 0