[tinyTiM-commits] SF.net SVN: tinytim:[348] tinytim-mio/trunk

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

Revision: 348
          http://tinytim.svn.sourceforge.net/tinytim/?rev=348&view=rev
Author:   lheuer
Date:     2009-08-14 11:59:23 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Removed unused Logger, committed forgotten code changes

Modified Paths:
--------------
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java

Added Paths:
-----------
    tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908141400.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908121355.jar

Deleted: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908121355.jar
===================================================================
(Binary files differ)

Added: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908141400.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908141400.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java	2009-08-14 11:43:24 UTC (rev 347)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java	2009-08-14 11:59:23 UTC (rev 348)
@@ -35,29 +35,46 @@
  */
 abstract class AbstractXTMTopicMapReader extends AbstractTopicMapReader {
 
+    /**
+     * The underlying topic map.
+     * 
+     * This can be <tt>null</tt> if 
+     * {@link #AbstractXTMTopicMapReader(IMapHandler, Syntax, Source)}
+     * was used to create an instance of this class and the provided handler 
+     * is not an instance of {@link TinyTimMapInputHandler}.
+     */
+    protected TopicMap _tm;
+
     protected AbstractXTMTopicMapReader(TopicMap topicMap, Syntax syntax,
             File source) throws IOException {
         super(topicMap, syntax, source);
+        _tm = topicMap;
     }
 
     protected AbstractXTMTopicMapReader(TopicMap topicMap, Syntax syntax,
             File source, String docIRI) throws IOException {
         super(topicMap, syntax, source, docIRI);
+        _tm = topicMap;
     }
 
     protected AbstractXTMTopicMapReader(TopicMap topicMap, Syntax syntax,
             InputStream source, String docIRI) {
         super(topicMap, syntax, source, docIRI);
+        _tm = topicMap;
     }
 
     protected AbstractXTMTopicMapReader(TopicMap topicMap, Syntax syntax,
             Source source) {
         super(topicMap, syntax, source);
+        _tm = topicMap;
     }
 
     protected AbstractXTMTopicMapReader(IMapHandler handler, Syntax syntax,
             Source source) {
         super(handler, syntax, source);
+        if (handler instanceof TinyTimMapInputHandler) {
+            _tm = ((TinyTimMapInputHandler) handler).getTopicMap();
+        }
     }
 
     /**

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java	2009-08-14 11:43:24 UTC (rev 347)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java	2009-08-14 11:59:23 UTC (rev 348)
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import org.tinytim.core.value.Literal;
 import org.tinytim.internal.api.IIndexManagerAware;
@@ -48,11 +47,6 @@
  */
 public class DefaultTMCLPreprocessor implements ITMCLPreprocessor {
 
-    @SuppressWarnings("unused")
-    // TODO can we remove it, if we don't use it?
-    private static final Logger LOG = Logger
-            .getLogger(DefaultTMCLPreprocessor.class.getName());
-
     private final Map<Topic, Collection<ITemplate>> _topic2Templates;
 
     private Topic _constrains;


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