Author: chatellier Date: 2011-05-31 09:31:19 +0000 (Tue, 31 May 2011) New Revision: 3343 Log: Rename RuleDomain to RuleDiscreteDomain Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 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/FactorXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.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/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 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/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 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-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Parse xml using dom. @@ -262,7 +262,7 @@ factor.setPath(path); Element fixedElement = factorElement.element("domain").element("fixed"); if ("discrete".equals(property)) { - RuleDomain domain = new RuleDomain(); + RuleDiscreteDomain domain = new RuleDiscreteDomain(); List<Element> valueElements = fixedElement.element("enumeration").elements("value"); int label = 0; for (Element valueElement : valueElements) { @@ -493,7 +493,7 @@ factor.setPath(path); Element fixedElement = factorElement.element("domain").element("fixed"); if ("discrete".equals(property)) { - RuleDomain domain = new RuleDomain(); + RuleDiscreteDomain domain = new RuleDiscreteDomain(); List<Element> valueElements = fixedElement.element("enumeration").elements("value"); int label = 0; for (Element valueElement : valueElements) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -36,7 +36,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** @@ -93,7 +93,7 @@ else if (referenceValueForType instanceof Integer) { xmlBuffer.append(" type=\"integer\""); } - else if (factor.getDomain() instanceof RuleDomain) { + else if (factor.getDomain() instanceof RuleDiscreteDomain) { xmlBuffer.append(" type=\"rule\""); } xmlBuffer.append(">"); @@ -122,7 +122,7 @@ else if (factor.getDomain() instanceof ContinuousDomain) { visitor = new ContinuousDomainXMLVisitor(); } - else if (factor.getDomain() instanceof RuleDomain) { + else if (factor.getDomain() instanceof RuleDiscreteDomain) { visitor = new RuleDomainXMLVisitor(); } else if (factor.getDomain() instanceof DiscreteDomain) { Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java (from rev 3334, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -0,0 +1,46 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import fr.ifremer.isisfish.rule.Rule; + +/** + * Factor domain for {@link Rule}s. + * + * @author chatellier + * @version $Revision$ + * + * @since 3.4.0.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class RuleDiscreteDomain extends DiscreteDomain { + + /** serialVersionUID. */ + private static final long serialVersionUID = -5611785362638191719L; + +} Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -1,46 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 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 - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.simulator.sensitivity.domain; - -import fr.ifremer.isisfish.rule.Rule; - -/** - * Factor domain for {@link Rule}s. - * - * @author chatellier - * @version $Revision$ - * - * @since 3.4.0.0 - * - * Last update : $Date$ - * By : $Author$ - */ -public class RuleDomain extends DiscreteDomain { - - /** serialVersionUID. */ - private static final long serialVersionUID = -5611785362638191719L; - -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -68,7 +68,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.input.InputAction; @@ -787,7 +787,7 @@ result = new MatrixPanelEditor(); ((MatrixPanelEditor)result).setMatrix((MatrixND)value); } - else if (domain instanceof RuleDomain) { + else if (domain instanceof RuleDiscreteDomain) { result = new RuleChooser(factorWizardUI); ((RuleChooser)result).setRulesList((List<Rule>)value); } 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-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -93,7 +93,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; @@ -946,7 +946,7 @@ DiscreteDomain domain = null; // FIXME echatellier gere le path mieux que ca if ("parameters.rules".equals(path)) { - domain = new RuleDomain(); + domain = new RuleDiscreteDomain(); } else { domain = new DiscreteDomain(); @@ -1283,7 +1283,7 @@ if (selectedFactor == null) { selectedFactor = new Factor(factorName); selectedFactor.setPath(factorName); - selectedFactor.setDomain(new RuleDomain()); + selectedFactor.setDomain(new RuleDiscreteDomain()); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -72,7 +72,9 @@ _("isisfish.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); - pane.setErrorReporter(new ErrorHelper()); + if (cause != null) { + pane.setErrorReporter(new ErrorHelper()); + } JXErrorPane.showDialog(parent, pane); } 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-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -57,7 +57,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Test for MexicoHelper class. @@ -174,7 +174,7 @@ // factor 7 : rule factor Factor factorRuleDiscrete = new Factor("factor 7 (RuleDiscrete)"); - RuleDomain domain7 = new RuleDomain(); + RuleDiscreteDomain domain7 = new RuleDiscreteDomain(); SortedMap<Object, Object> rules = new TreeMap<Object, Object>(); rules.put("ruleset1", Arrays.asList(ruleTacPoids, ruleTailleMin)); rules.put("ruleset2", Arrays.asList(ruleTailleMin)); 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-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -66,7 +66,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Test for {@link SimulationService}. @@ -388,7 +388,7 @@ props.setProperty("rule.0.parameter.propSurvie", "42"); RuleHelper.populateRule(0, regionContext, ruleTailleMin, props); Factor factorRule = new Factor("myRuleParams"); - factorPop.setDomain(new RuleDomain()); + factorPop.setDomain(new RuleDiscreteDomain()); factorRule.setPath("parameters.rules"); List<Rule> rules = new ArrayList<Rule>(); rules.add(ruleTacPoids); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Factors test. @@ -334,7 +334,7 @@ // factor and domain definition Factor factor = new Factor("testrule"); - RuleDomain ruleDomain = new RuleDomain(); + RuleDiscreteDomain ruleDomain = new RuleDiscreteDomain(); ruleDomain.getValues().put("rules1", rules1); ruleDomain.getValues().put("rules2", rules2); ruleDomain.getValues().put("rules3", rules3);