From: <ox-...@us...> - 2003-04-28 20:44:57
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv28052 Modified Files: Sheets.sheets Log Message: Fixed a few java completion bugs: 1. The default project was not properly picking up the classpath (it used a reference to a system property, which was not being expanded) 2. Jars or zips in the classpath without manifests would cause an NPE (now skips these jars and zips for classpath expansion) Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Sheets.sheets 26 Apr 2003 02:22:20 -0000 1.43 --- Sheets.sheets 28 Apr 2003 20:44:33 -0000 1.44 *************** *** 82331,82334 **** --- 82331,82336 ---- if (file.endsWith(".zip") || file.endsWith(".jar")) try { Manifest manifest = new JarFile(file).getManifest(); + if (manifest == null) + continue; Attributes attributes = manifest.getMainAttributes(); if (attributes.containsKey(Attributes.Name.CLASS_PATH)) { *************** *** 82508,82512 **** type=java section text schin:1228 ! public final static String ProjectFragment.DEFAULT_CLASSPATH = "${java.class.path}"; object schin:1229 pkg=org.browsecode.javaStuff --- 82510,82514 ---- type=java section text schin:1228 ! public final static String ProjectFragment.DEFAULT_CLASSPATH = System.getProperty("java.class.path"); object schin:1229 pkg=org.browsecode.javaStuff |