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

[<bo...@us...>]

Revision: 355
          http://tinytim.svn.sourceforge.net/tinytim/?rev=355&view=rev
Author:   bosso
Date:     2009-08-18 12:54:43 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
* bugfix in TemplateProcessor
* removed TMDM.Subject removal

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

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/CTMTopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/CTMTopicMapWriter.java	2009-08-18 11:37:46 UTC (rev 354)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/CTMTopicMapWriter.java	2009-08-18 12:54:43 UTC (rev 355)
@@ -469,12 +469,6 @@
         _newline();
         _writeSection("INSTANCES");
         _writeSection("Topics");
-        // remove tmdm:subject, because filter below doesn't work. tmdm:subject plays a role, so
-        // _omitTopic returns false - we definitly don't want "tmdm:subject ." in our ctm file, do we?
-        Topic topic = topicMap.getTopicBySubjectIdentifier(TMDM.SUBJECT);
-        if (topic != null) {
-            topics.remove(topic);
-        }
         _writeTopics(topics);
         if (!assocs.isEmpty()) {
             Association[] assocArray = assocs.toArray(new Association[assocs.size()]);

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-18 11:37:46 UTC (rev 354)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java	2009-08-18 12:54:43 UTC (rev 355)
@@ -602,9 +602,10 @@
         }
 
         DefaultTemplate tpl = new DefaultTemplate(templateName);
+        occCounter = _assignCardinality(constraint, tpl, occCounter);
         tpl.addParameter(regEx);
 
-        occCounter = _assignCardinality(constraint, tpl, occCounter);
+        
 
         Topic player = _getConstrainedTopicTypePlayer(constraint, assocs);
         _registerTemplate(player, tpl);


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