[jsword-svn] biblemapper/java/main/org/crosswire/biblemapper/model s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/biblemapper/java/main/org/crosswire/biblemapper/model
In directory www.crosswire.org:/tmp/cvs-serv32395/java/main/org/crosswire/biblemapper/model

Modified Files:
	LinkArray.java VBAExport.java Map.java 
Log Message:
Made full book names a configurable default and used it.
Fixed the name of Readings.

Index: Map.java
===================================================================
RCS file: /cvs/jsword/biblemapper/java/main/org/crosswire/biblemapper/model/Map.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Map.java	17 May 2005 00:44:09 -0000	1.2
--- Map.java	12 Jun 2005 02:39:37 -0000	1.3
***************
*** 507,511 ****
                  Element eb = new Element("book");
                  eb.setAttribute("num", ""+b);
!                 eb.setAttribute("name", BibleInfo.getShortBookName(b));
                  epos.addContent(eb);
  
--- 507,511 ----
                  Element eb = new Element("book");
                  eb.setAttribute("num", ""+b);
!                 eb.setAttribute("name", BibleInfo.getBookName(b));
                  epos.addContent(eb);
  

Index: VBAExport.java
===================================================================
RCS file: /cvs/jsword/biblemapper/java/main/org/crosswire/biblemapper/model/VBAExport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VBAExport.java	17 May 2005 00:44:09 -0000	1.2
--- VBAExport.java	12 Jun 2005 02:39:37 -0000	1.3
***************
*** 230,234 ****
                  y = (int) (map.getPositionDimension(b, 1, 1) * y_mag);
  
!                 out.println("  RouteStart "+x+"#, "+y+"#, \""+BibleInfo.getShortBookName(b)+"\"");
  
                  int cib = BibleInfo.chaptersInBook(b);
--- 230,234 ----
                  y = (int) (map.getPositionDimension(b, 1, 1) * y_mag);
  
!                 out.println("  RouteStart "+x+"#, "+y+"#, \""+BibleInfo.getBookName(b)+"\"");
  
                  int cib = BibleInfo.chaptersInBook(b);

Index: LinkArray.java
===================================================================
RCS file: /cvs/jsword/biblemapper/java/main/org/crosswire/biblemapper/model/LinkArray.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LinkArray.java	17 May 2005 00:44:09 -0000	1.6
--- LinkArray.java	12 Jun 2005 02:39:37 -0000	1.7
***************
*** 158,162 ****
                  Element eb = new Element("book");
                  eb.setAttribute("num", ""+b);
!                 eb.setAttribute("name", BibleInfo.getShortBookName(b));
                  elinks.addContent(eb);
  
--- 158,162 ----
                  Element eb = new Element("book");
                  eb.setAttribute("num", ""+b);
!                 eb.setAttribute("name", BibleInfo.getBookName(b));
                  elinks.addContent(eb);