[Sheets-cvs] sheets .sheetsrc,1.10,1.11 Sheets.sheets,1.38,1.39 todo.txt,1.12,1.13

[<ox-...@us...>]

Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv15291

Modified Files:
	.sheetsrc Sheets.sheets todo.txt 
Log Message:
Fixed a bug with importing objectIds that have spaces in them (for instance, if your username has a space in it)

Index: .sheetsrc
===================================================================
RCS file: /cvsroot/sheets/sheets/.sheetsrc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** .sheetsrc	19 Apr 2003 01:31:22 -0000	1.10
--- .sheetsrc	21 Apr 2003 19:17:19 -0000	1.11
***************
*** 3,18 ****
  ##########################################
  
! #set compile-command "ant.bat compile"
! #set recompile-command "ant.bat clean"
  # Use these instead for *nix systems
! set compile-command "./ant compile"
! set recompile-command "./ant clean"
  
  #set windows-task-bar-height 0
  #set screen-insets 0 108 0 0
  
! # set web-browser "explorer.exe"
  # Use this instead for *nix systems:
! set web-browser "mozilla"
  set sheets-documentation-url "doc/reference.html"
  set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api"
--- 3,18 ----
  ##########################################
  
! set compile-command "ant.bat compile"
! set recompile-command "ant.bat clean"
  # Use these instead for *nix systems
! #set compile-command "./ant compile"
! #set recompile-command "./ant clean"
  
  #set windows-task-bar-height 0
  #set screen-insets 0 108 0 0
  
! set web-browser "explorer.exe"
  # Use this instead for *nix systems:
! #set web-browser "mozilla"
  set sheets-documentation-url "doc/reference.html"
  set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api"

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Sheets.sheets	19 Apr 2003 01:31:23 -0000	1.38
--- Sheets.sheets	21 Apr 2003 19:17:19 -0000	1.39
***************
*** 8906,8910 ****
     // so we cut it's food into tiny bite-sized chunks -- this should be revisited.
     String[] lines = StringSplitter.splitLines(outString);
!    if (lines.length > 0 && errorSheet == null) {
       errorSheet = new Sheet(State.getObjectDatabase(), "Compilation errors", null, null);
       SentinelMgr.brandNewFragment(errorSheet, 
--- 8906,8910 ----
     // so we cut it's food into tiny bite-sized chunks -- this should be revisited.
     String[] lines = StringSplitter.splitLines(outString);
!    if (errorSheet == null) {
       errorSheet = new Sheet(State.getObjectDatabase(), "Compilation errors", null, null);
       SentinelMgr.brandNewFragment(errorSheet, 
***************
*** 8930,8934 ****
         unparsedText.append(line + "\\n");
     }
!    if (errorSheet == null || errorSheet.numFragments() == 0)
       return null;
     if (unparsedText.length() > 0)
--- 8930,8934 ----
         unparsedText.append(line + "\\n");
     }
!    if (errorSheet.numFragments() == 0)
       return null;
     if (unparsedText.length() > 0)
***************
*** 88927,88938 ****
       
     if (line.startsWith("section ")) {
!      String[] words = StringSplitter.split(line, ' ');
!      if (words.length != 3)
!        throw new Error("Invalid section marker in object " + objectId + ": "
!                          + line);
!      if (!words[2].equals(objectId))
         throw new Error("ObjectId mismatch in section marker in object " 
!                          + objectId + ": got " + words[2] + " instead.");
!      if (words[1].equals(sectionName))
         return true;
     }
--- 88927,88941 ----
       
     if (line.startsWith("section ")) {
!      int firstSpace = line.indexOf(' ');
!      int secondSpace = line.indexOf(' ', firstSpace + 1);
!      if (secondSpace == -1)
!        throw new Error("Missing ObjectId in section marker in object "
!                          + objectId + " on line that reads: " + line);
!      String term1 = line.substring(firstSpace + 1, secondSpace);
!      String term2 = line.substring(secondSpace + 1);
!      if (!term2.equals(objectId))
         throw new Error("ObjectId mismatch in section marker in object " 
!                          + objectId + ": got " + term2 + " instead.");
!      if (term1.equals(sectionName))
         return true;
     }

Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** todo.txt	19 Apr 2003 01:31:25 -0000	1.12
--- todo.txt	21 Apr 2003 19:17:27 -0000	1.13
***************
*** 10,13 ****
--- 10,14 ----
  npe on TextualViewer.getSaveRect
  touch all classes in the package on package-header modification
+ Attempt to get a released object when closing editor with a temporary sheet (such as the compile sheet) open
  
  * Java completion: