From: <ox-...@us...> - 2003-06-04 17:48:22
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv5241a Modified Files: Sheets.sheets todo.txt Log Message: New graphics for the installer... Redid the splash, background, and icons. Fixed Aaron's bug about including the classpath in the .sheetsrc file. now writes out the unexpanded system property (ie. ${java.class.path}) Changed the ordering of loading so that we don't have the load screen and the import project dialog up simultaneously (caused weird screen artifacts, and was probably not good for performance). Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Sheets.sheets 3 Jun 2003 22:22:11 -0000 1.53 --- Sheets.sheets 4 Jun 2003 17:47:40 -0000 1.54 *************** *** 26776,26779 **** --- 26776,26780 ---- if (!(state.sheetsFiles.isEmpty() && state.projects.isEmpty())) try { loadedSomething = true; + HistoryManager.beginChangeCommand("import projects"); ObjectIdSentinel.loadAll(state.projects, state.sheetsFiles); } catch (IOException e) { *************** *** 26781,26784 **** --- 26782,26787 ---- DB.abort(); System.exit(1); + } finally { + HistoryManager.endChangeCommand("import projects"); } *************** *** 80278,80285 **** 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; --- 80281,80291 ---- public JavaRepositoryHelper Project.getJavaRepository () { ! if (repositoryHelper == null) try { ProjectFragment root = getRootFrag(); ! String classpath = root == null ? StringSplitter.replaceProperties(ProjectFragment.DEFAULT_CLASSPATH) : root.getPlatformClassPath(); repositoryHelper = JavaRepositorySet.getRepositoryHelper(classpath); + } catch (PropertyNotFoundException e) { + // Should never happen on the default classpath + Console.internalError(e); } return repositoryHelper; *************** *** 81964,81968 **** 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 --- 81970,81974 ---- type=java section text schin:1228 ! public final static String ProjectFragment.DEFAULT_CLASSPATH = "${java.class.path}"; object schin:1229 pkg=org.browsecode.javaStuff *************** *** 87690,87694 **** Sheet lostStuff = checkForCrash(); - boolean loadedSomething = loadFiles(state); startOpenRequestServer(state); splash.updateProgress(4); --- 87696,87699 ---- *************** *** 87718,87721 **** --- 87723,87728 ---- Sheets.getRootFrame().addSheet(new SheetFrame(lostStuff)); + boolean loadedSomething = loadFiles(state); + if (state.immediateExport) { exportSheets(true); // export all *************** *** 101638,101642 **** nkramer:28438 object ram:2144 ! classpath=/home/schin/sheets/lib/bootstrap-sheets.jar project=Sheets root=src/java --- 101645,101649 ---- nkramer:28438 object ram:2144 ! classpath=${java.class.path} project=Sheets root=src/java Index: todo.txt =================================================================== RCS file: /cvsroot/sheets/sheets/todo.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** todo.txt 3 Jun 2003 22:22:16 -0000 1.22 --- todo.txt 4 Jun 2003 17:47:44 -0000 1.23 *************** *** 18,21 **** --- 18,22 ---- Todo: * Fix the background image of the project wizard dialog + - also fix the status icons on the left and reposition everything * Show the import errors in a new wizard pane |