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-05-30 08:19:38
|
Update of /cvsroot/sheets/sheets/tools In directory sc8-pr-cvs1:/tmp/cvs-serv26874/tools Added Files: javacc.jar Removed Files: JavaCC.zip Log Message: Upgraded to JavaCC 3.0. The functionality is nearly identical to the previous version, but they mucked with the packaging. --- NEW FILE: javacc.jar --- (This appears to be a binary file; contents omitted.) --- JavaCC.zip DELETED --- |
|
From: <ox-...@us...> - 2003-05-29 19:24:35
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv5346a
Modified Files:
Sheets.sheets build.xml todo.txt
Log Message:
Sheets now uses platform L&F by default. Upgrade to JDK 1.4.2 to get the new XP/GTK L&Fs.
New database version with the following fix:
1. Fixed one more subtle, yet nasty, database bug. After the recent change to promote from slots rather than the original new object list, garbage collection was marking the old objects. Modified the promotion algorithm to update slot information as they are populated.
Database seems to be stable (finally).
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Sheets.sheets 23 May 2003 20:49:05 -0000 1.50
--- Sheets.sheets 29 May 2003 19:23:56 -0000 1.51
***************
*** 10372,10376 ****
docFont = new FontFamily("documentation-font", "Serif");
! lookAndFeel = "com.incors.plaf.kunststoff.KunststoffLookAndFeel";
updateLookAndFeel();
int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
--- 10372,10376 ----
docFont = new FontFamily("documentation-font", "Serif");
! lookAndFeel = "system";
updateLookAndFeel();
int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
***************
*** 10408,10412 ****
gotoExistingWindow = true;
javaDocumentationURLs = new Vector();
! addJavaDocUrl("java.*", "http://java.sun.com/j2se/1.4/docs/api");
File docs = new File(Sheets.sheetsHome, "doc/reference.html");
if (docs.exists())
--- 10408,10412 ----
gotoExistingWindow = true;
javaDocumentationURLs = new Vector();
! addJavaDocUrl("java.*", "http://java.sun.com/j2se/1.4.2/docs/api");
File docs = new File(Sheets.sheetsHome, "doc/reference.html");
if (docs.exists())
***************
*** 49584,49587 ****
--- 49584,49588 ----
if (embeddedView.height() <= painter.compHeight) {
firstLine = 0;
+ scroll.setValues(0, 0, 0, 0);
scroll.setEnabled(false);
} else {
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** build.xml 23 May 2003 09:55:05 -0000 1.18
--- build.xml 29 May 2003 19:23:59 -0000 1.19
***************
*** 56,60 ****
<!-- Compile the java source code -->
! <javac srcdir="${java}" destdir="${classes}" debug="on" includeAntRuntime="no">
<classpath>
<pathelement location="${classes}"/>
--- 56,60 ----
<!-- Compile the java source code -->
! <javac source="1.4" srcdir="${java}" destdir="${classes}" debug="on" includeAntRuntime="no">
<classpath>
<pathelement location="${classes}"/>
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** todo.txt 23 May 2003 09:55:05 -0000 1.18
--- todo.txt 29 May 2003 19:23:59 -0000 1.19
***************
*** 6,9 ****
--- 6,10 ----
annoying bugs that should be fixed:
+ doesn't show references for inner class (ie. Goto Reference on ViewPanel.scoll)
empty compile command causes exceptions
dragging in TOC only works on left side of items
|
|
From: <ox-...@us...> - 2003-05-29 19:24:21
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv5346a/lib Modified Files: bootstrap-sheets.jar ox.jar Log Message: Sheets now uses platform L&F by default. Upgrade to JDK 1.4.2 to get the new XP/GTK L&Fs. New database version with the following fix: 1. Fixed one more subtle, yet nasty, database bug. After the recent change to promote from slots rather than the original new object list, garbage collection was marking the old objects. Modified the promotion algorithm to update slot information as they are populated. Database seems to be stable (finally). Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 Binary files /tmp/cvsUYVDd9 and /tmp/cvssGYO2D differ Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsqJjl7C and /tmp/cvsuAznb7 differ |
|
From: <ox-...@us...> - 2003-05-28 11:40:53
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv28131/lib Modified Files: ox.jar Log Message: New version of ox with the following fix: 1. Fixed a newly introduced bug with the objectCache. New objects were getting added at the wrong position during a promote, which caused ClassCastExceptions to occur later on. Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsdddYUd and /tmp/cvsa9BmUk differ |
|
From: <ox-...@us...> - 2003-05-27 09:23:50
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv14314 Modified Files: .cvsignore Log Message: YANVO (yet another new version of ox) This one fixes a new bug I inadvertently introduced that was the cause of data corruption. Things seem to be working better now. Index: .cvsignore =================================================================== RCS file: /cvsroot/sheets/sheets/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 22 May 2002 21:46:27 -0000 1.1 --- .cvsignore 27 May 2003 08:49:13 -0000 1.2 *************** *** 3,7 **** *.sdb *.message - *.lock src build --- 3,6 ---- |
|
From: <ox-...@us...> - 2003-05-27 09:23:50
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv14314/lib Modified Files: ox.jar Log Message: YANVO (yet another new version of ox) This one fixes a new bug I inadvertently introduced that was the cause of data corruption. Things seem to be working better now. Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsxwFVxU and /tmp/cvsgIhWcG differ |
|
From: <ox-...@us...> - 2003-05-27 07:45:37
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv16832/lib Modified Files: ox.jar Log Message: New version of OX with the following features: 1. Change the promotion algorithm so that it breaks data from a single sync across multiple slots. Also reduces the number of times data is re-stored. 2. Added version numbers for slots to allow future changes 3. Changed slot arrays so that they directly read/write from the byte buffer -- this resulted in improved performance and space efficiency. NOTE: This database format is incompatible with previous databases. Please recreate your .sdb file. Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvs4aFwl4 and /tmp/cvsUbpiEX differ |
|
From: <ox-...@us...> - 2003-05-27 07:45:36
|
Update of /cvsroot/sheets/sheets/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv16832/installer
Modified Files:
Sheets.iap_xml
Log Message:
New version of OX with the following features:
1. Change the promotion algorithm so that it breaks data from a single sync across multiple slots. Also reduces the number of times data is re-stored.
2. Added version numbers for slots to allow future changes
3. Changed slot arrays so that they directly read/write from the byte buffer -- this resulted in improved performance and space efficiency.
NOTE: This database format is incompatible with previous databases. Please recreate your .sdb file.
Index: Sheets.iap_xml
===================================================================
RCS file: /cvsroot/sheets/sheets/installer/Sheets.iap_xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Sheets.iap_xml 8 May 2003 22:21:13 -0000 1.5
--- Sheets.iap_xml 27 May 2003 07:45:33 -0000 1.6
***************
*** 2,6 ****
<!-- This script was automatically generated using Zero G's InstallAnywhere 5.0.7 Standard, Build 1680
STATUS: Fully Functional LICENSED Edition
! DATE: Thu May 08 15:07:48 PDT 2003 -->
<InstallAnywhere_Deployment_Project increments="1269">
<!-- ** DO NOT EDIT ** Essential authorization and configuration data ** DO NOT EDIT ** -->
--- 2,6 ----
<!-- 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 ** -->
***************
*** 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,3,-45,-48,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,2,4,16,121,5,0,0,0</authorizationID>
</essentialScriptInfo>
<installationObjects uniqueObjects="64">
--- 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,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">
***************
*** 167,171 ****
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="1d51d5948eb1">
<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="6abe05df8eae">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
***************
*** 258,262 ****
</property>
<property name="fileSize">
! <long>5236869</long>
</property>
<property name="macBinary">
--- 258,262 ----
</property>
<property name="fileSize">
! <long>5237944</long>
</property>
<property name="macBinary">
***************
*** 706,710 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Thu May 08 15:07:47 PDT 2003]]></string>
</method>
<method name="put">
--- 706,710 ----
<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">
***************
*** 750,754 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
! <string><![CDATA[Thu May 08 15:07:47 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">
***************
*** 1414,1418 ****
</property>
<property name="fileSize">
! <long>170088</long>
</property>
<property name="macBinary">
--- 1414,1418 ----
</property>
<property name="fileSize">
! <long>181447</long>
</property>
<property name="macBinary">
|
|
From: <ox-...@us...> - 2003-05-23 20:52:20
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv15453/lib Modified Files: bootstrap-sheets.jar ox.jar Log Message: Includes a new version of OX, which has an alternative file locking mechanism is getting a FileLock fails. This is necessary to work around problems on NFS. Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Binary files /tmp/cvsmL2rYf and /tmp/cvsC8sX8g differ Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs91Dt9F and /tmp/cvsOlXXDd differ |
|
From: <ox-...@us...> - 2003-05-23 20:49:44
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv15453
Modified Files:
Sheets.sheets
Log Message:
Includes a new version of OX, which has an alternative file locking mechanism is getting a FileLock fails. This is necessary to work around problems on NFS.
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Sheets.sheets 23 May 2003 09:55:00 -0000 1.49
--- Sheets.sheets 23 May 2003 20:49:05 -0000 1.50
***************
*** 26751,26755 ****
if (!sendOpenRequest(state)) {
// Print out a user friendly message to suggest possible causes
! Console.error("Unable to open Sheets. Please try one of the following remedies:\\nA) If Sheets is currently running, please close it.\\nB) If Sheets is not running delete \\"" + state.dbFile.getAbsolutePath() + ".lock\\" and then try again.");
System.exit(0);
}
--- 26751,26755 ----
if (!sendOpenRequest(state)) {
// Print out a user friendly message to suggest possible causes
! Console.error(e.getMessage());
System.exit(0);
}
|
|
From: <ox-...@us...> - 2003-05-23 09:55:40
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv18983
Modified Files:
Sheets.sheets build.xml todo.txt
Log Message:
1. automatically append .bat to command on failure (to emulate windows command prompt behavior)
2. fixed extend class wizard to work for bytecode objects
3. extend class wizard now prints out starting brace on same line as header
4. extend class wizard now removes comments, removes abstract keyword, and adds public keyword for interfaces
5. Goto documentation now works properly for throws clauses and class extends/implements
6. Fixed memo list bug (caused those annoying dialogs on exit)
7. Increased efficiency of prototype.sdb file copy
8. Updated code to use new database API
9. Fixed exit so that it will not close the main window if you abort
10. Turned off caching of ByteCodeObjects in order to prevent database corruption
11. Updated to new version of OX -- Database recreate required!
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Sheets.sheets 8 May 2003 22:21:11 -0000 1.48
--- Sheets.sheets 23 May 2003 09:55:00 -0000 1.49
***************
*** 8984,8992 ****
try {
proc = Runtime.getRuntime().exec(newcmd);
! }
! catch (IOException e) {
! Console.log("Execution of " + newcmd + " failed to start: " + e);
! Console.status("Execution of " + newcmd + " failed to start: " + e);
! return;
}
--- 8984,9002 ----
try {
proc = Runtime.getRuntime().exec(newcmd);
! } catch (IOException e) {
! try {
! // try executing command with a ".bat" extension like the command prompt in windows
! int firstSpace = newcmd.indexOf(" ");
! String withBat;
! if (firstSpace == -1)
! withBat = newcmd + ".bat";
! else
! withBat = newcmd.substring(0, firstSpace) + ".bat" + newcmd.substring(firstSpace);
! proc = Runtime.getRuntime().exec(withBat);
! } catch (IOException e2) {
! Console.log("Execution of " + newcmd + " failed to start: " + e);
! Console.status("Execution of " + newcmd + " failed to start: " + e);
! return;
! }
}
***************
*** 26715,26732 ****
if (protoFile.exists()) {
try {
! byte[] buffer = new byte[2048];
! InputStream proto = new FileInputStream(protoFile);
! OutputStream db = new FileOutputStream(state.dbFile);
! int bytes = proto.read(buffer);
! while (bytes != -1) {
! db.write(buffer, 0, bytes);
! bytes = proto.read(buffer);
}
db.close();
proto.close();
} catch (FileNotFoundException e) {
! ;
} catch (IOException e) {
! ;
}
}
--- 26725,26743 ----
if (protoFile.exists()) {
try {
! FileChannel proto = new FileInputStream(protoFile).getChannel();
! FileChannel db = new FileOutputStream(state.dbFile).getChannel();
! long remaining = proto.size();
! long position = 0;
! while (remaining > 0) {
! long transfered = proto.transferTo(position, remaining, db);
! position += transfered;
! remaining -= transfered;
}
db.close();
proto.close();
} catch (FileNotFoundException e) {
! // ignore because we already check file existence
} catch (IOException e) {
! Console.internalError(e);
}
}
***************
*** 26735,26742 ****
ObjectDatabase database = new ObjectDatabase(state.dbFile);
State.setObjectDatabase(database);
- if (state.dbFile.exists())
- database.open();
- else
- database.create();
State.loadGlobalState();
} catch (DatabaseLockedException e) {
--- 26746,26749 ----
***************
*** 26748,26755 ****
}
System.exit(1);
- } catch (ArchivalException e) {
- Console.error("ArchivalException opening " + state.dbFile + ": " + e);
- e.printStackTrace();
- System.exit(1);
} catch (ArchivalRuntimeException e) {
Console.error("ArchivalRuntimeException opening " + state.dbFile + ": " + e);
--- 26755,26758 ----
***************
*** 37303,37307 ****
if (ch.size() >= Profile.globalUndoHistorySize)
ch.removeElementAt(0);
!
ch.addElement(ckp);
}
--- 37306,37310 ----
if (ch.size() >= Profile.globalUndoHistorySize)
ch.removeElementAt(0);
!
ch.addElement(ckp);
}
***************
*** 37904,37907 ****
--- 37907,37914 ----
public static void Sheets.exit (String command)
{
+ if (HistoryManager.changeCommandStack.size() > 1) {
+ Console.internalError("Command change stack not empty upon exit. " + HistoryManager.changeCommandStack);
+ }
+
if (CommitEditsDialog.checkForEdits())
return;
***************
*** 37935,37939 ****
FragmentList.cleanMemoLists();
HistoryManager.endChangeCommand(command, true);
! State.getObjectDatabase().finalize();
Timer.reportAll();
System.exit(0);
--- 37942,37950 ----
FragmentList.cleanMemoLists();
HistoryManager.endChangeCommand(command, true);
! try {
! State.getObjectDatabase().finalize();
! } catch (IOException e) {
! Console.internalError(e);
! }
Timer.reportAll();
System.exit(0);
***************
*** 43293,43306 ****
return "unknown";
}
- object ram:2174
- pkg=org.browsecode.sheets
- type=java
- section text ram:2174
- // When we close the context window, that means exit.
- public void ContextSheetFrame.close (boolean stopObserving, boolean forReal) {
- super.close(true);
- if (!Sheets.tryingToExit)
- Sheets.exit("close-window");
- }
object ram:2175
pkg=org.browsecode.sheets
--- 43304,43307 ----
***************
*** 49408,49412 ****
// Like the above, this is the "header" view, except we use raw names instead
// of class qualified names.
! protected String JavaFragment.classlessHeader () {
String raw = beforeName + simpleName() + afterName.substring(0, headerEnd);
return StringSplitter.join(adjustLines(raw, startingColumn), '\\n');
--- 49409,49413 ----
// Like the above, this is the "header" view, except we use raw names instead
// of class qualified names.
! public String JavaFragment.classlessHeader () {
String raw = beforeName + simpleName() + afterName.substring(0, headerEnd);
return StringSplitter.join(adjustLines(raw, startingColumn), '\\n');
***************
*** 50276,50281 ****
return dialog.editsActive;
}
! else
! return false;
}
object rgs:6091
--- 50277,50281 ----
return dialog.editsActive;
}
! return false;
}
object rgs:6091
***************
*** 58103,58112 ****
for (int i=0; i<indices.length; i++) {
buf.append("\\n\\n");
! JavaFunctionFragment meth = (JavaFunctionFragment) possibleMethods.elementAt(indices[i]);
! if (meth instanceof JavaFragment)
! buf.append(meth.classlessHeader());
! else
! System.out.println("ExtendJavaClassDialog.generateNewFragments for ByteCodeObjects not yet implemented");
! buf.append("\\n{\\n}");
}
result = buf.toString();
--- 58103,58164 ----
for (int i=0; i<indices.length; i++) {
buf.append("\\n\\n");
! JavaInterface meth = (JavaInterface)possibleMethods.elementAt(indices[i]);
! String header = meth.classlessHeader();
!
! // strip comments
! StringBuffer newHeader = new StringBuffer(header.length());
! char lastlastc = ' ';
! char lastc = '\\n';
! boolean inSingleLineComment = false;
! boolean inMultiLineComment = false;
! boolean commentStartsWithReturn = false;
! boolean skipChar = false;
! for (int j=0; j<header.length(); j++) {
! char c = header.charAt(j);
! if (!inMultiLineComment && !inSingleLineComment) {
! if (c == '/' && lastc == '/') { // single line comment start
! inSingleLineComment = true;
! newHeader.setLength(newHeader.length() - 1);
! commentStartsWithReturn = lastlastc == '\\n';
! } else if (c == '*' && lastc == '/') { // multi line comment start
! inMultiLineComment = true;
! newHeader.setLength(newHeader.length() - 1);
! commentStartsWithReturn = lastlastc == '\\n';
! }
! }
!
! if (!skipChar && !inSingleLineComment && !inMultiLineComment)
! newHeader.append(c);
! skipChar = false;
!
! if (inSingleLineComment && c == '\\n') { // single line comment end
! inSingleLineComment = false;
! if (commentStartsWithReturn)
! newHeader.setLength(newHeader.length() - 1);
! commentStartsWithReturn = false;
! } else if (inMultiLineComment && c == '/' && lastc == '*') { // multi line comment end
! inMultiLineComment = false;
! boolean commentEndsWithReturn = header.length() > j + 1 && header.charAt(j + 1) == '\\n';
! if (commentStartsWithReturn && commentEndsWithReturn)
! skipChar = true;
! commentStartsWithReturn = false;
! }
!
! lastlastc = lastc;
! lastc = c;
! }
! header = newHeader.toString();
!
! // remove abstract from header
! header = StringSplitter.substringReplace(header, " abstract ", " ");
! if (header.startsWith("abstract ")) // catch the case where header begins with keyword
! header = header.substring(9);
!
! // add public keyword for interfaces
! if (meth instanceof JavaMemberInterface && ((JavaMemberInterface)meth).enclosingClass().isInterface() && !header.startsWith("public "))
! header = "public " + header;
!
! buf.append(header);
! buf.append(" {\\n}");
}
result = buf.toString();
***************
*** 58664,58668 ****
rgs:10972
rgs:10974
- ram:2174
object rgs:10972
pkg=org.browsecode.sheets
--- 58716,58719 ----
***************
*** 64398,64401 ****
--- 64449,64453 ----
schin:626
schin:627
+ schin:1255
object rgs:13224
pkg=org.browsecode.javaStuff
***************
*** 67766,67770 ****
schin:1012
schin:1013
! schin:1014
schin:1015
schin:1016
--- 67818,67822 ----
schin:1012
schin:1013
! schin:1254
schin:1015
schin:1016
***************
*** 74468,74472 ****
schin:701
schin:961
! schin:1014
schin:1015
schin:1016
--- 74520,74524 ----
schin:701
schin:961
! schin:1254
schin:1015
schin:1016
***************
*** 75692,75696 ****
result[i + fields.length] = ByteCodeFunction.createMethodOrConstructor(methods[i], this);
}
! memberCache = new SoftReference(result);
return result;
}
--- 75744,75749 ----
result[i + fields.length] = ByteCodeFunction.createMethodOrConstructor(methods[i], this);
}
! // disable cache temporarily (was causing problems with ObjectDatabase marking)
! // memberCache = new SoftReference(result);
return result;
}
***************
*** 75810,75813 ****
--- 75863,75867 ----
schin:766
schin:767
+ schin:1253
schin:768
schin:769
***************
*** 78169,78173 ****
if (info instanceof UVector && ((UVector)info).size() > 0)
results = (UVector)info;
! else if (info instanceof JavaFragment) {
results = new UVector();
results.addElement(info);
--- 78223,78227 ----
if (info instanceof UVector && ((UVector)info).size() > 0)
results = (UVector)info;
! else if (info instanceof JavaInterface) {
results = new UVector();
results.addElement(info);
***************
*** 79801,79805 ****
section text schin:996
public String ByteCodeObject.toString(int view) {
- styleList.clear();
switch (view) {
case SHORT_NAME: return simpleName();
--- 79855,79858 ----
***************
*** 79808,79812 ****
case HEADER:
case FULL:
! return styledText();
default:
Console.internalError("Bad view in ByteCodeObject.toString");
--- 79861,79868 ----
case HEADER:
case FULL:
! styleList.clear();
! StringBuffer sb = new StringBuffer();
! styledText(sb, styleList, true);
! return sb.toString();
default:
Console.internalError("Bad view in ByteCodeObject.toString");
***************
*** 79932,79947 ****
this.color = color;
}
- object schin:1014
- pkg=org.browsecode.javaStuff
- type=java
- section text schin:1014
- ArrayList ByteCodeObject.styleList = new ArrayList();
object schin:1015
pkg=org.browsecode.javaStuff
type=java
section text schin:1015
! String ByteCodeObject.styledText() {
StringBuffer sb = new StringBuffer();
! styledText(sb, styleList);
return sb.toString();
}
--- 79988,79998 ----
this.color = color;
}
object schin:1015
pkg=org.browsecode.javaStuff
type=java
section text schin:1015
! public String ByteCodeObject.classlessHeader() {
StringBuffer sb = new StringBuffer();
! styledText(sb, new ArrayList(), false);
return sb.toString();
}
***************
*** 79950,79954 ****
type=java
section text schin:1016
! void ByteCodeObject.styledText(StringBuffer sb, ArrayList styleList) {
String attributes = Utility.accessToString(flags.getModifiers());
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length(), sb.length() + attributes.length(), Profile.reservedWordColor));
--- 80001,80005 ----
type=java
section text schin:1016
! void ByteCodeObject.styledText(StringBuffer sb, ArrayList styleList, boolean prependClass) {
String attributes = Utility.accessToString(flags.getModifiers());
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length(), sb.length() + attributes.length(), Profile.reservedWordColor));
***************
*** 79959,79964 ****
type=java
section text schin:1017
! void ByteCodeClass.styledText(StringBuffer sb, ArrayList styleList) {
! super.styledText(sb, styleList);
if (sb.length() > 0)
sb.append(" ");
--- 80010,80015 ----
type=java
section text schin:1017
! void ByteCodeClass.styledText(StringBuffer sb, ArrayList styleList, boolean prependClass) {
! super.styledText(sb, styleList, prependClass);
if (sb.length() > 0)
sb.append(" ");
***************
*** 80009,80014 ****
type=java
section text schin:1020
! void ByteCodeField.styledText(StringBuffer sb, ArrayList styleList) {
! super.styledText(sb, styleList);
if (sb.length() > 0)
sb.append(" ");
--- 80060,80065 ----
type=java
section text schin:1020
! void ByteCodeField.styledText(StringBuffer sb, ArrayList styleList, boolean prependClass) {
! super.styledText(sb, styleList, prependClass);
if (sb.length() > 0)
sb.append(" ");
***************
*** 80020,80026 ****
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
! // print out Class.fieldName
sb.append(" ");
! sb.append(trueNameString());
}
object schin:1021
--- 80071,80077 ----
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
! // print out field name
sb.append(" ");
! sb.append(prependClass ? trueNameString() : simpleName());
}
object schin:1021
***************
*** 80028,80033 ****
type=java
section text schin:1021
! void ByteCodeMethod.styledText(StringBuffer sb, ArrayList styleList) {
! super.styledText(sb, styleList);
if (sb.length() > 0)
sb.append(" ");
--- 80079,80084 ----
type=java
section text schin:1021
! void ByteCodeMethod.styledText(StringBuffer sb, ArrayList styleList, boolean prependClass) {
! super.styledText(sb, styleList, prependClass);
if (sb.length() > 0)
sb.append(" ");
***************
*** 80039,80045 ****
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
! // print out Class.fieldName
sb.append(" ");
! sb.append(trueNameString());
printSignature(sb, styleList);
--- 80090,80096 ----
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
! // print out method name
sb.append(" ");
! sb.append(prependClass ? trueNameString() : simpleName());
printSignature(sb, styleList);
***************
*** 80049,80054 ****
type=java
section text schin:1022
! void ByteCodeConstructor.styledText(StringBuffer sb, ArrayList styleList) {
! super.styledText(sb, styleList);
if (sb.length() > 0)
sb.append(" ");
--- 80100,80105 ----
type=java
section text schin:1022
! void ByteCodeConstructor.styledText(StringBuffer sb, ArrayList styleList, boolean prependClass) {
! super.styledText(sb, styleList, prependClass);
if (sb.length() > 0)
sb.append(" ");
***************
*** 80342,80348 ****
return null;
ByteCodeClass bcc = new ByteCodeClass(this, clazz);
! if (cachedClasses == null)
! cachedClasses = new HashMap();
! cachedClasses.put(fullName, new SoftReference(bcc));
return bcc;
}
--- 80393,80400 ----
return null;
ByteCodeClass bcc = new ByteCodeClass(this, clazz);
! // disable cache temporarily (was causing problems with ObjectDatabase marking)
! // if (cachedClasses == null)
! // cachedClasses = new HashMap();
! // cachedClasses.put(fullName, new SoftReference(bcc));
return bcc;
}
***************
*** 82259,82262 ****
--- 82311,82332 ----
}
}
+ object schin:1253
+ pkg=org.browsecode.javaStuff
+ type=java
+ section text schin:1253
+ public String JavaInterface.classlessHeader ();
+ object schin:1254
+ pkg=org.browsecode.javaStuff
+ type=java
+ section text schin:1254
+ ArrayList ByteCodeObject.styleList = new ArrayList();
+ object schin:1255
+ pkg=org.browsecode.javaStuff
+ type=java
+ section text schin:1255
+ public String InnerClass.classlessHeader () {
+ // maybe come up with a syntax for this?
+ return null;
+ }
object sjc:1
pkg=org.browsecode.sheets.dicer
***************
*** 85011,85015 ****
sjc:567
wlott:121
- wlott:830
wlott:377
wlott:378
--- 85081,85084 ----
***************
*** 85974,85978 ****
comp.removeContainer(this);
! if (interesting)
makeInteresting();
if (numFragments() == 0 && !interesting) {
--- 86043,86047 ----
comp.removeContainer(this);
! if (!interesting)
makeInteresting();
if (numFragments() == 0 && !interesting) {
***************
*** 86213,86218 ****
public static Object State.getGlobalStateVar (String name)
{
- if (state == null)
- loadGlobalState();
return state.get(name);
}
--- 86282,86285 ----
***************
*** 86223,86228 ****
public static void State.setGlobalStateVar (String name, Object value)
{
- if (state == null)
- loadGlobalState();
state.put(name, value);
}
--- 86290,86293 ----
***************
*** 87166,87170 ****
type=java
section text wlott:633
! public static void ConsistencyCheck.main (String args[])
{
if (args.length != 1) {
--- 87231,87235 ----
type=java
section text wlott:633
! public static void ConsistencyCheck.main (String args[]) throws IOException
{
if (args.length != 1) {
***************
*** 87174,87188 ****
File sdbFile = new File(args[0]);
!
! try {
! State.setObjectDatabase(ObjectDatabase.open(sdbFile));
! } catch (FileDoesNotExistException e) {
System.err.println("Can't find " + sdbFile);
System.exit(1);
} catch (DatabaseLockedException e) {
Console.error(sdbFile + " appears to be in use. If not, delete "
+ sdbFile + ".lock and try again.");
System.exit(1);
! } catch (Exception e) {
System.err.println(e + " while opening " + sdbFile);
System.exit(1);
--- 87239,87254 ----
File sdbFile = new File(args[0]);
! if (!sdbFile.exists()) {
System.err.println("Can't find " + sdbFile);
System.exit(1);
+ }
+
+ try {
+ State.setObjectDatabase(new ObjectDatabase(sdbFile));
} catch (DatabaseLockedException e) {
Console.error(sdbFile + " appears to be in use. If not, delete "
+ sdbFile + ".lock and try again.");
System.exit(1);
! } catch (IOException e) {
System.err.println(e + " while opening " + sdbFile);
System.exit(1);
***************
*** 87677,87688 ****
dialog.dispose();
}
- object wlott:830
- pkg=org.browsecode.sheets
- type=java
- section text wlott:830
- public static void State.clearGlobalState ()
- {
- state = null;
- }
object wlott:833
pkg=org.browsecode.sheets
--- 87743,87746 ----
***************
*** 89329,89333 ****
type=java
section text wlott:2067
! public static void PTableTest.main (String args[])
{
File dbFile = new File("ptabletest.db");
--- 89387,89391 ----
type=java
section text wlott:2067
! public static void PTableTest.main (String args[]) throws IOException
{
File dbFile = new File("ptabletest.db");
***************
*** 89337,89344 ****
ObjectDatabase database;
try {
! database = ObjectDatabase.open(dbFile);
} catch (DatabaseLockedException e) {
throw new Error("Got a DBLockedExcpetion, but we deleted the lock file?");
! } catch (Exception e) {
throw new Error(e.toString());
}
--- 89395,89402 ----
ObjectDatabase database;
try {
! database = new ObjectDatabase(dbFile);
} catch (DatabaseLockedException e) {
throw new Error("Got a DBLockedExcpetion, but we deleted the lock file?");
! } catch (IOException e) {
throw new Error(e.toString());
}
***************
*** 94990,94994 ****
rgs:10972
rgs:10974
- ram:2174
object nkramer:630
title=SheetViewer
--- 95048,95051 ----
***************
*** 103318,103321 ****
--- 103375,103379 ----
schin:766
schin:767
+ schin:1253
schin:768
schin:769
***************
*** 103376,103379 ****
--- 103434,103438 ----
schin:610
schin:612
+ schin:1255
schin:614
schin:615
***************
*** 105885,105889 ****
schin:1000
schin:999
! schin:1014
schin:1015
schin:1016
--- 105944,105948 ----
schin:1000
schin:999
! schin:1254
schin:1015
schin:1016
***************
*** 106694,106698 ****
wlott:120
wlott:121
- wlott:830
wlott:377
wlott:378
--- 106753,106756 ----
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.xml 16 Apr 2003 18:00:53 -0000 1.17
--- build.xml 23 May 2003 09:55:05 -0000 1.18
***************
*** 90,94 ****
<mkdir dir="${test}"/>
<echo>Launching test...</echo>
! <java classname="org.browsecode.sheets.Sheets" maxmemory="192m" dir="${test}" fork="true">
<!-- Fix for Solaris pref spaming -->
<jvmarg value="-Djava.util.prefs.syncInterval=2000000"/>
--- 90,94 ----
<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"/>
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** todo.txt 6 May 2003 10:03:40 -0000 1.17
--- todo.txt 23 May 2003 09:55:05 -0000 1.18
***************
*** 2,11 ****
-
annoying bugs that should be fixed:
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
! * Stuff for Unix:
! The default monocode font is awful. See if there is a better one for unix.
* Better File Management:
--- 2,19 ----
-
+ Important:
+ need to fix sync on open so it is iterative
+
annoying bugs that should be fixed:
+ empty compile command causes exceptions
+ 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
+ Attributes (like file header of and exports) should not keep fragments alive.
! * Database Testing:
! Database (or rather Sheets using the Database) seems to react badly to low memory conditions (perhaps just expediting the inevitable corruption)
* Better File Management:
***************
*** 18,21 ****
--- 26,30 ----
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.
***************
*** 100,104 ****
Fix a few odd cases ("System.out.println")
Need to have repository traverse jars with embedded classpaths
- Middle-click doesn't always work for things which complete successfully
Restrict completion to entities in classpath across projects (JavaSentinel.getClass)
--- 109,112 ----
|
|
From: <ox-...@us...> - 2003-05-23 09:55:21
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv18983/lib Modified Files: bootstrap-sheets.jar ox.jar Log Message: 1. automatically append .bat to command on failure (to emulate windows command prompt behavior) 2. fixed extend class wizard to work for bytecode objects 3. extend class wizard now prints out starting brace on same line as header 4. extend class wizard now removes comments, removes abstract keyword, and adds public keyword for interfaces 5. Goto documentation now works properly for throws clauses and class extends/implements 6. Fixed memo list bug (caused those annoying dialogs on exit) 7. Increased efficiency of prototype.sdb file copy 8. Updated code to use new database API 9. Fixed exit so that it will not close the main window if you abort 10. Turned off caching of ByteCodeObjects in order to prevent database corruption 11. Updated to new version of OX -- Database recreate required! Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 Binary files /tmp/cvsR0ADP4 and /tmp/cvs3kBgDs differ Index: ox.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/ox.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsMuEhKT and /tmp/cvsQr16pE differ |
|
From: <ox-...@us...> - 2003-05-09 01:32:03
|
Update of /cvsroot/sheets/sheets/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv14801/installer
Modified Files:
Sheets.iap_xml
Log Message:
1. Fixed DocDefinition parsing and editing (which is necessary to rename commands).
2. Changed error mapping to also try to resolve against project roots (useful when the compilation filenames don't match the full path of the exported files).
Index: Sheets.iap_xml
===================================================================
RCS file: /cvsroot/sheets/sheets/installer/Sheets.iap_xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Sheets.iap_xml 16 Apr 2003 19:12:44 -0000 1.4
--- Sheets.iap_xml 8 May 2003 22:21:13 -0000 1.5
***************
*** 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 Apr 11 00:38:18 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1261">
<!-- ** 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: Thu May 08 15:07:48 PDT 2003 -->
! <InstallAnywhere_Deployment_Project increments="1269">
<!-- ** 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,115,-93,16,48,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,15,5,25,123,4,0,0,0</authorizationID>
</essentialScriptInfo>
! <installationObjects uniqueObjects="63">
<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,3,-45,-48,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,2,4,16,121,5,0,0,0</authorizationID>
</essentialScriptInfo>
! <installationObjects uniqueObjects="64">
<object class="com.zerog.ia.installer.Installer" objectID="7e3307a0b772">
<property name="wizardME">
***************
*** 29,35 ****
<object class="java.util.Vector">
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="c39d093ab75c">
<property name="propertyValue">
! <string><![CDATA[]]></string>
</property>
<property name="propertyName">
--- 29,35 ----
<object class="java.util.Vector">
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="1497ea188ec2">
<property name="propertyValue">
! <string><![CDATA[Sheets.log]]></string>
</property>
<property name="propertyName">
***************
*** 167,171 ****
</method>
<method name="addElement">
! <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="8f286c308eaf">
<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="1d51d5948eb1">
<property name="propertyValue">
<string><![CDATA[org.browsecode.sheets.Sheets]]></string>
***************
*** 193,196 ****
--- 193,209 ----
</object>
</method>
+ <method name="addElement">
+ <object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="149933dd8ec7">
+ <property name="propertyValue">
+ <string><![CDATA[-Xmx168m]]></string>
+ </property>
+ <property name="propertyName">
+ <string><![CDATA[lax.nl.java.option.additional]]></string>
+ </property>
+ <property name="propertyComment">
+ <string><![CDATA[set the maximum memory size for this application]]></string>
+ </property>
+ </object>
+ </method>
</object>
</property>
***************
*** 245,249 ****
</property>
<property name="fileSize">
! <long>5219927</long>
</property>
<property name="macBinary">
--- 258,262 ----
</property>
<property name="fileSize">
! <long>5236869</long>
</property>
<property name="macBinary">
***************
*** 693,697 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Fri Apr 11 00:38:18 PDT 2003]]></string>
</method>
<method name="put">
--- 706,710 ----
<method name="put">
<string><![CDATA[com.zerog.ia.project.save.last.date]]></string>
! <string><![CDATA[Thu May 08 15:07:47 PDT 2003]]></string>
</method>
<method name="put">
***************
*** 709,717 ****
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.linux.vm]]></string>
! <string><![CDATA[true]]></string>
</method>
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.solaris.vm]]></string>
! <string><![CDATA[true]]></string>
</method>
<method name="put">
--- 722,730 ----
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.linux.vm]]></string>
! <string><![CDATA[false]]></string>
</method>
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.solaris.vm]]></string>
! <string><![CDATA[false]]></string>
</method>
<method name="put">
***************
*** 737,741 ****
<method name="put">
<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
! <string><![CDATA[Fri Apr 11 00:38:18 PDT 2003]]></string>
</method>
<method name="put">
--- 750,754 ----
<method name="put">
<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
! <string><![CDATA[Thu May 08 15:07:47 PDT 2003]]></string>
</method>
<method name="put">
***************
*** 757,761 ****
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.linux.novm]]></string>
! <string><![CDATA[true]]></string>
</method>
<method name="put">
--- 770,774 ----
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.linux.novm]]></string>
! <string><![CDATA[false]]></string>
</method>
<method name="put">
***************
*** 765,769 ****
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.java.novm]]></string>
! <string><![CDATA[true]]></string>
</method>
<method name="put">
--- 778,782 ----
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.java.novm]]></string>
! <string><![CDATA[false]]></string>
</method>
<method name="put">
***************
*** 777,781 ****
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.solaris.novm]]></string>
! <string><![CDATA[true]]></string>
</method>
<method name="put">
--- 790,794 ----
<method name="put">
<string><![CDATA[com.zerog.ia.build.platform.solaris.novm]]></string>
! <string><![CDATA[false]]></string>
</method>
<method name="put">
***************
*** 1323,1327 ****
</property>
<property name="fileSize">
! <long>521125</long>
</property>
<property name="macBinary">
--- 1336,1340 ----
</property>
<property name="fileSize">
! <long>515920</long>
</property>
<property name="macBinary">
|
|
From: <ox-...@us...> - 2003-05-09 01:03:52
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv14801
Modified Files:
Sheets.sheets
Log Message:
1. Fixed DocDefinition parsing and editing (which is necessary to rename commands).
2. Changed error mapping to also try to resolve against project roots (useful when the compilation filenames don't match the full path of the exported files).
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Sheets.sheets 6 May 2003 10:03:39 -0000 1.47
--- Sheets.sheets 8 May 2003 22:21:11 -0000 1.48
***************
*** 31512,31516 ****
// Converts the XML element into a Fragment. elt is assumed to be a single
// top-level tag.
! private Fragment DocParser.toFragment (Element elt, FragmentList oldLinks) {
if (elt.getTagName() == null)
return null;
--- 31512,31516 ----
// Converts the XML element into a Fragment. elt is assumed to be a single
// top-level tag.
! private Fragment[] DocParser.toFragment (Element elt, FragmentList oldLinks) {
if (elt.getTagName() == null)
return null;
***************
*** 31518,31535 ****
String tag = elt.getTagName();
if (tag.equals("p")) {
! return parseParagraph(elt, oldLinks);
} else if (tag.equals("source")) {
! return parseSource(elt, oldLinks);
} else if (tag.equals("section")) {
! return parseSection(elt, oldLinks);
} else if (tag.equals("document")) {
! return parseDocument(elt, oldLinks);
} else if (tag.equals("ol") || tag.equals("ul")) {
! return parseList(elt, oldLinks);
} else if (tag.equals("dl")) {
return parseDefinition(elt, oldLinks);
} else {
Console.internalError("Unknown tag " + tag);
! return new UnknownDocFragment(State.getObjectDatabase(), xmlToText(elt), null);
}
}
--- 31518,31535 ----
String tag = elt.getTagName();
if (tag.equals("p")) {
! return new Fragment[] {parseParagraph(elt, oldLinks)};
} else if (tag.equals("source")) {
! return new Fragment[] {parseSource(elt, oldLinks)};
} else if (tag.equals("section")) {
! return new Fragment[] {parseSection(elt, oldLinks)};
} else if (tag.equals("document")) {
! return new Fragment[] {parseDocument(elt, oldLinks)};
} else if (tag.equals("ol") || tag.equals("ul")) {
! return new Fragment[] {parseList(elt, oldLinks)};
} else if (tag.equals("dl")) {
return parseDefinition(elt, oldLinks);
} else {
Console.internalError("Unknown tag " + tag);
! return new Fragment[] {new UnknownDocFragment(State.getObjectDatabase(), xmlToText(elt), null)};
}
}
***************
*** 31652,31666 ****
Element child = (Element)nodes.item(i);
if (ignoreTag == null || !child.getTagName().equals(ignoreTag)) {
! Fragment comp = toFragment(child, links);
! if (comp != null && comp instanceof DocFragment) {
! comps.addElement(comp);
! if (!(comp instanceof UnknownDocFragment)) {
! DocFragment newComp = (DocFragment) comp;
! NamedNodeMap attributes = child.getAttributes();
! for (int j=0; j<attributes.getLength(); i++) {
! Attr attr = (Attr)attributes.item(j);
! if (attr.getName().startsWith("anchor")) {
! ScalarAttribute anchor = newComp.getAnchorAttribute();
! anchor.changeValue(anchor.getValue() + "\\n" + attr.getValue());
}
}
--- 31652,31670 ----
Element child = (Element)nodes.item(i);
if (ignoreTag == null || !child.getTagName().equals(ignoreTag)) {
! Fragment[] newComps = toFragment(child, links);
! for (int j=0; newComps!=null && j<newComps.length; j++) {
! Fragment comp = newComps[j];
! if (comp != null && comp instanceof DocFragment) {
! comps.addElement(comp);
! if (!(comp instanceof UnknownDocFragment)) {
! // ### Really need to fix this for apache anchor attributes (which only occur on
! // sections and documents)
! NamedNodeMap attributes = child.getAttributes();
! for (int k=0; k<attributes.getLength(); i++) {
! Attr attr = (Attr)attributes.item(k);
! if (attr.getName().startsWith("anchor")) {
! ScalarAttribute anchor = ((DocFragment)comp).getAnchorAttribute();
! anchor.changeValue(anchor.getValue() + "\\n" + attr.getValue());
! }
}
}
***************
*** 32079,32082 ****
--- 32083,32089 ----
old.insertImplicitTags(lines);
text = StringSplitter.join(lines, '\\n');
+ String wrapperTag = old.wrapperTag();
+ if (wrapperTag != null)
+ System.out.println(text = "<" + wrapperTag + ">" + text + "</" + wrapperTag + ">");
return replaceWithDoc(old, text, force, extend, container);
***************
*** 32616,32631 ****
section text nkramer:30904
public void DocDefinition.insertImplicitTags (String[] lines) {
! int i = 0;
! for (i = 0; i < lines.length; i++) {
if (StringSplitter.isBlank(lines[i]))
break;
- else
- lines[i] = "<dt>" + lines[i] + "</dt>";
}
! DocHelper.insertImplicitTags(lines, i, "p", "p");
!
! lines[0] = "<dd>" + lines[0];
! lines[lines.length - 1] = lines[lines.length - 1] + "</dd>";
}
object nkramer:30911
--- 32623,32641 ----
section text nkramer:30904
public void DocDefinition.insertImplicitTags (String[] lines) {
! lines[0] = "<dt>" + lines[0];
! int i=0;
! for (; i < lines.length; i++) {
if (StringSplitter.isBlank(lines[i]))
break;
}
+ lines[i - 1] = lines[i - 1] + "</dt>";
! if (i < lines.length) {
! DocHelper.insertImplicitTags(lines, i, "p", "p");
! lines[i] = "<dd>" + lines[i];
! lines[lines.length - 1] = lines[lines.length - 1] + "</dd>";
! } else {
! lines[lines.length - 1] = lines[lines.length - 1] + "<dd/>";
! }
}
object nkramer:30911
***************
*** 32871,32889 ****
type=java
section text nkramer:31093
! // Parses a <definition>
! private DocDefinition DocParser.parseDefinition
! (Element elt, FragmentList oldLinks) {
StringBuffer buf = new StringBuffer();
Vector newLinks = new Vector();
NodeList nodes = elt.getChildNodes();
! for (int i=0; i<nodes.getLength(); i++) {
! Element child = (Element)nodes.item(i);
! if (child.getTagName().equals("term")) {
! renumberLinks(child, oldLinks, newLinks);
! buf.append(retrieveStyledText(child) + "\\n");
}
}
! Fragment[] subs = retrieveSubFragments(elt, "term", oldLinks, false);
! return new DocDefinition(State.getObjectDatabase(), buf.toString(), subs, newLinks);
}
object nkramer:31097
--- 32881,32911 ----
type=java
section text nkramer:31093
! // Parses a definition list <dl> into multiple definitions
! // ### Really need to add dtd validation (since this method does not do any)
! private DocDefinition[] DocParser.parseDefinition (Element elt, FragmentList oldLinks) {
StringBuffer buf = new StringBuffer();
Vector newLinks = new Vector();
NodeList nodes = elt.getChildNodes();
! ArrayList definitions = new ArrayList(nodes.getLength() / 2);
! int i=0;
! while (i<nodes.getLength()) {
! Node node = nodes.item(i++);
! if (node.getNodeType() != node.ELEMENT_NODE ||
! !node.getNodeName().equals("dt"))
! continue;
! Element dt = (Element)node;
! while (i<nodes.getLength()) {
! node = nodes.item(i++);
! if (node.getNodeType() != node.ELEMENT_NODE ||
! !node.getNodeName().equals("dd"))
! continue;
! Element dd = (Element)node;
! renumberLinks(dt, oldLinks, newLinks);
! String term = retrieveStyledText(dt);
! Fragment[] subs = retrieveSubFragments(dd, null, oldLinks, false);
! definitions.add(new DocDefinition(State.getObjectDatabase(), term, subs, newLinks));
}
}
! return (DocDefinition[])definitions.toArray(new DocDefinition[0]);
}
object nkramer:31097
***************
*** 90210,90214 ****
if (result == null) {
try {
! result = getCanonicalTable().get(new File(filename).getCanonicalPath());
} catch (IOException e) {
}
--- 90232,90246 ----
if (result == null) {
try {
! File file = new File(filename); // check for file relative to start directory
! if (!file.exists()) {
! // check for file relative to project directories
! Project[] projects = Project.getAllProjects();
! for (int i=0; i<projects.length; i++) {
! if (projects[i].getRootFrag() == null) continue;
! file = new File(projects[i].getRootFrag().getRoot(), filename);
! if (file.exists()) break;
! }
! }
! result = getCanonicalTable().get(file.getCanonicalPath());
} catch (IOException e) {
}
|
|
From: <ox-...@us...> - 2003-05-06 10:04:14
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv8312
Modified Files:
Sheets.sheets todo.txt
Added Files:
forrest.properties
Log Message:
Java Completion now list throws clauses in external prototypes
Also fixed local variable names (if they are specified), and print miscellaneous attributes
Fixed project website skin (new version of krysalis requires a forrest.properties file)
--- NEW FILE: forrest.properties ---
##############
# Properties used by forrest.build.xml for building the website
##############
# Prints out a summary of Forrest settings for this project
#forrest.echo=true
# Project name (used to name .war file)
project.name=sheets-site
# Specifies name of Forrest skin to use
project.skin=sheets-site
#project.skin=avalon-tigris
##############
# layout properties
# Properties that must be set to override the default locations
#
# Parent properties must be set. This usually means uncommenting
# project.content-dir if any other property using it is uncommented
#project.status=status.xml
project.content-dir=src/documentation
#project.conf-dir=${project.content-dir}/conf
#project.sitemap=${project.content-dir}/sitemap.xmap
project.xdocs-dir=${project.content-dir}/content
#project.stylesheets-dir=${project.content-dir}/resources/stylesheets
#project.images-dir=${project.content-dir}/resources/images
#project.schema-dir=${project.content-dir}/resources/schema
#project.skins-dir=${project.content-dir}/skins
#project.skinconf=${project.content-dir}/skinconf.xml
#project.lib-dir=${project.content-dir}/lib
#project.classes-dir=${project.content-dir}/classes
##############
# Cocoon catalog entity resolver properties
# A local catalog to supplement the default Forrest catalog
#project.catalog=${project.schema-dir}/catalog
# The verbosity level for the entity resolver (1..10)
#forrest.catalog.verbosity=1
##############
# validation properties
# These props determine if validation is performed at all
# Values are inherited unless overridden.
# Eg, if forrest.validate=false, then all others are false unless set to true.
#forrest.validate=true
#forrest.validate.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate}
forrest.validate.sitemap=false
#forrest.validate.stylesheets=${forrest.validate}
#forrest.validate.skins=${forrest.validate}
#forrest.validate.skins.stylesheets=${forrest.validate.skins}
# Key:
# *.failonerror=(true|false) stop when an XML file is invalid
# *.includes=(pattern) Comma-separated list of path patterns to validate
# *.excludes=(pattern) Comma-separated list of path patterns to not validate
#forrest.validate.failonerror=true
#forrest.validate.includes=**/*
#forrest.validate.excludes=
#
#forrest.validate.xdocs.failonerror=${forrest.validate.failonerror}
#
#forrest.validate.xdocs.includes=**/*.x*
#forrest.validate.xdocs.excludes=
#
#forrest.validate.skinconf.includes=${skinconf-file}
#forrest.validate.skinconf.excludes=
#forrest.validate.skinconf.failonerror=${forrest.validate.failonerror}
#
#forrest.validate.sitemap.includes=${sitemap-file}
#forrest.validate.sitemap.excludes=
#forrest.validate.sitemap.failonerror=${forrest.validate.failonerror}
#
#forrest.validate.stylesheets.includes=**/*.xsl
#forrest.validate.stylesheets.excludes=
#forrest.validate.stylesheets.failonerror=${forrest.validate.failonerror}
#
#forrest.validate.skins.includes=**/*
#forrest.validate.skins.excludes=**/*.xsl
#forrest.validate.skins.failonerror=${forrest.validate.failonerror}
#
#forrest.validate.skins.stylesheets.includes=**/*.xsl
#forrest.validate.skins.stylesheets.excludes=
#forrest.validate.skins.stylesheets.failonerror=${forrest.validate.skins.failonerror}
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Sheets.sheets 5 May 2003 09:20:00 -0000 1.46
--- Sheets.sheets 6 May 2003 10:03:39 -0000 1.47
***************
*** 67796,67799 ****
--- 67796,67800 ----
schin:720
schin:1090
+ schin:1252
schin:1021
schin:721
***************
*** 75321,75324 ****
--- 75322,75326 ----
schin:717
schin:972
+ schin:1252
object schin:714
pkg=org.browsecode.javaStuff
***************
*** 79992,79996 ****
// print out type
String type = getFieldType();
! sb.append(type);
if (StringProxy.isPrimitive(type) || type.equals("void"))
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
--- 79994,79998 ----
// print out type
String type = getFieldType();
! sb.append(makeSimple(type));
if (StringProxy.isPrimitive(type) || type.equals("void"))
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
***************
*** 80011,80015 ****
// print out type
String type = getReturnType();
! sb.append(type);
if (StringProxy.isPrimitive(type) || type.equals("void"))
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
--- 80013,80017 ----
// print out type
String type = getReturnType();
! sb.append(makeSimple(type));
if (StringProxy.isPrimitive(type) || type.equals("void"))
styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - type.length(), sb.length(), Profile.reservedWordColor));
***************
*** 80019,80036 ****
sb.append(trueNameString());
! // print out signature
! sb.append(" (");
! String[] parameters = getParamTypes();
! for (int i=0; i<parameters.length; i++) {
! sb.append(makeSimple(parameters[i]));
! if (StringProxy.isPrimitive(parameters[i]) || parameters[i].equals("void"))
! styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - parameters[i].length(), sb.length(), Profile.reservedWordColor));
! sb.append(" arg");
! sb.append(i);
! styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - Integer.toString(i).length() - 3, sb.length(), Profile.localVariableColor));
! if (i != parameters.length - 1)
! sb.append(", ");
! }
! sb.append(")");
}
object schin:1022
--- 80021,80025 ----
sb.append(trueNameString());
! printSignature(sb, styleList);
}
object schin:1022
***************
*** 80047,80064 ****
sb.append(enclosingClass.simpleName());
! // print out signature
! sb.append(" (");
! String[] parameters = getParamTypes();
! for (int i=0; i<parameters.length; i++) {
! sb.append(makeSimple(parameters[i]));
! if (StringProxy.isPrimitive(parameters[i]) || parameters[i].equals("void"))
! styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - parameters[i].length(), sb.length(), Profile.reservedWordColor));
! sb.append(" arg");
! sb.append(i);
! styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - Integer.toString(i).length() - 3, sb.length(), Profile.localVariableColor));
! if (i != parameters.length - 1)
! sb.append(", ");
! }
! sb.append(")");
}
object schin:1023
--- 80036,80040 ----
sb.append(enclosingClass.simpleName());
! printSignature(sb, styleList);
}
object schin:1023
***************
*** 82206,82209 ****
--- 82182,82240 ----
section text schin:1251
private static CommandMap DocDefinition.defaultCommands;
+ object schin:1252
+ pkg=org.browsecode.javaStuff
+ type=java
+ section text schin:1252
+ // This function should never be called from a field
+ void ByteCodeFunction.printSignature(StringBuffer sb, ArrayList styleList) {
+ Method method = (Method)fieldOrMethod;
+
+ // print out parameters
+ LocalVariableTable vars = method.getLocalVariableTable();
+ int varOffset = isStatic() ? 0 : 1;
+ sb.append(" (");
+ String[] parameters = getParamTypes();
+ for (int i=0; i<parameters.length; i++) {
+ sb.append(makeSimple(parameters[i]));
+ if (StringProxy.isPrimitive(parameters[i]) || parameters[i].equals("void"))
+ styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - parameters[i].length(), sb.length(), Profile.reservedWordColor));
+ sb.append(" ");
+ int paramStart = sb.length();
+ if (vars != null) {
+ LocalVariable l = vars.getLocalVariable(i + varOffset);
+ sb.append(l == null ? "null" : l.getName());
+ } else {
+ sb.append("arg");
+ sb.append(i);
+ }
+ styleList.add(new ByteCodeViewer.StyleMarker(0, paramStart, sb.length(), Profile.localVariableColor));
+ if (i < parameters.length - 1)
+ sb.append(", ");
+ }
+ sb.append(")");
+
+ // print out any weird extra attributes (ie. deprecated)
+ org.apache.bcel.classfile.Attribute[] attributes = method.getAttributes();
+ for (int i=0; i<attributes.length; i++) {
+ org.apache.bcel.classfile.Attribute a = attributes[i];
+ if(!(a instanceof Code || a instanceof ExceptionTable))
+ sb.append(" [" + a.toString() + "]");
+ }
+
+ // print out throws clauses
+ ExceptionTable e = method.getExceptionTable();
+ if (e != null) {
+ String[] exceptions = e.getExceptionNames();
+ if (exceptions.length > 0) {
+ sb.append(" throws ");
+ styleList.add(new ByteCodeViewer.StyleMarker(0, sb.length() - 7, sb.length() - 1, Profile.reservedWordColor));
+ }
+ for (int i=0; i<exceptions.length; i++) {
+ sb.append(makeSimple(exceptions[i]));
+ if (i < exceptions.length - 1)
+ sb.append(", ");
+ }
+ }
+ }
object sjc:1
pkg=org.browsecode.sheets.dicer
***************
*** 101565,101569 ****
type=doc-definition
section text ram:2507
! forward-char-select [shift-RIGHT]
section components ram:2507
ram:2508
--- 101596,101600 ----
type=doc-definition
section text ram:2507
! forward-char-select
section components ram:2507
ram:2508
***************
*** 101572,101576 ****
type=doc-definition
section text ram:2509
! forward-word [ctrl-RIGHT]
section components ram:2509
ram:2510
--- 101603,101607 ----
type=doc-definition
section text ram:2509
! forward-word
section components ram:2509
ram:2510
***************
*** 101579,101583 ****
type=doc-definition
section text ram:2511
! forward-word-select [ctrl-shift-RIGHT]
section components ram:2511
ram:2512
--- 101610,101614 ----
type=doc-definition
section text ram:2511
! forward-word-select
section components ram:2511
ram:2512
***************
*** 101586,101590 ****
type=doc-definition
section text ram:2513
! backward-char [LEFT]
section components ram:2513
ram:2514
--- 101617,101621 ----
type=doc-definition
section text ram:2513
! backward-char
section components ram:2513
ram:2514
***************
*** 101593,101597 ****
type=doc-definition
section text ram:2515
! backward-char-select [shift-LEFT]
section components ram:2515
ram:2516
--- 101624,101628 ----
type=doc-definition
section text ram:2515
! backward-char-select
section components ram:2515
ram:2516
***************
*** 101600,101604 ****
type=doc-definition
section text ram:2517
! backward-word [ctrl-LEFT]
section components ram:2517
ram:2518
--- 101631,101635 ----
type=doc-definition
section text ram:2517
! backward-word
section components ram:2517
ram:2518
***************
*** 101607,101611 ****
type=doc-definition
section text ram:2519
! backward-word-select [ctrl-shift-LEFT]
section components ram:2519
ram:2520
--- 101638,101642 ----
type=doc-definition
section text ram:2519
! backward-word-select
section components ram:2519
ram:2520
***************
*** 101614,101618 ****
type=doc-definition
section text ram:2521
! up-line [UP]
section components ram:2521
ram:2522
--- 101645,101649 ----
type=doc-definition
section text ram:2521
! up-line
section components ram:2521
ram:2522
***************
*** 101621,101625 ****
type=doc-definition
section text ram:2523
! up-line-select [shift-UP]
section components ram:2523
ram:2524
--- 101652,101656 ----
type=doc-definition
section text ram:2523
! up-line-select
section components ram:2523
ram:2524
***************
*** 101628,101632 ****
type=doc-definition
section text ram:2525
! down-line [DOWN]
section components ram:2525
ram:2526
--- 101659,101663 ----
type=doc-definition
section text ram:2525
! down-line
section components ram:2525
ram:2526
***************
*** 101635,101639 ****
type=doc-definition
section text ram:2527
! down-line-select [shift-DOWN]
section components ram:2527
ram:2528
--- 101666,101670 ----
type=doc-definition
section text ram:2527
! down-line-select
section components ram:2527
ram:2528
***************
*** 101642,101646 ****
type=doc-definition
section text ram:2529
! start-line [HOME]
section components ram:2529
ram:2530
--- 101673,101677 ----
type=doc-definition
section text ram:2529
! start-line
section components ram:2529
ram:2530
***************
*** 101649,101653 ****
type=doc-definition
section text ram:2531
! start-line-select [shift-HOME]
section components ram:2531
ram:2532
--- 101680,101684 ----
type=doc-definition
section text ram:2531
! start-line-select
section components ram:2531
ram:2532
***************
*** 101656,101660 ****
type=doc-definition
section text ram:2533
! end-line [END]
section components ram:2533
ram:2534
--- 101687,101691 ----
type=doc-definition
section text ram:2533
! end-line
section components ram:2533
ram:2534
***************
*** 101663,101667 ****
type=doc-definition
section text ram:2535
! end-line-select [shift-END]
section components ram:2535
ram:2536
--- 101694,101698 ----
type=doc-definition
section text ram:2535
! end-line-select
section components ram:2535
ram:2536
***************
*** 101680,101684 ****
type=doc-definition
section text ram:2538
! scroll-up-page [PAGEUP]
section components ram:2538
ram:2539
--- 101711,101715 ----
type=doc-definition
section text ram:2538
! scroll-up-page
section components ram:2538
ram:2539
***************
*** 101687,101691 ****
type=doc-definition
section text ram:2540
! scroll-up-line [ctrl-UP]
section components ram:2540
ram:2541
--- 101718,101722 ----
type=doc-definition
section text ram:2540
! scroll-up-line
section components ram:2540
ram:2541
***************
*** 101694,101698 ****
type=doc-definition
section text ram:2542
! scroll-down-page [PAGEDOWN]
section components ram:2542
ram:2543
--- 101725,101729 ----
type=doc-definition
section text ram:2542
! scroll-down-page
section components ram:2542
ram:2543
***************
*** 101701,101705 ****
type=doc-definition
section text ram:2544
! scroll-down-line [ctrl-DOWN]
section components ram:2544
ram:2545
--- 101732,101736 ----
type=doc-definition
section text ram:2544
! scroll-down-line
section components ram:2544
ram:2545
***************
*** 101728,101732 ****
type=doc-definition
section text ram:2547
! cut-text [ctrl-X]
section components ram:2547
ram:2548
--- 101759,101763 ----
type=doc-definition
section text ram:2547
! cut-text
section components ram:2547
ram:2548
***************
*** 101735,101739 ****
type=doc-definition
section text ram:2549
! copy-text [ctrl-C]
section components ram:2549
ram:2550
--- 101766,101770 ----
type=doc-definition
section text ram:2549
! copy-text
section components ram:2549
ram:2550
***************
*** 101742,101746 ****
type=doc-definition
section text ram:2551
! paste-text [ctrl-V]
section components ram:2551
ram:2552
--- 101773,101777 ----
type=doc-definition
section text ram:2551
! paste-text
section components ram:2551
ram:2552
***************
*** 101756,101760 ****
type=doc-definition
section text ram:2555
! split-line [ENTER]
section components ram:2555
ram:2556
--- 101787,101791 ----
type=doc-definition
section text ram:2555
! split-line
section components ram:2555
ram:2556
***************
*** 101770,101774 ****
type=doc-definition
section text ram:2559
! indent-line [ctrl-I]
section components ram:2559
ram:2560
--- 101801,101805 ----
type=doc-definition
section text ram:2559
! indent-line
section components ram:2559
ram:2560
***************
*** 101777,101781 ****
type=doc-definition
section text ram:2561
! kill-line [ctrl-K]
section components ram:2561
ram:2562
--- 101808,101812 ----
type=doc-definition
section text ram:2561
! kill-line
section components ram:2561
ram:2562
***************
*** 101784,101788 ****
type=doc-definition
section text ram:2563
! local-undo [ctrl-Z]
section components ram:2563
ram:2564
--- 101815,101819 ----
type=doc-definition
section text ram:2563
! local-undo
section components ram:2563
ram:2564
***************
*** 101791,101795 ****
type=doc-definition
section text ram:2565
! local-redo [ctrl-Y]
section components ram:2565
ram:2566
--- 101822,101826 ----
type=doc-definition
section text ram:2565
! local-redo
section components ram:2565
ram:2566
***************
*** 101798,101802 ****
type=doc-definition
section text ram:2567
! show-replace-dialog [ctrl-F]
section components ram:2567
ram:2568
--- 101829,101833 ----
type=doc-definition
section text ram:2567
! show-replace-dialog
section components ram:2567
ram:2568
***************
*** 101822,101826 ****
type=doc-definition
section text ram:2570
! cut-fragment [ctrl-shift-X]
section components ram:2570
ram:2571
--- 101853,101857 ----
type=doc-definition
section text ram:2570
! cut-fragment
section components ram:2570
ram:2571
***************
*** 101829,101833 ****
type=doc-definition
section text ram:2572
! copy-fragment [ctrl-shift-C]
section components ram:2572
ram:2573
--- 101860,101864 ----
type=doc-definition
section text ram:2572
! copy-fragment
section components ram:2572
ram:2573
***************
*** 101836,101840 ****
type=doc-definition
section text ram:2574
! paste-fragment [ctrl-shift-V]
section components ram:2574
ram:2575
--- 101867,101871 ----
type=doc-definition
section text ram:2574
! paste-fragment
section components ram:2574
ram:2575
***************
*** 101850,101854 ****
type=doc-definition
section text ram:2578
! commit-container-edits [shift-F12]
section components ram:2578
ram:2579
--- 101881,101885 ----
type=doc-definition
section text ram:2578
! commit-container-edits
section components ram:2578
ram:2579
***************
*** 101885,101889 ****
type=doc-definition
section text ram:2587
! show-query-dialog [ctrl-Q]
section components ram:2587
ram:2588
--- 101916,101920 ----
type=doc-definition
section text ram:2587
! show-query-dialog
section components ram:2587
ram:2588
***************
*** 101962,101966 ****
type=doc-definition
section text ram:2609
! show-fragment-in-context [ctrl-G]
section components ram:2609
ram:2610
--- 101993,101997 ----
type=doc-definition
section text ram:2609
! show-fragment-in-context
section components ram:2609
ram:2610
***************
*** 101986,101990 ****
type=doc-definition
section text ram:2616
! compile-program [F5]
section components ram:2616
ram:2617
--- 102017,102021 ----
type=doc-definition
section text ram:2616
! compile-program
section components ram:2616
ram:2617
***************
*** 101993,101997 ****
type=doc-definition
section text ram:2618
! recompile-program [ctrl-F5]
section components ram:2618
ram:2619
--- 102024,102028 ----
type=doc-definition
section text ram:2618
! recompile-program
section components ram:2618
ram:2619
***************
*** 102000,102004 ****
type=doc-definition
section text ram:2620
! show-compile-dialog [shift-F5]
section components ram:2620
ram:2621
--- 102031,102035 ----
type=doc-definition
section text ram:2620
! show-compile-dialog
section components ram:2620
ram:2621
***************
*** 102033,102037 ****
type=doc-definition
section text ram:2625
! goto-documentation [F1]
section components ram:2625
ram:2626
--- 102064,102068 ----
type=doc-definition
section text ram:2625
! goto-documentation
section components ram:2625
ram:2626
***************
*** 102092,102096 ****
type=doc-definition
section text ram:2646
! wrap-paragraph [ctrl-W]
section components ram:2646
ram:2647
--- 102123,102127 ----
type=doc-definition
section text ram:2646
! wrap-paragraph
section components ram:2646
ram:2647
***************
*** 102099,102103 ****
type=doc-definition
section text ram:2649
! up-fragment [alt-UP]
section components ram:2649
ram:2650
--- 102130,102134 ----
type=doc-definition
section text ram:2649
! up-fragment
section components ram:2649
ram:2650
***************
*** 102106,102110 ****
type=doc-definition
section text ram:2653
! down-fragment [alt-DOWN]
section components ram:2653
ram:2654
--- 102137,102141 ----
type=doc-definition
section text ram:2653
! down-fragment
section components ram:2653
ram:2654
***************
*** 102113,102117 ****
type=doc-definition
section text ram:2656
! start-fragment [alt-HOME]
section components ram:2656
ram:2657
--- 102144,102148 ----
type=doc-definition
section text ram:2656
! start-fragment
section components ram:2656
ram:2657
***************
*** 102120,102124 ****
type=doc-definition
section text ram:2659
! end-fragment [alt-END]
section components ram:2659
ram:2660
--- 102151,102155 ----
type=doc-definition
section text ram:2659
! end-fragment
section components ram:2659
ram:2660
***************
*** 102127,102131 ****
type=doc-definition
section text ram:2662
! start-fragment-select [alt-shift-HOME]
section components ram:2662
ram:2664
--- 102158,102162 ----
type=doc-definition
section text ram:2662
! start-fragment-select
section components ram:2662
ram:2664
***************
*** 102134,102138 ****
type=doc-definition
section text ram:2666
! end-fragment-select [alt-shift-END]
section components ram:2666
ram:2667
--- 102165,102169 ----
type=doc-definition
section text ram:2666
! end-fragment-select
section components ram:2666
ram:2667
***************
*** 102141,102145 ****
type=doc-definition
section text ram:2669
! start-sheet [ctrl-HOME]
section components ram:2669
ram:2670
--- 102172,102176 ----
type=doc-definition
section text ram:2669
! start-sheet
section components ram:2669
ram:2670
***************
*** 102148,102152 ****
type=doc-definition
section text ram:2672
! end-sheet [ctrl-END]
section components ram:2672
ram:2673
--- 102179,102183 ----
type=doc-definition
section text ram:2672
! end-sheet
section components ram:2672
ram:2673
***************
*** 102183,102187 ****
type=doc-definition
section text ram:2685
! extend-fragment [ctrl-E]
section components ram:2685
ram:2686
--- 102214,102218 ----
type=doc-definition
section text ram:2685
! extend-fragment
section components ram:2685
ram:2686
***************
*** 102218,102222 ****
type=doc-definition
section text ram:2706
! copy-fragment-to-temp-sheet [ctrl-N]
section components ram:2706
ram:2707
--- 102249,102253 ----
type=doc-definition
section text ram:2706
! copy-fragment-to-temp-sheet
section components ram:2706
ram:2707
***************
*** 104345,104349 ****
type=doc-definition
section text rgs:13462
! backward-selection [ctrl-PAGEDOWN]
section components rgs:13462
rgs:13463
--- 104376,104380 ----
type=doc-definition
section text rgs:13462
! backward-selection
section components rgs:13462
rgs:13463
***************
*** 104352,104356 ****
type=doc-definition
section text rgs:13464
! forward-selection [ctrl-PAGEUP]
section components rgs:13464
rgs:13465
--- 104383,104387 ----
type=doc-definition
section text rgs:13464
! forward-selection
section components rgs:13464
rgs:13465
***************
*** 104359,104363 ****
type=doc-definition
section text rgs:13466
! backward-char-delete [BACKSPACE]
section components rgs:13466
rgs:13467
--- 104390,104394 ----
type=doc-definition
section text rgs:13466
! backward-char-delete
section components rgs:13466
rgs:13467
***************
*** 104366,104370 ****
type=doc-definition
section text rgs:13468
! forward-char-delete [DELETE]
section components rgs:13468
rgs:13469
--- 104397,104401 ----
type=doc-definition
section text rgs:13468
! forward-char-delete
section components rgs:13468
rgs:13469
***************
*** 104373,104377 ****
type=doc-definition
section text rgs:13470
! commit-fragment-edit [F12]
section components rgs:13470
rgs:13471
--- 104404,104408 ----
type=doc-definition
section text rgs:13470
! commit-fragment-edit
section components rgs:13470
rgs:13471
***************
*** 104513,104517 ****
type=doc-definition
section text rgs:13510
! goto-documentation-for-selected-fragment [ctrl-F1]
section components rgs:13510
rgs:13511
--- 104544,104548 ----
type=doc-definition
section text rgs:13510
! goto-documentation-for-selected-fragment
section components rgs:13510
rgs:13511
***************
*** 105863,105866 ****
--- 105894,105898 ----
schin:713
schin:714
+ schin:1252
schin:715
schin:1087
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** todo.txt 5 May 2003 09:20:04 -0000 1.16
--- todo.txt 6 May 2003 10:03:40 -0000 1.17
***************
*** 6,12 ****
Attempt to get a released object when closing editor with a temporary sheet (such as the compile sheet) open
- * Java completion:
- list throws clauses in external prototypes
-
* Stuff for Unix:
The default monocode font is awful. See if there is a better one for unix.
--- 6,9 ----
***************
*** 34,38 ****
release criteria:
- fix project website skin
update license notices in code
move graphics to org.browsecode.graphics
--- 31,34 ----
|
|
From: <ox-...@us...> - 2003-05-06 10:04:02
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv8312/lib Modified Files: bootstrap-sheets.jar Log Message: Java Completion now list throws clauses in external prototypes Also fixed local variable names (if they are specified), and print miscellaneous attributes Fixed project website skin (new version of krysalis requires a forrest.properties file) Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 Binary files /tmp/cvsnCi8dI and /tmp/cvsnmbokX differ |
|
From: <ox-...@us...> - 2003-05-05 09:20:56
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv25430
Modified Files:
Sheets.sheets centibuild.xml todo.txt
Log Message:
INCOMPATIBLE DATABASE CHANGE -- please rebuild.
Fixed a newly introduced bug that inhibited editing doc fragments.
Added 1.2 apache documentation DTDs
Removed DocEditCmds and DocEditVars (replaced with DocDefinition)
Fixed DocDefinition to properly emit a single <dd> tag
Added a new wrapperTag method to DocFragment, and used it to wrap
DocDefinitions in a <dl> tag
Fixed minor incompatibilities in Sheets documentation with apache
documentation, so it now properly renders through forrest
Added new DTDs for latest version of forrest
Updated BCEL jar to the new 5.1 release
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Sheets.sheets 30 Apr 2003 23:25:54 -0000 1.45
--- Sheets.sheets 5 May 2003 09:20:00 -0000 1.46
***************
*** 31293,31296 ****
--- 31293,31297 ----
section exports nkramer:30598
nkramer:30731
+ schin:1246
nkramer:30866
nkramer:31289
***************
*** 31356,31365 ****
else if (type.equals("doc-list"))
return DocList.loadList(reader);
[...3816 lines suppressed...]
context-help-delay : integer = 100
--- 104700,104704 ----
object rgs:13565
title=context-help-delay : integer = 100
! type=doc-definition
section text rgs:13565
context-help-delay : integer = 100
***************
*** 105244,105248 ****
object rgs:13567
title=standard-java-indent : integer = 2
! type=doc-edit-variable
section text rgs:13567
standard-java-indent : integer = 2
--- 104707,104711 ----
object rgs:13567
title=standard-java-indent : integer = 2
! type=doc-definition
section text rgs:13567
standard-java-indent : integer = 2
Index: centibuild.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/centibuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** centibuild.xml 28 Nov 2002 06:54:57 -0000 1.1
--- centibuild.xml 5 May 2003 09:20:04 -0000 1.2
***************
*** 29,33 ****
<!-- =================================================================== -->
! <target name="all" depends="package, javadocs, forrest.docs"
description="Creates the jars and the site."/>
</project>
--- 29,33 ----
<!-- =================================================================== -->
! <target name="all" depends="package, javadocs, site"
description="Creates the jars and the site."/>
</project>
Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** todo.txt 24 Apr 2003 09:38:13 -0000 1.15
--- todo.txt 5 May 2003 09:20:04 -0000 1.16
***************
*** 2,11 ****
-
- * Work Release Stuff:
- Improve file management (see below)
- compile command in menu has to work
-
annoying bugs that should be fixed:
- report full error message for javac
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
--- 2,6 ----
***************
*** 23,31 ****
Capability to import modified files on disk (checked on startup, or by command)
Capability to resolve diff between changes on disk and in sheets (checked on export, or import)
!
! Currently Working On:
! Trying to get the basic document export and forrest generation working.
! In the process of trying to get the basic header export working...
! Next thing is to get forrest to run against the test directory so I don't have to bootstrap to test it out.
Stuff I Want to do:
--- 18,22 ----
Capability to import modified files on disk (checked on startup, or by command)
Capability to resolve diff between changes on disk and in sheets (checked on export, or import)
! Capability to monitor directories for changes, additions, or deletions
Stuff I Want to do:
***************
*** 43,49 ****
release criteria:
update license notices in code
move graphics to org.browsecode.graphics
- fix docbook support
new bugs:
--- 34,40 ----
release criteria:
+ fix project website skin
update license notices in code
move graphics to org.browsecode.graphics
new bugs:
***************
*** 68,73 ****
VTables completely broken?
PoE error on close related to deleting a file header?
- Compile doesn't work when you Compile from the Dialog
- Error listing for javac does not include line position text
* Project Compilation:
--- 59,62 ----
***************
*** 93,104 ****
Handle missing version attributes better
Create fragment-rendered attributes for use in document element
! Add new elements to fill out documentv1.1 DTD
Update Sheets Documentation with new elements
- - need a Definition List first
- Decide what to do with Edit Commands and Edit Variables
Properly export anchor element
Restrict addition of new fragments to those supported by DTD
Update the architectural documentation to reflect current code status
! Handle <br> tag
* Website:
--- 82,94 ----
Handle missing version attributes better
Create fragment-rendered attributes for use in document element
! Add new elements to fill out documentv1.2 DTD
Update Sheets Documentation with new elements
Properly export anchor element
Restrict addition of new fragments to those supported by DTD
Update the architectural documentation to reflect current code status
! Properly render <br> tag in sheets
!
! * Generic Documentation:
! Generalize xml documentation to work on a wide variety of xml-like languages with little coding.
* Website:
|
|
From: <ox-...@us...> - 2003-05-05 09:20:34
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv25430/lib Modified Files: bcel.jar bootstrap-sheets.jar Log Message: INCOMPATIBLE DATABASE CHANGE -- please rebuild. Fixed a newly introduced bug that inhibited editing doc fragments. Added 1.2 apache documentation DTDs Removed DocEditCmds and DocEditVars (replaced with DocDefinition) Fixed DocDefinition to properly emit a single <dd> tag Added a new wrapperTag method to DocFragment, and used it to wrap DocDefinitions in a <dl> tag Fixed minor incompatibilities in Sheets documentation with apache documentation, so it now properly renders through forrest Added new DTDs for latest version of forrest Updated BCEL jar to the new 5.1 release Index: bcel.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bcel.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvswIi7Wk and /tmp/cvsecj4fC differ Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvsbySdhu and /tmp/cvsx4kAoz differ |
|
From: <ox-...@us...> - 2003-05-05 09:20:32
|
Update of /cvsroot/sheets/sheets/src/documentation/content/xdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv25430/src/documentation/content/xdocs
Modified Files:
book.xml
Log Message:
INCOMPATIBLE DATABASE CHANGE -- please rebuild.
Fixed a newly introduced bug that inhibited editing doc fragments.
Added 1.2 apache documentation DTDs
Removed DocEditCmds and DocEditVars (replaced with DocDefinition)
Fixed DocDefinition to properly emit a single <dd> tag
Added a new wrapperTag method to DocFragment, and used it to wrap
DocDefinitions in a <dl> tag
Fixed minor incompatibilities in Sheets documentation with apache
documentation, so it now properly renders through forrest
Added new DTDs for latest version of forrest
Updated BCEL jar to the new 5.1 release
Index: book.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/src/documentation/content/xdocs/book.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** book.xml 28 Nov 2002 06:54:58 -0000 1.1
--- book.xml 5 May 2003 09:20:29 -0000 1.2
***************
*** 8,19 ****
<menu label="Community">
! <menu-item label="Download" href="http://sourceforge.net/project/showfiles.php?group_id=53805"/>
</menu>
! <menu label="Docs">
! <menu-item label="Documentation" href="index.html"/>
</menu>
<menu label="Code">
! <menu-item label="Javadocs" href="javadocs/index.html"/>
</menu>
--- 8,21 ----
<menu label="Community">
! <external label="Download" href="http://sourceforge.net/project/showfiles.php?group_id=53805"/>
</menu>
! <menu label="Documentation">
! <menu-item label="Reference Manual" href="reference.html"/>
! <menu-item label="Versioning" href="versioning.html"/>
! <menu-item label="Architecture" href="architecture.html"/>
</menu>
<menu label="Code">
! <menu-item label="Javadocs" href="javadocs/index.html"/>
</menu>
|
|
From: <ox-...@us...> - 2003-04-30 23:26:05
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv32500
Modified Files:
Sheets.sheets
Log Message:
Fixed a bug in the error patterns relating to ant support.
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Sheets.sheets 28 Apr 2003 20:44:33 -0000 1.44
--- Sheets.sheets 30 Apr 2003 23:25:54 -0000 1.45
***************
*** 10387,10393 ****
errorPatterns = new Vector();
// JAVAC error format
! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9.$_/\\\\\\\\]+):([0-9]+): ((?:.|\\\\n)*?)\\\\n.*\\\\n *\\\\^$", Pattern.MULTILINE));
// JIKE's error format
! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9_$./\\\\\\\\]+):([0-9]+):[0-9]+:[0-9]+:[0-9]+: (.*)$", Pattern.MULTILINE));
LanguageExpert.initializeExpert("org.browsecode.sheets.SheetExpert");
--- 10387,10393 ----
errorPatterns = new Vector();
// JAVAC error format
! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\] )?([A-Za-z]?:?[-a-zA-Z0-9.$_/\\\\\\\\]+):([0-9]+): ((?:.|\\\\n)*?)\\\\n.*\\\\n *\\\\^$", Pattern.MULTILINE));
// JIKE's error format
! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\] )?([A-Za-z]?:?[-a-zA-Z0-9_$./\\\\\\\\]+):([0-9]+):[0-9]+:[0-9]+:[0-9]+: (.*)$", Pattern.MULTILINE));
LanguageExpert.initializeExpert("org.browsecode.sheets.SheetExpert");
|
|
From: <ox-...@us...> - 2003-04-28 20:44:57
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv28052
Modified Files:
Sheets.sheets
Log Message:
Fixed a few java completion bugs:
1. The default project was not properly picking up the classpath (it used a reference to a system property, which was not being expanded)
2. Jars or zips in the classpath without manifests would cause an NPE (now skips these jars and zips for classpath expansion)
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Sheets.sheets 26 Apr 2003 02:22:20 -0000 1.43
--- Sheets.sheets 28 Apr 2003 20:44:33 -0000 1.44
***************
*** 82331,82334 ****
--- 82331,82336 ----
if (file.endsWith(".zip") || file.endsWith(".jar")) try {
Manifest manifest = new JarFile(file).getManifest();
+ if (manifest == null)
+ continue;
Attributes attributes = manifest.getMainAttributes();
if (attributes.containsKey(Attributes.Name.CLASS_PATH)) {
***************
*** 82508,82512 ****
type=java
section text schin:1228
! public final static String ProjectFragment.DEFAULT_CLASSPATH = "${java.class.path}";
object schin:1229
pkg=org.browsecode.javaStuff
--- 82510,82514 ----
type=java
section text schin:1228
! public final static String ProjectFragment.DEFAULT_CLASSPATH = System.getProperty("java.class.path");
object schin:1229
pkg=org.browsecode.javaStuff
|
|
From: <ox-...@us...> - 2003-04-26 02:22:27
|
Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv14367
Modified Files:
Sheets.sheets
Log Message:
Modified the default font names to be more platform neutral (makes a big difference on Linux)
Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Sheets.sheets 24 Apr 2003 09:38:10 -0000 1.42
--- Sheets.sheets 26 Apr 2003 02:22:20 -0000 1.43
***************
*** 10355,10364 ****
static void Profile.initVariables ()
{
! allFonts = new FontFamily("all-fonts", "Helvetica");
! codeFont = new FontFamily("code-font", "Courier");
! tocFont = new FontFamily("toc-font", "Helvetica");
! summaryFont = new FontFamily("summary-font", "Helvetica");
! graphFont = new FontFamily("graph-font", "Helvetica");
! docFont = new FontFamily("documentation-font", "TimesRoman");
lookAndFeel = "com.incors.plaf.kunststoff.KunststoffLookAndFeel";
--- 10355,10364 ----
static void Profile.initVariables ()
{
! allFonts = new FontFamily("all-fonts", "SansSerif");
! codeFont = new FontFamily("code-font", "Monospaced");
! tocFont = new FontFamily("toc-font", "SansSerif");
! summaryFont = new FontFamily("summary-font", "SansSerif");
! graphFont = new FontFamily("graph-font", "SansSerif");
! docFont = new FontFamily("documentation-font", "Serif");
lookAndFeel = "com.incors.plaf.kunststoff.KunststoffLookAndFeel";
|
|
From: <ox-...@us...> - 2003-04-24 09:38:51
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv14682 Modified Files: .sheetsrc Sheets.sheets todo.txt Log Message: Minor fixes: - Fixed tab order in compile dialog - Fixed error on compiling via compile dialog - Added a new status message on startup that lists the username - Added default TAB keybinding for JavaExpert (about time!) - Fixed tab-completion in search box Index: .sheetsrc =================================================================== RCS file: /cvsroot/sheets/sheets/.sheetsrc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** .sheetsrc 22 Apr 2003 22:33:47 -0000 1.12 --- .sheetsrc 24 Apr 2003 09:38:10 -0000 1.13 *************** *** 12,18 **** #set screen-insets 0 108 0 0 ! #set web-browser "explorer.exe" # Use this instead for *nix systems: ! set web-browser "mozilla" set sheets-documentation-url "doc/reference.html" set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api" --- 12,18 ---- #set screen-insets 0 108 0 0 ! set web-browser "explorer.exe" # Use this instead for *nix systems: ! #set web-browser "mozilla" set sheets-documentation-url "doc/reference.html" set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api" *************** *** 84,87 **** --- 84,90 ---- bind change-views-to-header F7 bind change-views-to-summary F6 + + bind commit-fragment-edit F10 + bind commit-container-edits shift-F10 bind show-highlight-dialog ctl-H Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Sheets.sheets 22 Apr 2003 22:33:47 -0000 1.41 --- Sheets.sheets 24 Apr 2003 09:38:10 -0000 1.42 *************** *** 4869,4872 **** --- 4869,4873 ---- nkramer:27611 nkramer:31389 + schin:1244 rgs:13433 object nkramer:647 *************** *** 8805,8808 **** --- 8806,8810 ---- section exports nkramer:1209 nkramer:1211 + schin:1243 rgs:13423 rgs:13422 *************** *** 8829,8862 **** type=java section text nkramer:1211 ! public CompileDialog (Frame parent) { ! super(parent, "Compile Program", true); ! setBackground(Profile.dialogBackground); ! ! DesignGridLayout layout = new DesignGridLayout(getContentPane(), DesignGrid.large, 4); ! layout.setRowSpacing(0); ! layout.addLabel("Compile command:"); ! layout.add(compileCommand, 2, 2); ! compileCommand.setText(Profile.compileCommand); ! layout.nextRow(); ! ! layout.addLabel("Recompile command:"); ! layout.makeColumnResizable(); ! layout.add(recompileCommand, 2, 2); ! recompileCommand.setText(Profile.recompileCommand); ! ! layout.beginButtonBlock(true); ! JButton compile = new JButton("Compile"); ! JButton recompile = new JButton("Recompile"); ! JButton cancel = new JButton("Cancel"); ! layout.add(compile); ! layout.add(recompile); ! layout.add(cancel); ! compile.addActionListener(this); ! recompile.addActionListener(this); ! cancel.addActionListener(this); ! layout.endBlock(); ! ! pack(); ! } object nkramer:1213 pkg=org.browsecode.sheets --- 8831,8835 ---- type=java section text nkramer:1211 ! private RootFrame CompileDialog.rootFrame; object nkramer:1213 pkg=org.browsecode.sheets *************** *** 10912,10920 **** type=java section text nkramer:1679 ! // This initialize method calls all of the above methods. Were we writing ! // in Java 1.1, this would probably be an instance initializer instead ! // of a method... ! final void LanguageExpert.initialize () ! { String[] extensions = filenameExtensions(); for (int i=0; i<extensions.length; i++) --- 10885,10889 ---- type=java section text nkramer:1679 ! LanguageExpert.<init> { String[] extensions = filenameExtensions(); for (int i=0; i<extensions.length; i++) *************** *** 11444,11451 **** Profile.compileCommand = compileCommand.getText(); Profile.recompileCommand = recompileCommand.getText(); if (arg.equals("Compile")) ! executeLastCommand(false); else if (arg.equals("Recompile")) ! executeLastCommand(true); } object nkramer:2145 --- 11413,11422 ---- Profile.compileCommand = compileCommand.getText(); Profile.recompileCommand = recompileCommand.getText(); + + ViewPanel panel = rootFrame.getVisibleContainer().getEditor(); if (arg.equals("Compile")) ! new CompileProgram().checkAndExecute(panel, panel.selectedFragment()); else if (arg.equals("Recompile")) ! new RecompileProgram().checkAndExecute(panel, panel.selectedFragment()); } object nkramer:2145 *************** *** 11593,11597 **** try { LanguageExpert expert = (LanguageExpert)Class.forName(name).newInstance(); - expert.initialize(); allExperts.add(expert); VectorUtils.append(Profile.defaultViewModifiers, expert.defaultViewModifiers()); --- 11564,11567 ---- *************** *** 71101,71107 **** queryField = new JTextField(20); queryField.addActionListener(queryAction); ! Keymap keymap = queryField.addKeymap(null, queryField.getKeymap()); keymap.addActionForKeyStroke(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_TAB, 0), queryCompleteAction); - queryField.setKeymap(keymap); queryField.getDocument().addDocumentListener(queryDocumentListener); query = new JButton("Go"); --- 71071,71076 ---- queryField = new JTextField(20); queryField.addActionListener(queryAction); ! Keymap keymap = queryField.getKeymap(); keymap.addActionForKeyStroke(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_TAB, 0), queryCompleteAction); queryField.getDocument().addDocumentListener(queryDocumentListener); query = new JButton("Go"); *************** *** 82683,82686 **** --- 82652,82704 ---- } } + object schin:1243 + pkg=org.browsecode.sheets + type=java + section text schin:1243 + public CompileDialog (RootFrame parent) { + super(parent, "Compile Program", true); + rootFrame = parent; + setBackground(Profile.dialogBackground); + + JPanel fields = new JPanel(); + JPanel buttons = new JPanel(); + + DesignGridLayout layout = new DesignGridLayout(fields, DesignGrid.small, 3); + layout.setRowSpacing(0); + layout.addLabel("Compile command:"); + layout.add(compileCommand, 2, 2); + compileCommand.setText(Profile.compileCommand); + layout.nextRow(); + + layout.addLabel("Recompile command:"); + layout.makeColumnResizable(); + layout.add(recompileCommand, 2, 2); + recompileCommand.setText(Profile.recompileCommand); + + DesignGridLayout buttonLayout = new DesignGridLayout(buttons, DesignGrid.tiny, 1); + buttonLayout.beginButtonBlock(true); + JButton compile = new JButton("Compile"); + JButton recompile = new JButton("Recompile"); + JButton cancel = new JButton("Cancel"); + buttonLayout.add(compile); + buttonLayout.add(recompile); + buttonLayout.add(cancel); + compile.addActionListener(this); + recompile.addActionListener(this); + cancel.addActionListener(this); + buttonLayout.endBlock(); + + getContentPane().setLayout(new FlowLayout()); + getContentPane().add(fields); + getContentPane().add(buttons); + pack(); + } + object schin:1244 + pkg=org.browsecode.javaStuff + type=java + section text schin:1244 + JavaExpert.<init> { + Profile.sheetCommands.add("TAB", 0, new CompleteJavaWord()); + } object sjc:1 pkg=org.browsecode.sheets.dicer *************** *** 87957,87960 **** --- 87975,87979 ---- public void run() { createRootFrame(); + Console.status("Welcome to Sheets, " + Profile.username + "!"); } }); *************** *** 96857,96860 **** --- 96876,96880 ---- rgs:13433 nkramer:31389 + schin:1244 lightWeight:separator rgs:6426 *************** *** 97711,97714 **** --- 97731,97735 ---- rgs:13423 nkramer:1211 + schin:1243 rgs:297 nkramer:1218 Index: todo.txt =================================================================== RCS file: /cvsroot/sheets/sheets/todo.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** todo.txt 21 Apr 2003 20:27:29 -0000 1.14 --- todo.txt 24 Apr 2003 09:38:13 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- Stuff I Want to do: + 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) |
|
From: <ox-...@us...> - 2003-04-24 09:38:36
|
Update of /cvsroot/sheets/sheets/lib In directory sc8-pr-cvs1:/tmp/cvs-serv14682/lib Modified Files: bootstrap-sheets.jar Log Message: Minor fixes: - Fixed tab order in compile dialog - Fixed error on compiling via compile dialog - Added a new status message on startup that lists the username - Added default TAB keybinding for JavaExpert (about time!) - Fixed tab-completion in search box Index: bootstrap-sheets.jar =================================================================== RCS file: /cvsroot/sheets/sheets/lib/bootstrap-sheets.jar,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsKKtt04 and /tmp/cvs2azDfL differ |
|
From: <ox-...@us...> - 2003-04-22 22:33:57
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv16956 Modified Files: .sheetsrc Sheets.sheets Log Message: Added support for multi-line compile command parsing (if you have any existing regular expressions in your .sheetsrc file, make sure that you fix them) Added a new default javac regexp that properly handles multi-line results (no more partial results) Index: .sheetsrc =================================================================== RCS file: /cvsroot/sheets/sheets/.sheetsrc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** .sheetsrc 21 Apr 2003 19:17:19 -0000 1.11 --- .sheetsrc 22 Apr 2003 22:33:47 -0000 1.12 *************** *** 3,18 **** ########################################## ! set compile-command "ant.bat compile" ! set recompile-command "ant.bat clean" # Use these instead for *nix systems ! #set compile-command "./ant compile" ! #set recompile-command "./ant clean" #set windows-task-bar-height 0 #set screen-insets 0 108 0 0 ! set web-browser "explorer.exe" # Use this instead for *nix systems: ! #set web-browser "mozilla" set sheets-documentation-url "doc/reference.html" set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api" --- 3,18 ---- ########################################## ! #set compile-command "ant.bat compile" ! #set recompile-command "ant.bat clean" # Use these instead for *nix systems ! set compile-command "ant compile" ! set recompile-command "ant clean" #set windows-task-bar-height 0 #set screen-insets 0 108 0 0 ! #set web-browser "explorer.exe" # Use this instead for *nix systems: ! set web-browser "mozilla" set sheets-documentation-url "doc/reference.html" set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api" Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Sheets.sheets 21 Apr 2003 20:27:18 -0000 1.40 --- Sheets.sheets 22 Apr 2003 22:33:47 -0000 1.41 *************** *** 8648,8652 **** showVerboseDialogs = getBoolean(stream); } else if (name.equals("error-pattern")) { ! errorPatterns.addElement(Pattern.compile(getString(stream))); } else if (name.equals("language-expert")) { LanguageExpert.initializeExpert(getString(stream)); --- 8648,8652 ---- showVerboseDialogs = getBoolean(stream); } else if (name.equals("error-pattern")) { ! errorPatterns.addElement(Pattern.compile(getString(stream), Pattern.MULTILINE)); } else if (name.equals("language-expert")) { LanguageExpert.initializeExpert(getString(stream)); *************** *** 8881,8891 **** // fileLine is the line # relative to the start of the file (not fragment). private static boolean CompileDialog.addError ! (Sheet sheet, ExportRecord record, String file, Matcher matcher) { - int line = Integer.parseInt(matcher.group(2)); FragmentAndLine location = record.fragmentAt(line); if (location == null) return false; ((LineViewFragment)location.fragment) ! .addError("CompilerError", matcher.group(3), location.line - 1, -1); int index = sheet.getContents().getFragments().indexOf(location.fragment); if (index == -1) { --- 8881,8890 ---- // fileLine is the line # relative to the start of the file (not fragment). private static boolean CompileDialog.addError ! (Sheet sheet, ExportRecord record, String file, int line, String message) { FragmentAndLine location = record.fragmentAt(line); if (location == null) return false; ((LineViewFragment)location.fragment) ! .addError("CompilerError", message, location.line - 1, -1); int index = sheet.getContents().getFragments().indexOf(location.fragment); if (index == -1) { *************** *** 8903,8909 **** // Return value is null if no errors are found. private static Sheet CompileDialog.parseErrors(String outString) { - // Out former regexp library seemed to get confused when given big inputs - // so we cut it's food into tiny bite-sized chunks -- this should be revisited. - String[] lines = StringSplitter.splitLines(outString); if (errorSheet == null) { errorSheet = new Sheet(State.getObjectDatabase(), "Compilation errors", null, null); --- 8902,8905 ---- *************** *** 8912,8932 **** } StringBuffer unparsedText = new StringBuffer(); ! for (int i = 0; i < lines.length; i++) { ! String line = lines[i]; ! boolean errorParsed = false; ! for (int j = 0; j < Profile.errorPatterns.size(); j++) { ! Pattern pat = (Pattern)Profile.errorPatterns.elementAt(j); ! Matcher matcher = pat.matcher(line); ! if (matcher.matches()) { ! String file = matcher.group(1); ! ExportRecord record = ExportRecord.forName(file); ! if (record != null && addError(errorSheet, record, file, matcher)) { ! errorParsed = true; ! break; // stop trying to match error msg against regexps ! } } } ! if (!errorParsed) ! unparsedText.append(line + "\\n"); } if (errorSheet.numFragments() == 0) --- 8908,8929 ---- } StringBuffer unparsedText = new StringBuffer(); ! for (int j = 0; j < Profile.errorPatterns.size(); j++) { ! unparsedText.setLength(0); ! Pattern pat = (Pattern)Profile.errorPatterns.elementAt(j); ! Matcher matcher = pat.matcher(outString); ! while (matcher.find()) { ! String file = matcher.group(1); ! 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); ! // recursively parse the text ! outString = unparsedText.toString(); } if (errorSheet.numFragments() == 0) *************** *** 10416,10425 **** errorPatterns = new Vector(); - // JVC error format - errorPatterns.addElement(Pattern.compile("(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9.$_/\\\\\\\\]+)\\\\(([0-9]+),[0-9]+\\\\) :(.*)")); // JAVAC error format ! errorPatterns.addElement(Pattern.compile("(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9.$_/\\\\\\\\]+):([0-9]+): (.*)")); // JIKE's error format ! errorPatterns.addElement(Pattern.compile("(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9_$./\\\\\\\\]+):([0-9]+):[0-9]+:[0-9]+:[0-9]+: (.*)")); LanguageExpert.initializeExpert("org.browsecode.sheets.SheetExpert"); --- 10413,10420 ---- errorPatterns = new Vector(); // JAVAC error format ! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9.$_/\\\\\\\\]+):([0-9]+): ((?:.|\\\\n)*?)\\\\n.*\\\\n *\\\\^$", Pattern.MULTILINE)); // JIKE's error format ! errorPatterns.addElement(Pattern.compile("^(?: \\\\[javac\\\\])?([A-Za-z]?:?[-a-zA-Z0-9_$./\\\\\\\\]+):([0-9]+):[0-9]+:[0-9]+:[0-9]+: (.*)$", Pattern.MULTILINE)); LanguageExpert.initializeExpert("org.browsecode.sheets.SheetExpert"); |
