Menu
▾
▴
[tinyTiM-commits] SF.net SVN: tinytim:[353] tinytim-mio/trunk
|
From: <bo...@us...> - 2009-08-18 08:55:45
|
Revision: 353
http://tinytim.svn.sourceforge.net/tinytim/?rev=353&view=rev
Author: bosso
Date: 2009-08-18 08:55:32 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
ctm export fixes
Modified Paths:
--------------
tinytim-mio/trunk/build.properties
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
Added Paths:
-----------
tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908171257.jar
Removed Paths:
-------------
tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908141400.jar
Modified: tinytim-mio/trunk/build.properties
===================================================================
--- tinytim-mio/trunk/build.properties 2009-08-17 20:08:59 UTC (rev 352)
+++ tinytim-mio/trunk/build.properties 2009-08-18 08:55:32 UTC (rev 353)
@@ -1,5 +1,5 @@
version=2.0.0
version_suffix=a6
#release_type=
-debug=off
+debug=on
optimize=on
Deleted: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908141400.jar
===================================================================
(Binary files differ)
Added: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908171257.jar
===================================================================
(Binary files differ)
Property changes on: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908171257.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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-17 20:08:59 UTC (rev 352)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/CTMTopicMapWriter.java 2009-08-18 08:55:32 UTC (rev 353)
@@ -140,7 +140,8 @@
ASSOCIATION,
ROLE,
OCCURRENCE,
- NAME
+ NAME,
+ SUBJECT
}
/**
@@ -468,6 +469,13 @@
_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.createTopicBySubjectIdentifier(TMDM.SUBJECT);
+ if ( (topic!=null) && (topics.contains(topic)) ) {
+ topics.remove(topic);
+ }
+
_writeTopics(topics);
if (!assocs.isEmpty()) {
Association[] assocArray = assocs.toArray(new Association[assocs.size()]);
@@ -536,6 +544,7 @@
_topic2Templates.putAll(tmclProcessor.getTopicToTemplatesMapping());
}
+ @SuppressWarnings("deprecation")
private Locator[] _getSubjectIdentifiersToFilter(TypeFilter mode) {
Locator[] toFilter = new Locator[0];
switch (mode) {
@@ -616,7 +625,8 @@
TMCL.CARD_MAX,
TMCL.DATATYPE,
TMCL.REGEXP,
- TMCL.VALIDATION_EXPRESSION
+ TMCL.VALIDATION_EXPRESSION,
+ TMDM.SUBJECT // the occurrence
};
}
break;
@@ -660,7 +670,6 @@
&& topic.getTypes().isEmpty()
&& topic.getNames().isEmpty()
&& topic.getOccurrences().isEmpty()
- && topic.getRolesPlayed().isEmpty()
&& topic.getReified() == null;
}
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-17 20:08:59 UTC (rev 352)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/internal/ctm/impl/DefaultTMCLPreprocessor.java 2009-08-18 08:55:32 UTC (rev 353)
@@ -30,6 +30,7 @@
import org.tinytim.mio.internal.ctm.ITMCLPreprocessor;
import org.tinytim.mio.internal.ctm.ITemplate;
import org.tinytim.voc.TMCL;
+import org.tinytim.voc.TMDM;
import org.tmapi.core.Association;
import org.tmapi.core.Locator;
import org.tmapi.core.Occurrence;
@@ -278,7 +279,7 @@
TypeInstanceIndex tiIdx, Collection<Topic> topics,
Collection<Association> assocs) {
for (Topic constraint : _getConstraintInstances(topicMap, tiIdx,
- TMCL.ABSTRACT_TOPIC_TYPE_CONSTRAINT)) {
+ TMCL.ABSTRACT_CONSTRAINT)) {
_processAbstractTopicConstraint(constraint, topics, assocs);
}
}
@@ -614,7 +615,7 @@
TypeInstanceIndex tiIdx, Collection<Topic> topics,
Collection<Association> assocs) {
final Topic type = topicMap
- .getTopicBySubjectIdentifier(TMCL.SCOPE_TYPE);
+ .getTopicBySubjectIdentifier(TMCL.TOPIC_TYPE);
if (type == null) {
return;
}
@@ -641,10 +642,12 @@
private void _processOccurrenceConstraints(TopicMap topicMap,
TypeInstanceIndex tiIdx, Collection<Topic> topics,
Collection<Association> assocs) {
- final Topic type = topicMap
- .getTopicBySubjectIdentifier(TMCL.OCCURRENCE_TYPE);
+ Topic type = topicMap.getTopicBySubjectIdentifier(TMCL.OCCURRENCE_TYPE);
if (type == null) {
- return;
+ // try tmdm:subject
+ type = topicMap.getTopicBySubjectIdentifier(TMDM.SUBJECT);
+ if (type==null)
+ return;
}
for (Topic constraint : _getConstraintInstances(topicMap, tiIdx,
TMCL.TOPIC_OCCURRENCE_CONSTRAINT)) {
@@ -656,9 +659,12 @@
private void _processNameConstraints(TopicMap topicMap,
TypeInstanceIndex tiIdx, Collection<Topic> topics,
Collection<Association> assocs) {
- final Topic type = topicMap.getTopicBySubjectIdentifier(TMCL.NAME_TYPE);
+ Topic type = topicMap.getTopicBySubjectIdentifier(TMCL.NAME_TYPE);
if (type == null) {
- return;
+ // try default name-type
+ type = topicMap.getTopicBySubjectIdentifier(TMDM.TOPIC_NAME);
+ if (type==null)
+ return;
}
for (Topic constraint : _getConstraintInstances(topicMap, tiIdx,
TMCL.TOPIC_NAME_CONSTRAINT)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
