[sword-cvs] swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate BookName.java, 1.1, 1.2

[sword at www.crosswire.org]

Committed by: mgruner

Update of /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate
In directory www:/tmp/cvs-serv10974/WLC2OSIS/Translate

Modified Files:
	BookName.java 
Log Message:
mgruner: futher fixes


Index: BookName.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/BookName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BookName.java	4 Jun 2004 09:14:52 -0000	1.1
+++ BookName.java	7 Jun 2004 19:24:49 -0000	1.2
@@ -18,10 +18,9 @@
 public int wlcnumber = 0 ;      // Book number in WLC text.
 public String wlcname = ""  ;   // Book name in WLC text.
 
-public int number = 0 ;         // Book number in JPS Tanach.
-public String name = "" ;       // Book name in JPS Tanach.
-public String abbrev = ""  ;    // Book abreviation in NSRV.
-public String filename  = "" ;  // Book filename
+public int number = 0 ;         // Book number.
+public String name = "" ;       // Book name in OSIS.
+public String abbrev = ""  ;    // Book abreviation in OSIS.
 public String hebrewname = "" ;
 
 //-----------------------------------------------------------------------------
@@ -30,24 +29,13 @@
 
 public BookName( int wlcnumber, String wlcname, 
              int number, String name, String abbrev,  
-             String hebrewname, String filename ) {
+             String hebrewname) {
     this.wlcnumber = wlcnumber ;
     this.wlcname = wlcname ;
     this.number = number ;
     this.name = name ;
     this.abbrev = abbrev ;
     this.hebrewname = hebrewname ;
-    this.filename = filename ;
-    }
-//-----------------------------------------------------------------------------
-
-// Definition for books that have names that are valid filenames.
-// Their filenames are their abbrev.
-
-public BookName( int wlcnumber, String wlcname, 
-             int number, String name, String abbrev, String hebrewname ) {
-    this(wlcnumber, wlcname, number, name, abbrev,
-        hebrewname, name ) ;
     }
 //-----------------------------------------------------------------------------
 
@@ -59,7 +47,7 @@
     BookNames[ 1] = new BookName(1, "gn", 
                                  1, "Genesis", "Gen", H.Gen ) ;
     BookNames[ 2] = new BookName(2, "ex", 
-                                 2, "Exodus", "Ex", H.Exod) ;
+                                 2, "Exodus", "Exod", H.Exod) ;
     BookNames[ 3] = new BookName(3, "lv", 
                                  3, "Leviticus", "Lev", H.Lev) ;
     BookNames[ 4] = new BookName(4, "nu", 
@@ -72,13 +60,13 @@
     BookNames[ 7] = new BookName(7, "ju",  
                                  7, "Judges", "Judg", H.Judg) ;
     BookNames[ 8] = new BookName(8, "1s", 
-                                 8, "1 Samuel", "1 Sam", H.Sam1, "Samuel 1") ;
+                                 8, "1 Samuel", "1Sam", H.Sam1) ;
     BookNames[ 9] = new BookName(9, "2s",  
-                                 9, "2 Samuel", "2 Sam", H.Sam2, "Samuel 2") ;
+                                 9, "2 Samuel", "2Sam", H.Sam2) ;
     BookNames[10] = new BookName(10, "1k", 
-                                 10, "1 Kings", "1 Kings", H.Kgs1, "Kings 1") ;
+                                 10, "1 Kings", "1Kgs", H.Kgs1) ;
     BookNames[11] = new BookName(11, "2k", 
-                                 11, "2 Kings", "2 Kings", H.Kgs2, "Kings 2") ;
+                                 11, "2 Kings", "2Kgs", H.Kgs2) ;
     BookNames[12] = new BookName(12, "is", 
                                  12, "Isaiah", "Isa", H.Isa) ;
     BookNames[13] = new BookName(13, "je", 
@@ -91,11 +79,11 @@
     BookNames[16] = new BookName(16, "jl",  
                                  16, "Joel", "Joel", H.Joel) ;
     BookNames[17] = new BookName(17, "am",  
-                                 17, "Amos", "Am", H.Amos) ;
+                                 17, "Amos", "Amos", H.Amos) ;
     BookNames[18] = new BookName(18, "ob", 
-                                 18, "Obadiah", "Ob", H.Obad) ;
+                                 18, "Obadiah", "Obad", H.Obad) ;
     BookNames[19] = new BookName(19, "jn", 
-                                 19, "Jonah", "Jon", H.Jonah) ;
+                                 19, "Jonah", "Jonah", H.Jonah) ;
     BookNames[20] = new BookName(20, "mi",  
                                  20, "Micah", "Mic", H.Micah) ;
     BookNames[21] = new BookName(21, "na", 
@@ -120,7 +108,7 @@
     BookNames[30] = new BookName(30, "ru", 
                                  31, "Ruth", "Ruth", H.Ruth) ;
     BookNames[31] = new BookName(31, "ca",  
-                                 30, "The Song of Songs", "Song", H.Song, "Song of Songs") ;
+                                 30, "The Song of Songs", "Song", H.Song) ;
     BookNames[32] = new BookName(32, "ec", 
                                  33, "Ecclesiastes", "Eccl", H.Eccl) ;
     BookNames[33] = new BookName(33, "lm",  
@@ -134,9 +122,9 @@
     BookNames[37] = new BookName(37, "ne",
                                  37, "Nehemiah", "Neh", H.Neh) ;
     BookNames[38] = new BookName(38, "1c", 
-                                 38, "1 Chronicles", "1 Chr", H.Chr1, "Chronicles 1") ;
+                                 38, "1 Chronicles", "1 Chr", H.Chr1) ;
     BookNames[39] = new BookName(39, "2c", 
-                                 39, "2 Chronicles", "2 Chr", H.Chr2, "Chronicles 2") ;
+                                 39, "2 Chronicles", "2 Chr", H.Chr2) ;
     return BookNames ;
     }
 //-----------------------------------------------------------------------------