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

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

Revision: 328
          http://tinytim.svn.sourceforge.net/tinytim/?rev=328&view=rev
Author:   bosso
Date:     2009-07-23 12:21:03 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
updated other-role-constraint tmcl changes

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-07-23 12:16:14 UTC (rev 327)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/CTMTopicMapWriter.java	2009-07-23 12:21:03 UTC (rev 328)
@@ -564,7 +564,8 @@
                         TMCL.ROLE_PLAYER_CONSTRAINT, TMCL.SCOPE_CONSTRAINT,
                         TMCL.REIFIER_CONSTRAINT,
                         TMCL.ASSOCIATION_ROLE_CONSTRAINT,
-                        TMCL.OTHER_ROLE_CONSTRAINT,
+                        TMCL.ROLE_COMBINATION_CONSTRAINT,
+                        TMCL.TOPIC_REIFIES_CONSTRAINT,
                         TMCL.OCCURRENCE_DATATYPE_CONSTRAINT,
                         TMCL.UNIQUE_VALUE_CONSTRAINT,
                         TMCL.REGULAR_EXPRESSION_CONSTRAINT

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-07-23 12:16:14 UTC (rev 327)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java	2009-07-23 12:21:03 UTC (rev 328)
@@ -48,6 +48,8 @@
  */
 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());
 
@@ -109,7 +111,6 @@
      */
     @Override
     public Set<Locator> getSuppressableSubjectIdentifiers() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -150,7 +151,7 @@
         _processOverlapConstraints(topicMap, tiIdx, topics, assocs);
         _processAssociationRoleConstraints(topicMap, tiIdx, topics, assocs);
         _processRolePlayerConstraints(topicMap, tiIdx, topics, assocs);
-        _processOtherRoleConstraints(topicMap, tiIdx, topics, assocs);
+        _processRoleCombinationConstraints(topicMap, tiIdx, topics, assocs);
         _processOccurrenceConstraints(topicMap, tiIdx, topics, assocs);
         _processNameConstraints(topicMap, tiIdx, topics, assocs);
         _processScopeConstraints(topicMap, tiIdx, topics, assocs);
@@ -408,17 +409,17 @@
         removeConstraint(constraint, topics, occCounter);
     }
 
-    private void _processOtherRoleConstraints(TopicMap topicMap,
+    private void _processRoleCombinationConstraints(TopicMap topicMap,
             TypeInstanceIndex tiIdx, Collection<Topic> topics,
             Collection<Association> assocs) {
         for (Topic constraint : _getConstraintInstances(topicMap, tiIdx,
-                TMCL.OTHER_ROLE_CONSTRAINT)) {
-            _processOtherRoleConstraint(constraint, topics, assocs);
+                TMCL.ROLE_COMBINATION_CONSTRAINT)) {
+            _processRoleCombinationConstraint(constraint, topics, assocs);
         }
 
     }
 
-    private void _processOtherRoleConstraint(Topic constraint,
+    private void _processRoleCombinationConstraint(Topic constraint,
             Collection<Topic> topics, Collection<Association> assocs) {
         Topic type = _getConstrainedTopicTypePlayer(constraint, assocs);
         Topic assocType = _getConstrainedStatementPlayer(constraint, assocs);
@@ -427,7 +428,7 @@
         Topic otherPlayer = _getOtherConstrainedTopicTypePlayer(constraint,
                 assocs);
 
-        DefaultTemplate tpl = new DefaultTemplate("other-role");
+        DefaultTemplate tpl = new DefaultTemplate("role-combination");
         tpl.addParameter(roleType);
         tpl.addParameter(type);
         tpl.addParameter(otherRole);


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