Added a simple error line highlighting

rssdev10 · rssdev10 · commit c47aa8852970 · 2014-07-31T20:31:34.000+04:00
diff --git a/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeDialog.java b/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeDialog.java
@@ -50,13 +50,16 @@ public class RubyScriptNodeDialog extends NodeDialogPane {
     private JTable table;
     private int counter = 1;
     private JCheckBox m_appendColsCB;
+    private RubyScriptNodeFactory m_factory;
 
     /**
      * New pane for configuring ScriptedNode node dialog.
      * 
      */
-    protected RubyScriptNodeDialog() {
+    protected RubyScriptNodeDialog(RubyScriptNodeFactory factory) {
         super();
+        
+        m_factory = factory;
 
         //scriptTextArea.setAutoscrolls(true);
         //Font font = new Font(Font.MONOSPACED, Font.PLAIN, 12);
@@ -211,6 +214,17 @@ protected final void loadSettingsFrom(final NodeSettingsRO settings,
             script = "";
         }
         m_scriptTextArea.setText(script);
+        m_scriptTextArea.removeAllLineHighlights();
+        RubyScriptNodeModel.ScriptError error = m_factory.getModel().getErrorData();
+        if ( error.lineNum != -1 ) {            
+            try {
+                m_scriptTextArea.addLineHighlight(error.lineNum - 1, Color.red);
+            } catch (BadLocationException e1) {
+                // nothing to do
+                // e1.printStackTrace();
+            }            
+        }
+        
 
         boolean appendCols = settings.getBoolean(
                 RubyScriptNodeModel.APPEND_COLS, true);
diff --git a/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory.java b/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory.java
@@ -12,12 +12,28 @@
  */
 public class RubyScriptNodeFactory extends NodeFactory<RubyScriptNodeModel> {
 
+    private RubyScriptNodeModel m_model;
+    private RubyScriptNodeDialog m_dialog;
+
+    protected RubyScriptNodeModel setModel(RubyScriptNodeModel model) {
+        m_model = model;
+        return model;
+    }
+    
+    public RubyScriptNodeModel getModel() {
+        return m_model;
+    }
+
+    public RubyScriptNodeDialog getDialog() {
+        return m_dialog;
+    }
+    
     /**
      * {@inheritDoc}
      */
     @Override
     public RubyScriptNodeModel createNodeModel() {
-        return new RubyScriptNodeModel(1, 1, false);
+        return setModel(new RubyScriptNodeModel(1, 1, false)); 
     }
 
     /**
@@ -50,6 +66,7 @@ public final boolean hasDialog() {
      */
     @Override
     public final NodeDialogPane createNodeDialogPane() {
-        return new RubyScriptNodeDialog();
+        m_dialog = new RubyScriptNodeDialog(this); 
+        return m_dialog;
     }
 }
diff --git a/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory01.java b/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory01.java
@@ -13,6 +13,6 @@ public class RubyScriptNodeFactory01 extends RubyScriptNodeFactory {
      */
     @Override
     public final RubyScriptNodeModel createNodeModel() {
-        return new RubyScriptNodeModel(0, 1, false);
+        return setModel(new RubyScriptNodeModel(0, 1, false));
     }
 }
diff --git a/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory22.java b/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeFactory22.java
@@ -13,6 +13,6 @@ public class RubyScriptNodeFactory22 extends RubyScriptNodeFactory {
      */
     @Override
     public final RubyScriptNodeModel createNodeModel() {
-        return new RubyScriptNodeModel(2, 2, false);
+        return setModel(new RubyScriptNodeModel(2, 2, false));
     }
 }
diff --git a/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeModel.java b/RubyScript/src/org/knime/ext/jruby/RubyScriptNodeModel.java
@@ -76,29 +76,33 @@ public class RubyScriptNodeModel extends NodeModel {
     
     private boolean snippetMode;
 
-    private class ScriptError {
-        public int errorLine;
-        public int errorColumn;
-        public String errorType;
-        public String errorText;
-        public String errorTrace;
+    public class ScriptError {
+        public int lineNum;
+        public int columnNum;
+        public String type;
+        public String text;
+        public String trace;
         public String msg;        
 
         public ScriptError() {
           clear();
         }
         
         public void clear() {
-            errorLine = -1;
-            errorColumn = -1;
-            errorType = "--UnKnown--";
-            errorText = "--UnKnown--";
-            errorTrace = "";
+            lineNum = -1;
+            columnNum = -1;
+            type = "--UnKnown--";
+            text = "--UnKnown--";
+            trace = "";
             msg = "";
         }
     }
     
     private ScriptError m_script_error;
+    
+    public ScriptError getErrorData() {
+        return m_script_error;
+    }
 
     protected RubyScriptNodeModel(int inNumInputs, int inNumOutputs, boolean snippetMode) {
         super(inNumInputs, inNumOutputs);
@@ -319,7 +323,7 @@ protected final BufferedDataTable[] execute(final BufferedDataTable[] inData,
             } else {
                 findErrorSource(e, script_fn);
                 logger.error("Script error in line: "
-                        + m_script_error.errorLine);
+                        + m_script_error.lineNum);
             }
             throw new CanceledExecutionException(e.getMessage());
         }
@@ -338,7 +342,6 @@ protected final BufferedDataTable[] execute(final BufferedDataTable[] inData,
      */
     protected final DataTableSpec[] configure(final DataTableSpec[] inSpecs)
             throws InvalidSettingsException {
-        m_script_error.clear();
 
         appendCols &= numInputs > 0;
         // append the property columns to the data table spec
@@ -445,6 +448,8 @@ protected final void loadValidatedSettingsFrom(final NodeSettingsRO settings)
         appendCols = settings.getBoolean(APPEND_COLS, true);
         columnNames = settings.getStringArray(COLUMN_NAMES);
         columnTypes = settings.getStringArray(COLUMN_TYPES);
+
+        m_script_error.clear();
     }
 
     /**
@@ -484,12 +489,12 @@ private int findErrorSource(Throwable thr, String filename) {
             Matcher mLine = pLineS.matcher(err);
             if (mLine.find()) {
                 logger.debug("SyntaxError error line: " + mLine.group(1));
-                m_script_error.errorText = mLine.group(2) == null ? m_script_error.errorText
+                m_script_error.text = mLine.group(2) == null ? m_script_error.text
                         : mLine.group(2);
-                logger.debug("SyntaxError: " + m_script_error.errorText);
-                m_script_error.errorLine = Integer.parseInt(mLine.group(1));
-                m_script_error.errorColumn = -1;
-                m_script_error.errorType = "SyntaxError";
+                logger.debug("SyntaxError: " + m_script_error.text);
+                m_script_error.lineNum = Integer.parseInt(mLine.group(1));
+                m_script_error.columnNum = -1;
+                m_script_error.type = "SyntaxError";
             }
         } else {
             // if (err.startsWith("(NameError)")) {
@@ -500,48 +505,48 @@ private int findErrorSource(Throwable thr, String filename) {
             Pattern type = Pattern.compile("(?<=\\()(\\w*)");
             Matcher mLine = type.matcher(err);
             if (mLine.find()) {
-                m_script_error.errorType = mLine.group(1);
+                m_script_error.type = mLine.group(1);
             }
             Throwable cause = thr.getCause();
             // cause.printStackTrace();
             for (StackTraceElement line : cause.getStackTrace()) {
                 if (line.getFileName().equals(filename)) {
-                    m_script_error.errorText = cause.getMessage();
-                    m_script_error.errorColumn = -1;
-                    m_script_error.errorLine = line.getLineNumber();
-                    m_script_error.errorText = thr.getMessage();
+                    m_script_error.text = cause.getMessage();
+                    m_script_error.columnNum = -1;
+                    m_script_error.lineNum = line.getLineNumber();
+                    m_script_error.text = thr.getMessage();
 
                     Pattern knimeType = Pattern
                             .compile("(?<=org.knime.)(.*)(?=:)");
                     Matcher mKnimeType = knimeType
-                            .matcher(m_script_error.errorText);
+                            .matcher(m_script_error.text);
 
                     if (mKnimeType.find()) {
-                        m_script_error.errorType = mKnimeType.group(1);
+                        m_script_error.type = mKnimeType.group(1);
                     }
 
-                    m_script_error.errorType = "RuntimeError";
+                    m_script_error.type = "RuntimeError";
 
                     break;
                 }
             }
         }
 
         m_script_error.msg = "script";
-        if (m_script_error.errorLine != -1) {
+        if (m_script_error.lineNum != -1) {
             m_script_error.msg += " stopped with error in line "
-                    + m_script_error.errorLine;
-            if (m_script_error.errorColumn != -1) {
+                    + m_script_error.lineNum;
+            if (m_script_error.columnNum != -1) {
                 m_script_error.msg += " at column "
-                        + m_script_error.errorColumn;
+                        + m_script_error.columnNum;
             }
         } else {
             m_script_error.msg += "] stopped with error at line --unknown--";
         }
 
-        if (m_script_error.errorType == "RuntimeError") {
-            logger.error(m_script_error.msg + "\n" + m_script_error.errorType
-                    + " ( " + m_script_error.errorText + " )");
+        if (m_script_error.type == "RuntimeError") {
+            logger.error(m_script_error.msg + "\n" + m_script_error.type
+                    + " ( " + m_script_error.text + " )");
 
             Throwable cause = thr.getCause();
             // cause.printStackTrace();
@@ -563,19 +568,19 @@ private int findErrorSource(Throwable thr, String filename) {
                 builder.append('\n');
             }
 
-            m_script_error.errorTrace = builder.toString();
-            if (m_script_error.errorTrace.length() > 0) {
+            m_script_error.trace = builder.toString();
+            if (m_script_error.trace.length() > 0) {
                 logger.error("\n--- Traceback --- error source first\n"
                         + "line:   class ( method )    file \n"
-                        + m_script_error.errorTrace
+                        + m_script_error.trace
                         + "--- Traceback --- end --------------");
             }
 
-        } else if (m_script_error.errorType != "SyntaxError") {
+        } else if (m_script_error.type != "SyntaxError") {
             logger.error(m_script_error.msg);
             logger.error("Could not evaluate error source nor reason. Analyze StackTrace!");
             logger.error(err);
         }
-        return m_script_error.errorLine;
+        return m_script_error.lineNum;
     }
 }
diff --git a/RubyScript/src/org/knime/ext/jruby/RubySnippetNodeFactory.java b/RubyScript/src/org/knime/ext/jruby/RubySnippetNodeFactory.java
@@ -13,6 +13,6 @@ public class RubySnippetNodeFactory extends RubyScriptNodeFactory {
      */
     @Override
     public final RubyScriptNodeModel createNodeModel() {
-        return new RubyScriptNodeModel(1, 1, true);
+        return setModel(new RubyScriptNodeModel(1, 1, true));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public class RubyScriptNodeFactory01 extends RubyScriptNodeFactory {`
`13`	`13`	`*/`
`14`	`14`	`@Override`
`15`	`15`	`public final RubyScriptNodeModel createNodeModel() {`
`16`		`- return new RubyScriptNodeModel(0, 1, false);`
	`16`	`+ return setModel(new RubyScriptNodeModel(0, 1, false));`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public class RubySnippetNodeFactory extends RubyScriptNodeFactory {`
`13`	`13`	`*/`
`14`	`14`	`@Override`
`15`	`15`	`public final RubyScriptNodeModel createNodeModel() {`
`16`		`- return new RubyScriptNodeModel(1, 1, true);`
	`16`	`+ return setModel(new RubyScriptNodeModel(1, 1, true));`
`17`	`17`	`}`
`18`	`18`	`}`