[tmapi-commit] SF.net SVN: tmapi:[63] trunk/src

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

Revision: 63
          http://tmapi.svn.sourceforge.net/tmapi/?rev=63&view=rev
Author:   lheuer
Date:     2008-08-09 16:08:12 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
TopicMap.getIndex() uses Generics to avoid casting

Modified Paths:
--------------
    trunk/src/main/java/org/tmapi/core/TopicMap.java
    trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java
    trunk/src/test/java/org/tmapi/index/TestScopedIndex.java
    trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java

Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java	2008-08-08 12:00:50 UTC (rev 62)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java	2008-08-09 16:08:12 UTC (rev 63)
@@ -237,6 +237,6 @@
      * @throws UnsupportedOperationException If the implementation does not
      *          support indices or if the specified index is unsupported.
      */
-    public Index getIndex(Class<?  extends Index> indexInterface);
+    public <I extends Index> I getIndex(Class<I> indexInterface);
 
 }

Modified: trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java	2008-08-08 12:00:50 UTC (rev 62)
+++ trunk/src/test/java/org/tmapi/index/TestLiteralIndex.java	2008-08-09 16:08:12 UTC (rev 63)
@@ -43,7 +43,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        _litIdx = (LiteralIndex) _tm.getIndex(LiteralIndex.class);
+        _litIdx = _tm.getIndex(LiteralIndex.class);
         _litIdx.open();
         final String XSD_BASE = "http://www.w3.org/2001/XMLSchema#";
         _xsdString = createLocator(XSD_BASE + "string");

Modified: trunk/src/test/java/org/tmapi/index/TestScopedIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestScopedIndex.java	2008-08-08 12:00:50 UTC (rev 62)
+++ trunk/src/test/java/org/tmapi/index/TestScopedIndex.java	2008-08-09 16:08:12 UTC (rev 63)
@@ -42,7 +42,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        _scopedIdx = (ScopedIndex) _tm.getIndex(ScopedIndex.class);
+        _scopedIdx = _tm.getIndex(ScopedIndex.class);
         _scopedIdx.open();
     }
 

Modified: trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java	2008-08-08 12:00:50 UTC (rev 62)
+++ trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java	2008-08-09 16:08:12 UTC (rev 63)
@@ -41,7 +41,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        _typeInstanceIdx = (TypeInstanceIndex) _tm.getIndex(TypeInstanceIndex.class);
+        _typeInstanceIdx = _tm.getIndex(TypeInstanceIndex.class);
         _typeInstanceIdx.open();
     }
 


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