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

r3380 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:30:55 +0000 (Thu, 09 Jun 2011) New Revision: 3380 Log: Fix sysinfo logging Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:26:47 UTC (rev 3379) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:30:55 UTC (rev 3380) @@ -219,14 +219,14 @@ // i18n is not inited here if (log.isInfoEnabled()) { - log.info("Starting Isis-Fish with args : " + java.util.Arrays.toString(args)); - log.info("Isis Version: " + IsisConfig.getVersion()); + log.info("Starting Isis-Fish " + IsisConfig.getVersion() + " with args : " + + java.util.Arrays.toString(args)); log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); - log.info("Java version: " + System.getProperty("java.runtime.version")); + log.info("Java version: " + System.getProperty("java.runtime.version") + + "(" + System.getProperty("os.arch") + ")"); log.info("Java VM: " + System.getProperty("java.vm.name")); - log.info("System arch: " + System.getProperty("os.arch")); - log.info("R_HOME: " + System.getenv("R_HOME")); - log.info("R.type: " + System.getProperty("R.type")); + log.info("R_HOME: " + System.getenv("R_HOME") + + ", R.type: " + System.getProperty("R.type")); log.info("PATH: " + System.getenv("PATH")); }

1 0

r3379 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:26:47 +0000 (Thu, 09 Jun 2011) New Revision: 3379 Log: Fix comments Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2011-06-09 13:26:27 UTC (rev 3378) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2011-06-09 13:26:47 UTC (rev 3379) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2011 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: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2011-06-09 13:26:27 UTC (rev 3378) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2011-06-09 13:26:47 UTC (rev 3379) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2011 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 @@ -146,7 +146,7 @@ try { FactorTree factorTree = (FactorTree) cp; - // elements here, task can be move to task or projects + // elements here, task can be move to group only FactorGroup selectedFactorGroup = factorTree.getSelectedFactorGroup(); if (selectedFactorGroup != null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2011-06-09 13:26:27 UTC (rev 3378) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2011-06-09 13:26:47 UTC (rev 3379) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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

1 0

r3378 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/ui/simulator main/resources/i18n test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:26:27 +0000 (Thu, 09 Jun 2011) New Revision: 3378 Log: Modification dans la gestion des parametres des populations de d?\195?\169part, et parameter de regles, leur noms. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 12:40:59 UTC (rev 3377) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 13:26:27 UTC (rev 3378) @@ -48,6 +48,7 @@ import java.util.concurrent.Executors; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.mutable.MutableInt; @@ -608,9 +609,8 @@ buffer.append("/* factor : ").append(factor.getName()).append(" */\n"); // cas special 1 : population de départ - if (factor.getPath().startsWith("parameters.population.")) { + if (factor.getPath().matches("parameters.population\\.\\w+\\.number")) { String paramName = StringUtils.removeStart(factor.getPath(), "parameters."); - paramName += ".number"; // pas de convert, c'est fait comme ca dans // SimulationParameters.toProperties(); MatrixND matrix = (MatrixND)factor.getValue(); @@ -632,7 +632,13 @@ } buffer.append("params.setProperty(\"rules\",\"").append(StringUtils.join(rulesNames, ",")).append("\");\n"); } - // cas special 3 : equation + // cas special 3 : facteur sur les parametres des regles + else if (factor.getPath().startsWith("parameters.rule.")) { + String paramName = StringUtils.removeStart(factor.getPath(), "parameters."); + String stringValue = ConvertUtils.convert(factor.getValue()); + buffer.append("params.setProperty(\"").append(paramName).append("\",\"").append(stringValue).append("\");\n"); + } + // cas special 4 : equation else if (factor.getDomain() instanceof EquationContinuousDomain) { buffer.append("context.setComputeValue(\"").append(factor.getName()); buffer.append("\",").append(factor.getValue()).append(");\n"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-09 12:40:59 UTC (rev 3377) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-09 13:26:27 UTC (rev 3378) @@ -321,7 +321,7 @@ * in rule list : * for example : * <pre> - * parameters.rule.2.tacPoids + * parameters.rule.2.parameter.tacPoids * </pre> * * Must also rename all next indices. @@ -1286,11 +1286,11 @@ // new factor with rule domain if (source instanceof RuleChooser) { - String factorName = "parameters.rules"; - selectedFactor = getFactor(factorName); + String factorPath = "parameters.rules"; + selectedFactor = getFactor(factorPath); if (selectedFactor == null) { - selectedFactor = new Factor(factorName); - selectedFactor.setPath(factorName); + selectedFactor = new Factor(_("isisfish.sensitivity.rulesfactorname")); + selectedFactor.setPath(factorPath); selectedFactor.setDomain(new RuleDiscreteDomain()); } } @@ -1298,11 +1298,11 @@ // new factor with matrix continous domain else if (source instanceof MatrixPanelEditor) { Population population = (Population)source.getClientProperty("sensitivityPopulation"); - String factorName = "parameters.population." + population.getName(); - selectedFactor = getFactor(factorName); + String factorPath = "parameters.population." + population.getName() + ".number"; + selectedFactor = getFactor(factorPath); if (selectedFactor == null) { - selectedFactor = new Factor(factorName); - selectedFactor.setPath(factorName); + selectedFactor = new Factor(_("isisfish.sensitivity.populationfactorname", population.getName())); + selectedFactor.setPath(factorPath); MatrixContinuousDomain factorDomain = new MatrixContinuousDomain(); MatrixND populationEffectives = getSimulationParameter().getNumberOf(population); factorDomain.setReferenceValue(populationEffectives.copy()); @@ -1341,15 +1341,16 @@ // with rule list, if a rule is deleted, factor on it must // be deleted too, et next factor must be renamed int index = ruleChooser.getRulesList().indexOf(rule); - String factorName = "parameters.rule." + index + "." + paramName; + String factorPath = "parameters.rule." + index + ".parameter." + paramName; try { // arrivé ici, on doit pouvoir la mettre en facteur Object object = RuleStorage.getParameterValue(rule, paramName); // init new factor wizard ui FactorWizardUI factorWizardUI = new FactorWizardUI(ruleChooser); - factorWizardUI.getFactorNameField().setText(factorName); - factorWizardUI.setFactorPath(factorName); + factorWizardUI.getFactorNameField().setText(_("isisfish.sensitivity.ruleparameterfactorname", + rule.getClass().getSimpleName(), paramName)); + factorWizardUI.setFactorPath(factorPath); handler.initNewFactorWithValue(factorWizardUI, object); factorWizardUI.pack(); factorWizardUI.setLocationRelativeTo(ruleChooser); Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-09 12:40:59 UTC (rev 3377) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-09 13:26:27 UTC (rev 3378) @@ -867,7 +867,10 @@ isisfish.sensitivity.name=Factor name isisfish.sensitivity.newfactorgroup.tip=Add new factor group isisfish.sensitivity.newfactorname=Factor group name +isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Reference value +isisfish.sensitivity.ruleparameterfactorname=Param rule \: %s.%s +isisfish.sensitivity.rulesfactorname=Rule set isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results isisfish.sensitivity.select=Method Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 12:40:59 UTC (rev 3377) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 13:26:27 UTC (rev 3378) @@ -867,7 +867,10 @@ isisfish.sensitivity.name=Nom du facteur isisfish.sensitivity.newfactorgroup.tip=Ajouter un groupe de facteur isisfish.sensitivity.newfactorname=Nom du groupe de facteurs +isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Valeur de référence +isisfish.sensitivity.ruleparameterfactorname=Param règle \: %d.%d +isisfish.sensitivity.rulesfactorname=Ensemble de règles isisfish.sensitivity.secondpass=Analyse des résultats isisfish.sensitivity.secondpass.title=Analyse des résultats isisfish.sensitivity.select=Méthode Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-09 12:40:59 UTC (rev 3377) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-09 13:26:27 UTC (rev 3378) @@ -373,7 +373,7 @@ // factor pop Factor factorPop = new Factor("myPopulationParams"); factorPop.setDomain(new MatrixContinuousDomain()); - factorPop.setPath("parameters.population.xxx"); + factorPop.setPath("parameters.population.xxx.number"); MatrixND mat = MatrixFactory.getInstance().create(new int[]{2, 3}); MatrixHelper.convertToId(mat); factorPop.setValue(mat); @@ -413,6 +413,37 @@ } /** + * Test que la generation du prescript avec l'ajout des facteurs sur + * les parametres de regles. + * + * @since 3.4.0.0 + * @throws IsisFishException + */ + @Test + public void testPrescriptGenerationRulesParameters() throws IsisFishException { + + // build test scenario + Scenario scenario1 = new Scenario(); + + // factor pop + Factor factorPop = new Factor("parameters of rule TACpoids"); + factorPop.setDomain(new MatrixContinuousDomain()); + factorPop.setPath("parameters.rule.0.parameter.tacInTons"); + factorPop.setValue(42.0); + + List<Factor> factors = new ArrayList<Factor>(); + factors.add(factorPop); + scenario1.setFactors(factors); + + // generate prescript for that wonderfull scenario + SimulationService service = SimulationService.getService(); + String preScriptContent = service.generatePreScript(scenario1); + log.info("Script = " + preScriptContent); + + Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.tacInTons\",\"42.0\");")); + } + + /** * Test que la generation du prescript avec l'ajout des groupes des facteurs * depuis IsisFish 3.4.0.0 fonctionne correctement. *

1 0

r3377 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 12:40:59 +0000 (Thu, 09 Jun 2011) New Revision: 3377 Log: Close context after setting factors nominal values Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 12:29:19 UTC (rev 3376) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 12:40:59 UTC (rev 3377) @@ -438,8 +438,15 @@ // get a TopiaContext on region database, for discret domain // to get original database value (Nominal value) RegionStorage regionStorage = RegionStorage.getRegion(param.getRegionName()); - TopiaContext context = regionStorage.getStorage().beginTransaction(); - fillDesignPlanNominalValue(context, designPlan); + TopiaContext context = null; + try { + context = regionStorage.getStorage().beginTransaction(); + fillDesignPlanNominalValue(context, designPlan); + } finally { + if (context != null) { + context.closeContext(); + } + } // Sensitivity scenario returned contains same factor references // as input design plan. Factor group are still present

1 0

r3376 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 12:29:19 +0000 (Thu, 09 Jun 2011) New Revision: 3376 Log: Imports Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 12:28:44 UTC (rev 3375) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 12:29:19 UTC (rev 3376) @@ -36,10 +36,8 @@ import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import javax.imageio.ImageIO; import javax.swing.JLabel;

1 0

r3375 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 12:28:44 +0000 (Thu, 09 Jun 2011) New Revision: 3375 Log: sysout Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:25:52 UTC (rev 3374) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:28:44 UTC (rev 3375) @@ -411,7 +411,7 @@ File tempFile = File.createTempFile("testdesignplan", ".xml"); tempFile.deleteOnExit(); FileUtils.writeStringToFile(tempFile, content); - System.out.println(content); + // test to read it and get content DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null); String reReadContent = MexicoHelper.getDesignPlanAsXML(plan);

1 0

r3374 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml test/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 12:25:52 +0000 (Thu, 09 Jun 2011) New Revision: 3374 Log: Fix test (design plan save/reloading) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -61,7 +61,7 @@ */ protected void appendDomain(ContinuousDomain domain) { // facteur continue pourcentage - if (domain.getCoefficient() != null || domain.getReferenceValue() != null) { + if (domain.isPercentageType()) { xmlBuffer.append("<reference coefficient=\"" + domain.getCoefficient() + "\">"); xmlBuffer.append(domain.getReferenceValue()); xmlBuffer.append("</reference>"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -155,7 +155,7 @@ if (property.endsWith(CONTINUOUS)) { ContinuousDomain domain; - if(property.equals(MATRIXCONTINUOUS)) { + if (property.equals(MATRIXCONTINUOUS)) { // matrix specific // <coefficient operator="-" value="0.799"/> MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); @@ -350,7 +350,7 @@ ContinuousDomain domain; if(property.equals(MATRIXCONTINUOUS)) { - MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); + MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); Element referenceElement = fixedElement.element(REFERENCE); if (referenceElement != null) { // matrix specific Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -68,7 +68,7 @@ EquationContinuousDomain eDomain = (EquationContinuousDomain)domain; // facteur continue pourcentage - if (domain.getCoefficient() != null || domain.getReferenceValue() != null) { + if (domain.isPercentageType()) { xmlBuffer.append("<reference coefficient=\"") .append(eDomain.getCoefficient()) .append( "\">"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -165,7 +165,7 @@ // factor 1 Factor factorContinuousPercentage = new Factor("factor 6 (double continuous percentage)"); - ContinuousDomain domain6 = new ContinuousDomain(); + ContinuousDomain domain6 = new ContinuousDomain(true); domain6.setCoefficient(5.0); domain6.setReferenceValue(14.0); domain6.setCardinality(5); @@ -379,7 +379,7 @@ // factor x1 Factor factorContinuous = new Factor("factor x1"); - ContinuousDomain domain1 = new ContinuousDomain(); + ContinuousDomain domain1 = new ContinuousDomain(true); domain1.setReferenceValue(42.0); domain1.setCoefficient(0.05); factorContinuous.setDomain(domain1); @@ -411,7 +411,7 @@ File tempFile = File.createTempFile("testdesignplan", ".xml"); tempFile.deleteOnExit(); FileUtils.writeStringToFile(tempFile, content); - + System.out.println(content); // test to read it and get content DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null); String reReadContent = MexicoHelper.getDesignPlanAsXML(plan);

1 0

r3373 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/vcs test/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 12:04:28 +0000 (Thu, 09 Jun 2011) New Revision: 3373 Log: Avoir le status local dans getRemoteStatus (bof), deplacement dans getLocalStatus (mieux) Fix tests. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-06-09 10:30:14 UTC (rev 3372) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-06-09 12:04:28 UTC (rev 3373) @@ -59,7 +59,7 @@ STATUS_NORMAL, STATUS_ADDED, STATUS_MODIFIED, - STATUS_DELETED, + STATUS_DELETED } /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 10:30:14 UTC (rev 3372) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 12:04:28 UTC (rev 3373) @@ -313,8 +313,11 @@ @Override public List<File> checkFileStatus() throws VCSException { List<File> fileInConflict = null; - + Map<File, SVNStatus> status = getRemoteStatus(null, true); + // add local missing files + status.putAll(getLocalStatus(null, true, SVNStatusType.STATUS_MISSING)); + // si des fichiers ont ete mis a jour sur le serveur on se synchronise if (status.size() > 0) { if (fireAction(VCSActionEvent.UPDATE_REPOSITORY, status.keySet() @@ -620,13 +623,11 @@ if ((acceptedStatusType.isEmpty() && status.getContentsStatus() != SVNStatusType.STATUS_NONE && status .getContentsStatus() != SVNStatusType.STATUS_NORMAL) - || acceptedStatusType.contains(status - .getContentsStatus())) { + || acceptedStatusType.contains(status.getContentsStatus())) { File statusFile = status.getFile(); - if (statusFile.exists() - && (!statusFile.isDirectory() - || status.getRemoteContentsStatus() == SVNStatusType.STATUS_ADDED || status - .getRemoteContentsStatus() == SVNStatusType.STATUS_DELETED)) { + if (!statusFile.isDirectory() || + status.getRemoteContentsStatus() == SVNStatusType.STATUS_ADDED || + status.getRemoteContentsStatus() == SVNStatusType.STATUS_DELETED) { // on ne met pas les repertoires pere dans le status // car en fait ca veut dire qu'un fichier/rep dans ce // repertoire a ete ajout/modifier/delete, et on l'aura @@ -662,7 +663,6 @@ * <ul> * <li>SVNStatusType.STATUS_ADDED (remote) pour ajout local * <li>SVNStatusType.STATUS_DELETED (remote) pour suppression locale - * <li>SVNStatusType.MISSING (local) pour restauration * </ul> * * @param file @@ -687,12 +687,12 @@ + status.getRemoteContentsStatus() + " lstatus:" + status.getContentsStatus()); } - if (status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_ADDED) || - status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_DELETED) || - status.getContentsStatus().equals(SVNStatusType.STATUS_MISSING)) { - + if (!status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_NONE) && + !status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_NORMAL)) { File statusFile = status.getFile(); - if (!statusFile.isDirectory()) { + if (!statusFile.isDirectory() || + status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_ADDED) || + status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_DELETED)) { // on ne met pas les repertoires pere dans le status // car en fait ca veut dire qu'un fichier/rep dans ce // repertoire a ete ajout/modifier/delete, et on l'aura Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2011-06-09 10:30:14 UTC (rev 3372) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2011-06-09 12:04:28 UTC (rev 3373) @@ -51,6 +51,7 @@ import org.tmatesoft.svn.core.wc.SVNCopySource; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNStatus; +import org.tmatesoft.svn.core.wc.SVNStatusType; import org.tmatesoft.svn.core.wc.SVNUpdateClient; import org.tmatesoft.svn.core.wc.SVNWCClient; @@ -962,8 +963,7 @@ vcs.checkout(null, false); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" - + remoteRepo.getAbsolutePath()); + SVNURL svnURL = SVNURL.parseURIDecoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); SVNClientManager svnManager = SVNClientManager.newInstance(); @@ -1253,7 +1253,7 @@ * @throws IOException */ @Test - public void testGetLocalStatus() throws VCSException, SVNException, + public void testGetLocalStatusModified() throws VCSException, SVNException, IOException { // log @@ -1271,4 +1271,36 @@ Assert.assertEquals(Status.STATUS_MODIFIED, vcs.getLocalStatus(file)); } + + /** + * Test file local status. + * + * - Checkout + * - delete file (file system delete) + * - tests + * + * @throws VCSException + * @throws SVNException + * @throws IOException + */ + @Test + public void testGetLocalStatusMissing() throws VCSException, SVNException, + IOException { + + // log + if (log.isInfoEnabled()) { + log.info("testGetLocalStatus()"); + } + + // chechout + vcs.checkout(null, false); + + // modif on remote repo + File file = new File(vcs.getLocalRepository(), "scripts" + + File.separator + "version.txt"); + file.delete(); + + Map<File, SVNStatus> statusFiles = vcs.getLocalStatus(file, true, SVNStatusType.STATUS_MISSING); + Assert.assertEquals(1, statusFiles.size()); + } } \ No newline at end of file

1 0

r3372 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 10:30:14 +0000 (Thu, 09 Jun 2011) New Revision: 3372 Log: Fix svn update (wasn't restoring locally missing file) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 10:01:12 UTC (rev 3371) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 10:30:14 UTC (rev 3372) @@ -656,14 +656,21 @@ } /** + * Retourne la liste des fichiers qui ont été mis à jour sur le serveur. + * + * Le status des fichiers retourné est : + * <ul> + * <li>SVNStatusType.STATUS_ADDED (remote) pour ajout local + * <li>SVNStatusType.STATUS_DELETED (remote) pour suppression locale + * <li>SVNStatusType.MISSING (local) pour restauration + * </ul> + * * @param file * @param recurse - * @param wanted * @return remote status * @throws VCSException */ - protected Map<File, SVNStatus> getRemoteStatus(File file, boolean recurse, - SVNStatusType... wanted) throws VCSException { + protected Map<File, SVNStatus> getRemoteStatus(File file, boolean recurse) throws VCSException { try { File localFile = file; @@ -672,21 +679,21 @@ } final Map<File, SVNStatus> result = new HashMap<File, SVNStatus>(); - final Set<SVNStatusType> acceptedStatusType = new HashSet<SVNStatusType>( - Arrays.asList(wanted)); ISVNStatusHandler handler = new ISVNStatusHandler() { public void handleStatus(SVNStatus status) throws SVNException { - if ((acceptedStatusType.size() == 0 - && status.getRemoteContentsStatus() != SVNStatusType.STATUS_NONE && status - .getRemoteContentsStatus() != SVNStatusType.STATUS_NORMAL) - || acceptedStatusType.contains(status - .getRemoteContentsStatus())) { + if (log.isDebugEnabled()) { + log.debug("Status on file " + status.getFile() + " rstatus:" + + status.getRemoteContentsStatus() + " lstatus:" + status.getContentsStatus()); + } + + if (status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_ADDED) || + status.getRemoteContentsStatus().equals(SVNStatusType.STATUS_DELETED) || + status.getContentsStatus().equals(SVNStatusType.STATUS_MISSING)) { + File statusFile = status.getFile(); - if (!statusFile.isDirectory() - || status.getRemoteContentsStatus() == SVNStatusType.STATUS_ADDED - || status.getRemoteContentsStatus() == SVNStatusType.STATUS_DELETED) { - // on ne met pas les repertoires pere dans le status + if (!statusFile.isDirectory()) { + // on ne met pas les repertoires pere dans le status // car en fait ca veut dire qu'un fichier/rep dans ce // repertoire a ete ajout/modifier/delete, et on l'aura // aussi dans les resultats et ca suffit @@ -701,8 +708,8 @@ SVNRevision.HEAD, // SVNRevision revision, SVNDepth.INFINITY, // SVNDepth depth, true, // boolean remote, - !acceptedStatusType.contains(SVNStatusType.STATUS_NORMAL), // boolean reportAll, - acceptedStatusType.contains(SVNStatusType.STATUS_IGNORED), // boolean includeIgnored, + true, // boolean reportAll, + false, // boolean includeIgnored, true, // boolean collectParentExternals, handler, // ISVNStatusHandler handler, null); // Collection changeLists

1 0

r3371 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 10:01:12 +0000 (Thu, 09 Jun 2011) New Revision: 3371 Log: Remove svnkit 1.1 commented code Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-08 13:03:49 UTC (rev 3370) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 10:01:12 UTC (rev 3371) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 Ifremer, CodeLutin + * Copyright (C) 2008 - 2011 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 @@ -521,10 +521,6 @@ File destDir = getLocalRepository(); destDir.mkdirs(); - // getSVNManager().getUpdateClient().doCheckout(source, destDir, null, - // SVNRevision.HEAD, recurse); - - // since svnkit 1.2 SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doCheckout(source, // SVNURL url @@ -640,12 +636,6 @@ } } }; - // getSVNManager().getStatusClient().doStatus(file, - // recurse, - // false, // on remote - // !acceptedStatusType.contains(SVNStatusType.STATUS_NORMAL), // report only change file, - // acceptedStatusType.contains(SVNStatusType.STATUS_IGNORED), // includeIgnored, - // handler); SVNStatusClient statusClient = getSVNManager().getStatusClient(); statusClient.doStatus(localFile, // File @@ -706,13 +696,6 @@ } }; - // getSVNManager().getStatusClient().doStatus(localFile, - // recurse, - // true, // on remote - // !acceptedStatusType.contains(SVNStatusType.STATUS_NORMAL), // report only change file, - // acceptedStatusType.contains(SVNStatusType.STATUS_IGNORED), // includeIgnored, - // handler); - SVNStatusClient statusClient = getSVNManager().getStatusClient(); statusClient.doStatus(localFile, // File path, SVNRevision.HEAD, // SVNRevision revision, @@ -1071,8 +1054,6 @@ update(localFile.getParentFile(), false); } - //getSVNManager().getUpdateClient().doUpdate(file, SVNRevision.HEAD, recurse); - SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doUpdate(localFile, // File file @@ -1093,8 +1074,6 @@ result.addAll(status.keySet()); // on supprime les conflits pour pouvoir commiter convenablement // les fichiers - //getSVNManager().getWCClient().doResolve(localFile, recurse); - // FIXME use conflit resolution choice ? SVNWCClient wcClient = getSVNManager().getWCClient(); wcClient.doResolve(localFile, // File file @@ -1212,10 +1191,7 @@ log.info(_("isisfish.vcs.vcssvn.settag.switchfromto", currentTag, tag)); } - //getSVNManager().getUpdateClient().doSwitch( - // localRoot, newUrl, SVNRevision.HEAD, true); - // svnkit 1.2 code SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doSwitch(localRoot, // File path @@ -1243,7 +1219,6 @@ filesInConflict.addAll(status.keySet()); // on supprime les conflits pour pouvoir commiter convenablement // les fichiers - //getSVNManager().getWCClient().doResolve(localFile, recurse); // FIXME use conflit resolution choice ? SVNWCClient wcClient = getSVNManager().getWCClient();

1 0