[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SpaceTool.java, 1.50, 1.51

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2547/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	SpaceTool.java 
Log Message:
Small change to error-handling

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** SpaceTool.java	10 Oct 2006 14:41:33 -0000	1.50
--- SpaceTool.java	11 Oct 2006 06:23:11 -0000	1.51
***************
*** 721,760 ****
        ScriptParser parser = new ScriptParser(lexer);
        parser.script(globals);
!     } catch (Exception error) {
!       log.info(error);
!     }
!     try {
!       Environment global = new Environment(globals, null);
!       Environment env = new Environment(global, new HashMap(), new LinkedList());
!       Reader input = new StringReader(value);
!       ScriptLexer lexer = new ScriptLexer(input);
!       ScriptParser parser = new ScriptParser(lexer);
!       Function function = new Function();
!       parser.statement(function);
!       Stack stack = new Stack();
!       function.evaluate(env, stack);
!       Project.getInstance().getGlobals().define(globals);
!       Project.getInstance().changed(Project.getInstance().getGlobals());
!       
!       Space space = Project.getInstance().getActiveSpace();
!       while (!stack.empty()) {
!         Object result = stack.pop();
!         if (result instanceof Vertex) {
!           result = space.insert((Vertex)result, true);
!           Selection.primary().add(result);
!         } else  if (result instanceof Edge) {
!           result = space.insert((Edge)result, true);
!           Selection.primary().add(result);
!         } else if (result instanceof Surface) {
!           result = space.insert((Surface) result, true);
!           Selection.primary().add(result);
!         } else {
!           glv.setLengthValue(result.toString());
          }
        }
-       typing = false;
      } catch (Exception error) {
!       log.info(error);
      }
      return null;
    }
--- 721,765 ----
        ScriptParser parser = new ScriptParser(lexer);
        parser.script(globals);
!       System.out.println("done parsing globals");
!       try {
!         Environment global = new Environment(globals, null);
!         Environment env = new Environment(global, new HashMap(), new LinkedList());
!         input = new StringReader(value);
!         lexer = new ScriptLexer(input);
!         parser = new ScriptParser(lexer);
!         Function function = new Function();
!         parser.statement(function);
!         Stack stack = new Stack();
!         function.evaluate(env, stack);
!         Project.getInstance().getGlobals().define(globals);
!         Project.getInstance().changed(Project.getInstance().getGlobals());
!         
!         Space space = Project.getInstance().getActiveSpace();
!         while (!stack.empty()) {
!           Object result = stack.pop();
!           if (result instanceof Vertex) {
!             result = space.insert((Vertex)result, true);
!             Selection.primary().add(result);
!           } else  if (result instanceof Edge) {
!             result = space.insert((Edge)result, true);
!             Selection.primary().add(result);
!           } else if (result instanceof Surface) {
!             result = space.insert((Surface) result, true);
!             Selection.primary().add(result);
!           } else {
!             glv.setLengthValue(result.toString());
!           }
          }
+         typing = false;
+       } catch (Exception error) {
+         
+         log.info("runtime error: " + error);
        }
      } catch (Exception error) {
!       log.info("-- error --");
!       log.info("syntax error: " + error);
!       log.info("-----------");
      }
+     
      return null;
    }
***************
*** 772,781 ****
        }
        char ch = event.getKeyChar();
!       if (ch > 31 && ch < 128) {
          value = value + ch;
          glv.setLengthValue(value);
          typing = true;
        } else {
-         log.info(new Character(ch));
          if (event.getKeyCode() == KeyEvent.VK_ENTER) {
            evaluate(value);
--- 777,785 ----
        }
        char ch = event.getKeyChar();
!       if (ch > 31 && ch < 256) {
          value = value + ch;
          glv.setLengthValue(value);
          typing = true;
        } else {
          if (event.getKeyCode() == KeyEvent.VK_ENTER) {
            evaluate(value);