Author: sletellier Date: 2011-12-28 17:13:13 +0100 (Wed, 28 Dec 2011) New Revision: 14 Url: http://forge.codelutin.com/repositories/revision/jmexico/14 Log: - Remove s for association names Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java trunk/jmexico-model/src/main/xmi/mexico.zargo trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditorHandler.java trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2011-12-28 16:13:13 UTC (rev 14) @@ -55,7 +55,7 @@ this.scenarioFactorValueListenerMap = Maps.newHashMap(); this.scenarioListenerList = new EventListenerList(); this.factorListenerList = new EventListenerList(); - addPropertyChangeListener(PROPERTY_SCENARIOS, new PropertyChangeListener() { + addPropertyChangeListener(PROPERTY_SCENARIO, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent propertyChangeEvent) { @@ -75,11 +75,11 @@ } @Override - public void addScenarios(final Scenario scenarios) { - if (this.scenarios == null) { - this.scenarios = Lists.newArrayList(); + public void addScenario(final Scenario scenarios) { + if (this.scenario == null) { + this.scenario = Lists.newArrayList(); } - super.addScenarios(scenarios); + super.addScenario(scenarios); ScenarioFactorValueListener scenarioFactorValueListener = new ScenarioFactorValueListener() { @@ -95,31 +95,31 @@ } @Override - public void addAllScenarios(Collection<Scenario> scenarios) { + public void addAllScenario(Collection<Scenario> scenarios) { for (Scenario scenario : scenarios) { - addScenarios(scenario); + addScenario(scenario); } } - public void setScenarios(Collection<Scenario> scenarios) { - addAllScenarios(scenarios); + public void setScenario(Collection<Scenario> scenarios) { + addAllScenario(scenarios); } @Override - public boolean removeScenarios(Scenario scenarios) { + public boolean removeScenario(Scenario scenario) { // Remove listener - scenarios.removeFactorValueListener(scenarioFactorValueListenerMap.get(scenarios)); - scenarioFactorValueListenerMap.remove(scenarios); + scenario.removeFactorValueListener(scenarioFactorValueListenerMap.get(scenario)); + scenarioFactorValueListenerMap.remove(scenario); - return super.removeScenarios(scenarios); + return super.removeScenario(scenario); } @Override - public boolean removeAllScenarios(Collection<Scenario> scenarios) { + public boolean removeAllScenario(Collection<Scenario> scenarios) { boolean removed = false; for (Scenario scenario : scenarios) { - removed = removeScenarios(scenario); + removed = removeScenario(scenario); } return removed; } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java 2011-12-28 16:13:13 UTC (rev 14) @@ -40,7 +40,7 @@ public static final String EXPERIMENT_DESIGN_AUTHOR = ExperimentDesign.PROPERTY_AUTHOR; public static final String EXPERIMENT_DESIGN_LICENCE = ExperimentDesign.PROPERTY_LICENCE; public static final String EXPERIMENT_DESIGN_DESCRIPTION = ExperimentDesign.PROPERTY_DESCRIPTION; - public static final String FACTORS = ExperimentDesign.PROPERTY_FACTORS; + public static final String FACTORS = "factors"; public static final String FACTOR = Introspector.decapitalize(Factor.class.getSimpleName()); public static final String FACTOR_ID = Factor.PROPERTY_ID; public static final String FACTOR_NAME = Factor.PROPERTY_NAME; Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2011-12-28 16:13:13 UTC (rev 14) @@ -147,7 +147,7 @@ // factor factors.add(parseFactor(parser)); } - model.setFactors(factors); + model.setFactor(factors); } // read experience design next tag @@ -199,7 +199,7 @@ // read next tag parser.nextTag(); } - factor.setFeatures(features); + factor.setFeature(features); } } @@ -262,7 +262,7 @@ // read next start tag eventType = parser.nextTag(); } - domain.setDistributionParameters(distributionParameters); + domain.setDistributionParameter(distributionParameters); } // level Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2011-12-28 16:13:13 UTC (rev 14) @@ -104,7 +104,7 @@ // factor scenarios.add(parseScenario(parser)); } - model.setScenarios(scenarios); + model.setScenario(scenarios); } } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java 2011-12-28 16:13:13 UTC (rev 14) @@ -103,7 +103,7 @@ } protected void composeFactors(XmlNode rootXmlNode) { - Collection<Factor> factors = model.getFactors(); + Collection<Factor> factors = model.getFactor(); // do nothing if no factors in model if (factors.isEmpty()) { @@ -136,7 +136,7 @@ addParameter(domainXmlNode, DOMAIN_DISTRIBUTION_NAME, domain.getDistributionName()); // distributionParameters - Collection<DistributionParameter> distributionParameters = domain.getDistributionParameters(); + Collection<DistributionParameter> distributionParameters = domain.getDistributionParameter(); if (distributionParameters != null) { for (DistributionParameter distributionParameter : distributionParameters) { XmlNode distributionParameterXmlNode = XmlNode.createElement(domainXmlNode, DOMAIN_DISTRIBUTION_PARAMETER); @@ -158,7 +158,7 @@ } // features - addAllFeature(factorXmlNode, factor.getFeatures()); + addAllFeature(factorXmlNode, factor.getFeature()); } } } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java 2011-12-28 16:13:13 UTC (rev 14) @@ -77,7 +77,7 @@ protected void composeScenarios(XmlNode rootXmlNode) { // scenarios - for (Scenario scenario : model.getScenarios()) { + for (Scenario scenario : model.getScenario()) { XmlNode scenariosXmlNode = XmlNode.createElement(rootXmlNode, SCENARIO); addParameter(scenariosXmlNode, SCENARIO_NAME, scenario.getName()); addParameter(scenariosXmlNode, SCENARIO_ORDER_NUMBER, scenario.getOrderNumber()); @@ -91,7 +91,7 @@ } // features - addAllFeature(scenariosXmlNode, scenario.getFeatures()); + addAllFeature(scenariosXmlNode, scenario.getFeature()); } } } Modified: trunk/jmexico-model/src/main/xmi/mexico.zargo =================================================================== (Binary files differ) Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditorHandler.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditorHandler.java 2011-12-28 16:13:13 UTC (rev 14) @@ -47,7 +47,7 @@ String selectedName = JOptionPane.showInputDialog(editor, _("jmexico.scenario.inputName")); // check that name is never used - Collection<Scenario> scenarios = inputDesign.getScenarios(); + Collection<Scenario> scenarios = inputDesign.getScenario(); int maxOrder = 0; for (Scenario scenario : scenarios) { @@ -77,14 +77,14 @@ scenarioToAdd.setName(selectedName); // create all empty factor values - Collection<Factor> factors = inputDesign.getExperimentDesign().getFactors(); + Collection<Factor> factors = inputDesign.getExperimentDesign().getFactor(); Map<Factor, Object> factorValues = Maps.newHashMap(); for (Factor factor : factors) { factorValues.put(factor, null); } scenarioToAdd.setFactorValues(factorValues); - inputDesign.addScenarios(scenarioToAdd); + inputDesign.addScenario(scenarioToAdd); } public void removeScenario(InputDesignEditor editor) { Modified: trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java 2011-12-27 09:54:49 UTC (rev 13) +++ trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/model/InputDesignTableModel.java 2011-12-28 16:13:13 UTC (rev 14) @@ -77,15 +77,15 @@ } public Collection<Scenario> getScenarios() { - return inputDesign.getScenarios(); + return inputDesign.getScenario(); } public Scenario getScenario(int i) { - return inputDesign.getScenarios(i); + return inputDesign.getScenario(i); } public Factor getFactor(int i) { - return inputDesign.getExperimentDesign().getFactors(i); + return inputDesign.getExperimentDesign().getFactor(i); } @Override @@ -93,7 +93,7 @@ if (inputDesign == null) { return delegate.getRowCount(); } - Collection<Factor> factors = inputDesign.getExperimentDesign().getFactors(); + Collection<Factor> factors = inputDesign.getExperimentDesign().getFactor(); return factors == null ? 0 : factors.size(); }