[tinyTiM-commits] SF.net SVN: tinytim: [43] tinytim/trunk/src/main/java/org/tinytim

[<lh...@us...>]

Revision: 43
          http://tinytim.svn.sourceforge.net/tinytim/?rev=43&view=rev
Author:   lheuer
Date:     2008-04-26 07:36:30 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
- Construct accesses the _id now directly
- Removed unnecessary Generics from the IdentityManager

Modified Paths:
--------------
    tinytim/trunk/src/main/java/org/tinytim/Construct.java
    tinytim/trunk/src/main/java/org/tinytim/IdentityManager.java

Modified: tinytim/trunk/src/main/java/org/tinytim/Construct.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/Construct.java	2008-04-26 09:51:39 UTC (rev 42)
+++ tinytim/trunk/src/main/java/org/tinytim/Construct.java	2008-04-26 14:36:30 UTC (rev 43)
@@ -26,7 +26,6 @@
 import org.tmapi.core.DuplicateSourceLocatorException;
 import org.tmapi.core.Locator;
 import org.tmapi.core.TopicMap;
-import org.tmapi.core.TopicMapObject;
 
 /**
  * Base class for all Topic Maps constructs.
@@ -34,7 +33,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-abstract class Construct implements TopicMapObject, IConstruct {
+abstract class Construct implements IConstruct {
 
     protected String _id;
     protected TopicMapImpl _tm;
@@ -129,7 +128,7 @@
         if (this == obj) {
             return true;
         }
-        return (obj instanceof Construct) && _id.equals(((Construct) obj).getObjectId());
+        return (obj instanceof Construct) && _id.equals(((Construct) obj)._id);
     }
 
     /* (non-Javadoc)

Modified: tinytim/trunk/src/main/java/org/tinytim/IdentityManager.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/IdentityManager.java	2008-04-26 09:51:39 UTC (rev 42)
+++ tinytim/trunk/src/main/java/org/tinytim/IdentityManager.java	2008-04-26 14:36:30 UTC (rev 43)
@@ -45,10 +45,10 @@
 
     IdentityManager(TopicMapImpl tm) {
         ICollectionFactory collFactory = tm.getCollectionFactory();
-        _id2Construct = collFactory.<String, IConstruct>createMap();
-        _sid2Topic = collFactory.<Locator, Topic>createMap();
-        _slo2Topic = collFactory.<Locator, Topic>createMap();
-        _iid2Construct = collFactory.<Locator, IConstruct>createMap();
+        _id2Construct = collFactory.createMap();
+        _sid2Topic = collFactory.createMap();
+        _slo2Topic = collFactory.createMap();
+        _iid2Construct = collFactory.createMap();
         _subscribe(tm);
         _register(tm);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.