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

r3379 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model
by chatellier＠users.labs.libre-entreprise.org June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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 June 9, 2011

June 9, 2011

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

r3370 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . ui vcs
by chatellier＠users.labs.libre-entreprise.org June 8, 2011

June 8, 2011

Author: chatellier Date: 2011-06-08 13:03:49 +0000 (Wed, 08 Jun 2011) New Revision: 3370 Log: Add configuration for community VCS Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 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/ui/WelcomeHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 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/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -206,6 +206,16 @@ File result = getOptionAsFile(Option.DATABASE_DIRECTORY.key); return result; } + + /** + * Retourne le repertoire racine de toutes les donnees communauté (commit utilisateur). + * + * @return community database directory + */ + public File getCommunityDatabaseDirectory() { + File result = getOptionAsFile(Option.COMMUNITY_DATABASE_DIRECTORY.key); + return result; + } /** * Get database directory to use for script. @@ -957,10 +967,10 @@ */ public static enum Option implements OptionDef { + CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), - CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""), @@ -1002,7 +1012,7 @@ /** Application locale (for i18n init). */ LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"), - + /** Perform ui launch option. */ LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"), /** Perform data migration option. */ @@ -1011,32 +1021,35 @@ PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"), /** Perform cron option. */ PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"), - - /** Database directory. */ - DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), + /** Database lock mode (h2).*/ DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"), - + // SSH (global, for both VCS and caparmor) SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), - //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), - //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), - // can be None, CVS or SVN. only None or SVN work + DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), - // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file - VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.useSshConnexion.description"), "svn"), - - // user login to access vcs + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.protocol.description"), "svn"), VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), + // community vsc + COMMUNITY_DATABASE_DIRECTORY("community.database.directory", n_("isisfish.config.vcs.localCommunityDatabasePath.description"), getUserHome() + File.separator + "isis-community-database-3"), + VCS_COMMUNITY_TYPE("vcs.community.type", n_("isisfish.config.vcs.community.type.description"), VCS.TYPE_SVN), + VCS_COMMUNITY_PROTOCOL("vcs.community.protocole", n_("isisfish.config.vcs.community.protocol.description"), "http"), + VCS_COMMUNITY_USER_NAME("vcs.community.username", n_("isisfish.config.vcs.community.username.description"), ""), + VCS_COMMUNITY_PASSWORD("vcs.community.password", n_("isisfish.config.vcs.community.password.description"), ""), + VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n_("isisfish.config.vcs.community.hostname.description"), "www.isis-fish.org"), + VCS_COMMUNITY_PATH("vcs.community.path", n_("isisfish.config.vcs.community.remotepath.description"), "/svn/isis-fish-community/"), + + // misc options USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); - + public String key; public String description; public String defaultValue; 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-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -112,6 +112,8 @@ static public IsisConfig config = null; static public VCS vcs = null; + + static public VCS communityVcs = null; /** * ask for application quit @@ -141,6 +143,7 @@ // static vcs init (needed for some actions) try { initVCS(); + initCommunityVCS(); } catch (Exception eee) { log.warn(_("Error during vcs initialisation"), eee); } @@ -151,8 +154,6 @@ // after init vcs and local data config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); - - doNuitonMigration(); launchUI(); @@ -174,82 +175,6 @@ } /** - * Move user script to nuiton dependants packages. - * - * Find all files containing "org.codelutin." into "org.nuiton." - */ - protected static void doNuitonMigration() { - if (config.isPerformMigration()) { - // Search in a set of directories - // Searching throw simulations/* can take a huge time... - File[] folders = new File[]{ - AnalysePlanStorage.getAnalysePlanDirectory(), - ExportStorage.getExportDirectory(), - FormuleStorage.getFormuleDirectory(), - RuleStorage.getRuleDirectory(), - ScriptStorage.getScriptDirectory(), - SensitivityStorage.getSensitivityDirectory(), - SensitivityExportStorage.getSensitivityExportDirectory(), - SimulatorStorage.getSimulatorDirectory() - }; - - try { - Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); - for (File folder : folders) { - filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); - } - - if (!filesToMigrate.isEmpty()) { - - // yes by defaut (for tests) - // but ask user if UI launch - boolean migrationOption = true; - if (IsisFish.config.isLaunchUI()) { - // display a user frame - String migratedFiles = ""; - String separator = ""; - for (File fileToMigrate : filesToMigrate.keySet()) { - migratedFiles += separator + fileToMigrate.toString(); - separator = "\n"; - } - JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); - JTextArea areaModifiedFiles = new JTextArea(migratedFiles); - areaModifiedFiles.setEditable(false); - areaModifiedFiles.setAutoscrolls(true); - JScrollPane sp = new JScrollPane(areaModifiedFiles); - sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge - migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); - } - - // if migration has to be done - if (migrationOption) { - if (log.isInfoEnabled()) { - log.info("Starting nuiton.org migration for user scripts :"); - } - - for (File fileToMigrate : filesToMigrate.keySet()) { - if (log.isInfoEnabled()) { - log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); - } - FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); - } - } - } - } - catch(IOException eee) { - if (log.isErrorEnabled()) { - log.error("Can't to nuiton migration", eee); - } - } - } - else { - if (log.isInfoEnabled()) { - log.info(_("Skip data migration (disabled)")); - } - } - } - - /** * Install "Nimbus" LookAndFeel if available. * * @throws InstantiationException @@ -297,6 +222,7 @@ // 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("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); log.info("Java version: " + System.getProperty("java.runtime.version")); log.info("Java VM: " + System.getProperty("java.vm.name")); @@ -385,16 +311,6 @@ } /** - * Switch le vcs vers VCSNone et le sauvegarde pour le prochain lancement - */ - protected static void switchToNoneVCS() { - log.info(_("Switch repository type to none")); - config.setOption(IsisConfig.Option.VCS_TYPE.key, VCS.TYPE_NONE); - config.saveForUser(); - vcs = VCSFactory.createVCS(config); - } - - /** * Initialise le VCS et check s'il y a des mises à jour pour * prevenir l'utilisateur. * @@ -436,7 +352,10 @@ "Can't rename local repository that don't use svn"); } } else { - switchToNoneVCS(); + log.info(_("Switch repository type to none")); + config.setOption(IsisConfig.Option.VCS_TYPE.key, VCS.TYPE_NONE); + config.saveForUser(); + vcs = VCSFactory.createVCS(config); } } } @@ -447,8 +366,7 @@ log.info(_("Local repository don't exist")); } if (!vcs.isConnected()) { - ErrorHelper.showErrorDialog(_( - "isisfish.vcs.init.notfoundcantdownload", + ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", IsisConfig.getApiVersion()), null); } else { // Si on utilise pas le bon tag on change de tag @@ -540,11 +458,94 @@ else { // VCS can't be null // set none if ui isn't launched - config.setOption(VCS.VCS_TYPE, "none"); // to make him happy + config.setOption(VCS.VCS_TYPE, VCS.TYPE_NONE); // to make him happy vcs = VCSFactory.createVCS(config); } } + + /** + * Initialise le VCS et check s'il y a des mises à jour pour + * prevenir l'utilisateur. + * + * @throws VCSException + */ + static public void initCommunityVCS() throws VCSException { + // vcs must be done is ui is enabled too + if (config.isLaunchUI() && config.isPerformVcsUpdate()) { + + // init vcs + // in graphical mode, real VCS + communityVcs = VCSFactory.createPublicVCS(config); + + VCSActionAsker asker = new VCSActionAsker(); + communityVcs.addVetoableActionListener(asker); + + // Si le repo local exist mais n'est pas du bon type, on renome ce repertoire + File local = config.getCommunityDatabaseDirectory(); + + if (local.exists()) { + if (!communityVcs.isValidLocalRepository()) { + if (log.isInfoEnabled()) { + log.info(_("Local repository exists but it's not valide for current vcs: %s", + config.getOption(VCS.VCS_TYPE))); + } + if (ask(_("isisfish.vcs.init.wrongprotocol", local))) { + File localBackup = new File(local.getParentFile(), + local.getName() + "-" + + new SimpleDateFormat("yyyy-mm-dd-HH-mm-ss").format(new java.util.Date())); + if (log.isInfoEnabled()) { + log.info(_("Rename data directory to %s", localBackup)); + } + if (!local.renameTo(localBackup)) { + throw new IsisFishRuntimeException( + "Can't rename local repository that don't use svn"); + } + } else { + log.info(_("Switch repository type to none")); + config.setOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key, VCS.TYPE_NONE); + config.saveForUser(); + communityVcs = VCSFactory.createPublicVCS(config); + } + } + } + + // Si le repo local n'existe pas on fait un check out complet + if (!local.exists()) { + if (log.isInfoEnabled()) { + log.info(_("Local repository don't exist")); + } + if (!communityVcs.isConnected()) { + ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", + "trunk"), null); + } else { + // initialise le repo local + communityVcs.checkout(null, true); + } + } + + // on s'arrete la si on est pas connecte + if (communityVcs.isConnected()) { + + // cleanup + communityVcs.cleanup(null); + + // check protocol, user, host + communityVcs.checkProtocol(); + + } + + // fin de l'init on supprime le vetoable du vcs + communityVcs.remoteVetoableActionListener(asker); + } + else { + // VCS can't be null + // set none if ui isn't launched + config.setOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key, VCS.TYPE_NONE); // to make him happy + communityVcs = VCSFactory.createPublicVCS(config); + } + } + /** * Display dialog with files list, and specifique label. * @@ -625,8 +626,6 @@ // init IsisTray IsisTray.getInstance(); - //initRSyntaxJavaSupport(config); - // configure swing session // can't be in config ? getUserConfigDirectory() not static File isisConfigDirectory = new File(config.getUserConfigDirectory(), "isis-fish"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -202,7 +202,7 @@ } /** - * Show config frame (Jaxx based). + * Show config frame. * * @param welcomeUI parent ui */ @@ -213,6 +213,7 @@ modelBuilder.addCategory(_("isisfish.config.category.main"), _("isisfish.config.category.main.description")); modelBuilder.addOption(IsisConfig.Option.CONFIG_FILE); modelBuilder.addOption(IsisConfig.Option.DATABASE_DIRECTORY); + modelBuilder.addOption(IsisConfig.Option.COMMUNITY_DATABASE_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.COMPILATION_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.MONITORING_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.JAVADOC_DIRECTORY); @@ -220,15 +221,24 @@ modelBuilder.addOption(IsisConfig.Option.LOCALE); modelBuilder.addOption(IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR); - // category control - modelBuilder.addCategory(_("isisfish.config.category.versioning"), _("isisfish.config.category.versioning.description")); + // category database vcs + modelBuilder.addCategory(_("isisfish.config.category.officialvcs"), _("isisfish.config.category.officialvcs.description")); modelBuilder.addOption(IsisConfig.Option.VCS_TYPE); modelBuilder.addOption(IsisConfig.Option.VCS_PROTOCOL); + modelBuilder.addOption(IsisConfig.Option.VCS_HOST_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_PATH); modelBuilder.addOption(IsisConfig.Option.VCS_USER_NAME); modelBuilder.addOption(IsisConfig.Option.VCS_USER_PASSWORD); - modelBuilder.addOption(IsisConfig.Option.VCS_HOST_NAME); - modelBuilder.addOption(IsisConfig.Option.VCS_PATH); + // category community vcs + modelBuilder.addCategory(_("isisfish.config.category.communityvcs"), _("isisfish.config.category.communityvcs.description")); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_TYPE); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PROTOCOL); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_HOST_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PATH); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_USER_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PASSWORD); + // category misc modelBuilder.addCategory(_("isisfish.config.category.misc"), _("isisfish.config.category.misc.description")); modelBuilder.addOption(IsisConfig.Option.SSH_KEY_FILE); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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 @@ -49,26 +49,29 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(VCSFactory.class); - private VCSFactory() {} + protected static final Properties TYPE_ALIASES = new Properties(); + static { + TYPE_ALIASES.setProperty("", VCSNone.class.getName()); + TYPE_ALIASES.setProperty(VCS.TYPE_NONE, VCSNone.class.getName()); + TYPE_ALIASES.setProperty(VCS.TYPE_SVN, VCSSVN.class.getName()); + } + + private VCSFactory() { + + } + /** - * VCSNone factory, looking for vcs.type key in config to find vcs class to used. + * VCS factory, looking for vcs.type key in config to find vcs class to used. * If no vcs.type found or is not valid class, use {@link VCSNone}. * - * @param config - * @return usable VCSNone + * @param config config + * @return usable VCS */ static public VCS createVCS(IsisConfig config) { - Properties aliases = new Properties(); - // for empty and TYPE_NONE we used this class - aliases.setProperty("", VCSNone.class.getName()); - aliases.setProperty(VCS.TYPE_NONE, VCSNone.class.getName()); - aliases.setProperty(VCS.TYPE_SVN, VCSSVN.class.getName()); - - VCS result = null; String type = config.getOption(VCS.VCS_TYPE); // try to convert if type is not class name but an alias - String classname = aliases.getProperty(type, type); + String classname = TYPE_ALIASES.getProperty(type, type); File dataDir = config.getDatabaseDirectory(); String protocol = config.getOption(VCS.VCS_PROTOCOL); @@ -78,13 +81,56 @@ String login = config.getOption(VCS.VCS_USER_NAME); String password = config.getOption(VCS.VCS_USER_PASSWORD); + VCS result = makeVCSInstance(classname, dataDir, protocol, host, path, sshKeyFile, login, password); + return result; + } + + /** + * Create VCS to manage community VCS repository. + * + * @param config config + * @return usable VCS + */ + static public VCS createPublicVCS(IsisConfig config) { + String type = config.getOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key); + // try to convert if type is not class name but an alias + String classname = TYPE_ALIASES.getProperty(type, type); + + File dataDir = config.getCommunityDatabaseDirectory(); + String protocol = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PROTOCOL.key); + String host = config.getOption(IsisConfig.Option.VCS_COMMUNITY_HOST_NAME.key); + String path = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PATH.key); + File sshKeyFile = config.getSSHPrivateKeyFilePath(); + String login = config.getOption(IsisConfig.Option.VCS_COMMUNITY_USER_NAME.key); + String password = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PASSWORD.key); + + VCS result = makeVCSInstance(classname, dataDir, protocol, host, path, sshKeyFile, login, password); + return result; + } + + /** + * Make CSV instance. + * + * @param classname class name + * @param dataDir root data dir + * @param protocol protocol + * @param host host + * @param path path + * @param sshKeyFile ssh key file + * @param login login + * @param password password + * @return CSV instance + */ + static protected VCS makeVCSInstance(String classname, File dataDir, String protocol, + String host, String path, File sshKeyFile, String login, String password) { + VCS result = null; try { - Class<?> clazz = (Class<?>) ConvertUtils.convert(classname, Class.class); + Class clazz = (Class) ConvertUtils.convert(classname, Class.class); result = (VCS) ConstructorUtils.invokeConstructor(clazz, new Object[]{dataDir, protocol, host, path, sshKeyFile, login, password}); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.vcs.factory.cantinstanciate", type), eee); + log.error(_("isisfish.vcs.factory.cantinstanciate", classname), eee); } result = new VCSNone(dataDir, protocol, host, path, sshKeyFile, login, password); } 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:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -168,7 +168,7 @@ passphrase = SSHAgent.getAgent().getPassphrase(sshKeyFile); } catch(InvalidPassphraseException e) { - if(log.isWarnEnabled()) { + if (log.isWarnEnabled()) { log.warn("Can't get passphrase for key", e); } } @@ -283,8 +283,7 @@ || !url.getHost().equals(newUrl.getHost())) { if (fireAction(VCSActionEvent.SWITCH_PROTOCOL)) { if (log.isInfoEnabled()) { - log.info(_( - "isisfish.vcs.vcssvn.checkProtocol.relocate", + log.info(_("isisfish.vcs.vcssvn.checkProtocol.relocate", localRoot, url, newUrl)); }

1 0