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

[Andreas V. <a_...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15458/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.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Item.java	14 Apr 2004 20:18:42 -0000	1.19
+++ Item.java	15 Apr 2004 15:57:33 -0000	1.20
@@ -83,11 +83,6 @@
      */
     private String xmlEncoding = "UTF-8";
     
-    /**
-     * This map contains all items which are already instantiated before
-     * instantiating this item
-     */
-    private Map alreadyInstantiated;
     // item attributes cache
     Map annotations;
     Map attachments;
@@ -118,20 +113,7 @@
         throws CobricksException {
         super();
         this.defaultLanguage = itemManager.getDefaultLanguage();
-        this.xmlEncoding = itemManager.getXMLEncoding();
-        this.alreadyInstantiated = new HashMap();
-        this.initFromXML(xml, itemManager);
-
-    }
-
-    protected Item (String xml,
-    ItemManager itemManager,
-    Map alreadyInstantiatedItems)
-        throws CobricksException {
-        super();
-        this.defaultLanguage = itemManager.getDefaultLanguage();
-        this.xmlEncoding = itemManager.getXMLEncoding();
-        this.alreadyInstantiated = alreadyInstantiatedItems;
+        this.xmlEncoding = itemManager.getXMLEncoding();        
         this.initFromXML(xml, itemManager);
     }
 
@@ -212,8 +194,7 @@
     private void initFromXML(String xml,
     ItemManager itemManager)
         throws CobricksException {
-        Map attrs = ItemAttrs.extractFromXML(xml, alreadyInstantiated, this, 
-                                                itemManager);
+        Map attrs = ItemAttrs.extractFromXML(xml, itemManager);
         if (attrs == null) {
             logger.warn("Item(String, ItemManager): Couldn't instantiate Item");
         } else {