[Cobricks-cvscommit] cobricks2/src/org/cobricks/item Item.java,1.4,1.5

[<j_m...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10990/src/org/cobricks/item

Modified Files:
	Item.java 
Log Message:


Index: Item.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/Item.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Item.java	23 Feb 2004 08:20:59 -0000	1.4
--- Item.java	29 Feb 2004 12:03:00 -0000	1.5
***************
*** 26,30 ****
      implements java.io.Serializable {
      private static int OBJECT_TYPE = -1;
!     private static final String XML_ENCODING = "UTF-8";
      static Logger logger = Logger.getLogger(Item.class);
  
--- 26,30 ----
      implements java.io.Serializable {
      private static int OBJECT_TYPE = -1;
!     
      static Logger logger = Logger.getLogger(Item.class);
  
***************
*** 34,38 ****
      protected String itemclass;
      protected String defaultLanguage = "en";
! 
      // item attributes cache
      Map annotations;
--- 34,41 ----
      protected String itemclass;
      protected String defaultLanguage = "en";
!     /**
!      * Used for all xml encoding declarations
!      */
!     private String xmlEncoding = "UTF-8";
      // item attributes cache
      Map annotations;
***************
*** 54,58 ****
          logger.debug("Item(String, ItemManager)");
          this.defaultLanguage = itemManager.getDefaultLanguage();
! 
          HashMap attrs = itemManager.extractFromXML(xml);
  
--- 57,61 ----
          logger.debug("Item(String, ItemManager)");
          this.defaultLanguage = itemManager.getDefaultLanguage();
!         this.xmlEncoding = itemManager.getXMLEncoding();
          HashMap attrs = itemManager.extractFromXML(xml);
  
***************
*** 106,109 ****
--- 109,113 ----
          super();
          this.defaultLanguage = itemManager.getDefaultLanguage();
+         this.xmlEncoding = itemManager.getXMLEncoding();
      }
  
***************
*** 113,116 ****
--- 117,121 ----
          this.defaultLanguage = itemManager.getDefaultLanguage();
          this.itemid = itemid;
+         this.xmlEncoding = itemManager.getXMLEncoding();
  
          /*
***************
*** 134,137 ****
--- 139,143 ----
          this.itemid = itemid;
          this.itemclass = itemclass;
+         this.xmlEncoding = itemManager.getXMLEncoding();
  
          /*
***************
*** 149,162 ****
          return null; // tbd
      }
! 
      public String getGlobalId() {
          return this.globalid;
      }
  
-     public int getId()
-     {
-         return this.itemid;
-     }
- 
      public int getLocalId() {
          return this.itemid;
--- 155,165 ----
          return null; // tbd
      }
!     public int getId(){
!         return this.itemid;
!     }
      public String getGlobalId() {
          return this.globalid;
      }
  
      public int getLocalId() {
          return this.itemid;
***************
*** 303,307 ****
  
          //String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<item>\n" +
!         String xml = "<?xml version=\"1.0\" encoding=\"" +
            Item.XML_ENCODING + "?>\n<item>\n" +
              "  <itemid>" + new Integer(this.itemid).toString() + "</itemid>\n" +
              "  <globalid>" + this.globalid + "</globalid>\n  " + "<itemclass>" +
--- 306,310 ----
  
          //String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<item>\n" +
!         String xml = "<?xml version=\"1.0\" encoding=\"" +
           this.xmlEncoding + "\"?>\n<item>\n" +
              "  <itemid>" + new Integer(this.itemid).toString() + "</itemid>\n" +
              "  <globalid>" + this.globalid + "</globalid>\n  " + "<itemclass>" +
***************
*** 359,363 ****
  
          if (withXMLDeclaration) {
!             xml = "<?xml version=\"1.0\" encoding=\"" + Item.XML_ENCODING + "\"?>\n";
          }
  
--- 362,366 ----
  
          if (withXMLDeclaration) {
!             xml = "<?xml version=\"1.0\" encoding=\"" + this.xmlEncoding + "\"?>\n";
          }