Menu
▾
▴
[Sheets-cvs] sheets Sheets.sheets,1.63,1.64 build.xml,1.22,1.23 todo.txt,1.29,1.30
|
From: <ox-...@us...> - 2003-07-14 17:37:02
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv19457
Modified Files:
Sheets.sheets build.xml todo.txt
Log Message:
Non-functional version of Sheets (the database is unstable). Although, I have made a bootstrap-ox version of the database, so development can continue with a stable version of the database.
The only change to Sheets was to fix the load order so that the splash screen does not come up if you are merely opening a file. Since this required a database change, you can't see it except when testing the new code.
Checked in some missing installer graphics.
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Sheets.sheets 18 Jun 2003 12:20:55 -0000 1.63
--- Sheets.sheets 14 Jul 2003 17:36:25 -0000 1.64
***************
*** 479,484 ****
private static void Sheets.parseCommandLine (String args[], InitState state)
{
! Vector fileList = new Vector();
! String userName = null;
for (int i = 0; i < args.length; i++) {
--- 479,483 ----
private static void Sheets.parseCommandLine (String args[], InitState state)
{
! state.fileList = new Vector();
for (int i = 0; i < args.length; i++) {
***************
*** 487,491 ****
currentDir = arg.substring(2);
else if (arg.startsWith("-u"))
! userName = arg.substring(2);
else if (arg.startsWith("-h"))
sheetsHome = arg.substring(2);
--- 486,490 ----
currentDir = arg.substring(2);
else if (arg.startsWith("-u"))
! state.username = arg.substring(2);
else if (arg.startsWith("-h"))
sheetsHome = arg.substring(2);
***************
*** 506,516 ****
state.logMessage = new File(args[++i]);
} else
! doOneArg(arg, fileList);
}
!
! if (userName == null)
! userName = System.getProperty("user.name");
! Profile.initialize(userName);
! state.fileList = fileList;
}
object nkramer:20
--- 505,512 ----
state.logMessage = new File(args[++i]);
} else
! doOneArg(arg, state.fileList);
}
! if (state.username == null)
! state.username = System.getProperty("user.name");
}
object nkramer:20
***************
*** 3325,3330 ****
rgs:3469
schin:169
- schin:25
- schin:26
nkramer:444
nkramer:5074
--- 3321,3324 ----
***************
*** 26655,26658 ****
--- 26649,26653 ----
nkramer:27856
rgs:13200
+ schin:1292
nkramer:27857
nkramer:27863
***************
*** 26703,26706 ****
--- 26698,26703 ----
state.filesToImport.addElement(file);
}
+ if (state.dbFile == null)
+ state.dbFile = new File("sheets.sdb");
}
object nkramer:27862
***************
*** 26709,26715 ****
section text nkramer:27862
private static void Sheets.initDatabase (InitState state) {
- if (state.dbFile == null)
- state.dbFile = new File("sheets.sdb");
-
if (!state.dbFile.exists()) {
state.newDB = true;
--- 26706,26709 ----
***************
*** 26740,26744 ****
State.loadGlobalState();
} catch (DatabaseLockedException e) {
- // If the database is locked, we should attempt to notify the corresponding Sheets process
if (!sendOpenRequest(state)) {
// Print out a user friendly message to suggest possible causes
--- 26734,26737 ----
***************
*** 37236,37241 ****
if (fragmentsChanged) {
ArchivalReference[] undoIDs = new ArchivalReference[ch.size()];
! for (int i = 0; i < undoIDs.length; i++)
undoIDs[i] = ((Checkpoint)(ch.elementAt(i))).getArchivalReference();
CommandCheckpoints ckp = new CommandCheckpoints(State.getObjectDatabase());
ckp.undoIDs = undoIDs;
--- 37229,37235 ----
if (fragmentsChanged) {
ArchivalReference[] undoIDs = new ArchivalReference[ch.size()];
! for (int i = 0; i < undoIDs.length; i++) {
undoIDs[i] = ((Checkpoint)(ch.elementAt(i))).getArchivalReference();
+ }
CommandCheckpoints ckp = new CommandCheckpoints(State.getObjectDatabase());
ckp.undoIDs = undoIDs;
***************
*** 38617,38626 ****
if (changeCommandStack.empty()) {
UndoDialog.maybeFinishUndo();
! if (getDeadFragments().size() != 0)
Console.internalError("Dead fragments not empty at beginChangeCommand?");
! if (getChangeHistory().size() != 0)
Console.internalError("History not empty at beginChangeCommand?");
! if (getReplacedFragments().size() != 0)
Console.internalError("Replaced fragments not empty at beginChangeCommand?");
}
changeCommandStack.push(cmd);
--- 38611,38626 ----
if (changeCommandStack.empty()) {
UndoDialog.maybeFinishUndo();
! if (getDeadFragments().size() != 0) {
! getDeadFragments().setSize(0);
Console.internalError("Dead fragments not empty at beginChangeCommand?");
! }
! if (getChangeHistory().size() != 0) {
! getChangeHistory().setSize(0);
Console.internalError("History not empty at beginChangeCommand?");
! }
! if (getReplacedFragments().size() != 0) {
! getReplacedFragments().setSize(0);
Console.internalError("Replaced fragments not empty at beginChangeCommand?");
+ }
}
changeCommandStack.push(cmd);
***************
*** 69691,69707 ****
return new SheetPropertiesDialog(this);
}
- object schin:25
- pkg=org.browsecode.sheets
- type=java
- section text schin:25
- private RootFrame ContainerFrame.rootFrame;
- object schin:26
- pkg=org.browsecode.sheets
- type=java
- section text schin:26
- public RootFrame ContainerFrame.getRootFrame()
- {
- return rootFrame;
- }
object schin:27
pkg=org.browsecode.sheets
--- 69691,69694 ----
***************
*** 82649,82652 ****
--- 82636,82645 ----
view.replaceMultiLines(0, lines.length - 1, JavaFragment.adjustLines(output, (short)(Profile.standardJavaIndent + 1)));
}
+ object schin:1292
+ pkg=org.browsecode.sheets
+ type=java
+ section text schin:1292
+ // Primary username for this session
+ String InitState.username;
object sjc:1
pkg=org.browsecode.sheets.dicer
***************
*** 87891,87895 ****
public static void Sheets.main (String args[]) throws Exception
{
! final Splash splash = new Splash(6);
EventQueue.invokeAndWait(new Runnable() {
--- 87884,87899 ----
public static void Sheets.main (String args[]) throws Exception
{
! // read command line parameters
! InitState state = new InitState();
! parseCommandLine(args, state);
! scanFilenames(state);
!
! // if the database is already open, this must be a file open command
! if (!(state.dbFile.exists() && ObjectDatabase.databaseLocked(state.dbFile)))
! if (sendOpenRequest(state))
! System.exit(1); // successful file open
!
! // show splash screen
! final Splash splash = new Splash(5);
EventQueue.invokeAndWait(new Runnable() {
***************
*** 87900,87908 ****
splash.updateProgress(1);
! InitState state = new InitState();
! parseCommandLine(args, state);
! scanFilenames(state);
splash.updateProgress(2);
initDatabase(state);
splash.updateProgress(3);
--- 87904,87912 ----
splash.updateProgress(1);
! // initialize the profile
! Profile.initialize(state.username);
splash.updateProgress(2);
+ // initialize the database
initDatabase(state);
splash.updateProgress(3);
***************
*** 95195,95198 ****
--- 95199,95203 ----
nkramer:27856
rgs:13200
+ schin:1292
nkramer:27857
nkramer:27863
***************
*** 98735,98740 ****
nkramer:439
schin:172
- schin:25
- schin:26
nkramer:444
nkramer:5074
--- 98740,98743 ----
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml 10 Jun 2003 09:42:30 -0000 1.22
--- build.xml 14 Jul 2003 17:36:27 -0000 1.23
***************
*** 76,79 ****
--- 76,80 ----
<include name="**/*.jar"/>
<exclude name="bootstrap-sheets.jar"/>
+ <exclude name="bootstrap-ox.jar"/>
</patternset>
</fileset>
***************
*** 131,137 ****
</target>
! <target name="bootstrap" depends="dist"
description="Makes the current distribution the devel version of sheets">
! <copy file="${dist}/sheets.jar" tofile="${lib}/bootstrap-sheets.jar"/>
</target>
--- 132,139 ----
</target>
! <target name="bootstrap" depends="compile"
description="Makes the current distribution the devel version of sheets">
! <!-- The bootstrap differs from the distribution, because it has no manifest -->
! <jar jarfile="${lib}/bootstrap-sheets.jar" basedir="${classes}"/>
</target>
***************
*** 149,153 ****
<echo>Launching sheets...</echo>
! <java jar="${lib}/bootstrap-sheets.jar" maxmemory="384m" fork="true">
<!-- Fix for Solaris pref spaming -->
<jvmarg value="-Djava.util.prefs.syncInterval=2000000"/>
--- 151,155 ----
<echo>Launching sheets...</echo>
! <java classname="org.browsecode.sheets.Sheets" maxmemory="384m" fork="true">
<!-- Fix for Solaris pref spaming -->
<jvmarg value="-Djava.util.prefs.syncInterval=2000000"/>
***************
*** 157,160 ****
--- 159,172 ----
<arg line="${arg.import}"/>
<arg value="${database}"/>
+ <classpath>
+ <fileset dir="${lib}">
+ <patternset>
+ <include name="**/*.jar"/>
+ <exclude name="sheets.jar"/>
+ <exclude name="ox.jar"/>
+ </patternset>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
</java>
</target>
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** todo.txt 18 Jun 2003 12:20:56 -0000 1.29
--- todo.txt 14 Jul 2003 17:36:27 -0000 1.30
***************
*** 3,6 ****
--- 3,7 ----
todo:
+ line number is off (due to change in export format)
improve performance of file import by turning off the history manager during the batch.
|
