[Sheets-cvs] sheets .sheetsrc,1.6,1.7 Sheets.sheets,1.32,1.33 ant,1.5,1.6 todo.txt,1.9,1.10

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

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

Modified Files:
	.sheetsrc Sheets.sheets ant todo.txt 
Log Message:
Fixed a bug where a bad docsheet import could hose the system.
Fixed some NullPointerExceptions related to importing into the default UnknownProject
Updated the ant script to get it back up to date
Removed reference to XQuery module in .sheetsrc


Index: .sheetsrc
===================================================================
RCS file: /cvsroot/sheets/sheets/.sheetsrc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .sheetsrc	23 Dec 2002 13:39:31 -0000	1.6
--- .sheetsrc	1 Apr 2003 02:21:07 -0000	1.7
***************
*** 21,25 ****
  ##########################################
  
- #set language-expert "com.vitria.xquery.editor.XQueryExpert"
  set global-undo-history-size 1
  #show-with java-package-name
--- 21,24 ----

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Sheets.sheets	31 Jan 2003 19:34:42 -0000	1.32
--- Sheets.sheets	1 Apr 2003 02:21:07 -0000	1.33
***************
*** 31482,31485 ****
--- 31482,31488 ----
   
     Fragment[] comps = parseString(fileContents);
+    if (comps.length == 0)
+      return null;
+    
     // Any top-level fragment will get assigned an id by
     // makeImportSheet, but for nested components we need to 
***************
*** 31830,31840 ****
         if (comp != null && comp instanceof DocFragment) {
           comps.addElement(comp);
!          DocFragment newComp = (DocFragment) comp;
!          NamedNodeMap attributes = child.getAttributes();
!          for (int j=0; j<attributes.getLength(); i++) {
!            Attr attr = (Attr)attributes.item(j);
!            if (attr.getName().startsWith("anchor")) {
!              ScalarAttribute anchor = newComp.getAnchorAttribute();
!              anchor.changeValue(anchor.getValue() + "\\n" + attr.getValue());
             }
           }
--- 31833,31845 ----
         if (comp != null && comp instanceof DocFragment) {
           comps.addElement(comp);
!          if (!(comp instanceof UnknownDocFragment)) {
!            DocFragment newComp = (DocFragment) comp;
!            NamedNodeMap attributes = child.getAttributes();
!            for (int j=0; j<attributes.getLength(); i++) {
!              Attr attr = (Attr)attributes.item(j);
!              if (attr.getName().startsWith("anchor")) {
!                ScalarAttribute anchor = newComp.getAnchorAttribute();
!                anchor.changeValue(anchor.getValue() + "\\n" + attr.getValue());
!              }
             }
           }
***************
*** 43452,43455 ****
--- 43457,43461 ----
   ram:2060
   schin:195
+  schin:1228
   schin:1038
   schin:1039
***************
*** 75536,75540 ****
       fileName.append(exportLocation);
       fileName.append(File.separatorChar);
!    } else if (!project.getRootFrag().getRoot().equals("")) {
       basePath = new File(project.getRootFrag().getRoot(), exportLocation);
       fileName.append(basePath.getPath());
--- 75542,75546 ----
       fileName.append(exportLocation);
       fileName.append(File.separatorChar);
!    } else if (project.getRootFrag() != null && !project.getRootFrag().getRoot().equals("")) {
       basePath = new File(project.getRootFrag().getRoot(), exportLocation);
       fileName.append(basePath.getPath());
***************
*** 81384,81388 ****
   type=java
  section text schin:1038
!  String ProjectFragment.classPath = "${java.class.path}";
  object schin:1039
   pkg=org.browsecode.sheets.archive
--- 81390,81394 ----
   type=java
  section text schin:1038
!  String ProjectFragment.classPath = DEFAULT_CLASSPATH;
  object schin:1039
   pkg=org.browsecode.sheets.archive
***************
*** 81436,81441 ****
   public JavaRepositoryHelper Project.getJavaRepository ()
   {
!    if (repositoryHelper == null)
!      repositoryHelper = JavaRepositorySet.getRepositoryHelper(getRootFrag().getPlatformClassPath());
     return repositoryHelper;
   }
--- 81442,81450 ----
   public JavaRepositoryHelper Project.getJavaRepository ()
   {
!    if (repositoryHelper == null) {
!      ProjectFragment root = getRootFrag();
!      String classpath = root == null ? ProjectFragment.DEFAULT_CLASSPATH : root.getPlatformClassPath();
!      repositoryHelper = JavaRepositorySet.getRepositoryHelper(classpath);
!    }
     return repositoryHelper;
   }
***************
*** 83112,83115 ****
--- 83121,83129 ----
     }
   }
+ object schin:1228
+  pkg=org.browsecode.sheets.archive
+  type=java
+ section text schin:1228
+  public final static String ProjectFragment.DEFAULT_CLASSPATH = "${java.class.path}";
  object sjc:1
   pkg=org.browsecode.sheets.dicer
***************
*** 102065,102068 ****
--- 102079,102083 ----
   schin:200
   schin:195
+  schin:1228
   schin:1038
   schin:1039

Index: ant
===================================================================
RCS file: /cvsroot/sheets/sheets/ant,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ant	6 Dec 2002 03:03:40 -0000	1.5
--- ant	1 Apr 2003 02:21:09 -0000	1.6
***************
*** 1,2 ****
  #! /bin/sh
! java -Xmx128m -classpath $JAVA_HOME/lib/tools.jar:lib/ant.jar:lib/antlrall.jar:$CLASSPATH org.apache.tools.ant.Main -emacs "$@"
--- 1,2 ----
  #! /bin/sh
! java -Xmx128m -classpath $JAVA_HOME/lib/tools.jar:tools/ant.jar:lib/antlrall.jar:$CLASSPATH org.apache.tools.ant.Main -emacs "$@"

Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** todo.txt	31 Jan 2003 19:34:56 -0000	1.9
--- todo.txt	1 Apr 2003 02:21:09 -0000	1.10
***************
*** 1,4 ****
  Fixed in this snapshot so far:
! x
  
  Currently Working On:
--- 1,18 ----
  Fixed in this snapshot so far:
! *
! 
! * Stuff for Unix:
! Should change ant to build (to avoid name collision with ant program)
! Redrawing across X is very slow (even with anti-aliasing turned off).  May be a simple fix (since most of the slowdown is in the main window)
! The default monocode font is awful.  See if there is a better one for unix.
! 
! * Better File Management:
! Don't unnecessarily mark files as dirty on import
! Distinguish between dirty files and files that should be "touched"
! Prompt for deletion of files on disk
! Cache timestamp in export map and use for overwrite warnings
! Nice to have --
! Capability to import modified files on disk (checked on startup, or by command)
! Capability to resolve diff between changes on disk and in sheets (checked on export, or import)
  
  Currently Working On:
***************
*** 87,99 ****
  Add JDepend, Checksite results
  Integrate generated documentation (see documentation section above)
- 
- * Better File Management:
- Don't unnecessarily mark files as dirty on import
- Distinguish between dirty files and files that should be "touched"
- Prompt for deletion of files on disk
- Cache timestamp in export map and use for overwrite warnings
- Nice to have --
- Capability to import modified files on disk (checked on startup, or by command)
- Capability to resolve diff between changes on disk and in sheets (checked on export, or import)
  
  * ByteCode Completion
--- 101,104 ----