Author: chatellier Date: 2009-04-06 13:50:08 +0000 (Mon, 06 Apr 2009) New Revision: 2072 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Readd default value as argument for getValueAndCompute Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:47:18 UTC (rev 2071) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:50:08 UTC (rev 2072) @@ -165,15 +165,16 @@ protected JButton getActionButton(int i){ return actions.get(i); } -protected void valid(int i){ +protected void valid(int i) { String variableName = datas.get(i).getVariableName(); String[] lines = editor.getEditor().getText().split("\n"); String result = ""; - for (String line : lines){ - Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*).*\\;$"); + for (String line : lines) { + Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { - line = matcher.group(1) + "context.getValueAndCompute(\"" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "\");"; + String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName; + line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; } result += line + "\n"; }