Author: sletellier Date: 2009-03-23 14:37:38 +0000 (Mon, 23 Mar 2009) New Revision: 2027 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Evaluating script enabled Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-03-23 14:33:34 UTC (rev 2026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-03-23 14:37:38 UTC (rev 2027) @@ -539,7 +539,7 @@ } public String checkScript(String content) { - String resultLog = ""; + String resultLog = null; try { if (log.isDebugEnabled()) { log.debug("checkScript called"); @@ -563,8 +563,6 @@ if (e == null) { e = new RuntimeException("there is some problem in script"); } - } else { - resultLog = "ok"; } } catch (IOException ex) { if (log.isErrorEnabled()) { @@ -583,7 +581,7 @@ String msg = ""; try { String checkResult = checkScript(content); - if (checkResult != null && !"ok".equals(checkResult)) { + if (checkResult != null) { return checkResult; } code.setContent(content); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-03-23 14:33:34 UTC (rev 2026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-03-23 14:37:38 UTC (rev 2027) @@ -238,7 +238,8 @@ protected void paste(){ } protected void checkScript(){ - actionLogArea.setText(getContextValue(ScriptAction.class).checkScript(editor.getText())); + String txt = getContextValue(ScriptAction.class).checkScript(editor.getText()); + actionLogArea.setText(txt == null ? "ok" : txt); setInfoText(_("isisfish.message.check.finished")); } protected void evaluateScript(){