Menu
▾
▴
sheets-cvs — CVS Commit Mailing List
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
(1) |
Sep
|
Oct
(3) |
Nov
(39) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(8) |
Feb
|
Mar
(1) |
Apr
(19) |
May
(23) |
Jun
(36) |
Jul
(4) |
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ox-...@us...> - 2003-06-11 19:15:59
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv31248/lib Modified Files: bootstrap-sheets.jar Log Message: Changed splash to use invokeAndWait (think this may make X happier) Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 Binary files /tmp/cvsA3E9ci and /tmp/cvsN2gvBx differ |
|
From: <ox-...@us...> - 2003-06-11 19:15:44
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv31248 Modified Files: Sheets.sheets Log Message: Changed splash to use invokeAndWait (think this may make X happier) Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Sheets.sheets 10 Jun 2003 09:42:25 -0000 1.56 --- Sheets.sheets 11 Jun 2003 19:14:33 -0000 1.57 *************** *** 7401,7404 **** --- 7401,7405 ---- import javax.swing.text.*; import javax.swing.event.*; + import java.lang.reflect.*; import java.util.*; import java.io.*; *************** *** 82374,82379 **** }; public void run() { ! if (firstPaintComplete) ! SwingUtilities.invokeLater(runner); } }, 0, 33); --- 82375,82383 ---- }; public void run() { ! if (firstPaintComplete) try { ! SwingUtilities.invokeAndWait(runner); ! } catch (InvocationTargetException e) { ! Console.internalError(e); ! } catch (InterruptedException e) { /* ignore */ } } }, 0, 33); |
|
From: <ox-...@us...> - 2003-06-11 10:31:20
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv10743/lib Modified Files: ox.jar Log Message: New version of OX with some important stability fixes: 1. Fixed yet another tricky database bug... the problem was that we were not clearing the reference list after a promotion, so the object written right after the promotion would get a few extra references (usually resulting in a ClassCastException during runtime) -- Also added additional checks so this sort of error will get picked up sooner. 2. Ripped out the locking mechanism on the log file. It was more trouble than it was worth (and we lock the main database file, so that is sufficient). Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvs5wKIWb and /tmp/cvskUZUTe differ |
|
From: <ox-...@us...> - 2003-06-11 10:31:20
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv10743 Modified Files: todo.txt Log Message: New version of OX with some important stability fixes: 1. Fixed yet another tricky database bug... the problem was that we were not clearing the reference list after a promotion, so the object written right after the promotion would get a few extra references (usually resulting in a ClassCastException during runtime) -- Also added additional checks so this sort of error will get picked up sooner. 2. Ripped out the locking mechanism on the log file. It was more trouble than it was worth (and we lock the main database file, so that is sufficient). Index: todo.txt =================================================================== RCS file: /cvsroot/sheets/sheets/todo.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** todo.txt 11 Jun 2003 02:28:52 -0000 1.26 --- todo.txt 11 Jun 2003 10:31:16 -0000 1.27 *************** *** 33,37 **** at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.run(Unknown Source) - Locking on the log file fails on NFS (do we need this at all?) Background picture doesn't show up at all with the new splash screen code (on linux) java.lang.NullPointerException --- 33,36 ---- *************** *** 55,62 **** Setup line numbers based on location of methods when imported. Command-line project import feature (possibly by a special file that gets read) - Get rid of annoying warnings about temporary or transient sheets disappearing. - Database recovery now! (so that other database bugs can be diagnosed consistently) - - Todo: * Fix the background image of the project wizard dialog - also fix the status icons on the left and reposition everything --- 54,57 ---- *************** *** 164,167 **** --- 159,167 ---- Properly render <br> tag in sheets + * Hardcore Documentation: + Error when committing a fragment with spaces in it + Promotion of paragraph to section doesn't work + Copy of text with a link should really copy the link too (and automatically update the slot numbers -- or, better yet, get rid of those slot numbers altogether) + * Generic Documentation: Generalize xml documentation to work on a wide variety of xml-like languages with little coding. *************** *** 209,213 **** * lost during transition to edit * lost on double-click - TreeWidget Turns Red? Installer --- 209,212 ---- *************** *** 215,219 **** New icons for *.sdb, *.sheets, and *.java or other Config screen for file extensions ! Install a default .sheetsrc file clean-up .sheetsrc --- 214,218 ---- New icons for *.sdb, *.sheets, and *.java or other Config screen for file extensions ! Install a sample .sheetsrc file clean-up .sheetsrc |
|
From: <ox-...@us...> - 2003-06-11 02:28:55
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv11602
Modified Files:
todo.txt
Log Message:
Minor changes to todo list.
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** todo.txt 9 Jun 2003 19:03:49 -0000 1.25
--- todo.txt 11 Jun 2003 02:28:52 -0000 1.26
***************
*** 3,7 ****
more annoying bugs:
! Trouble loading files with spaces in the name (when done by file association)
java.lang.NullPointerException
at org.browsecode.sheets.TextualViewer.getSaveRect(TextualViewer.java:252)
--- 3,38 ----
more annoying bugs:
! java.lang.NullPointerException
! at org.browsecode.sheets.RichTextViewer.addStyle(RichTextViewer.java:375)
! at org.browsecode.javaStuff.JavaViewer.restyleLines(JavaViewer.java:274)
! at org.browsecode.javaStuff.JavaViewer.paint(JavaViewer.java:303)
! at org.browsecode.sheets.ListViewer.paintContents(ListViewer.java:791)
! at org.browsecode.sheets.Viewer.paint(Viewer.java:222)
! at org.browsecode.sheets.AbstractSheetViewer.paintContents(AbstractSheetViewer.java:363)
! at org.browsecode.sheets.Viewer.paint(Viewer.java:222)
! at org.browsecode.sheets.RichTextViewer.paint(RichTextViewer.java:637)
! at org.browsecode.sheets.ViewPanel$Painter.paintCanvas(ViewPanel.java:755)
! at org.browsecode.sheets.ViewPanel$Painter.updateCanvas(ViewPanel.java:738)
! at org.browsecode.sheets.ViewPanel$Painter.paintCanvas(ViewPanel.java:749)
! at org.browsecode.sheets.ViewCanvas.paint(ViewCanvas.java:70)
! at javax.swing.JComponent.paintChildren(Unknown Source)
! at javax.swing.JComponent.paint(Unknown Source)
! at javax.swing.JComponent.paintChildren(Unknown Source)
! at javax.swing.JComponent.paint(Unknown Source)
! at javax.swing.JComponent.paintWithOffscreenBuffer(Unknown Source)
! at javax.swing.JComponent.paintDoubleBuffered(Unknown Source)
! at javax.swing.JComponent._paintImmediately(Unknown Source)
! at javax.swing.JComponent.paintImmediately(Unknown Source)
! at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source)
! at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source)
! at java.awt.event.InvocationEvent.dispatch(Unknown Source)
! at java.awt.EventQueue.dispatchEvent(Unknown Source)
! at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source)
! at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)
! at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
! at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
! at java.awt.EventDispatchThread.run(Unknown Source)
! Locking on the log file fails on NFS (do we need this at all?)
! Background picture doesn't show up at all with the new splash screen code (on linux)
java.lang.NullPointerException
at org.browsecode.sheets.TextualViewer.getSaveRect(TextualViewer.java:252)
***************
*** 17,20 ****
--- 48,54 ----
* Should not let the user close the wizard during file import.
* Refresh problem on main sheet after wizard closes
+
+ Nice ideas:
+ Extend methods dialog should have an easy way to insert appropriate constructors.
Todo:
|
|
From: <ox-...@us...> - 2003-06-10 09:43:06
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv16911
Modified Files:
Sheets.sheets build.xml
Log Message:
Sheets fixes:
1. Fixed an intermittent NPE on startup caused by the new splash screen (update events are now posted on the event queue)
2. Changed the installer info screen to no longer recommend closing apps (it is unnecessary)
3. Changed the default button for the license screen to accept
New version of OX with the following stability fixes:
1. Fixed a bug with the crash recovery that sometimes resulted in this exception: com.versionablestore.ox.ArchivalIdNotInDatabase: com.versionablestore.ox.ArchivalIdNotInDatabase: No object with archivalId[0] exists.
2. Fixed a longstanding intermittent gc bug that was caused using arrays of ArchivalReferences in a SerializableArchivalObject. It now correctly handles arrays, and has been improved so that ArchivalReference is no longer Serializable (which should catch this sort of mishap in the future).
3. Database is now failsafe on the usage of NullArchivalReferences. Any attempt to modify or dereference them will result in an error (making it much easier to track down potential problems).
WARNING - These database changes will make your *.sdb files invalid. Please regenerate from a .sheets file!
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Sheets.sheets 8 Jun 2003 17:14:34 -0000 1.55
--- Sheets.sheets 10 Jun 2003 09:42:25 -0000 1.56
***************
*** 65055,65063 ****
// A bit of extra bulletproofing never hurts.
! if (at < 0 || at + count > dispLines.length)
! Console.internalError("Bad indices in reformat: invalidFormatStart = "
! + invalidFormatStart + "; invalidFormatEnd = "
! + invalidFormatEnd + "; dispLines.length = "
! + dispLines.length);
// Set up the values which should exist by the time we finish.
--- 65055,65065 ----
// A bit of extra bulletproofing never hurts.
! // (I believe the code may get here when invalidFormatting is called from a different thread)
! if (at < 0)
! at = 0;
! if (at > dispLines.length)
! at = dispLines.length;
! if (at + count > dispLines.length)
! count = dispLines.length - at;
// Set up the values which should exist by the time we finish.
***************
*** 82365,82373 ****
timer = new java.util.Timer();
timer.schedule(new TimerTask() {
! public void run() {
! if (firstPaintComplete) {
subincrement = 1f - (1f - subincrement) * .9f;
paintImmediately(progressArea);
}
}
}, 0, 33);
--- 82367,82379 ----
timer = new java.util.Timer();
timer.schedule(new TimerTask() {
! Runnable runner = new Runnable() {
! public void run() {
subincrement = 1f - (1f - subincrement) * .9f;
paintImmediately(progressArea);
}
+ };
+ public void run() {
+ if (firstPaintComplete)
+ SwingUtilities.invokeLater(runner);
}
}, 0, 33);
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** build.xml 30 May 2003 19:13:40 -0000 1.21
--- build.xml 10 Jun 2003 09:42:30 -0000 1.22
***************
*** 103,107 ****
<mkdir dir="${test}"/>
<echo>Launching test...</echo>
! <java classname="org.browsecode.sheets.Sheets" maxmemory="768m" dir="${test}" fork="true">
<!-- Fix for Solaris pref spaming -->
<jvmarg value="-Djava.util.prefs.syncInterval=2000000"/>
--- 103,107 ----
<mkdir dir="${test}"/>
<echo>Launching test...</echo>
! <java classname="org.browsecode.sheets.Sheets" maxmemory="128m" dir="${test}" fork="true">
<!-- Fix for Solaris pref spaming -->
<jvmarg value="-Djava.util.prefs.syncInterval=2000000"/>
|
|
From: <ox-...@us...> - 2003-06-10 09:43:05
|
Update of /cvsroot/sheets/sheets/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv16911/installer
Modified Files:
Sheets.iap_xml
Log Message:
Sheets fixes:
1. Fixed an intermittent NPE on startup caused by the new splash screen (update events are now posted on the event queue)
2. Changed the installer info screen to no longer recommend closing apps (it is unnecessary)
3. Changed the default button for the license screen to accept
New version of OX with the following stability fixes:
1. Fixed a bug with the crash recovery that sometimes resulted in this exception: com.versionablestore.ox.ArchivalIdNotInDatabase: com.versionablestore.ox.ArchivalIdNotInDatabase: No object with archivalId[0] exists.
2. Fixed a longstanding intermittent gc bug that was caused using arrays of ArchivalReferences in a SerializableArchivalObject. It now correctly handles arrays, and has been improved so that ArchivalReference is no longer Serializable (which should catch this sort of mishap in the future).
3. Database is now failsafe on the usage of NullArchivalReferences. Any attempt to modify or dereference them will result in an error (making it much easier to track down potential problems).
WARNING - These database changes will make your *.sdb files invalid. Please regenerate from a .sheets file!
Index: Sheets.iap_xml
===================================================================
RCS file: /cvsroot/sheets/sheets/installer/Sheets.iap_xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Sheets.iap_xml 4 Jun 2003 17:47:44 -0000 1.7
--- Sheets.iap_xml 10 Jun 2003 09:42:30 -0000 1.8
***************
*** 2,7 ****
<!-- This script was automatically generated using Zero G's InstallAnywhere 5.0.7 Standard, Build 1680
STATUS: Fully Functional LICENSED Edition
! DATE: Tue Jun 03 11:34:49 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1346">
<!-- ** DO NOT EDIT ** Essential authorization and configuration data ** DO NOT EDIT ** -->
<essentialScriptInfo>
--- 2,7 ----
<!-- This script was automatically generated using Zero G's InstallAnywhere 5.0.7 Standard, Build 1680
STATUS: Fully Functional LICENSED Edition
! DATE: Tue Jun 10 01:03:20 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1348">
<!-- ** DO NOT EDIT ** Essential authorization and configuration data ** DO NOT EDIT ** -->
<essentialScriptInfo>
***************
*** 11,15 ****
<buildID>3,13,71,87,105,110,100,111,119,115,32,50,48,48,48,44,32,53,46,49,44,32,120,56,54,59,32,74,97,118,97,32,49,46,51,46,49,95,48,51,44,32,83,117,110,32,77,105,99,114,111,115,121,115,116,101,109,115,32,73,110,99,46,44,32,104,116,116,112,58,47,47,106,97,118,97,46,115,117,110,46,99,111,109,47,59,32,101,110,44,32,85,83,59,32,67,112,49,50,53,50</buildID>
<!-- The authorizationID may change between project saves and builds. This does not effect the integrity of the project, nor do changes in this value represent changes in the actual InstallAnywhere project. -->
! <authorizationID>1,0,0,-16,-125,-13,32,-32,80,112,114,103,83,98,113,97,113,49,51,67,58,65,70,68,86,69,64,69,66,69,48,63,87,5,2,1,14,19,126,5,0,0,0</authorizationID>
</essentialScriptInfo>
<installationObjects uniqueObjects="67">
--- 11,15 ----
<buildID>3,13,71,87,105,110,100,111,119,115,32,50,48,48,48,44,32,53,46,49,44,32,120,56,54,59,32,74,97,118,97,32,49,46,51,46,49,95,48,51,44,32,83,117,110,32,77,105,99,114,111,115,121,115,116,101,109,115,32,73,110,99,46,44,32,104,116,116,112,58,47,47,106,97,118,97,46,115,117,110,46,99,111,109,47,59,32,101,110,44,32,85,83,59,32,67,112,49,50,53,50</buildID>
<!-- The authorizationID may change between project saves and builds. This does not effect the integrity of the project, nor do changes in this value represent changes in the actual InstallAnywhere project. -->
! <authorizationID>1,0,0,-16,-77,-77,-128,-64,80,112,114,103,83,98,113,97,113,49,51,67,58,65,70,68,86,69,64,69,66,69,48,63,87,5,2,8,14,29,112,5,0,0,0</authorizationID>
</essentialScriptInfo>
<installationObjects uniqueObjects="67">
***************
*** 167,171 ****
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="a1dbbb998eb0">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
--- 167,171 ----
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="c43c70048eb1">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
***************
*** 385,391 ****
</property>
<property name="message">
! <string><![CDATA[InstallAnywhere will guide you through the installation of $PRODUCT_NAME$.
!
! It is strongly recommended that you quit all programs before continuing with this installation.
Click the 'Next' button to proceed to the next screen. If you want to change something on a previous screen, click the 'Previous' button.
--- 385,389 ----
</property>
<property name="message">
! <string><![CDATA[This installer will guide you through the installation of the $PRODUCT_NAME$.
Click the 'Next' button to proceed to the next screen. If you want to change something on a previous screen, click the 'Previous' button.
***************
*** 437,441 ****
</property>
<property name="agreeWithLicenseByDefault">
! <boolean>false</boolean>
</property>
<property name="openExternalLinks">
--- 435,439 ----
</property>
<property name="agreeWithLicenseByDefault">
! <boolean>true</boolean>
</property>
<property name="openExternalLinks">
***************
*** 750,753 ****
--- 748,754 ----
<string><![CDATA[2.0.0.0]]></string>
</property>
+ <property name="description">
+ <string><![CDATA[]]></string>
+ </property>
<property name="summary">
<string><![CDATA[<none>]]></string>
***************
*** 777,781 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Tue Jun 03 11:34:48 PDT 2003]]></string>
</method>
<method name="put">
--- 778,782 ----
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Tue Jun 10 01:03:20 PDT 2003]]></string>
</method>
<method name="put">
|
|
From: <ox-...@us...> - 2003-06-10 09:42:56
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv16911/lib Modified Files: bootstrap-sheets.jar ox.jar Log Message: Sheets fixes: 1. Fixed an intermittent NPE on startup caused by the new splash screen (update events are now posted on the event queue) 2. Changed the installer info screen to no longer recommend closing apps (it is unnecessary) 3. Changed the default button for the license screen to accept New version of OX with the following stability fixes: 1. Fixed a bug with the crash recovery that sometimes resulted in this exception: com.versionablestore.ox.ArchivalIdNotInDatabase: com.versionablestore.ox.ArchivalIdNotInDatabase: No object with archivalId[0] exists. 2. Fixed a longstanding intermittent gc bug that was caused using arrays of ArchivalReferences in a SerializableArchivalObject. It now correctly handles arrays, and has been improved so that ArchivalReference is no longer Serializable (which should catch this sort of mishap in the future). 3. Database is now failsafe on the usage of NullArchivalReferences. Any attempt to modify or dereference them will result in an error (making it much easier to track down potential problems). WARNING - These database changes will make your *.sdb files invalid. Please regenerate from a .sheets file! Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 Binary files /tmp/cvsEFVMfV and /tmp/cvs9Vedwi differ Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvscSMaL4 and /tmp/cvss13Uj4 differ |
|
From: <ox-...@us...> - 2003-06-09 19:04:03
|
Update of /cvsroot/sheets/sheets/installer In directory sc8-pr-cvs1:/tmp/cvs-serv32181/installer Modified Files: FileAssociations.zgr Log Message: 1. New version of OX with crash recovery! -- [from the OX check-in log] Implemented crash recovery, so that if the database gets killed unexpectedly it will come back up in the last known good state (basically, the state it was in at the time of the last sync). 2. Installer now properly handles file associations with a space in the path Index: FileAssociations.zgr =================================================================== RCS file: /cvsroot/sheets/sheets/installer/FileAssociations.zgr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileAssociations.zgr 27 Jun 2002 07:36:35 -0000 1.1 --- FileAssociations.zgr 9 Jun 2003 19:03:29 -0000 1.2 *************** *** 16,18 **** HKEY_CLASSES_ROOT\Sheets\shell HKEY_CLASSES_ROOT\Sheets\shell\open ! HKEY_CLASSES_ROOT\Sheets\shell\open\command; @; "$USER_INSTALL_DIR$\Sheets.exe" %1 --- 16,18 ---- HKEY_CLASSES_ROOT\Sheets\shell HKEY_CLASSES_ROOT\Sheets\shell\open ! HKEY_CLASSES_ROOT\Sheets\shell\open\command; @; "$USER_INSTALL_DIR$\Sheets.exe" "%1" |
|
From: <ox-...@us...> - 2003-06-09 19:03:55
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv32181 Modified Files: todo.txt Log Message: 1. New version of OX with crash recovery! -- [from the OX check-in log] Implemented crash recovery, so that if the database gets killed unexpectedly it will come back up in the last known good state (basically, the state it was in at the time of the last sync). 2. Installer now properly handles file associations with a space in the path Index: todo.txt =================================================================== RCS file: /cvsroot/sheets/sheets/todo.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** todo.txt 8 Jun 2003 17:14:35 -0000 1.24 --- todo.txt 9 Jun 2003 19:03:49 -0000 1.25 *************** *** 16,19 **** --- 16,20 ---- * Should not let the user go back form the file import screen. * Should not let the user close the wizard during file import. + * Refresh problem on main sheet after wizard closes Todo: |
|
From: <ox-...@us...> - 2003-06-09 19:03:54
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv32181/lib Modified Files: bootstrap-sheets.jar ox.jar Log Message: 1. New version of OX with crash recovery! -- [from the OX check-in log] Implemented crash recovery, so that if the database gets killed unexpectedly it will come back up in the last known good state (basically, the state it was in at the time of the last sync). 2. Installer now properly handles file associations with a space in the path Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 Binary files /tmp/cvsGtiEJy and /tmp/cvsPjaFVz differ Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsZq4sGB and /tmp/cvs0vf513 differ |
|
From: <ox-...@us...> - 2003-06-08 17:15:11
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv16047
Modified Files:
.sheetsrc Sheets.sheets todo.txt
Log Message:
1. Fixed a bug with the interesting flag that was causing spurious messages and warnings.
2. Fixed a bug with error parsing, which would cause unparsed text with the '$' character in it to throw an exception.
3. Changed error reporting so that even if no errors could be found via regular expressions, it will still display compilation errors. Likewise, if compilation is successful it will not display output (such as warnings)
Index: .sheetsrc
===================================================================
RCS file: /cvsroot/sheets/sheets/.sheetsrc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** .sheetsrc 24 Apr 2003 09:38:10 -0000 1.13
--- .sheetsrc 8 Jun 2003 17:14:34 -0000 1.14
***************
*** 12,16 ****
#set screen-insets 0 108 0 0
! set web-browser "explorer.exe"
# Use this instead for *nix systems:
#set web-browser "mozilla"
--- 12,16 ----
#set screen-insets 0 108 0 0
! set web-browser "konqueror"
# Use this instead for *nix systems:
#set web-browser "mozilla"
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Sheets.sheets 4 Jun 2003 17:47:40 -0000 1.54
--- Sheets.sheets 8 Jun 2003 17:14:34 -0000 1.55
***************
*** 4618,4625 ****
// This is really nothing more than parseString without the error handling
// for IO errors.
! private synchronized Fragment[] JavaFragmentParser.parseIntoFragments ()
! throws IOException {
! // I think the synchronized keyword is at this point purely historical,
! // but I don't really want to find out the hard way.
JavaParser parser = new JavaParser(new StringBufferInputStream(text));
parser.file = text;
--- 4618,4622 ----
// This is really nothing more than parseString without the error handling
// for IO errors.
! private Fragment[] JavaFragmentParser.parseIntoFragments () throws IOException {
JavaParser parser = new JavaParser(new StringBufferInputStream(text));
parser.file = text;
***************
*** 4633,4638 ****
protoFragments = parser.JavaFragments();
} catch (ParseException e) {
- // The extra spewage to the console is more trouble than it is worth.
- // Console.warning("Couldn't parse it -- " + e.getMessage());
Console.batchedDisplay(e.getShortMessage());
parsedOK = false;
--- 4630,4633 ----
***************
*** 4643,4648 ****
}
} catch (TokenMgrError e) {
- // The extra spewage to the console is more trouble than it is worth.
- // Console.warning("Couldn't lex it -- " + e.getMessage());
Console.batchedDisplay("Couldn't tokenize it");
parsedOK = false;
--- 4638,4641 ----
***************
*** 8889,8898 ****
ExportRecord record = ExportRecord.forName(file);
int line = Integer.parseInt(matcher.group(2));
! String unparsedEntry = "";
if (record == null || !addError(errorSheet, record, file, line, matcher.group(3))) {
// pushes the match into unparsed text because no error could be generated
! unparsedEntry = matcher.group();
}
- matcher.appendReplacement(unparsedText, unparsedEntry);
}
matcher.appendTail(unparsedText);
--- 8882,8890 ----
ExportRecord record = ExportRecord.forName(file);
int line = Integer.parseInt(matcher.group(2));
! matcher.appendReplacement(unparsedText, "");
if (record == null || !addError(errorSheet, record, file, line, matcher.group(3))) {
// pushes the match into unparsed text because no error could be generated
! unparsedText.append(matcher.group());
}
}
matcher.appendTail(unparsedText);
***************
*** 8900,8905 ****
outString = unparsedText.toString();
}
- if (errorSheet.numFragments() == 0)
- return null;
if (unparsedText.length() > 0)
addText(errorSheet, unparsedText.toString());
--- 8892,8895 ----
***************
*** 9027,9044 ****
outString = StringSplitter.trimCRs(StringSplitter.expandTabs(outString));
CompileDialogSentinel.clearErrors();
! Sheet errors = parseErrors(outString);
! // Console.notify(null, 0);
! if (errors != null) {
SheetFrame frame = new SheetFrame(errors, Profile.getDefaultViews("full"), false);
Sheets.getRootFrame().addSheet(frame);
((SheetViewer)frame.getEditor().embeddedView).contentView
.showAttributeInFragments("errors");
- Console.status("Found compilation errors.");
Console.beep();
} else {
! if (procResult != 0)
! Console.status("Compilation failed.");
! else
! Console.status("Compilation successful.");
}
}
--- 9017,9030 ----
outString = StringSplitter.trimCRs(StringSplitter.expandTabs(outString));
CompileDialogSentinel.clearErrors();
! if (procResult != 0) {
! Console.status("Compilation failed.");
! Sheet errors = parseErrors(outString);
SheetFrame frame = new SheetFrame(errors, Profile.getDefaultViews("full"), false);
Sheets.getRootFrame().addSheet(frame);
((SheetViewer)frame.getEditor().embeddedView).contentView
.showAttributeInFragments("errors");
Console.beep();
} else {
! Console.status("Compilation successful.");
}
}
***************
*** 86150,86154 ****
comp.removeContainer(this);
! if (!interesting)
makeInteresting();
if (numFragments() == 0 && !interesting) {
--- 86136,86140 ----
comp.removeContainer(this);
! if (interesting)
makeInteresting();
if (numFragments() == 0 && !interesting) {
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** todo.txt 4 Jun 2003 17:47:44 -0000 1.23
--- todo.txt 8 Jun 2003 17:14:35 -0000 1.24
***************
*** 3,6 ****
--- 3,7 ----
more annoying bugs:
+ Trouble loading files with spaces in the name (when done by file association)
java.lang.NullPointerException
at org.browsecode.sheets.TextualViewer.getSaveRect(TextualViewer.java:252)
***************
*** 17,26 ****
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
! annoying bugs that should be fixed:
long delays for completions... should be run in a separate thread.
byte code lookups for large class libraries are slow!!! (cache results, or better yet index the known jars locally in sheets)
window still closes if you click cancel during exit
--- 18,41 ----
Todo:
+ Setup line numbers based on location of methods when imported.
+ Command-line project import feature (possibly by a special file that gets read)
+ Get rid of annoying warnings about temporary or transient sheets disappearing.
+ Database recovery now! (so that other database bugs can be diagnosed consistently)
+
+ 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
! Completion Stuff:
long delays for completions... should be run in a separate thread.
+ - get rid of antiquated timeout
+ fix completion support in go box to:
+ - kill off thread when user types more
+ - when user trys to complete (by typing tab) do a join
+ - methods of inner classes show up in completion, but "go" doesn't work
+ have a global completion key binding for the entire program
+
+ Annoying bugs that should be fixed:
byte code lookups for large class libraries are slow!!! (cache results, or better yet index the known jars locally in sheets)
window still closes if you click cancel during exit
***************
*** 31,35 ****
dragging in TOC only works on left side of items
no line numbers on inner classes
- methods of inner classes show up in completion, but "go" doesn't work
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
--- 46,49 ----
***************
*** 49,53 ****
Stuff I Want to do:
Make the compile/recompile commands general purpose exec commands that can be listed and bound in the .sheetsrc file
- Add a Profile keybinding for search-box completion
Fix the language expert so that it can lookup the right xml expert by public identifier.
Create a package/class-lookup routine for the bytecode support (modeled after the ClassPath.java bcel class)
--- 63,66 ----
|
|
From: <ox-...@us...> - 2003-06-08 17:14:48
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv16047/lib Modified Files: bootstrap-sheets.jar Log Message: 1. Fixed a bug with the interesting flag that was causing spurious messages and warnings. 2. Fixed a bug with error parsing, which would cause unparsed text with the '$' character in it to throw an exception. 3. Changed error reporting so that even if no errors could be found via regular expressions, it will still display compilation errors. Likewise, if compilation is successful it will not display output (such as warnings) Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 Binary files /tmp/cvs0Q7Hwh and /tmp/cvsT6QnBB differ |
|
From: <ox-...@us...> - 2003-06-04 18:17:09
|
Update of /cvsroot/sheets/sheets/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv5241a/installer
Modified Files:
Sheets.iap_xml
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.iap_xml
===================================================================
RCS file: /cvsroot/sheets/sheets/installer/Sheets.iap_xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Sheets.iap_xml 27 May 2003 07:45:33 -0000 1.6
--- Sheets.iap_xml 4 Jun 2003 17:47:44 -0000 1.7
***************
*** 2,7 ****
<!-- This script was automatically generated using Zero G's InstallAnywhere 5.0.7 Standard, Build 1680
STATUS: Fully Functional LICENSED Edition
! DATE: Fri May 23 15:56:53 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1269">
<!-- ** DO NOT EDIT ** Essential authorization and configuration data ** DO NOT EDIT ** -->
<essentialScriptInfo>
--- 2,7 ----
<!-- This script was automatically generated using Zero G's InstallAnywhere 5.0.7 Standard, Build 1680
STATUS: Fully Functional LICENSED Edition
! DATE: Tue Jun 03 11:34:49 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1346">
<!-- ** DO NOT EDIT ** Essential authorization and configuration data ** DO NOT EDIT ** -->
<essentialScriptInfo>
***************
*** 11,17 ****
<buildID>3,13,71,87,105,110,100,111,119,115,32,50,48,48,48,44,32,53,46,49,44,32,120,56,54,59,32,74,97,118,97,32,49,46,51,46,49,95,48,51,44,32,83,117,110,32,77,105,99,114,111,115,121,115,116,101,109,115,32,73,110,99,46,44,32,104,116,116,112,58,47,47,106,97,118,97,46,115,117,110,46,99,111,109,47,59,32,101,110,44,32,85,83,59,32,67,112,49,50,53,50</buildID>
<!-- The authorizationID may change between project saves and builds. This does not effect the integrity of the project, nor do changes in this value represent changes in the actual InstallAnywhere project. -->
! <authorizationID>1,0,0,-16,83,51,32,0,80,112,114,103,83,98,113,97,113,49,51,67,58,65,70,68,86,69,64,69,66,69,48,63,87,5,2,13,10,29,119,5,0,0,0</authorizationID>
</essentialScriptInfo>
! <installationObjects uniqueObjects="64">
<object class="com.zerog.ia.installer.Installer" objectID="7e3307a0b772">
<property name="wizardME">
--- 11,17 ----
<buildID>3,13,71,87,105,110,100,111,119,115,32,50,48,48,48,44,32,53,46,49,44,32,120,56,54,59,32,74,97,118,97,32,49,46,51,46,49,95,48,51,44,32,83,117,110,32,77,105,99,114,111,115,121,115,116,101,109,115,32,73,110,99,46,44,32,104,116,116,112,58,47,47,106,97,118,97,46,115,117,110,46,99,111,109,47,59,32,101,110,44,32,85,83,59,32,67,112,49,50,53,50</buildID>
<!-- The authorizationID may change between project saves and builds. This does not effect the integrity of the project, nor do changes in this value represent changes in the actual InstallAnywhere project. -->
! <authorizationID>1,0,0,-16,-125,-13,32,-32,80,112,114,103,83,98,113,97,113,49,51,67,58,65,70,68,86,69,64,69,66,69,48,63,87,5,2,1,14,19,126,5,0,0,0</authorizationID>
</essentialScriptInfo>
! <installationObjects uniqueObjects="67">
<object class="com.zerog.ia.installer.Installer" objectID="7e3307a0b772">
<property name="wizardME">
***************
*** 167,171 ****
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="6abe05df8eae">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
--- 167,171 ----
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="a1dbbb998eb0">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
***************
*** 258,262 ****
</property>
<property name="fileSize">
! <long>5237944</long>
</property>
<property name="macBinary">
--- 258,262 ----
</property>
<property name="fileSize">
! <long>1502777</long>
</property>
<property name="macBinary">
***************
*** 277,284 ****
</property>
<property name="userSplashPath">
! <string><![CDATA[C:\sheets\graphics\]]></string>
</property>
<property name="userSplashName">
! <string><![CDATA[sheets-logo.jpg]]></string>
</property>
<property name="localesToBuild">
--- 277,284 ----
</property>
<property name="userSplashPath">
! <string><![CDATA[C:\sheets\installer\installer-graphics\]]></string>
</property>
<property name="userSplashName">
! <string><![CDATA[sheets-logo-noprogress.jpg]]></string>
</property>
<property name="localesToBuild">
***************
*** 301,304 ****
--- 301,307 ----
</method>
<method name="addElement">
+ <string><![CDATA[Choose Java Virtual Machine]]></string>
+ </method>
+ <method name="addElement">
<string><![CDATA[Choose $SHORTCUT_NAME$ Folder]]></string>
</method>
***************
*** 315,319 ****
</property>
<property name="installProgressLabelIndex">
! <int>5</int>
</property>
<property name="installProgressLabelOption">
--- 318,322 ----
</property>
<property name="installProgressLabelIndex">
! <int>6</int>
</property>
<property name="installProgressLabelOption">
***************
*** 357,361 ****
</property>
<property name="splashHeight">
! <int>300</int>
</property>
<property name="splashWidth">
--- 360,364 ----
</property>
<property name="splashHeight">
! <int>320</int>
</property>
<property name="splashWidth">
***************
*** 425,429 ****
</property>
<property name="resourceName">
! <string><![CDATA[LICENSE.sheets]]></string>
</property>
<property name="sourceFileType">
--- 428,432 ----
</property>
<property name="resourceName">
! <string><![CDATA[LICENSE.sheets.html]]></string>
</property>
<property name="sourceFileType">
***************
*** 470,473 ****
--- 473,507 ----
</method>
<method name="addElement">
+ <object class="com.zerog.ia.installer.actions.ChooseJavaVMAction" objectID="a20ab6e38eca">
+ <property name="imageOption">
+ <int>1</int>
+ </property>
+ <property name="userHasVMChoice">
+ <boolean>true</boolean>
+ </property>
+ <property name="title">
+ <string><![CDATA[Choose Java Virtual Machine]]></string>
+ </property>
+ <property name="header">
+ <string><![CDATA[Please Choose a Java VM for Use by the Installed Application]]></string>
+ </property>
+ <property name="canUseJRE">
+ <boolean>true</boolean>
+ </property>
+ <property name="canUseMicrosoft">
+ <boolean>false</boolean>
+ </property>
+ <property name="canUseJDK">
+ <boolean>true</boolean>
+ </property>
+ <property name="labelOption">
+ <int>2</int>
+ </property>
+ <property name="labelIndex">
+ <int>3</int>
+ </property>
+ </object>
+ </method>
+ <method name="addElement">
<object class="com.zerog.ia.installer.actions.ShortcutLocAction" objectID="7e3307b4b77a">
<property name="imageOption">
***************
*** 496,500 ****
</property>
<property name="labelIndex">
! <int>3</int>
</property>
</object>
--- 530,534 ----
</property>
<property name="labelIndex">
! <int>4</int>
</property>
</object>
***************
*** 539,543 ****
</property>
<property name="labelIndex">
! <int>4</int>
</property>
<property name="fieldList">
--- 573,577 ----
</property>
<property name="labelIndex">
! <int>5</int>
</property>
<property name="fieldList">
***************
*** 575,579 ****
</property>
<property name="labelIndex">
! <int>6</int>
</property>
<rules logicalOperation="AND">
--- 609,613 ----
</property>
<property name="labelIndex">
! <int>7</int>
</property>
<rules logicalOperation="AND">
***************
*** 615,619 ****
</property>
<property name="labelIndex">
! <int>6</int>
</property>
<rules logicalOperation="AND">
--- 649,653 ----
</property>
<property name="labelIndex">
! <int>7</int>
</property>
<rules logicalOperation="AND">
***************
*** 702,710 ****
<string><![CDATA[jre]]></string>
</property>
<property name="buildSettings">
<object class="java.util.Properties">
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Fri May 23 15:56:53 PDT 2003]]></string>
</method>
<method name="put">
--- 736,781 ----
<string><![CDATA[jre]]></string>
</property>
+ <property name="RPMSpec">
+ <object class="com.zerog.ia.installer.RPMSpec" objectID="a1e517a88ec3">
+ <property name="enabled">
+ <boolean>true</boolean>
+ </property>
+ <property name="name">
+ <string><![CDATA[Sheets Hypertext Environment]]></string>
+ </property>
+ <property name="version">
+ <string><![CDATA[2.0.0.0]]></string>
+ </property>
+ <property name="release">
+ <string><![CDATA[2.0.0.0]]></string>
+ </property>
+ <property name="summary">
+ <string><![CDATA[<none>]]></string>
+ </property>
+ <property name="copyright">
+ <string><![CDATA[2002]]></string>
+ </property>
+ <property name="url">
+ <string><![CDATA[www.browsecode.org]]></string>
+ </property>
+ <property name="distribution">
+ <string><![CDATA[<none>]]></string>
+ </property>
+ <property name="vendor">
+ <string><![CDATA[BrowseCode.org]]></string>
+ </property>
+ <property name="group">
+ <string><![CDATA[Applications/System]]></string>
+ </property>
+ <property name="packager">
+ <string><![CDATA[]]></string>
+ </property>
+ </object>
+ </property>
<property name="buildSettings">
<object class="java.util.Properties">
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Tue Jun 03 11:34:48 PDT 2003]]></string>
</method>
<method name="put">
***************
*** 750,754 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
! <string><![CDATA[Fri May 23 15:56:53 PDT 2003]]></string>
</method>
<method name="put">
--- 821,825 ----
<method name="put">
<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
! <string><![CDATA[Tue Jun 03 11:34:48 PDT 2003]]></string>
</method>
<method name="put">
***************
*** 835,866 ****
</property>
<property name="backgroundImagePath">
! <string><![CDATA[com/zerog/ia/installer/images/]]></string>
</property>
<property name="backgroundImageName">
! <string><![CDATA[backgroundImage.gif]]></string>
</property>
<property name="currentLabelIconPath">
! <string><![CDATA[com/zerog/ia/installer/images/]]></string>
</property>
<property name="currentLabelIconName">
! <string><![CDATA[currentLabelIcon.gif]]></string>
</property>
<property name="previousLabelIconPath">
! <string><![CDATA[com/zerog/ia/installer/images/]]></string>
</property>
<property name="previousLabelIconName">
! <string><![CDATA[previousLabelIcon.gif]]></string>
</property>
<property name="futureLabelIconPath">
! <string><![CDATA[com/zerog/ia/installer/images/]]></string>
</property>
<property name="futureLabelIconName">
! <string><![CDATA[futureLabelIcon.gif]]></string>
</property>
<property name="fitBackgroundImageHorizontally">
! <boolean>true</boolean>
</property>
<property name="fitBackgroundImageVertically">
! <boolean>true</boolean>
</property>
</object>
--- 906,937 ----
</property>
<property name="backgroundImagePath">
! <string><![CDATA[C:\sheets\installer\installer-graphics\]]></string>
</property>
<property name="backgroundImageName">
! <string><![CDATA[wizard.jpg]]></string>
</property>
<property name="currentLabelIconPath">
! <string><![CDATA[C:\sheets\installer\installer-graphics\]]></string>
</property>
<property name="currentLabelIconName">
! <string><![CDATA[active.gif]]></string>
</property>
<property name="previousLabelIconPath">
! <string><![CDATA[C:\sheets\installer\installer-graphics\]]></string>
</property>
<property name="previousLabelIconName">
! <string><![CDATA[complete.gif]]></string>
</property>
<property name="futureLabelIconPath">
! <string><![CDATA[C:\sheets\installer\installer-graphics\]]></string>
</property>
<property name="futureLabelIconName">
! <string><![CDATA[upcoming.gif]]></string>
</property>
<property name="fitBackgroundImageHorizontally">
! <boolean>false</boolean>
</property>
<property name="fitBackgroundImageVertically">
! <boolean>false</boolean>
</property>
</object>
***************
*** 1263,1266 ****
--- 1334,1353 ----
<string><![CDATA[]]></string>
</property>
+ <property name="shortcutIcon">
+ <object class="com.zerog.ia.installer.util.BindingWin32" objectID="a1e6c86d8ec4">
+ <property name="smallIconName">
+ <string><![CDATA[icon.gif]]></string>
+ </property>
+ <property name="largeIconName">
+ <string><![CDATA[icon32.gif]]></string>
+ </property>
+ <property name="smallIconPath">
+ <string><![CDATA[C:\sheets\graphics\]]></string>
+ </property>
+ <property name="largeIconPath">
+ <string><![CDATA[C:\sheets\graphics\]]></string>
+ </property>
+ </object>
+ </property>
<property name="shouldUninstall">
<boolean>true</boolean>
***************
*** 1414,1418 ****
</property>
<property name="fileSize">
! <long>181447</long>
</property>
<property name="macBinary">
--- 1501,1505 ----
</property>
<property name="fileSize">
! <long>182495</long>
</property>
<property name="macBinary">
|
|
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
|
|
From: <ox-...@us...> - 2003-06-04 17:48:13
|
Update of /cvsroot/sheets/sheets/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv5241a/lib
Modified Files:
bootstrap-sheets.jar
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: bootstrap-sheets.jar
===================================================================
RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
Binary files /tmp/cvsC28CBA and /tmp/cvsWJk8Xh differ
|
|
From: <ox-...@us...> - 2003-06-04 17:48:12
|
Update of /cvsroot/sheets/sheets/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv5241a/graphics
Added Files:
icon32.gif icon48.gif
Removed Files:
tree.gif
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).
--- NEW FILE: icon32.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: icon48.gif ---
(This appears to be a binary file; contents omitted.)
--- tree.gif DELETED ---
|
|
From: <ox-...@us...> - 2003-06-03 22:22:25
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv11675
Modified Files:
Sheets.sheets todo.txt
Log Message:
Removed the magical project setting for java fragments. The previous behavior was that all java fragments got their project from the file header. However, it is sometimes necessary to work with code that has fragments from the same package split acros different projects.
Now java fragments get their package like any other normal fragment (by inheriting it from the fragment they extend, picking it up from context, or setting it manuall)
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Sheets.sheets 2 Jun 2003 08:05:04 -0000 1.52
--- Sheets.sheets 3 Jun 2003 22:22:11 -0000 1.53
***************
*** 2124,2128 ****
throw new Error("\\"" + comp + "\\" doesn't have an identity.");
if (this.objectIdPrefix == null) {
! this.project = (projectIsReadOnly()) ? computeProject() : comp.project;
Project.createIfNotFound(this.project);
if (this.project == comp.project) {
--- 2124,2128 ----
throw new Error("\\"" + comp + "\\" doesn't have an identity.");
if (this.objectIdPrefix == null) {
! this.project = comp.project;
Project.createIfNotFound(this.project);
if (this.project == comp.project) {
***************
*** 2153,2157 ****
if (this instanceof LightWeightFragment)
throw new Error("Can't set ID of lightweight frags.");
- project = (projectIsReadOnly()) ? computeProject() : project;
Project.createIfNotFound(project);
this.project = project;
--- 2153,2156 ----
***************
*** 5728,5732 ****
nkramer:9399
rgs:7513
- nkramer:28180
nkramer:28402
rgs:6417
--- 5727,5730 ----
***************
*** 13064,13069 ****
rgs:7507
rgs:8483
- nkramer:28179
- nkramer:28539
nkramer:27668
nkramer:27669
--- 13062,13065 ----
***************
*** 13219,13226 ****
ram:2425
nkramer:28164
- nkramer:28178
nkramer:28171
ram:2114
- nkramer:28538
nkramer:28192
nkramer:28401
--- 13215,13220 ----
***************
*** 27242,27266 ****
return project;
}
- object nkramer:28178
- pkg=org.browsecode.sheets.archive
- type=java
- section text nkramer:28178
- // Whether or not the "project" attribute is read only.
- public boolean SheetsArchivalObject.projectIsReadOnly () { return false; }
- object nkramer:28179
- pkg=org.browsecode.javaStuff
- type=java
- section text nkramer:28179
- // Under sufficiently bogus circumstances, we can't compute any useful project.
- // One such situation is if the package has been set, but to a package that we
- // don't have the definition for.
- public boolean JavaFragment.projectIsReadOnly () {
- return computeProject() != null;
- }
- object nkramer:28180
- pkg=org.browsecode.javaStuff
- type=java
- section text nkramer:28180
- public boolean JavaFileHeaderFragment.projectIsReadOnly () { return false; }
object nkramer:28192
pkg=org.browsecode.sheets.archive
--- 27236,27239 ----
***************
*** 28259,28282 ****
// Make sure to intern the string before you set this field.
private static String Profile.userSpecifiedFavoriteProject;
- object nkramer:28538
- pkg=org.browsecode.sheets.archive
- type=java
- section text nkramer:28538
- // Anyone whose project is computed should implement this method.
- // And don't call this method unless the project is computed (aka read only).
- public String SheetsArchivalObject.computeProject () {
- throw new Error("Default method of computeProject should never be called");
- }
- object nkramer:28539
- pkg=org.browsecode.javaStuff
- type=java
- section text nkramer:28539
- public String JavaFragment.computeProject () {
- JavaFileHeaderFragment pkg = JavaPackageSentinel.getPackage(getPackage());
- if (pkg == null)
- return null;
- else
- return pkg.getProjectName();
- }
object nkramer:28542
pkg=org.browsecode.sheets.archive
--- 28232,28235 ----
***************
*** 28629,28633 ****
(Fragment comp, String newProject)
{
! if (!comp.projectIsReadOnly() && !(comp instanceof LightWeightFragment)
&& comp.getProjectName() != newProject)
comp.setProject(newProject);
--- 28582,28586 ----
(Fragment comp, String newProject)
{
! if (!(comp instanceof LightWeightFragment)
&& comp.getProjectName() != newProject)
comp.setProject(newProject);
***************
*** 54201,54205 ****
result.addElement(new ScalarAttribute("project", this) {
- public boolean isWritable () { return !projectIsReadOnly(); }
public String getValue () { return getProjectName(); }
protected void setValue (String value) { setProject(value); }
--- 54154,54157 ----
***************
*** 96538,96543 ****
nkramer:27977
rgs:8483
- nkramer:28179
- nkramer:28539
nkramer:27667
nkramer:27668
--- 96490,96493 ----
***************
*** 97156,97163 ****
nkramer:28232
nkramer:28164
- nkramer:28178
nkramer:28171
ram:2114
- nkramer:28538
nkramer:28192
nkramer:28401
--- 97106,97111 ----
***************
*** 99882,99886 ****
nkramer:9399
rgs:7513
- nkramer:28180
nkramer:28402
rgs:13352
--- 99830,99833 ----
***************
*** 101691,101695 ****
nkramer:28438
object ram:2144
! classpath=C:\\sheets\\lib\\bootstrap-sheets.jar
project=Sheets
root=src/java
--- 101638,101642 ----
nkramer:28438
object ram:2144
! classpath=/home/schin/sheets/lib/bootstrap-sheets.jar
project=Sheets
root=src/java
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** todo.txt 2 Jun 2003 08:05:15 -0000 1.21
--- todo.txt 3 Jun 2003 22:22:16 -0000 1.22
***************
*** 2,5 ****
--- 2,20 ----
-
+ more annoying bugs:
+ java.lang.NullPointerException
+ at org.browsecode.sheets.TextualViewer.getSaveRect(TextualViewer.java:252)
+ at org.browsecode.sheets.TextualViewer.contentHeight(TextualViewer.java:121)
+ at org.browsecode.sheets.Viewer.height(Viewer.java:189)
+ at org.browsecode.sheets.ListViewer.validate(ListViewer.java:323)
+ at org.browsecode.sheets.AbstractSheetViewer.validate(AbstractSheetViewer.java:276)
+ at org.browsecode.sheets.ViewPanel.makeValid(ViewPanel.java:276)
+ at org.browsecode.sheets.ViewPanel.doAllRedraws(ViewPanel.java:1272)
+ at org.browsecode.sheets.SimpleCommandMenuItem.actionPerformed(SimpleCommandMenuItem.java:97)
+ Wizard stuff (possibly duplicate):
+ * Should not let the user go back form the file import screen.
+ * Should not let the user close the wizard during file import.
+
+ Todo:
* Fix the background image of the project wizard dialog
* Show the import errors in a new wizard pane
|
|
From: <ox-...@us...> - 2003-06-02 08:06:22
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv19018
Modified Files:
Sheets.sheets todo.txt
Log Message:
1. New splash screen on startup... Must see!
- Cool new design (thanks, Mike)
- Uses the new logo
- Has a progress bar
2. Fixed the timing of the initialization process
- Splash screen disappears once sheets opens
- New project dialog comes up after Sheets
3. New icon to match the logo
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Sheets.sheets 29 May 2003 19:23:56 -0000 1.51
--- Sheets.sheets 2 Jun 2003 08:05:04 -0000 1.52
***************
*** 2251,2255 ****
BrokenLink.tryFixing();
! SentinelMgr.finalizeSentinels();
LanguageExpert.compressEverything();
}
--- 2251,2257 ----
BrokenLink.tryFixing();
! SentinelMgr.finalizeSentinels();
! // Display any messages that might have been generated during finalization
! Console.displayBatchedMessages();
LanguageExpert.compressEverything();
}
***************
*** 26775,26795 ****
type=java
section text nkramer:27865
! private static void Sheets.loadFiles (InitState state) {
! if (!(state.sheetsFiles.isEmpty() && state.projects.isEmpty())) {
! try {
! ObjectIdSentinel.loadAll(state.projects, state.sheetsFiles);
! }
! catch (IOException e) {
! System.err.println(e + " while reading a project.");
! DB.abort();
! System.exit(1);
! }
! } else if (state.filesToImport.size() == 0 && state.newDB) {
! try {
! HistoryManager.beginChangeCommand("import dumpfile");
! new ProjectWizardDialog(Sheets.getRootFrame()).show();
! } finally {
! HistoryManager.endChangeCommand("import dumpfile");
! }
}
--- 26777,26790 ----
type=java
section text nkramer:27865
! private static boolean Sheets.loadFiles (InitState state) {
! boolean loadedSomething = false;
!
! if (!(state.sheetsFiles.isEmpty() && state.projects.isEmpty())) try {
! loadedSomething = true;
! ObjectIdSentinel.loadAll(state.projects, state.sheetsFiles);
! } catch (IOException e) {
! System.err.println(e + " while reading a project.");
! DB.abort();
! System.exit(1);
}
***************
*** 26800,26803 ****
--- 26795,26799 ----
}
if (importList.size() > 0) try {
+ loadedSomething = true;
HistoryManager.beginChangeCommand("import files");
new FileImportProgressDialog(Sheets.getRootFrame(), importList).show();
***************
*** 26805,26808 ****
--- 26801,26806 ----
HistoryManager.endChangeCommand("import files");
}
+
+ return loadedSomething;
}
object nkramer:27868
***************
*** 26973,26981 ****
return false;
} catch (IOException e) {
! // I'm not sure what the right thing to do here is...
! throw new Error("ServerSocket failed: " + e);
}
! new Thread(new ExistingSheetsProcess(), "Sheets server process").run();
return true;
}
--- 26971,26980 ----
return false;
} catch (IOException e) {
! Console.error(e);
}
! Thread thread = new Thread(new ExistingSheetsProcess(), "Sheets server process");
! thread.setDaemon(true);
! thread.start();
return true;
}
***************
*** 27037,27043 ****
section text nkramer:27930
private static void ExistingSheetsProcess.showUsageAndExit () {
! System.out.println
! ("Usage: java org.browsecode.sheets.ExistingSheetsProcess"
! + " someFile.comp");
System.exit(1);
}
--- 27036,27040 ----
section text nkramer:27930
private static void ExistingSheetsProcess.showUsageAndExit () {
! System.out.println("Usage: java org.browsecode.sheets.ExistingSheetsProcess someFile.comp");
System.exit(1);
}
***************
*** 37268,37271 ****
--- 37265,37270 ----
// give them the chance.
SentinelMgr.finalizeSentinels();
+ // Display any messages that might have been generated during finalization
+ Console.displayBatchedMessages();
}
***************
*** 51655,51662 ****
((Sentinel)sentinels.get(i)).finalizeEvents();
}
-
- // Hack: Calling "displayBatchedMessages" is not logically part of our job,
- // but someone needs to call it, and this is the most convenient place.
- Console.displayBatchedMessages();
}
object rgs:7180
--- 51654,51657 ----
***************
*** 69885,69889 ****
// forces the menubar to use the right L&F
SwingUtilities.updateComponentTreeUI(Sheets.getRootFrame());
- rootFrame.setVisible(true);
}
object schin:39
--- 69880,69883 ----
***************
*** 71766,71782 ****
schin:323
schin:281
- schin:279
- schin:271
schin:400
object schin:267
pkg=org.browsecode.sheets.archive
type=java
section text schin:267
! Image Wizard.backgroundImage;
object schin:268
pkg=org.browsecode.sheets.archive
type=java
section text schin:268
! public void Wizard.setBackground(Image backgroundImage) {
this.backgroundImage = backgroundImage;
setOpaque(false);
--- 71760,71775 ----
schin:323
schin:281
schin:400
+ schin:279
object schin:267
pkg=org.browsecode.sheets.archive
type=java
section text schin:267
! ImageIcon Wizard.backgroundImage;
object schin:268
pkg=org.browsecode.sheets.archive
type=java
section text schin:268
! public void Wizard.setBackgroundImage(ImageIcon backgroundImage) {
this.backgroundImage = backgroundImage;
setOpaque(false);
***************
*** 71787,71800 ****
section text schin:270
WizardListener Wizard.listener;
- object schin:271
- pkg=org.browsecode.sheets.archive
- type=java
- section text schin:271
- public void Wizard.paint(Graphics2D g) {
- if (backgroundImage != null)
- // draw the background
- g.drawImage(backgroundImage, 0, 0, getSize().width, getSize().height, this);
- super.paint(g);
- }
object schin:274
pkg=org.browsecode.sheets.archive
--- 71780,71783 ----
***************
*** 71826,71831 ****
type=java
section text schin:279
! public void Wizard.paintComponents(Graphics2D g) {
! super.paintComponent(g);
}
object schin:280
--- 71809,71816 ----
type=java
section text schin:279
! public void Wizard.paintComponent(Graphics g) {
! if (backgroundImage != null)
! // draw the background
! backgroundImage.paintIcon(this, g, 0, 0);
}
object schin:280
***************
*** 72276,72280 ****
super(parent, title, true);
! Image image = getToolkit().createImage(getClass().getResource("/graphics/project-wizard.jpg"));
addWindowListener(new WindowAdapter() {
--- 72261,72265 ----
super(parent, title, true);
! ImageIcon image = new ImageIcon(getClass().getResource("/graphics/project-wizard.jpg"));
addWindowListener(new WindowAdapter() {
***************
*** 72284,72290 ****
});
! getContentPane().add(wizard = new Wizard(this, firstCard));
wizard.setPreferredSize(new Dimension(600, 400));
! wizard.setBackground(image);
pack();
setLocationRelativeTo(parent);
--- 72269,72276 ----
});
! wizard = new Wizard(this, firstCard);
! wizard.setBackgroundImage(image);
wizard.setPreferredSize(new Dimension(600, 400));
! getContentPane().add(wizard);
pack();
setLocationRelativeTo(parent);
***************
*** 73145,73148 ****
--- 73131,73137 ----
if (closeOnFinish)
wizard.finishWizard();
+ else
+ // would be nice to show this in the wizard
+ Console.displayBatchedMessages();
}
};
***************
*** 73240,73244 ****
type=java
section text schin:417
! public void ImportProgressCard.execute() {
ArrayList importList = (ArrayList)getProperty("imports");
int count = 0;
--- 73229,73233 ----
type=java
section text schin:417
! public void ImportProgressCard.execute() throws IOException {
ArrayList importList = (ArrayList)getProperty("imports");
int count = 0;
***************
*** 73257,73260 ****
--- 73246,73255 ----
});
}
+
+ setStatusText("Finalizing Import");
+ SentinelMgr.finalizeSentinels();
+
+ setStatusText("Synchronizing Database");
+ State.getObjectDatabase().sync();
}
object schin:418
***************
*** 73763,73766 ****
--- 73758,73762 ----
setStatusText("Synchronizing Database");
State.getObjectDatabase().sync();
+ progress.setValue(progress.getMaximum());
}
object schin:473
***************
*** 80181,80185 ****
{
super("Sheets");
- showSplash();
}
object schin:1033
--- 80177,80180 ----
***************
*** 80201,80205 ****
});
! setIconImage(getToolkit().createImage(getClass().getResource("/graphics/stump.gif")));
getContentPane().setLayout(new BorderLayout());
--- 80196,80200 ----
});
! setIconImage(getToolkit().createImage(getClass().getResource("/graphics/icon.gif")));
getContentPane().setLayout(new BorderLayout());
***************
*** 82330,82333 ****
--- 82325,82481 ----
return null;
}
+ object schin:1256
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1256
+ public class Splash
+ section exports schin:1256
+ schin:1257
+ schin:1260
+ schin:1258
+ schin:1268
+ schin:1259
+ schin:1261
+ object schin:1257
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1257
+ JWindow Splash.window;
+ object schin:1258
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1258
+ public Splash(int numIncrements)
+ {
+ window = new JWindow();
+
+ Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+ progress = new Progress(new Rectangle(29, 302, 440, 20), new ImageIcon(getClass().getResource("/graphics/sheets-logo.jpg")), numIncrements);
+ progress.setBorder(BorderFactory.createLineBorder(Color.black));
+ window.getContentPane().add(progress);
+ window.pack();
+ window.move((int)((d.getWidth() - window.getWidth()) / 2), (int)((d.getHeight() - window.getHeight()) / 2));
+ window.show();
+ window.toFront();
+ }
+ object schin:1259
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1259
+ public void Splash.close() {
+ progress.timer.cancel();
+ window.dispose();
+ window = null;
+ progress = null;
+ }
+ object schin:1260
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1260
+ Progress Splash.progress;
+ object schin:1261
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1261
+ public static class Splash.Progress extends JComponent
+ section exports schin:1261
+ schin:1262
+ schin:1263
+ schin:1264
+ schin:1270
+ schin:1271
+ schin:1269
+ schin:1265
+ schin:1266
+ schin:1272
+ schin:1267
+ object schin:1262
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1262
+ Rectangle Splash.Progress.progressArea;
+ object schin:1263
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1263
+ ImageIcon Splash.Progress.image;
+ object schin:1264
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1264
+ int Splash.Progress.increment;
+ object schin:1265
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1265
+ public Splash.Progress (Rectangle area, ImageIcon image, int numIncrements) {
+ this.progressArea = area;
+ this.image = image;
+ this.numIncrements = numIncrements;
+ setOpaque(false);
+ setPreferredSize(new Dimension(image.getIconWidth(), image.getIconHeight()));
+
+ // We use a timer to get the effect that the progress bar is updated more frequently than it
+ // really is. For each 1/30th of a second interval, we increment the taskbar 10% of the way
+ // to the next increment.
+ timer = new java.util.Timer();
+ timer.schedule(new TimerTask() {
+ public void run() {
+ if (firstPaintComplete) {
+ subincrement = 1f - (1f - subincrement) * .9f;
+ paintImmediately(progressArea);
+ }
+ }
+ }, 0, 33);
+ }
+ object schin:1266
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1266
+ public void Splash.Progress.updateProgress(int increment) {
+ this.increment = increment;
+ subincrement = 0f;
+ paintImmediately(progressArea);
+ }
+ object schin:1267
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1267
+ public void Splash.Progress.paintComponent(Graphics g) {
+ Graphics2D g2d = (Graphics2D)g;
+ image.paintIcon(this, g2d, 0, 0);
+ g2d.setPaint(new Color(0, 0, 0, 63));
+ Rectangle scaledRegion = (Rectangle)progressArea.clone();
+ scaledRegion.setSize((int)(scaledRegion.getWidth() * (increment + subincrement) / numIncrements), (int)scaledRegion.getHeight());
+ g2d.fill(scaledRegion);
+ firstPaintComplete = true;
+ }
+ object schin:1268
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1268
+ public void Splash.updateProgress(int increment) {
+ progress.updateProgress(increment);
+ }
+ object schin:1269
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1269
+ java.util.Timer Splash.Progress.timer;
+ object schin:1270
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1270
+ int Splash.Progress.numIncrements;
+ object schin:1271
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1271
+ float Splash.Progress.subincrement;
+ object schin:1272
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1272
+ private boolean Splash.Progress.firstPaintComplete;
object sjc:1
pkg=org.browsecode.sheets.dicer
***************
*** 87572,87575 ****
--- 87720,87725 ----
public static void Sheets.main (String args[]) throws Exception
{
+ final Splash splash = new Splash(6);
+
EventQueue.invokeAndWait(new Runnable() {
public void run() {
***************
*** 87577,87589 ****
}
});
InitState state = new InitState();
parseCommandLine(args, state);
-
scanFilenames(state);
initDatabase(state);
Sheet lostStuff = checkForCrash();
! loadFiles(state);
startOpenRequestServer(state);
Console.status("Synchronizing....");
--- 87727,87744 ----
}
});
+ splash.updateProgress(1);
InitState state = new InitState();
parseCommandLine(args, state);
scanFilenames(state);
+ splash.updateProgress(2);
+
initDatabase(state);
+ splash.updateProgress(3);
+
Sheet lostStuff = checkForCrash();
! boolean loadedSomething = loadFiles(state);
startOpenRequestServer(state);
+ splash.updateProgress(4);
Console.status("Synchronizing....");
***************
*** 87595,87606 ****
Console.status("Synchronizing....failed.");
}
-
HistoryManager.init();
EventQueue.invokeAndWait(new Runnable() {
public void run() {
createRootFrame();
Console.status("Welcome to Sheets, " + Profile.username + "!");
}
});
if (lostStuff != null)
--- 87750,87765 ----
Console.status("Synchronizing....failed.");
}
HistoryManager.init();
+ splash.updateProgress(5);
+
EventQueue.invokeAndWait(new Runnable() {
public void run() {
createRootFrame();
+ splash.updateProgress(6);
+ rootFrame.setVisible(true);
Console.status("Welcome to Sheets, " + Profile.username + "!");
}
});
+ splash.close();
if (lostStuff != null)
***************
*** 87627,87630 ****
--- 87786,87796 ----
ExistingSheetsProcess.maybeStartServer();
+
+ if (!loadedSomething && state.newDB) try {
+ HistoryManager.beginChangeCommand("import dumpfile");
+ new ProjectWizardDialog(Sheets.getRootFrame()).show();
+ } finally {
+ HistoryManager.endChangeCommand("import dumpfile");
+ }
}
object wlott:770
***************
*** 94868,94871 ****
--- 95034,95055 ----
ram:2360
lightWeight:separator
+ schin:1261
+ schin:1262
+ schin:1263
+ schin:1264
+ schin:1270
+ schin:1271
+ schin:1269
+ schin:1265
+ schin:1266
+ schin:1272
+ schin:1267
+ schin:1256
+ schin:1257
+ schin:1260
+ schin:1258
+ schin:1268
+ schin:1259
+ lightWeight:separator
nkramer:9
nkramer:6934
***************
*** 98330,98335 ****
schin:1026
schin:147
- schin:1034
- schin:28
schin:1032
schin:1033
--- 98514,98517 ----
***************
*** 101459,101463 ****
schin:281
schin:279
- schin:271
object ram:2109
title=Applying
--- 101641,101644 ----
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** todo.txt 30 May 2003 08:16:01 -0000 1.20
--- todo.txt 2 Jun 2003 08:05:15 -0000 1.21
***************
*** 2,7 ****
-
! Important:
! need to fix sync on open so it is iterative
annoying bugs that should be fixed:
--- 2,7 ----
-
! * Fix the background image of the project wizard dialog
! * Show the import errors in a new wizard pane
annoying bugs that should be fixed:
|
|
From: <ox-...@us...> - 2003-06-02 08:06:20
|
Update of /cvsroot/sheets/sheets/graphics In directory sc8-pr-cvs1:/tmp/cvs-serv19018/graphics Modified Files: sheets-logo.jpg Added Files: icon.gif tree.gif Log Message: 1. New splash screen on startup... Must see! - Cool new design (thanks, Mike) - Uses the new logo - Has a progress bar 2. Fixed the timing of the initialization process - Splash screen disappears once sheets opens - New project dialog comes up after Sheets 3. New icon to match the logo --- NEW FILE: icon.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tree.gif --- (This appears to be a binary file; contents omitted.) Index: sheets-logo.jpg =================================================================== RCS file: /cvsroot/sheets/sheets/graphics/sheets-logo.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsuh3YlP and /tmp/cvsABygpw differ |
|
From: <ox-...@us...> - 2003-06-02 08:06:16
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv19018/lib Modified Files: bootstrap-sheets.jar Log Message: 1. New splash screen on startup... Must see! - Cool new design (thanks, Mike) - Uses the new logo - Has a progress bar 2. Fixed the timing of the initialization process - Splash screen disappears once sheets opens - New project dialog comes up after Sheets 3. New icon to match the logo Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 Binary files /tmp/cvsHTQWqa and /tmp/cvsU1yhPX differ |
|
From: <ox-...@us...> - 2003-05-30 19:14:13
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv4000
Modified Files:
build.xml
Log Message:
1. Updated the Java grammar to handle byte[].class construct.
2. Fixed the build file to check before recompiling javacc
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.xml 30 May 2003 08:16:00 -0000 1.20
--- build.xml 30 May 2003 19:13:40 -0000 1.21
***************
*** 29,32 ****
--- 29,43 ----
</target>
+ <target name="javacc" unless="javacc.uptodate">
+ <java classname="jjtree" classpath="${javacc-jar}" fork="yes">
+ <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
+ <arg value="${parsers}/JavaParser.jjt"/>
+ </java>
+ <java classname="javacc" classpath="${javacc-jar}" fork="yes">
+ <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
+ <arg value="${javadir}/JavaParser.jj"/>
+ </java>
+ </target>
+
<target name="compile" depends="init"
description="Compiles the java code (automatically exports from Sheets)">
***************
*** 40,51 ****
<!-- Note: JavaCC 3.0 is not supported by ant, so we need to invoke it directly -->
! <java classname="jjtree" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${parsers}/JavaParser.jjt"/>
! </java>
! <java classname="javacc" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${javadir}/JavaParser.jj"/>
! </java>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
--- 51,56 ----
<!-- Note: JavaCC 3.0 is not supported by ant, so we need to invoke it directly -->
! <uptodate property="javacc.uptodate" srcfile="${parsers}/JavaParser.jjt" targetfile="${javadir}/JavaParser.java"/>
! <antcall target="javacc"/>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
|
|
From: <ox-...@us...> - 2003-05-30 19:13:58
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv4000/lib Modified Files: bootstrap-sheets.jar Log Message: 1. Updated the Java grammar to handle byte[].class construct. 2. Fixed the build file to check before recompiling javacc Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsptdcrD and /tmp/cvsS2sGyV differ |
|
From: <ox-...@us...> - 2003-05-30 19:13:55
|
Update of /cvsroot/sheets/sheets/parsers
In directory sc8-pr-cvs1:/tmp/cvs-serv4000/parsers
Modified Files:
JavaParser.jjt
Log Message:
1. Updated the Java grammar to handle byte[].class construct.
2. Fixed the build file to check before recompiling javacc
Index: JavaParser.jjt
===================================================================
RCS file: /cvsroot/sheets/sheets/parsers/JavaParser.jjt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JavaParser.jjt 22 May 2002 21:46:28 -0000 1.1
--- JavaParser.jjt 30 May 2003 19:13:52 -0000 1.2
***************
*** 1,11 ****
// Derived from Java1.1.jj in the JavaCC examples directory.
- // ### Doesn't handle the construct "int[].class"
-
/**
* Change history:
! * 5/11 - Incorporated changes for Java 1.4 to handle the assert keyword.
! * 11/01 - Modified this grammar to accept the strictfp keyword, which is new in
! * Java 1.2. --Stephen Chin
*/
--- 1,11 ----
// Derived from Java1.1.jj in the JavaCC examples directory.
/**
* Change history:
! * 5/30/03 - [sjc] Fixed int[].class construct
! * 5/11/02 - [sjc] Incorporated changes for Java 1.4 to handle the assert
! keyword.
! * 11/01 - Modified this grammar to accept the strictfp keyword, which is new
! * in Java 1.2. --Stephen Chin [sjc]
*/
***************
*** 1035,1043 ****
{}
{
! ArefExpression()
! ( LOOKAHEAD(2)
! DotClass()
! | (<DOT> ArefExpression())
! )*
}
--- 1035,1045 ----
{}
{
! (
! LOOKAHEAD( ResultType() DotClass() )
! ResultType() DotClass()
! |
! ArefExpression()
! )
! ( LOOKAHEAD(2) <DOT> ArefExpression())*
}
|
|
From: <ox-...@us...> - 2003-05-30 08:19:39
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv26874
Modified Files:
build.xml todo.txt
Log Message:
Upgraded to JavaCC 3.0. The functionality is nearly identical to the previous version, but they mucked with the packaging.
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** build.xml 29 May 2003 19:23:59 -0000 1.19
--- build.xml 30 May 2003 08:16:00 -0000 1.20
***************
*** 2,6 ****
<!-- set global properties for this build -->
! <property name="JAVACC_HOME" value="tools"/>
<property name="java" value="src/java"/>
<property name="lib" value="lib"/>
--- 2,6 ----
<!-- set global properties for this build -->
! <property name="javacc-jar" value="tools/javacc.jar"/>
<property name="java" value="src/java"/>
<property name="lib" value="lib"/>
***************
*** 38,43 ****
<property name="javadir" value="${java}/org/browsecode/javaStuff"/>
<property name="htmldir" value="${java}/org/browsecode/html"/>
! <jjtree target="${parsers}/JavaParser.jjt" outputdirectory="${javadir}" javacchome="${JAVACC_HOME}"/>
! <javacc target="${javadir}/JavaParser.jj" javacchome="${JAVACC_HOME}"/>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
--- 38,51 ----
<property name="javadir" value="${java}/org/browsecode/javaStuff"/>
<property name="htmldir" value="${java}/org/browsecode/html"/>
!
! <!-- Note: JavaCC 3.0 is not supported by ant, so we need to invoke it directly -->
! <java classname="jjtree" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${parsers}/JavaParser.jjt"/>
! </java>
! <java classname="javacc" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${javadir}/JavaParser.jj"/>
! </java>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** todo.txt 29 May 2003 19:23:59 -0000 1.19
--- todo.txt 30 May 2003 08:16:01 -0000 1.20
***************
*** 6,9 ****
--- 6,14 ----
annoying bugs that should be fixed:
+ long delays for completions... should be run in a separate thread.
+ byte code lookups for large class libraries are slow!!! (cache results, or better yet index the known jars locally in sheets)
+ window still closes if you click cancel during exit
+ interesting memo list errors out the wazoo
+ stand-alone comments don't get added to class exports automatically
doesn't show references for inner class (ie. Goto Reference on ViewPanel.scoll)
empty compile command causes exceptions
|
