[Sheets-cvs] sheets Sheets.sheets,1.25,1.26 build.xml,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv9797

Modified Files:
	Sheets.sheets build.xml 
Log Message:
Doc Changes:
Tested with the released version of Centipede, and checked in an updated skin.
Fixed the SourceForge link to point to the main page rather than the sheets project (per their instructions)

Code Changes:
Fixed the build files so an empty arg.sheets property is handled correctly.
Re-enabled the xml extension for the DocExpert, because it was causing a NullPointerException on export
Fixed some color references in the ui to point to the Profile, rather than be hard-coded.

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Sheets.sheets	6 Dec 2002 03:03:39 -0000	1.25
--- Sheets.sheets	6 Dec 2002 12:54:40 -0000	1.26
***************
*** 8477,8480 ****
--- 8477,8481 ----
   nkramer:7543
   nkramer:7544
+  schin:1101
   nkramer:7545
   nkramer:7546
***************
*** 17137,17141 ****
   // The color of the view selector (that little shape to the left of the
   // fragment)
!  public static final Color Profile.viewSelectorColor = Color.black;
  object nkramer:6581
   pkg=org.browsecode.sheets
--- 17138,17142 ----
   // The color of the view selector (that little shape to the left of the
   // fragment)
!  public static final Color Profile.viewSelectorColor = faintGray;
  object nkramer:6581
   pkg=org.browsecode.sheets
***************
*** 32493,32498 ****
  section text nkramer:30606
   protected String[] DocExpert.filenameExtensions () {
!    // disable until we are smart enough to check the doctype
!    return new String[] { };// "xml" };
   }
  object nkramer:30607
--- 32494,32498 ----
  section text nkramer:30606
   protected String[] DocExpert.filenameExtensions () {
!    return new String[] { "xml" };
   }
  object nkramer:30607
***************
*** 62507,62511 ****
       // dot (a very small circle)
       int adjust = (lineHeight - 3) / 2;  // center just like the circle
!      g.setColor(Profile.faintGray);
       g.fillOval(adjust, adjust + 1, 3, 3);
       g.setColor(Color.black);
--- 62507,62511 ----
       // dot (a very small circle)
       int adjust = (lineHeight - 3) / 2;  // center just like the circle
!      g.setColor(Profile.viewSelectorColor);
       g.fillOval(adjust, adjust + 1, 3, 3);
       g.setColor(Color.black);
***************
*** 62513,62517 ****
     } else if (view.equals("name")) {
       // line
!      g.setColor(Profile.faintGray);
       g.fillRect(lineHeight / 4, lineHeight / 2 - 1, lineHeight / 2, 2);
       g.setColor(Color.black);
--- 62513,62517 ----
     } else if (view.equals("name")) {
       // line
!      g.setColor(Profile.viewSelectorColor);
       g.fillRect(lineHeight / 4, lineHeight / 2 - 1, lineHeight / 2, 2);
       g.setColor(Color.black);
***************
*** 62526,62530 ****
       xs[1] = xs[0] + lineHeight / 4;
       xs[2] = xs[0] + lineHeight / 2;
!      g.setColor(Profile.faintGray);
       g.fillPolygon(xs, ys, 3);
       g.setColor(Color.black);
--- 62526,62530 ----
       xs[1] = xs[0] + lineHeight / 4;
       xs[2] = xs[0] + lineHeight / 2;
!      g.setColor(Profile.viewSelectorColor);
       g.fillPolygon(xs, ys, 3);
       g.setColor(Color.black);
***************
*** 62532,62536 ****
     } else if (view.equals("header")) {
       // square
!      g.setColor(Profile.faintGray);
       g.fillRect(lineHeight * 3 / 10, lineHeight * 3 / 10 + 1, lineHeight * 2 / 5, lineHeight * 2 / 5);
       g.setColor(Color.black);
--- 62532,62536 ----
     } else if (view.equals("header")) {
       // square
!      g.setColor(Profile.viewSelectorColor);
       g.fillRect(lineHeight * 3 / 10, lineHeight * 3 / 10 + 1, lineHeight * 2 / 5, lineHeight * 2 / 5);
       g.setColor(Color.black);
***************
*** 62538,62542 ****
     } else if (view.equals("full")) {
       // circle
!      g.setColor(Profile.faintGray);
       g.fillOval(lineHeight / 4, lineHeight / 4 + 1, lineHeight / 2, lineHeight / 2);
       g.setColor(Color.black);
--- 62538,62542 ----
     } else if (view.equals("full")) {
       // circle
!      g.setColor(Profile.viewSelectorColor);
       g.fillOval(lineHeight / 4, lineHeight / 4 + 1, lineHeight / 2, lineHeight / 2);
       g.setColor(Color.black);
***************
*** 84072,84075 ****
--- 84072,84080 ----
     out.writeUTF(javaClass.getClassName());
   }
+ object schin:1101
+  pkg=org.browsecode.sheets
+  type=java
+ section text schin:1101
+  public static final Color Profile.lime = new Color(233, 245, 230);
  object sjc:1
   pkg=org.browsecode.sheets.dicer
***************
*** 97417,97420 ****
--- 97422,97426 ----
   nkramer:7543
   nkramer:7544
+  schin:1101
   nkramer:7545
   nkramer:7546

Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	6 Dec 2002 03:03:40 -0000	1.12
--- build.xml	6 Dec 2002 12:54:42 -0000	1.13
***************
*** 2,18 ****

    <!-- set global properties for this build -->
!   <property name="JAVACC_HOME"   value="tools"/>
!   <property name="java"          value="src/java"/>
!   <property name="lib"          value="lib"/>
!   <property name="graphics"      value="graphics"/>
!   <property name="build"         value="build"/>
!   <property name="classes"       value="${build}/sheets/classes"/>
!   <property name="test"          value="test"/>
!   <property name="dist"          value="dist"/>
!   <property name="installer"     value="installer"/>
!   <property name="parsers"       value="parsers"/>
!   <property name="database"      value="Sheets.sdb"/>
!   <property name="test-database" value="Test.sdb"/>
!   <property name="imports"       value="Sheets.sheets"/>

    <target name="init">
--- 2,18 ----

    <!-- set global properties for this build -->
!   <property name="JAVACC_HOME"    value="tools"/>
!   <property name="java"           value="src/java"/>
!   <property name="lib"            value="lib"/>
!   <property name="graphics"       value="graphics"/>
!   <property name="build"          value="build"/>
!   <property name="classes"        value="${build}/sheets/classes"/>
!   <property name="test"           value="test"/>
!   <property name="dist"           value="dist"/>
!   <property name="installer"      value="installer"/>
!   <property name="parsers"        value="parsers"/>
!   <property name="database"       value="Sheets.sdb"/>
!   <property name="test-database"  value="Test.sdb"/>
!   <property name="imports"        value="Sheets.sheets"/>

    <target name="init">
***************
*** 21,24 ****
--- 21,29 ----
      <!-- Create the build directory structure used by compile -->
      <mkdir dir="${classes}"/>
+ 
+     <!-- Set the variable to an empty string if not specified -->
+     <condition property="arg.sheets" value="">
+       <not> <isset property="arg.sheets"/> </not>
+     </condition>
    </target>