You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/06/15 20:27:31 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/util/dom DOMWriter.java DOMParser.java DOMParserWrapper.java

remm        00/06/15 11:27:25

  Modified:    src/share/org/apache/slide/util/dom DOMWriter.java
  Removed:     src/share/org/apache/slide/util/dom DOMParser.java
                        DOMParserWrapper.java
  Log:
  - Dependency with Xerces removed. Should now be able to use
  any JAXP parser.
  
  Revision  Changes    Path
  1.2       +5 -147    jakarta-slide/src/share/org/apache/slide/util/dom/DOMWriter.java
  
  Index: DOMWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/dom/DOMWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMWriter.java	2000/05/09 02:47:30	1.1
  +++ DOMWriter.java	2000/06/15 18:27:19	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/dom/DOMWriter.java,v 1.1 2000/05/09 02:47:30 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/05/09 02:47:30 $
  + * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/dom/DOMWriter.java,v 1.2 2000/06/15 18:27:19 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/06/15 18:27:19 $
    *
    * ====================================================================
    *
  @@ -64,15 +64,12 @@
   package org.apache.slide.util.dom;
   
   import java.io.*;
  -
   import org.w3c.dom.Attr;
   import org.w3c.dom.Document;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.xml.sax.InputSource;
  -import org.apache.xerces.readers.MIME2Java;
  -
   
   /**
    * A sample DOM writer. This sample program illustrates how to
  @@ -81,14 +78,6 @@
   public class DOMWriter {
   
      //
  -   // Constants
  -   //
  -
  -   /** Default parser name. */
  -   private static final String 
  -   DEFAULT_PARSER_NAME = "com.exoffice.intalio.slide.common.dom.DOMParser";
  -
  -   //
      // Data
      //
   
  @@ -107,34 +96,6 @@
       };
   
   
  -/*
  -   private static String JAVA_SUPPORTED_ENCODINGS[] = 
  -   { "Default", "8859_1", "8859_2", "8859_3", "8859_4", "8859_5", "8859_6", 
  -      "8859_7", "8859_8", "8859_9", "Cp037", "Cp273", "Cp277", "Cp278",
  -      "Cp280", "Cp284", "Cp285", "Cp297", "Cp420", "Cp424", "Cp437",
  -      "Cp500", "Cp737", "Cp775", "Cp838", "Cp850", "Cp852", "Cp855", "Cp856",
  -      "Cp857", "Cp860", "Cp861",
  -      "Cp862", "Cp863", "Cp864", "Cp865", "Cp866", "Cp868", "Cp869", "Cp870",
  -      "Cp871", "Cp874", "Cp875",
  -      "Cp918", "Cp921", "Cp922", "Cp930", "Cp933", "Cp935", "Cp937", "Cp939",
  -      "Cp942", "Cp948", "Cp949",
  -      "Cp950", "Cp964", "Cp970", "Cp1006", "Cp1025", "Cp1026", "Cp1046", 
  -      "Cp1097", "Cp1098", "Cp1112",
  -      "Cp1122", "Cp1123", "Cp1124", "Cp1250", "Cp1251", "Cp1252", "Cp1253",
  -      "Cp1254", "Cp1255", "Cp1256",
  -      "Cp1257", "Cp1258", "Cp1381", "Cp1383", "Cp33722", "MS874",
  -      "EUCJIS", "GB2312", 
  -       "GBK", "ISO2022CN_CNS", "ISO2022CN_GB",
  -      "JIS",
  -      "JIS0208", "KOI8_R", "KSC5601","MS874",
  -      "SJIS",  "Big5", "CNS11643",
  -      "MacArabic", "MacCentralEurope", "MacCroatian", "MacCyrillic",
  -      "MacDingbat", "MacGreek",
  -      "MacHebrew", "MacIceland", "MacRoman", "MacRomania", "MacSymbol",
  -      "MacThai", "MacTurkish",
  -      "MacUkraine", "SJIS", "Unicode", "UnicodeBig", "UnicodeLittle", "UTF8"};
  -*/
  -
      /** Print writer. */
      protected PrintWriter out;
   
  @@ -172,7 +133,7 @@
         else if( encoding.equalsIgnoreCase( "UTF-16" ) )
            PRINTWRITER_ENCODING  = "Unicode";
         else
  -         PRINTWRITER_ENCODING = MIME2Java.convert( encoding ); 
  +         PRINTWRITER_ENCODING = "8859-1";
      }// setWriterEncoding 
   
   
  @@ -185,23 +146,6 @@
      }// isValidJavaEncoding 
   
   
  -
  -   /** Prints the resulting document tree. */
  -   public static void print(String parserWrapperName, String uri, 
  -                            boolean canonical ) {
  -      try {
  -         DOMParserWrapper parser = 
  -         (DOMParserWrapper)Class.forName(parserWrapperName).newInstance();
  -         Document document = parser.parse(uri);
  -         DOMWriter writer = new DOMWriter(canonical);
  -         writer.print(document);
  -      } catch ( Exception e ) {
  -         //e.printStackTrace(System.err);
  -      }
  -
  -   } // print(String,String,boolean)
  -
  -
      /** Prints the specified node, recursively. */
      public void print(Node node) {
   
  @@ -221,7 +165,7 @@
                     else if( Encoding.equalsIgnoreCase( "Unicode" ) )
                        Encoding = "UTF-16";
                     else 
  -                     Encoding = MIME2Java.reverse( Encoding );
  +                     Encoding = "8859-1";
   
                     out.println("<?xml version=\"1.0\" encoding=\""+
                              Encoding + "\"?>");
  @@ -345,77 +289,6 @@
      } // sortAttributes(NamedNodeMap):Attr[]
   
   
  -   //
  -   // Main
  -   //
  -
  -   /** Main program entry point. */
  -   public static void main(String argv[]) {
  -
  -      // is there anything to do?
  -      if ( argv.length == 0 ) {
  -         printUsage();
  -         System.exit(1);
  -      }
  -
  -      // vars
  -      String  parserName = DEFAULT_PARSER_NAME;
  -      boolean canonical  = false;
  -      String  encoding   = "UTF8"; // default encoding
  -
  -      // check parameters
  -      for ( int i = 0; i < argv.length; i++ ) {
  -         String arg = argv[i];
  -
  -         // options
  -         if ( arg.startsWith("-") ) {
  -            if ( arg.equals("-p") ) {
  -               if ( i == argv.length - 1 ) {
  -                  System.err.println("error: missing parser name");
  -                  System.exit(1);
  -               }
  -               parserName = argv[++i];
  -               continue;
  -            }
  -
  -            if ( arg.equals("-c") ) {
  -               canonical = true;
  -               continue;
  -            }
  -
  -            if ( arg.equals("-h") ) {
  -               printUsage();
  -               System.exit(1);
  -            }
  -
  -            if ( arg.equals("-e") ) {
  -               if ( i == argv.length - 1 ) {
  -                  System.err.println("error: missing encoding name");
  -                  printValidJavaEncoding();
  -                  System.exit(1);
  -               } else {
  -                  encoding = argv[++i];
  -                  if ( isValidJavaEncoding( encoding ) )
  -                     setWriterEncoding( encoding );
  -                  else {
  -                     printValidJavaEncoding();
  -                     System.exit( 1 );
  -                  }
  -               }
  -               continue;
  -            }
  -
  -         }
  -
  -         // print uri
  -         System.err.println(arg+':');
  -         print(parserName, arg, canonical );
  -         System.err.println();
  -      }
  -
  -   } // main(String[])
  -
  -
      /** Normalizes the given string. */
      protected String normalize(String s) {
         StringBuffer str = new StringBuffer();
  @@ -459,21 +332,6 @@
         return (str.toString());
   
      } // normalize(String):String
  -
  -   /** Prints the usage. */
  -   private static void printUsage() {
  -
  -      System.err.println("usage: java dom.DOMWriter (options) uri ...");
  -      System.err.println();
  -      System.err.println("options:");
  -      System.err.println("  -p name  Specify DOM parser wrapper by name.");
  -      System.err.println("           Default parser: "+DEFAULT_PARSER_NAME);
  -      System.err.println("  -c       Canonical XML output.");
  -      System.err.println("  -h       This help screen.");
  -      System.err.println("  -e       Output Java Encoding.");
  -      System.err.println("           Default encoding: UTF-8");
  -
  -   } // printUsage()
   
      private static void printValidJavaEncoding() {
         System.err.println( "    ENCODINGS:" );