[Sheets-cvs] sheets Sheets.sheets,1.23,1.24

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

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

Modified Files:
	Sheets.sheets 
Log Message:
Fixed a few minor bugs:
* [fatal] File import was broken due to a NullPointerException on getResolver
* [non-fatal] Clicking in the Fragment Edit Sheet would throw up a ClassCastException
* [non-fatal] ArchivalStoreException due to a bug in the constructor for JavaRepositoryHelper


Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Sheets.sheets	4 Dec 2002 21:11:07 -0000	1.23
--- Sheets.sheets	5 Dec 2002 04:26:50 -0000	1.24
***************
*** 82256,82260 ****
         }
       }
!    if (found == null) {
       // search the classpath
       found = repository.lookup(pkg + "." + name);
--- 82256,82260 ----
         }
       }
!    if (repository != null && found == null) {
       // search the classpath
       found = repository.lookup(pkg + "." + name);
***************
*** 82327,82331 ****
     
     // try the classpath resolver:
!    return context.getRepository().lookup(name, context.getImportedClasses(), context.getImportedPackages());
   }
  section documentation schin:923
--- 82327,82335 ----
     
     // try the classpath resolver:
!    JavaRepositoryHelper repository = context.getRepository();
!    if (repository != null)
!      return repository.lookup(name, context.getImportedClasses(), context.getImportedPackages());
!    
!    return null;
   }
  section documentation schin:923
***************
*** 83727,83730 ****
--- 83731,83735 ----
     this.classPath = classPath;
     repository = SyntheticRepository.getInstance(new ClassPath(classPath));
+    allocateArchivalReference(State.getObjectDatabase());
   }
  object schin:1055
***************
*** 83799,83803 ****
  section text schin:1063
   public JavaRepositoryHelper JavaFragment.getRepository () {
!    return getProject().getJavaRepository();
   }
  section documentation schin:1063
--- 83804,83811 ----
  section text schin:1063
   public JavaRepositoryHelper JavaFragment.getRepository () {
!    Project project = getProject();
!    if (project == null)
!      return null;
!    return project.getJavaRepository();
   }
  section documentation schin:1063
***************
*** 91486,91490 ****
       if (command == null) {
         // nothing bound to that key.  Can we just insert it?
!        if (keyMap == null && c != java.awt.event.KeyEvent.CHAR_UNDEFINED 
               && !e.isControlDown() && !e.isAltDown()
               // editableSelection has a side effect, so call it last!!
--- 91494,91499 ----
       if (command == null) {
         // nothing bound to that key.  Can we just insert it?
!        if (selectedFragment() instanceof TextualViewer &&
!              keyMap == null && c != java.awt.event.KeyEvent.CHAR_UNDEFINED 
               && !e.isControlDown() && !e.isAltDown()
               // editableSelection has a side effect, so call it last!!