[sword-svn] r67 - in trunk/modules/hebrew-wlc/WLC2OSIS: Utilities WLC2OSIS WLC2OSIS/Parse WLC2OSIS/Translate WLC2OSIS/Utilities
mgruner at crosswire.org
mgruner at crosswire.org
Thu Jul 6 13:04:08 MST 2006
Author: mgruner
Date: 2006-07-06 13:03:39 -0700 (Thu, 06 Jul 2006)
New Revision: 67
Removed:
trunk/modules/hebrew-wlc/WLC2OSIS/Utilities/package.html
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/package.html
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/package.html
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/package.html
Modified:
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java
trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSISMain.java
Log:
Deleted: trunk/modules/hebrew-wlc/WLC2OSIS/Utilities/package.html
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/Utilities/package.html 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/Utilities/package.html 2006-07-06 20:03:39 UTC (rev 67)
@@ -1,9 +0,0 @@
-<HTML>
-<BODY>
-<b>General java utilities.</B>
-(/Utilities/package.html)
-<p>
-
-</BODY>
-</HTML>
-
Modified: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java 2006-07-06 20:03:39 UTC (rev 67)
@@ -94,6 +94,7 @@
for (int k = 0; k < A.InputChars.length ; k++){
s = t.nextToken() ;
+ System.out.println("processing: " + s);
if(s.compareTo(t.EOF) == 0){
break ;
Deleted: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/package.html
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/package.html 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/package.html 2006-07-06 20:03:39 UTC (rev 67)
@@ -1,9 +0,0 @@
-<HTML>
-<BODY>
-<b>Parsing classes</b>.
-<p/>
-<p align="right"> (<b><tt>BHS2XML/Parse/package.html</tt></b>)
-</p>
-Only the Parse and Tokenizer classes are specific to the WLC.
-</BODY>
-</HTML>
Deleted: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/package.html
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/package.html 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/package.html 2006-07-06 20:03:39 UTC (rev 67)
@@ -1,8 +0,0 @@
-<HTML>
-<BODY>
-<b>Classes to translate from the ASCII MC format to Unicode<b>.
-<p/>
-<p align="right"> (BHS2XML/Translate/package.html)
-<p/>
-Only the BookName and Note classes are specific to the WLC.</BODY>
-</HTML>
Deleted: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/package.html
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/package.html 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/package.html 2006-07-06 20:03:39 UTC (rev 67)
@@ -1,8 +0,0 @@
-<HTML>
-<BODY>
-<b>Utilities for text reading and XML writing, not specialized to WLC</b>.<p/>
-<p align="right"> (<b><tt>BHS2XML/Utilities/package.html</tt></b>)
-<p/>
-Includes a Test class to write XML for MC ASCII test cases.
-</BODY>
-</HTML>
Modified: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java 2006-07-06 20:03:39 UTC (rev 67)
@@ -1,6 +1,5 @@
package WLC2OSIS ;
-import WLC2OSIS.GUI.* ;
import WLC2OSIS.Parse.* ;
import WLC2OSIS.Translate.* ;
import WLC2OSIS.Utilities.* ;
@@ -24,9 +23,7 @@
// Definitions of input and output to be set by user.
// public String ProgramDate = "30 May 2004" ;
-public String DefaultInputFilename = "/home/Martin/dev/swordtools/modules/hebrew-wlc/" ;
public String InputFilename;
-public String DefaultOutputDirectory = "/home/Martin/KDesktop/" ;
public String OutputDirectory ;
// Define the title and descriptions.
public String Title = "The Westminster Leningrad Codex (WLC)" ;
@@ -73,37 +70,17 @@
//-----------------------------------------------------------------------------
-public final int InputBufferSize = 4000000 ; // Length of input in bytes.
-public SuperContainer SC ;
-Container InputContainer ;
-public Frame SuperFrame ;
-public Container OverallContainer ; // Actually, the content pane.
-public JRootPane RP ;
+public final int InputBufferSize = 40000000 ; // Length of input in bytes.
public char[] InputChars ; // Input char[] array set by FileRead.
public Parser p ;
public XMLWriter w ;
public Fmt F = new Fmt() ;
// public boolean StandAlone = true ; // If used by another app,
-Messages M;
-public WLC2OSIS( Container InputContainer ){
- this.InputContainer = InputContainer ;
- this.SC = new SuperContainer(InputContainer) ;
- OverallContainer = this.SC.getContentPane() ;
-// SuperFrame = SC.superFrame() ;
-// StandAlone = true ;
-//-----------------------------------------------------------------------------
-
-// Crude GUI
-
- M = new Messages(this) ;
- FileChoices fc = new FileChoices(this) ;
+public WLC2OSIS( String file, String directory ){
- M.initialMessage() ;
- InputFilename = fc.getInputFilename(DefaultInputFilename) ;
-// GetDate gd = new GetDate(this) ;
- OutputDirectory = fc.getOutputDirectory(DefaultOutputDirectory) ;
-//-----------------------------------------------------------------------------
+ InputFilename = file ;
+ OutputDirectory = directory ;
// Identifying printouts
@@ -115,28 +92,13 @@
FileRead FR = new FileRead(this) ;
FR.read(InputFilename) ;
-//-----------------------------------------------------------------------------
-// *** DISABLED *** Test of CCAT format -> XML translation.
-
-//L5253W.L\"815253)5253]4
-//YI&:RF)\"80L
-// if(false){
-// String TestString = "HA/$.FMA73YIM" ;
-// Test.test(this, TestString) ;
-// }
-//-----------------------------------------------------------------------------
-
// Read, parse, and write the book files.
p = new Parser(this) ;
p.parse() ;
-//-----------------------------------------------------------------------------
- M.doneMessage() ;
-//-----------------------------------------------------------------------------
-
+
done() ;
}
-//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
/**
@@ -147,8 +109,4 @@
F.bar("=", 80) ;
System.exit(0) ;
}
-//-----------------------------------------------------------------------------
-// End of class
}
-//========================================================================================
-//========================================================================================
Modified: trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSISMain.java
===================================================================
--- trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSISMain.java 2006-07-06 19:41:12 UTC (rev 66)
+++ trunk/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSISMain.java 2006-07-06 20:03:39 UTC (rev 67)
@@ -4,51 +4,20 @@
import java.awt.*;
import javax.swing.*;
-//==============================================================================
-/**
- * <b>WLC2OSISMain main method and applet launcher,
- * actual working program is in the WLC2OSIS class.</b><p>
- *
- * This is a general purpose launching class. It can launch
- *
- * 1. Applets
- * 2. Applications
- * 3. Dialogs launched from other programs
- *
- */
-//==============================================================================
+
+
public class WLC2OSISMain{
static WLC2OSIS A ;
-//==============================================================================
-
/**
* Static main() method for use as an application or dialog.
*
- * @param args String[] un-used.
+ * @param args String[]
*/
public static void main( String[] args) {
-
- boolean Dialog = false ; // Either a dialog or application window.
-
- Frame SuperFrame = GetParentFrame.GetParentFrame(new JFrame()) ;
-
- if (Dialog){
-
-// As a MODAL JDialog
- JDialog WLC2OSISDialog = new JDialog(SuperFrame, true) ;
- A = new WLC2OSIS( WLC2OSISDialog ) ;
+ A = new WLC2OSIS( args[0], args[1] ) ;
System.exit(0) ;
- }
- else{
-
-// Ss a JFrame
- JFrame ThisFrame = new JFrame() ;
- A = new WLC2OSIS(ThisFrame) ;
- }
- }
-// end of class
}
-//==============================================================================
-//==============================================================================
+
+} //class
More information about the sword-cvs
mailing list