r4288 - in trunk/src/main/java/fr/ifremer/isisfish: mexico ui/sensitivity/wizard
Author: echatellier Date: 2015-06-23 16:15:29 +0000 (Tue, 23 Jun 2015) New Revision: 4288 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4288 Log: fixes #7230: Cannot restore sensitivity analysis factor on rule Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2015-06-23 15:31:32 UTC (rev 4287) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2015-06-23 16:15:29 UTC (rev 4288) @@ -520,6 +520,9 @@ result = beanUtils.convert(objectId, Month.class); } } + } else { + // ca peut arriver pour des parametres de type "String" sur les param_ de regles. + result = content; } if (result == null && log.isWarnEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2015-06-23 15:31:32 UTC (rev 4287) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2015-06-23 16:15:29 UTC (rev 4288) @@ -229,12 +229,9 @@ JComponent c = null; if (o != null) { c = getEditorWithValue(factorWizardUI, factor, dDomain, o); + } else if (log.isWarnEnabled()) { + log.warn("Null value in factor"); } - else { - if (log.isWarnEnabled()) { - log.warn("Null value in factor"); - } - } JScrollPane js = new JScrollPane(c); String tabName = t("isisfish.sensitivity.discretevaluelabel", i); factorWizardUI.getTabPane().addTab(tabName, js); @@ -266,7 +263,6 @@ protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Factor factor, Domain domain, Object value) { JComponent result = null; - if (Double.class.isAssignableFrom(value.getClass())) { result = new JTextField(); ((JTextField)result).setText(String.valueOf(value));
participants (1)
-
echatellier@users.forge.codelutin.com