Menu
▾
▴
[tinyTiM-commits] SF.net SVN: tinytim:[344] tinytim
|
From: <lh...@us...> - 2009-08-12 11:55:02
|
Revision: 344
http://tinytim.svn.sourceforge.net/tinytim/?rev=344&view=rev
Author: lheuer
Date: 2009-08-12 11:54:51 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
* Updated mio-xtm which handles XTM 1.0 xml:base correctly
* XTM10TopicMapReader and the XTMTopicMapReader converts XTM 1.0 PSIs to TMDM PSIs and XTM 1.0 reification
to TMDM reification automatically
Modified Paths:
--------------
tinytim/trunk/CHANGES.txt
tinytim-mio/trunk/CHANGES.txt
tinytim-mio/trunk/build.xml
tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java
tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapReader.java
tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTMTopicMapReader.java
Added Paths:
-----------
tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.5.jar
tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908121355.jar
Removed Paths:
-------------
tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.4.jar
tinytim-mio/trunk/lib/tinytim-2.0.0a5.jar
Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim/trunk/CHANGES.txt 2009-08-12 11:54:51 UTC (rev 344)
@@ -4,10 +4,12 @@
2.0.0 a6 (xx.yy.2009)
---------------------
+* Added support to convert XTM 1.0 class-instance relationships
+ to TMDM type-instance relationships
+* Added support to convert XTM 1.0 PSIs to TMDM PSIs
-
2.0.0 a5 (23.07.2009)
---------------------
Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim-mio/trunk/CHANGES.txt 2009-08-12 11:54:51 UTC (rev 344)
@@ -4,9 +4,11 @@
2.0.0 a6 (xx.yy.2009)
---------------------
+* XTM(10)TopicMapReader converts automatically XTM 1.0 PSIs to
+ TMDM PSIs and XTM 1.0 reification to TMDM reification.
+* XTM10TopicMapReader handles xml:base correctly
-
2.0.0 a5 (23.07.2009)
---------------------
* JTMTopicMapReader / JTMTopicMapWriter implement the new JSON Topic Maps
Modified: tinytim-mio/trunk/build.xml
===================================================================
--- tinytim-mio/trunk/build.xml 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim-mio/trunk/build.xml 2009-08-12 11:54:51 UTC (rev 344)
@@ -11,7 +11,7 @@
<property name="lib.junit" value="${dir.lib}/junit-4.5.jar"/>
<property name="lib.tmapi" value="${dir.lib}/tmapi-2.0a2.jar"/>
- <property name="lib.tinytim" value="${dir.lib}/tinytim-2.0.0a5.jar"/>
+ <property name="lib.tinytim" value="${dir.lib}/tinytim-2.0.0a6-snapshot-200908121355.jar"/>
<property name="lib.tinytim.tests" value="${dir.lib}/tinytim-2.0.0a5-tests.jar"/>
<property name="lib.logging" value="${dir.lib}/slf4j-api-1.5.8.jar"/>
<property name="lib.logger" value="${dir.lib}/slf4j-jdk14-1.5.8.jar"/>
@@ -22,7 +22,7 @@
<property name="lib.rdf" value="${dir.lib}/semagia-mio-rdf-0.9.3.jar"/>
<property name="lib.snello" value="${dir.lib}/semagia-mio-snello-0.9.3.jar"/>
<property name="lib.tmxml" value="${dir.lib}/semagia-mio-tmxml-0.9.3.jar"/>
- <property name="lib.xtm" value="${dir.lib}/semagia-mio-xtm-0.9.4.jar"/>
+ <property name="lib.xtm" value="${dir.lib}/semagia-mio-xtm-0.9.5.jar"/>
<target name="help">
<echo message="------------------------"/>
Deleted: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.4.jar
===================================================================
(Binary files differ)
Added: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.5.jar
===================================================================
(Binary files differ)
Property changes on: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: tinytim-mio/trunk/lib/tinytim-2.0.0a5.jar
===================================================================
(Binary files differ)
Added: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908121355.jar
===================================================================
(Binary files differ)
Property changes on: tinytim-mio/trunk/lib/tinytim-2.0.0a6-snapshot-200908121355.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java 2009-08-12 11:54:51 UTC (rev 344)
@@ -145,7 +145,8 @@
}
/**
- * Called if parsing has been finished without errors, does nothing by default.
+ * Called if parsing has been finished without errors,
+ * does nothing by default.
* <p>
* The {@link #_deserializer} is still available.
* </p>
Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapReader.java 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapReader.java 2009-08-12 11:54:51 UTC (rev 344)
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
+import org.tinytim.utils.XTM10Utils;
import org.tmapi.core.TopicMap;
import com.semagia.mio.Source;
@@ -88,4 +89,14 @@
super(topicMap, Syntax.XTM_10, source);
}
+ /* (non-Javadoc)
+ * @see org.tinytim.mio.AbstractTopicMapReader#postProcess()
+ */
+ @Override
+ protected void postProcess() {
+ if (super._tm != null) {
+ XTM10Utils.convertToTMDM(super._tm);
+ }
+ }
+
}
Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTMTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTMTopicMapReader.java 2009-08-12 11:48:07 UTC (rev 343)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTMTopicMapReader.java 2009-08-12 11:54:51 UTC (rev 344)
@@ -19,8 +19,10 @@
import java.io.IOException;
import java.io.InputStream;
+import org.tinytim.utils.XTM10Utils;
import org.tmapi.core.TopicMap;
+import com.semagia.mio.IVersionAwareDeserializer;
import com.semagia.mio.Source;
import com.semagia.mio.Syntax;
@@ -87,4 +89,16 @@
super(topicMap, Syntax.XTM, source);
}
+ /* (non-Javadoc)
+ * @see org.tinytim.mio.AbstractTopicMapReader#postProcess()
+ */
+ @Override
+ protected void postProcess() {
+ if (super._deserializer instanceof IVersionAwareDeserializer
+ && ((IVersionAwareDeserializer) super._deserializer).getVersion().equals("1.0")
+ && super._tm != null) {
+ XTM10Utils.convertToTMDM(super._tm);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
