[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/impexp/xtm XTMSerializer.java, 1.4, 1.5

[Tobias R. <tob...@us...>]

Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/impexp/xtm
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28716

Modified Files:
	XTMSerializer.java 
Log Message:
Added setEncoding to save XTM with any encoding - default is still ISO-8859-1



Index: XTMSerializer.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/impexp/xtm/XTMSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XTMSerializer.java	3 Mar 2005 17:33:32 -0000	1.4
--- XTMSerializer.java	9 Jul 2007 21:27:47 -0000	1.5
***************
*** 39,42 ****
--- 39,43 ----
      private TopicMap tm;
      private int baselen;
+     private String encoding = "ISO-8859-1";
      
      public static final String PROPERTY_SUBJECTIDENTIFIERSONLY = "org.tmapi-utils.impexp.xtm.XTMSerializer.subjectIdentifiersOnly";
***************
*** 49,52 ****
--- 50,57 ----
          setProperty(PROPERTY_ALLIDS, "false");
      }
+     
+     public void setEncoding(String encoding) {
+       this.encoding = encoding;
+     }
      public void serialize(Writer w, TopicMap tmap) throws TMAPIException {
          this.tm =   tmap;
***************
*** 135,139 ****
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(w);
!         s.startDocument("ISO-8859-1", null);
          
          s.startTag(null, XTMParser.TAG_TOPIC_MAP);
--- 140,144 ----
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(w);
!         s.startDocument(this.encoding, null);
          
          s.startTag(null, XTMParser.TAG_TOPIC_MAP);
***************
*** 144,149 ****
      public void startTopicMap(OutputStream stream, String base) throws java.io.IOException{
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
!         s.setOutput(stream, "ISO-8859-1");
!         s.startDocument("ISO-8859-1", null);
          
          s.startTag(null, XTMParser.TAG_TOPIC_MAP);
--- 149,154 ----
      public void startTopicMap(OutputStream stream, String base) throws java.io.IOException{
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
!         s.setOutput(stream, this.encoding);
!         s.startDocument(this.encoding, null);
          
          s.startTag(null, XTMParser.TAG_TOPIC_MAP);
***************
*** 160,164 ****
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(writer);
!         s.startDocument("ISO-8859-1", null);
          writeTopic(topic,true);
          s.endDocument();
--- 165,169 ----
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(writer);
!         s.startDocument(this.encoding, null);
          writeTopic(topic,true);
          s.endDocument();
***************
*** 295,299 ****
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(writer);
!         s.startDocument("ISO-8859-1", null);
          writeAssociation(assoc,true);
          s.endDocument();
--- 300,304 ----
          s.setProperty( "http://xmlpull.org/v1/doc/properties.html#serializer-indentation","    ");
          s.setOutput(writer);
!         s.startDocument(this.encoding, null);
          writeAssociation(assoc,true);
          s.endDocument();