Author: echatellier Date: 2011-11-07 16:01:17 +0100 (Mon, 07 Nov 2011) New Revision: 3520 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3520 Log: Petit hack pour que la migration graphique n'interompe pas les tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 14:59:08 UTC (rev 3519) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 15:01:17 UTC (rev 3520) @@ -37,7 +37,7 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; import org.nuiton.util.Version; -import fr.ifremer.isisfish.datastore.update.ImportFromV2; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; import fr.ifremer.isisfish.util.EvaluatorHelper; @@ -88,28 +88,30 @@ queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); - // start equation migration - List<Equation> equations = tx.find("from " + Equation.class.getName()); - for (Equation equation : equations) { - int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); - if (ok != 0) { - EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle(_("isisfish.message.import.equation.convert")); - - try { - frame.setEquation(equation.getCategory(), equation.getName(), - equation.getJavaInterface(), equation.getContent()); - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Can't migrate equation", ex); + if (IsisFish.config.isLaunchUI()) { + // start equation migration + List<Equation> equations = tx.find("from " + Equation.class.getName()); + for (Equation equation : equations) { + int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); + if (ok != 0) { + EquationEditorPaneUI frame = new EquationEditorPaneUI(); + frame.setTitle(_("isisfish.message.import.equation.convert")); + + try { + frame.setEquation(equation.getCategory(), equation.getName(), + equation.getJavaInterface(), equation.getContent()); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't migrate equation", ex); + } } + + frame.setVisible(true); + if (frame.isResultOk()) { + equation.setContent(frame.getEditor().getText()); + equation.update(); + } } - - frame.setVisible(true); - if (frame.isResultOk()) { - equation.setContent(frame.getEditor().getText()); - equation.update(); - } } } }