[sword-cvs] swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS WLC2OSIS.java, 1.4, 1.5 WLC2OSISMain.java, 1.1, 1.2

[sword at www.crosswire.org]

Committed by: mgruner

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

Modified Files:
	WLC2OSIS.java WLC2OSISMain.java 
Log Message:
final cleanups.



Index: WLC2OSIS.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- WLC2OSIS.java	10 Jun 2004 12:00:19 -0000	1.4
+++ WLC2OSIS.java	14 Jul 2004 14:55:47 -0000	1.5
@@ -19,15 +19,13 @@
 */
 //=================================================================================================
 
-public class WLC2OSIS implements Stoppable {
+public class WLC2OSIS /*implements Stoppable*/ {
 
 // Definitions of input and output to be set by user.
 
-public String ProgramDate = "30 May 2004" ;
+// public String ProgramDate = "30 May 2004" ;
 public String DefaultInputFilename = "/home/Martin/dev/swordtools/modules/hebrew-wlc/" ;
 public String InputFilename;
-public String DefaultInputDate = "5 March 2004" ;
-public String Date ;
 public String DefaultOutputDirectory = "/home/Martin/KDesktop/" ;
 public String OutputDirectory ;
 // Define the title and descriptions.
@@ -82,15 +80,15 @@
 public Parser p ;
 public XMLWriter w ;
 public Fmt F = new Fmt() ;
-public boolean StandAlone = true ;  // If used by another app, 
+// public boolean StandAlone = true ;  // If used by another app, 
 Messages M;
  
 public WLC2OSIS( Container InputContainer ){
     this.InputContainer = InputContainer ;
-    this.SC = new SuperContainer(InputContainer) ;
-    OverallContainer =  SC.getContentPane() ;
-    SuperFrame =  SC.superFrame() ;
-    StandAlone = true ;
+     this.SC = new SuperContainer(InputContainer) ;
+    OverallContainer =  this.SC.getContentPane() ;
+//     SuperFrame =  SC.superFrame() ;
+//     StandAlone = true ;
 //-----------------------------------------------------------------------------
 
 // Crude GUI
@@ -100,7 +98,7 @@
     
     M.initialMessage() ;
     InputFilename = fc.getInputFilename(DefaultInputFilename) ;
-    GetDate gd = new GetDate(this) ;
+//     GetDate gd = new GetDate(this) ;
     OutputDirectory = fc.getOutputDirectory(DefaultOutputDirectory) ;    
 //-----------------------------------------------------------------------------
 
@@ -130,35 +128,13 @@
     p = new Parser(this) ;
     p.parse() ;    
 //-----------------------------------------------------------------------------
-
-// Write the Tanach.xml file
-        
-//    Index.writeIndex(this) ;
-//    System.out.println("\nThe index file, Tanach.xml, has been written.\n") ;
-    
-//-----------------------------------------------------------------------------
     M.doneMessage() ;
 //-----------------------------------------------------------------------------
-
-// Launch the browser on Tanach.xml
-
-//   try{
-//        BrowserLauncher.openURL("file:\\" + OutputDirectory
-//             + File.separator + "Tanach.xml") ;
-//        }
-//    catch(IOException e){
-//        System.out.println("WLC2OSIS: Couldn't launch browser.") ;
-//        }    
      
     done() ;
     } 
 //-----------------------------------------------------------------------------
 
-// Applet stop() method, calls done() method.
-
-public void stop() {
-    done() ;
-    }
 //------------------------------------------------------------------------------
 /**
   *    Universal exit.
@@ -166,11 +142,7 @@
 public void done(){
     System.out.println("\nWLC2OSIS: Normal end.") ;
     F.bar("=", 80) ;
-    if(!SC.isApplet()){
-        if(StandAlone){
-            System.exit(0) ;
-            }
-        }
+    System.exit(0) ;
     }
 //-----------------------------------------------------------------------------
 // End of class

Index: WLC2OSISMain.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSISMain.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WLC2OSISMain.java	4 Jun 2004 09:14:52 -0000	1.1
+++ WLC2OSISMain.java	14 Jul 2004 14:55:47 -0000	1.2
@@ -17,38 +17,12 @@
  *
  */
 //==============================================================================
-public class WLC2OSISMain extends JApplet{
+public class WLC2OSISMain{
 
 static WLC2OSIS A ;
 
 //==============================================================================
 
-//  Applet
-
-/**
- *    Applet init() method for use as an applet.
- */
-public void init(){
-//  System.out.println ("init() called.") ; 
-    }
-//------------------------------------------------------------------------------
-/**
- *    Applet start() method goes to WLC2OSISCore.start() 
- */
-public void start() {
-//  System.out.println ("start() called.") ; 
-    A = new WLC2OSIS(this) ;
-    this.setVisible(true) ;
-    }
-//------------------------------------------------------------------------------
-/**
- *    Applet stop() method which goes to WLC2OSISCore.stop()
- */
-public void stop() {
-//  System.out.println("WLC2OSIS: stop() called.") ;
-    A.stop() ;
-    }
-//==============================================================================
 /**
  *    Static main() method for use as an application or dialog.
  *