Author: echatellier Date: 2012-08-27 17:20:25 +0200 (Mon, 27 Aug 2012) New Revision: 3735 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3735 Log: Update to topia 2.6.13 Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/pom.xml 2012-08-27 15:20:25 UTC (rev 3735) @@ -525,7 +525,7 @@ <!-- Dependencies version --> <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.2</eugeneVersion> - <topiaVersion>2.6.9</topiaVersion> + <topiaVersion>2.6.13-SNAPSHOT</topiaVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -178,7 +178,7 @@ try { @SuppressWarnings("unchecked") - List<String> contextCategory = (List<String>) context.find( + List<String> contextCategory = (List<String>) context.findAll( "SELECT DISTINCT category FROM Equation"); all.addAll(contextCategory); } catch (TopiaException eee) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -168,7 +168,7 @@ mustClose = true; } - List<String> result = (List<String>) tx.find("Select " + Result.PROPERTY_RESULT_STEP + "||':'||name from fr.ifremer.isisfish.entities.Result"); + List<String> result = (List<String>) tx.findAll("Select " + Result.PROPERTY_RESULT_STEP + "||':'||name from fr.ifremer.isisfish.entities.Result"); if (mustClose) { tx.closeContext(); } @@ -430,7 +430,7 @@ ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); result = (List<String>) resultPS.getContext() - .find("Select distinct name from fr.ifremer.isisfish.entities.Result order by name"); + .findAll("Select distinct name from fr.ifremer.isisfish.entities.Result order by name"); if (mustClose) { tx.closeContext(); } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -120,7 +120,7 @@ } // build new equation for maturity group and reproduction rate - List<Population> pops = tx.find("from " + Population.class.getName()); + List<Population> pops = tx.findAll("from " + Population.class.getName()); for (Population pop : pops) { String content = getReproductionRateContent(pop, reproductionResults); ((PopulationImpl)pop).setReproductionRateEquationContent(content); @@ -129,7 +129,7 @@ // start equation migration if (IsisFish.config.isLaunchUI()) { - List<Equation> equations = tx.find("from " + Equation.class.getName()); + List<Equation> equations = tx.findAll("from " + Equation.class.getName()); for (Equation equation : equations) { // empty is empty and stay empty Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -269,7 +269,7 @@ TopiaContext tx = metier.getTopiaContext(); List<StrategyMonthInfo> res = null; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation - res = tx.find("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", + res = tx.findAll("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", month, metier); for(StrategyMonthInfo smi : res){ @@ -298,7 +298,7 @@ TopiaContext tx = metier.getTopiaContext(); List<SetOfVessels> res = null; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation - res = tx.find("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", + res = tx.findAll("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", metier); for(SetOfVessels sov : res){ Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -75,7 +75,7 @@ Variable v = variablesCache.get(name); if (v == null) { TopiaContext topiaContext = simulationContext.getDB(); - List<Variable> vindb = topiaContext.find("FROM " + Variable.class.getName() + + List<Variable> vindb = topiaContext.findAll("FROM " + Variable.class.getName() + " WHERE " + Variable.PROPERTY_ENTITY_ID + " = :id" + " AND " + Variable.PROPERTY_NAME + " = :name", "id", topiaEntity.getTopiaId(), Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -883,7 +883,7 @@ TopiaContext context = null; try { context = regionStorage.getStorage().beginTransaction(); - List list = context.find("from " + value.getClass().getName()); + List list = context.findAll("from " + value.getClass().getName()); JComboBox c = new JComboBox(list.toArray()); c.setSelectedItem(value); result = c; @@ -1041,7 +1041,7 @@ TopiaContext context = null; try { context = regionStorage.getStorage().beginTransaction(); - List list = context.find("from " + type.getName()); + List list = context.findAll("from " + type.getName()); JComboBox c = new JComboBox(list.toArray()); result = c; } catch (TopiaException ex) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2012-08-27 15:05:05 UTC (rev 3734) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2012-08-27 15:20:25 UTC (rev 3735) @@ -154,7 +154,7 @@ } TopiaContext context = regionStorage.getStorage().beginTransaction(); if (context != null) { - List list = context.find("from " + type.getName()); + List list = context.findAll("from " + type.getName()); c = new JComboBox(list.toArray()); c.setSelectedItem(value); editor = c;