Menu
▾
▴
tmapi-commit — TMAPI commit messages
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(29) |
Sep
(4) |
Oct
|
Nov
(12) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(4) |
Apr
|
May
(2) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2010 |
Jan
(12) |
Feb
(20) |
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
|
From: <jos...@us...> - 2010-01-17 21:22:35
|
Revision: 141
http://tmapi.svn.sourceforge.net/tmapi/?rev=141&view=rev
Author: joschmidt
Date: 2010-01-17 21:22:27 +0000 (Sun, 17 Jan 2010)
Log Message:
-----------
enhanced comment of hashCode()
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-15 17:57:29 UTC (rev 140)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-17 21:22:27 UTC (rev 141)
@@ -118,7 +118,7 @@
/**
* Returns the hash code value.
*
- * The returned hash code is equal to the hash code of <tt>System.identityHashCode(this);</tt>.
+ * The returned hash code is equal to the hash code of <tt>System.identityHashCode(this)</tt>.
*
* @return <tt>System.identityHashCode(this)</tt>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-15 17:57:39
|
Revision: 140
http://tmapi.svn.sourceforge.net/tmapi/?rev=140&view=rev
Author: lheuer
Date: 2010-01-15 17:57:29 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Forgot to change CHANGES.txt, done, updated build.properties
Modified Paths:
--------------
tags/release-2_0_rc2/CHANGES.txt
tags/release-2_0_rc2/build.properties
trunk/CHANGES.txt
trunk/build.properties
Modified: tags/release-2_0_rc2/CHANGES.txt
===================================================================
--- tags/release-2_0_rc2/CHANGES.txt 2010-01-15 17:52:39 UTC (rev 139)
+++ tags/release-2_0_rc2/CHANGES.txt 2010-01-15 17:57:29 UTC (rev 140)
@@ -2,7 +2,7 @@
TMAPI Changes
=============
-TMAPI 2.0 RC2 - 2010-mm-dd
+TMAPI 2.0 RC2 - 2010-01-15
--------------------------
* Fixed TestLocator test case (engines are not required to support
application/x-www-form-urlencoded).
Modified: tags/release-2_0_rc2/build.properties
===================================================================
--- tags/release-2_0_rc2/build.properties 2010-01-15 17:52:39 UTC (rev 139)
+++ tags/release-2_0_rc2/build.properties 2010-01-15 17:57:29 UTC (rev 140)
@@ -1,5 +1,5 @@
version=2.0
-version_suffix=RC1
+version_suffix=RC2
debug=off
optimize=on
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-01-15 17:52:39 UTC (rev 139)
+++ trunk/CHANGES.txt 2010-01-15 17:57:29 UTC (rev 140)
@@ -2,7 +2,7 @@
TMAPI Changes
=============
-TMAPI 2.0 RC2 - 2010-mm-dd
+TMAPI 2.0 RC2 - 2010-01-15
--------------------------
* Fixed TestLocator test case (engines are not required to support
application/x-www-form-urlencoded).
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-01-15 17:52:39 UTC (rev 139)
+++ trunk/build.properties 2010-01-15 17:57:29 UTC (rev 140)
@@ -1,5 +1,5 @@
version=2.0
-version_suffix=RC1
+version_suffix=final-snapshot
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-15 17:53:01
|
Revision: 139
http://tmapi.svn.sourceforge.net/tmapi/?rev=139&view=rev
Author: lheuer
Date: 2010-01-15 17:52:39 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
made a copy
Added Paths:
-----------
tags/release-2_0_rc2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-15 16:28:56
|
Revision: 138
http://tmapi.svn.sourceforge.net/tmapi/?rev=138&view=rev
Author: lheuer
Date: 2010-01-15 16:28:33 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Applied changes suggested by Johannes Payr
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-01-13 16:30:00 UTC (rev 137)
+++ trunk/CHANGES.txt 2010-01-15 16:28:33 UTC (rev 138)
@@ -2,12 +2,14 @@
TMAPI Changes
=============
-TMAPI 2.0 RC?!? - 2010-mm-dd
-----------------------------
+TMAPI 2.0 RC2 - 2010-mm-dd
+--------------------------
* Fixed TestLocator test case (engines are not required to support
application/x-www-form-urlencoded).
* Changed Construct.equals(other) / Construct.hashCode() to compare
the identity of objects.
+* Improved support for Topic Maps engines which represent numeric
+ values such as floats as numbers and not as String values.
TMAPI 2.0 RC1 - 2009-10-25
Modified: trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-01-13 16:30:00 UTC (rev 137)
+++ trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-01-15 16:28:33 UTC (rev 138)
@@ -218,7 +218,8 @@
dt.setValue(value);
assertEquals(strValue, dt.getValue());
assertEquals(_xsdFloat, dt.getDatatype());
- assertEquals(new BigDecimal(strValue), dt.decimalValue());
+ assertTrue("Expected either BigDecimal(1976.0F).equals(dt.decimalValue()) or BigDecimal('1976.0').equals(dt.decimalValue())",
+ new BigDecimal(value).equals(dt.decimalValue()) || new BigDecimal(strValue).equals(dt.decimalValue()));
assertEquals(new BigInteger("1976"), dt.integerValue());
assertEquals(1976L, dt.longValue());
assertEquals(1976, dt.intValue());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-13 16:30:08
|
Revision: 137
http://tmapi.svn.sourceforge.net/tmapi/?rev=137&view=rev
Author: lheuer
Date: 2010-01-13 16:30:00 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-01-13 16:08:20 UTC (rev 136)
+++ trunk/CHANGES.txt 2010-01-13 16:30:00 UTC (rev 137)
@@ -6,6 +6,8 @@
----------------------------
* Fixed TestLocator test case (engines are not required to support
application/x-www-form-urlencoded).
+* Changed Construct.equals(other) / Construct.hashCode() to compare
+ the identity of objects.
TMAPI 2.0 RC1 - 2009-10-25
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-13 16:08:26
|
Revision: 136
http://tmapi.svn.sourceforge.net/tmapi/?rev=136&view=rev
Author: lheuer
Date: 2010-01-13 16:08:20 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Forgot to change the description of hashCode's @return value. Fixed.
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-13 16:03:49 UTC (rev 135)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-13 16:08:20 UTC (rev 136)
@@ -120,7 +120,7 @@
*
* The returned hash code is equal to the hash code of <tt>System.identityHashCode(this);</tt>.
*
- * @return <tt>this.getId().hashCode()</tt>
+ * @return <tt>System.identityHashCode(this)</tt>
*/
public int hashCode();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-13 16:04:03
|
Revision: 135
http://tmapi.svn.sourceforge.net/tmapi/?rev=135&view=rev
Author: lheuer
Date: 2010-01-13 16:03:49 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Changed semantics of equals / hashCode
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-10 17:31:49 UTC (rev 134)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2010-01-13 16:03:49 UTC (rev 135)
@@ -103,24 +103,22 @@
/**
* Returns <tt>true</tt> if the <tt>other</tt> object is equal to this one.
*
- * Equality must be the result of comparing the ids of the two objects.
- * If <tt>other</tt> is not an instance of {@link Construct}, the return
- * value is <tt>false</tt>.
+ * Equality must be the result of comparing the identity (<tt>this == other</tt>)
+ * of the two objects.
*
* Note: This equality test does not reflect any equality rule according
* to the <a href="http://www.isotopicmaps.org/sam/sam-model/">Topic Maps - Data Model (TMDM)</a>
* by intention.
*
* @param other The object to compare this object against.
- * @return <tt>(other instanceof Construct && this.getId().equals(((Construct)other).getId()))</tt>
+ * @return <tt>(this == other)</tt>
*/
public boolean equals(Object other);
/**
- * Returns a hash code value.
+ * Returns the hash code value.
*
- * The returned hash code is equal to the hash code of the {@link #getId()}
- * property.
+ * The returned hash code is equal to the hash code of <tt>System.identityHashCode(this);</tt>.
*
* @return <tt>this.getId().hashCode()</tt>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-10 17:31:55
|
Revision: 134
http://tmapi.svn.sourceforge.net/tmapi/?rev=134&view=rev
Author: lheuer
Date: 2010-01-10 17:31:49 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-01-10 17:23:12 UTC (rev 133)
+++ trunk/CHANGES.txt 2010-01-10 17:31:49 UTC (rev 134)
@@ -2,6 +2,12 @@
TMAPI Changes
=============
+TMAPI 2.0 RC?!? - 2010-mm-dd
+----------------------------
+* Fixed TestLocator test case (engines are not required to support
+ application/x-www-form-urlencoded).
+
+
TMAPI 2.0 RC1 - 2009-10-25
--------------------------
* More test cases (feature strings)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-10 17:23:18
|
Revision: 133
http://tmapi.svn.sourceforge.net/tmapi/?rev=133&view=rev
Author: lheuer
Date: 2010-01-10 17:23:12 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
Replaced references to http://www.semagia.com/ with http://www.tmapi.org/
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestLocator.java
Modified: trunk/src/test/java/org/tmapi/core/TestLocator.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestLocator.java 2010-01-10 17:20:11 UTC (rev 132)
+++ trunk/src/test/java/org/tmapi/core/TestLocator.java 2010-01-10 17:23:12 UTC (rev 133)
@@ -104,10 +104,10 @@
* must not be stripped away from the address.
*/
public void testNormizationPreserveEmpty() {
- String ref = "http://www.semagia.com/x?";
- assertEquals("http://www.semagia.com/x?", _tm.createLocator(ref).toExternalForm());
- ref = "http://www.semagia.com/x#";
- assertEquals("http://www.semagia.com/x#", _tm.createLocator(ref).toExternalForm());
+ String ref = "http://www.tmapi.org/x?";
+ assertEquals("http://www.tmapi.org/x?", _tm.createLocator(ref).toExternalForm());
+ ref = "http://www.tmapi.org/x#";
+ assertEquals("http://www.tmapi.org/x#", _tm.createLocator(ref).toExternalForm());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-10 17:20:17
|
Revision: 132
http://tmapi.svn.sourceforge.net/tmapi/?rev=132&view=rev
Author: lheuer
Date: 2010-01-10 17:20:11 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
Removed the + encoding from the tests
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestLocator.java
Modified: trunk/src/test/java/org/tmapi/core/TestLocator.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestLocator.java 2009-10-26 15:13:40 UTC (rev 131)
+++ trunk/src/test/java/org/tmapi/core/TestLocator.java 2010-01-10 17:20:11 UTC (rev 132)
@@ -26,9 +26,7 @@
}
public void testNormalization() {
- // Reference using "application/x-www-form-urlencoded"
- // C.f. <http://en.wikipedia.org/wiki/Percent-encoding#The_application.2Fx-www-form-urlencoded_type>
- final Locator loc = _tm.createLocator("http://www.example.org/test+me/");
+ final Locator loc = _tm.createLocator("http://www.example.org/test%20me/");
assertEquals("http://www.example.org/test me/", loc.getReference());
assertEquals("http://www.example.org/test%20me/", loc.toExternalForm());
final Locator loc2 = loc.resolve("./too");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-26 15:13:57
|
Revision: 131
http://tmapi.svn.sourceforge.net/tmapi/?rev=131&view=rev
Author: lheuer
Date: 2009-10-26 15:13:40 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Tagged RC1
Added Paths:
-----------
tags/release-2_0_rc1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-26 15:12:30
|
Revision: 130
http://tmapi.svn.sourceforge.net/tmapi/?rev=130&view=rev
Author: lheuer
Date: 2009-10-26 15:12:23 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/build.properties
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2009-10-22 13:31:17 UTC (rev 129)
+++ trunk/CHANGES.txt 2009-10-26 15:12:23 UTC (rev 130)
@@ -2,6 +2,13 @@
TMAPI Changes
=============
+TMAPI 2.0 RC1 - 2009-10-25
+--------------------------
+* More test cases (feature strings)
+* Added feature string to support Topic Maps engines which
+ model the type-instance relationship as association
+
+
TMAPI 2.0 alpha2 - 2009-07-23
-----------------------------
* Introduced MalformedIRIException
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2009-10-22 13:31:17 UTC (rev 129)
+++ trunk/build.properties 2009-10-26 15:12:23 UTC (rev 130)
@@ -1,5 +1,5 @@
version=2.0
-version_suffix=b1
+version_suffix=RC1
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-22 13:31:27
|
Revision: 129
http://tmapi.svn.sourceforge.net/tmapi/?rev=129&view=rev
Author: lheuer
Date: 2009-10-22 13:31:17 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
Added feature string test
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/AllCoreTests.java
Added Paths:
-----------
trunk/src/test/java/org/tmapi/core/TestFeatureStrings.java
Modified: trunk/src/test/java/org/tmapi/core/AllCoreTests.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AllCoreTests.java 2009-10-10 14:44:57 UTC (rev 128)
+++ trunk/src/test/java/org/tmapi/core/AllCoreTests.java 2009-10-22 13:31:17 UTC (rev 129)
@@ -43,6 +43,7 @@
suite.addTestSuite(TestItemIdentifierConstraint.class);
suite.addTestSuite(TestTopicMapSystem.class);
+ suite.addTestSuite(TestFeatureStrings.class);
suite.addTestSuite(TestConstruct.class);
suite.addTestSuite(TestTopicMap.class);
suite.addTestSuite(TestTopic.class);
Added: trunk/src/test/java/org/tmapi/core/TestFeatureStrings.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestFeatureStrings.java (rev 0)
+++ trunk/src/test/java/org/tmapi/core/TestFeatureStrings.java 2009-10-22 13:31:17 UTC (rev 129)
@@ -0,0 +1,117 @@
+/*
+ * The Topic Maps API (TMAPI) was created collectively by
+ * the membership of the tmapi-discuss mailing list
+ * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
+ * is hereby released into the public domain; and comes with
+ * NO WARRANTY.
+ *
+ * No one owns TMAPI: you may use it freely in both commercial and
+ * non-commercial applications, bundle it with your software
+ * distribution, include it on a CD-ROM, list the source code in a
+ * book, mirror the documentation at your own web site, or use it in
+ * any other way you see fit.
+ */
+package org.tmapi.core;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests if the TMAPI feature strings are recognised.
+ *
+ * @author <a href="http://tmapi.org/">The TMAPI Project</a>
+ * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
+ * @version $Rev:$ - $Date:$
+ */
+public class TestFeatureStrings extends TestCase {
+
+ private static final String _FEATURE_BASE = "http://tmapi.org/features/";
+
+ private static final String
+ TYPE_INSTANCE_ASSOCS= _FEATURE_BASE + "type-instance-associations",
+ READ_ONLY = _FEATURE_BASE + "readOnly",
+ AUTOMERGE = _FEATURE_BASE + "automerge";
+
+ private TopicMapSystemFactory _factory;
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ _factory = TopicMapSystemFactory.newInstance();
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ _factory = null;
+ }
+
+ /**
+ * Creates a new {@link TopicMapSystem} with the current configuration
+ * of the {@link #_factory}
+ *
+ * @return A newly created TopicMapSystem.
+ */
+ private TopicMapSystem makeTopicMapSystem() {
+ try {
+ return _factory.newTopicMapSystem();
+ }
+ catch (TMAPIException ex) {
+ throw new TMAPIRuntimeException("Cannot create TopicMapSystem", ex);
+ }
+ }
+
+ /**
+ * Tests the feature string "type-instance-associations".
+ *
+ * @throws FeatureNotRecognizedException
+ * If the Topic Maps engine is not TMAPI 2.0 compatible.
+ */
+ public void testTypeInstanceAssociations() throws FeatureNotRecognizedException {
+ _testFeature(TYPE_INSTANCE_ASSOCS);
+ }
+
+ /**
+ * Tests the feature string "automerge".
+ *
+ * @throws FeatureNotRecognizedException
+ * If the Topic Maps engine is not TMAPI 2.0 compatible.
+ */
+ public void testAutomerge() throws FeatureNotRecognizedException {
+ _testFeature(AUTOMERGE);
+ }
+
+ /**
+ * Tests the feature string "readOnly".
+ *
+ * @throws FeatureNotRecognizedException If the Topic Maps engine is not TMAPI 2.0 compatible.
+ */
+ public void testReadOnly() throws FeatureNotRecognizedException {
+ _testFeature(READ_ONLY);
+ }
+
+ /**
+ * Tests the provided featureName. The featureName must be recognized by
+ * the engine.
+ *
+ * @throws FeatureNotRecognizedException
+ * If the Topic Maps engine is not TMAPI 2.0 compatible.
+ */
+ private void _testFeature(final String featureName) throws FeatureNotRecognizedException {
+ final boolean enabledInFactory = _factory.getFeature(featureName);
+ try {
+ _factory.setFeature(featureName, enabledInFactory);
+ }
+ catch (FeatureNotSupportedException ex) {
+ fail("The engine does not allow to set the feature string to the default value returned by factory.getFeature(String)");
+ }
+ final TopicMapSystem sys = makeTopicMapSystem();
+ final boolean enabledInSystem = sys.getFeature(featureName);
+ assertEquals("The system has a different value of " + featureName + " than the factory",
+ enabledInFactory, enabledInSystem);
+ }
+}
Property changes on: trunk/src/test/java/org/tmapi/core/TestFeatureStrings.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-10 14:45:07
|
Revision: 128
http://tmapi.svn.sourceforge.net/tmapi/?rev=128&view=rev
Author: lheuer
Date: 2009-10-10 14:44:57 +0000 (Sat, 10 Oct 2009)
Log Message:
-----------
Added comment to the build.xml
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-09 22:51:17 UTC (rev 127)
+++ trunk/build.xml 2009-10-10 14:44:57 UTC (rev 128)
@@ -91,7 +91,12 @@
</target>
<!-- =================================================================== -->
- <!-- Internal Tests -->
+ <!-- Internal Tests
+
+ TestTopicMapSystemFactory is the only test which is executable
+ without a Topic Maps engine and tests the discovery process of a
+ TopicMapSystemFactory
+ -->
<!-- =================================================================== -->
<target name="internal.tests" depends="test">
<mkdir dir="tmp/META-INF/services"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-09 22:51:45
|
Revision: 127
http://tmapi.svn.sourceforge.net/tmapi/?rev=127&view=rev
Author: lheuer
Date: 2009-10-09 22:51:17 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
Added JUnit to the classpath, patch provided by Minto van der Sluis
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-02 15:56:12 UTC (rev 126)
+++ trunk/build.xml 2009-10-09 22:51:17 UTC (rev 127)
@@ -105,6 +105,7 @@
printsummary="true" showoutput="false"
errorProperty="test.failed" failureProperty="test.failed">
<classpath>
+ <pathelement location="${lib.junit}"/>
<pathelement location="tmapi-test.jar"/>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${dir.build.tests}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-02 15:56:33
|
Revision: 125
http://tmapi.svn.sourceforge.net/tmapi/?rev=125&view=rev
Author: lheuer
Date: 2009-10-02 15:53:38 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
Applied patch contributed by Stefan Kesberg to take type-instance relationships as assocs into account
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
Modified: trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2009-10-01 17:21:27 UTC (rev 124)
+++ trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2009-10-02 15:53:38 UTC (rev 125)
@@ -14,6 +14,7 @@
package org.tmapi.index;
import org.tmapi.core.Association;
+import org.tmapi.core.FeatureNotRecognizedException;
import org.tmapi.core.Name;
import org.tmapi.core.Occurrence;
import org.tmapi.core.Role;
@@ -29,7 +30,8 @@
*/
public class TestTypeInstanceIndex extends TMAPITestCase {
- private TypeInstanceIndex _typeInstanceIdx;
+ private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
+ private TypeInstanceIndex _typeInstanceIdx;
public TestTypeInstanceIndex(String name) {
super(name);
@@ -61,7 +63,7 @@
}
}
- public void testTopic() {
+ public void testTopic() throws FeatureNotRecognizedException {
_updateIndex();
assertTrue(_typeInstanceIdx.getTopics(null).isEmpty());
assertTrue(_typeInstanceIdx.getTopicTypes().isEmpty());
@@ -85,7 +87,16 @@
_updateIndex();
assertEquals(1, _typeInstanceIdx.getTopicTypes().size());
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+ {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ }
+ else
+ {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ }
+
assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
@@ -100,7 +111,16 @@
assertEquals(2, _typeInstanceIdx.getTopicTypes().size());
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type2));
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+ {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ }
+ else
+ {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ }
+
assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
@@ -116,7 +136,16 @@
topic.remove();
_updateIndex();
assertEquals(0, _typeInstanceIdx.getTopicTypes().size());
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+ {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ }
+ else
+ {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ }
+
assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
assertTrue(_typeInstanceIdx.getTopics(type1).isEmpty());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-02 15:56:27
|
Revision: 126
http://tmapi.svn.sourceforge.net/tmapi/?rev=126&view=rev
Author: lheuer
Date: 2009-10-02 15:56:12 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
Code style, tabs -> spaces
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
Modified: trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2009-10-02 15:53:38 UTC (rev 125)
+++ trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java 2009-10-02 15:56:12 UTC (rev 126)
@@ -30,8 +30,8 @@
*/
public class TestTypeInstanceIndex extends TMAPITestCase {
- private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
- private TypeInstanceIndex _typeInstanceIdx;
+ private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
+ private TypeInstanceIndex _typeInstanceIdx;
public TestTypeInstanceIndex(String name) {
super(name);
@@ -88,13 +88,11 @@
assertEquals(1, _typeInstanceIdx.getTopicTypes().size());
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
- if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
- {
- assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS)) {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
}
- else
- {
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ else {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
}
assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
@@ -112,13 +110,11 @@
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
assertTrue(_typeInstanceIdx.getTopicTypes().contains(type2));
- if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
- {
- assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS)) {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
}
- else
- {
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ else {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
}
assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
@@ -137,13 +133,11 @@
_updateIndex();
assertEquals(0, _typeInstanceIdx.getTopicTypes().size());
- if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
- {
- assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+ if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS)) {
+ assertEquals(5, _typeInstanceIdx.getTopics(null).size());
}
- else
- {
- assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+ else {
+ assertEquals(2, _typeInstanceIdx.getTopics(null).size());
}
assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-01 17:21:35
|
Revision: 124
http://tmapi.svn.sourceforge.net/tmapi/?rev=124&view=rev
Author: lheuer
Date: 2009-10-01 17:21:27 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Forgot some occurrences of MCE
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
trunk/src/main/java/org/tmapi/core/DatatypeAware.java
trunk/src/main/java/org/tmapi/core/Scoped.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2009-10-01 17:17:03 UTC (rev 123)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2009-10-01 17:21:27 UTC (rev 124)
@@ -82,7 +82,7 @@
* identifier which is equal to <tt>itemIdentifier</tt>.
* @throws ModelConstraintException If the item identifier is <tt>null</tt>.
*/
- public void addItemIdentifier(Locator itemIdentifier);
+ public void addItemIdentifier(Locator itemIdentifier) throws ModelConstraintException;
/**
* Removes an item identifier.
Modified: trunk/src/main/java/org/tmapi/core/DatatypeAware.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/DatatypeAware.java 2009-10-01 17:17:03 UTC (rev 123)
+++ trunk/src/main/java/org/tmapi/core/DatatypeAware.java 2009-10-01 17:21:27 UTC (rev 124)
@@ -57,8 +57,9 @@
* <a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a>.
*
* @param value The string value.
+ * @throws ModelConstraintException In case the <tt>value</tt> is <tt>null</tt>.
*/
- public void setValue(String value);
+ public void setValue(String value) throws ModelConstraintException;
/**
* Sets the IRI value.
@@ -70,7 +71,7 @@
* @param value The IRI value.
* @throws ModelConstraintException In case the <tt>value</tt> is <tt>null</tt>.
*/
- public void setValue(Locator value);
+ public void setValue(Locator value) throws ModelConstraintException;
/**
* Sets the string value and the datatype.
@@ -80,7 +81,7 @@
* @throws ModelConstraintException In case the <tt>value</tt> or <tt>datatype</tt>
* is <tt>null</tt>.
*/
- public void setValue(String value, Locator datatype);
+ public void setValue(String value, Locator datatype) throws ModelConstraintException;
/**
* Sets the decimal value.
@@ -92,7 +93,7 @@
* @param value The decimal value.
* @throws ModelConstraintException In case the <tt>value</tt> is <tt>null</tt>.
*/
- public void setValue(BigDecimal value);
+ public void setValue(BigDecimal value) throws ModelConstraintException;
/**
* Sets the integer value.
@@ -104,7 +105,7 @@
* @param value The integer value.
* @throws ModelConstraintException In case the <tt>value</tt> is <tt>null</tt>.
*/
- public void setValue(BigInteger value);
+ public void setValue(BigInteger value) throws ModelConstraintException;
/**
* Sets the long value.
Modified: trunk/src/main/java/org/tmapi/core/Scoped.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Scoped.java 2009-10-01 17:17:03 UTC (rev 123)
+++ trunk/src/main/java/org/tmapi/core/Scoped.java 2009-10-01 17:21:27 UTC (rev 124)
@@ -43,7 +43,7 @@
* @param theme The topic which should be added to the scope.
* @throws ModelConstraintException If the <tt>theme</tt> is <tt>null</tt>.
*/
- public void addTheme(Topic theme);
+ public void addTheme(Topic theme) throws ModelConstraintException;
/**
* Removes a topic from the scope.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-01 17:17:12
|
Revision: 123
http://tmapi.svn.sourceforge.net/tmapi/?rev=123&view=rev
Author: lheuer
Date: 2009-10-01 17:17:03 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Added MCE and IdentityConstraintException to the signatures
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Association.java
trunk/src/main/java/org/tmapi/core/Name.java
trunk/src/main/java/org/tmapi/core/Topic.java
trunk/src/main/java/org/tmapi/core/TopicMap.java
Modified: trunk/src/main/java/org/tmapi/core/Association.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Association.java 2009-10-01 17:08:29 UTC (rev 122)
+++ trunk/src/main/java/org/tmapi/core/Association.java 2009-10-01 17:17:03 UTC (rev 123)
@@ -91,6 +91,6 @@
* @throws ModelConstraintException In case the role <tt>type</tt> or
* <tt>player</tt> is <tt>null</tt>.
*/
- public Role createRole(Topic type, Topic player);
+ public Role createRole(Topic type, Topic player) throws ModelConstraintException;
}
Modified: trunk/src/main/java/org/tmapi/core/Name.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Name.java 2009-10-01 17:08:29 UTC (rev 122)
+++ trunk/src/main/java/org/tmapi/core/Name.java 2009-10-01 17:17:03 UTC (rev 123)
@@ -49,7 +49,7 @@
* @param value The name string to be assigned to the name.
* @throws ModelConstraintException If the the <tt>value</tt> is <tt>null</tt>.
*/
- public void setValue(String value);
+ public void setValue(String value) throws ModelConstraintException;
/**
* Returns the {@link Variant}s defined for this name.
@@ -79,7 +79,7 @@
* or the scope of the variant would not be a true superset of the
* name's scope.
*/
- public Variant createVariant(String value, Topic... scope);
+ public Variant createVariant(String value, Topic... scope) throws ModelConstraintException;
/**
* Creates a {@link Variant} of this topic name with the specified string
@@ -100,7 +100,7 @@
* or the scope of the variant would not be a true superset of the
* name's scope.
*/
- public Variant createVariant(String value, Collection<Topic> scope);
+ public Variant createVariant(String value, Collection<Topic> scope) throws ModelConstraintException;
/**
* Creates a {@link Variant} of this topic name with the specified IRI
@@ -121,7 +121,7 @@
* or the scope of the variant would not be a true superset of the
* name's scope.
*/
- public Variant createVariant(Locator value, Topic... scope);
+ public Variant createVariant(Locator value, Topic... scope) throws ModelConstraintException;
/**
* Creates a {@link Variant} of this topic name with the specified IRI
@@ -142,7 +142,7 @@
* or the scope of the variant would not be a true superset of the
* name's scope.
*/
- public Variant createVariant(Locator value, Collection<Topic> scope);
+ public Variant createVariant(Locator value, Collection<Topic> scope) throws ModelConstraintException;
/**
* Creates a {@link Variant} of this topic name with the specified
@@ -164,7 +164,7 @@
* is <tt>null</tt>, or the scope of the variant would not be a
* true superset of the name's scope.
*/
- public Variant createVariant(String value, Locator datatype, Topic... scope);
+ public Variant createVariant(String value, Locator datatype, Topic... scope) throws ModelConstraintException;
/**
* Creates a {@link Variant} of this topic name with the specified
@@ -187,6 +187,6 @@
* true superset of the name's scope.
*/
public Variant createVariant(String value, Locator datatype,
- Collection<Topic> scope);
+ Collection<Topic> scope) throws ModelConstraintException;
}
Modified: trunk/src/main/java/org/tmapi/core/Topic.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Topic.java 2009-10-01 17:08:29 UTC (rev 122)
+++ trunk/src/main/java/org/tmapi/core/Topic.java 2009-10-01 17:17:03 UTC (rev 123)
@@ -72,7 +72,7 @@
* topic represent the same subject as another topic.
* @throws ModelConstraintException If the subject identifier is <tt>null</tt>.
*/
- public void addSubjectIdentifier(Locator subjectIdentifier);
+ public void addSubjectIdentifier(Locator subjectIdentifier) throws IdentityConstraintException, ModelConstraintException;
/**
* Removes a subject identifier from this topic.
@@ -107,7 +107,7 @@
* topic represent the same subject as another topic.
* @throws ModelConstraintException If the subject locator is <tt>null</tt>.
*/
- public void addSubjectLocator(Locator subjectLocator);
+ public void addSubjectLocator(Locator subjectLocator) throws IdentityConstraintException, ModelConstraintException;
/**
* Removes a subject locator from this topic.
@@ -163,7 +163,7 @@
* @throws ModelConstraintException If either the <tt>type</tt>, the
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
- public Name createName(Topic type, String value, Topic... scope);
+ public Name createName(Topic type, String value, Topic... scope) throws ModelConstraintException;
/**
* Creates a {@link Name} for this topic with the specified <tt>type</tt>,
@@ -177,7 +177,7 @@
* @throws ModelConstraintException If either the <tt>type</tt>, the
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
- public Name createName(Topic type, String value, Collection<Topic> scope);
+ public Name createName(Topic type, String value, Collection<Topic> scope) throws ModelConstraintException;
/**
* Creates a {@link Name} for this topic with the specified <tt>value</tt>,
@@ -196,7 +196,7 @@
* @throws ModelConstraintException If either the <tt>value</tt>, or
* <tt>scope</tt> is <tt>null</tt>.
*/
- public Name createName(String value, Topic... scope);
+ public Name createName(String value, Topic... scope) throws ModelConstraintException;
/**
* Creates a {@link Name} for this topic with the specified <tt>value</tt>,
@@ -214,7 +214,7 @@
* @throws ModelConstraintException If either the <tt>value</tt>, or
* <tt>scope</tt> is <tt>null</tt>.
*/
- public Name createName(String value, Collection<Topic> scope);
+ public Name createName(String value, Collection<Topic> scope) throws ModelConstraintException;
/**
* Returns the {@link Occurrence}s of this topic.
@@ -266,7 +266,7 @@
* @throws ModelConstraintException If either the <tt>type</tt>, the
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
- public Occurrence createOccurrence(Topic type, String value, Topic... scope);
+ public Occurrence createOccurrence(Topic type, String value, Topic... scope) throws ModelConstraintException;
/**
* Creates an {@link Occurrence} for this topic with the specified
@@ -285,7 +285,7 @@
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
public Occurrence createOccurrence(Topic type, String value,
- Collection<Topic> scope);
+ Collection<Topic> scope) throws ModelConstraintException;
/**
* Creates an {@link Occurrence} for this topic with the specified
@@ -305,7 +305,7 @@
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
public Occurrence createOccurrence(Topic type, Locator value,
- Topic... scope);
+ Topic... scope) throws ModelConstraintException;
/**
* Creates an {@link Occurrence} for this topic with the specified
@@ -324,7 +324,7 @@
* <tt>value</tt>, or <tt>scope</tt> is <tt>null</tt>.
*/
public Occurrence createOccurrence(Topic type, Locator value,
- Collection<Topic> scope);
+ Collection<Topic> scope) throws ModelConstraintException;
/**
* Creates an {@link Occurrence} for this topic with the specified
@@ -346,7 +346,7 @@
* <tt>null</tt>.
*/
public Occurrence createOccurrence(Topic type, String value,
- Locator datatype, Topic... scope);
+ Locator datatype, Topic... scope) throws ModelConstraintException;
/**
* Creates an {@link Occurrence} for this topic with the specified
@@ -367,7 +367,7 @@
* <tt>null</tt>.
*/
public Occurrence createOccurrence(Topic type, String value,
- Locator datatype, Collection<Topic> scope);
+ Locator datatype, Collection<Topic> scope) throws ModelConstraintException;
/**
* Returns the roles played by this topic.
@@ -456,7 +456,7 @@
* must not be <tt>null</tt>.
* @throws ModelConstraintException If the type is <tt>null</tt>.
*/
- public void addType(Topic type);
+ public void addType(Topic type) throws ModelConstraintException;
/**
* Removes a type from this topic.
@@ -494,7 +494,7 @@
* @param other The topic to be merged into this topic; must not be <tt>null</tt>.
* @throws ModelConstraintException If <tt>other</tt> is <tt>null</tt>.
*/
- public void mergeIn(Topic other);
+ public void mergeIn(Topic other) throws ModelConstraintException;
/**
* Removes this topic from the containing {@link TopicMap} instance.
@@ -510,6 +510,6 @@
* @throws TopicInUseException If the topic plays a {@link Role} or it
* is used as type, in a scope, or as reifier.
*/
- public void remove();
+ public void remove() throws TopicInUseException;
}
Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java 2009-10-01 17:08:29 UTC (rev 122)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2009-10-01 17:17:03 UTC (rev 123)
@@ -129,7 +129,7 @@
* @return A {@link Topic} instance with the specified subject identifier.
* @throws ModelConstraintException If the subject identifier <tt>subjectIdentifier</tt> is <tt>null</tt>.
*/
- public Topic createTopicBySubjectIdentifier(Locator subjectIdentifier);
+ public Topic createTopicBySubjectIdentifier(Locator subjectIdentifier) throws ModelConstraintException;
/**
* Returns a {@link Topic} instance with the specified subject locator.
@@ -142,7 +142,7 @@
* @return A {@link Topic} instance with the specified subject locator.
* @throws ModelConstraintException If the subject locator <tt>subjectLocator</tt> is <tt>null</tt>.
*/
- public Topic createTopicBySubjectLocator(Locator subjectLocator);
+ public Topic createTopicBySubjectLocator(Locator subjectLocator) throws ModelConstraintException;
/**
* Returns a {@link Topic} instance with the specified item identifier.
@@ -166,7 +166,7 @@
* @throws IdentityConstraintException If an other {@link Construct} with the
* specified item identifier exists which is not a {@link Topic}.
*/
- public Topic createTopicByItemIdentifier(Locator itemIdentifier);
+ public Topic createTopicByItemIdentifier(Locator itemIdentifier) throws IdentityConstraintException, ModelConstraintException;
/**
* Returns a {@link Topic} instance with an automatically generated item
@@ -194,7 +194,7 @@
* @throws ModelConstraintException If either the <tt>type</tt> or
* <tt>scope</tt> is <tt>null</tt>.
*/
- public Association createAssociation(Topic type, Topic... scope);
+ public Association createAssociation(Topic type, Topic... scope) throws ModelConstraintException;
/**
* Creates an {@link Association} in this topic map with the specified
@@ -207,7 +207,7 @@
* @throws ModelConstraintException If either the <tt>type</tt> or
* <tt>scope</tt> is <tt>null</tt>.
*/
- public Association createAssociation(Topic type, Collection<Topic> scope);
+ public Association createAssociation(Topic type, Collection<Topic> scope) throws ModelConstraintException;
/**
* Closes use of this topic map instance.
@@ -245,7 +245,7 @@
* must not be <tt>null</tt>.
* @throws ModelConstraintException If <tt>other</tt> is <tt>null</tt>.
*/
- public void mergeIn(TopicMap other);
+ public void mergeIn(TopicMap other) throws ModelConstraintException;
/**
* Returns the specified index.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-01 17:08:39
|
Revision: 122
http://tmapi.svn.sourceforge.net/tmapi/?rev=122&view=rev
Author: lheuer
Date: 2009-10-01 17:08:29 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Added MalformedIRIEx to the signature of several methods
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Locator.java
trunk/src/main/java/org/tmapi/core/TopicMap.java
trunk/src/main/java/org/tmapi/core/TopicMapSystem.java
Modified: trunk/src/main/java/org/tmapi/core/Locator.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Locator.java 2009-08-12 20:09:02 UTC (rev 121)
+++ trunk/src/main/java/org/tmapi/core/Locator.java 2009-10-01 17:08:29 UTC (rev 122)
@@ -46,8 +46,9 @@
* @param reference The reference which should be resolved against this locator.
* @return A locator representing an absolute IRI.
* @throws IllegalArgumentException If <tt>reference</tt> is <tt>null</tt>.
+ * @throws MalformedIRIException If the provided string cannot be resolved against this locator.
*/
- public Locator resolve(String reference);
+ public Locator resolve(String reference) throws MalformedIRIException;
/**
* Returns <tt>true</tt> if the <tt>other</tt> object is equal to this one.
Modified: trunk/src/main/java/org/tmapi/core/TopicMap.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMap.java 2009-08-12 20:09:02 UTC (rev 121)
+++ trunk/src/main/java/org/tmapi/core/TopicMap.java 2009-10-01 17:08:29 UTC (rev 122)
@@ -105,8 +105,9 @@
* @param reference A string which uses the IRI notation.
* @return A {@link Locator} representing the IRI <tt>reference</tt>.
* @throws IllegalArgumentException If <tt>reference</tt> is <tt>null</tt>.
+ * @throws MalformedIRIException If the provided string cannot be used to create a valid locator.
*/
- public Locator createLocator(String reference);
+ public Locator createLocator(String reference) throws MalformedIRIException;
/**
* Returns a {@link Topic} instance with the specified subject identifier.
Modified: trunk/src/main/java/org/tmapi/core/TopicMapSystem.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMapSystem.java 2009-08-12 20:09:02 UTC (rev 121)
+++ trunk/src/main/java/org/tmapi/core/TopicMapSystem.java 2009-10-01 17:08:29 UTC (rev 122)
@@ -77,7 +77,7 @@
/**
* @see org.tmapi.core.TopicMap#createLocator(String reference)
*/
- public Locator createLocator(String reference);
+ public Locator createLocator(String reference) throws MalformedIRIException;
/**
* Creates a new {@link TopicMap} and stores it within the system under the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jos...@us...> - 2009-08-12 20:09:10
|
Revision: 121
http://tmapi.svn.sourceforge.net/tmapi/?rev=121&view=rev
Author: joschmidt
Date: 2009-08-12 20:09:02 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
enhanced comments in remove()
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2009-08-12 14:09:42 UTC (rev 120)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2009-08-12 20:09:02 UTC (rev 121)
@@ -96,7 +96,7 @@
* Deletes this construct from its parent container.
*
* After invocation of this method, the construct is in an undefined state and
- * must not used further.
+ * must not be used further.
*/
public void remove();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-08-12 14:09:50
|
Revision: 120
http://tmapi.svn.sourceforge.net/tmapi/?rev=120&view=rev
Author: lheuer
Date: 2009-08-12 14:09:42 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Clarification of Construct.remove()
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/Construct.java
Modified: trunk/src/main/java/org/tmapi/core/Construct.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/Construct.java 2009-07-23 17:46:15 UTC (rev 119)
+++ trunk/src/main/java/org/tmapi/core/Construct.java 2009-08-12 14:09:42 UTC (rev 120)
@@ -94,6 +94,9 @@
/**
* Deletes this construct from its parent container.
+ *
+ * After invocation of this method, the construct is in an undefined state and
+ * must not used further.
*/
public void remove();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-07-23 17:46:19
|
Revision: 119
http://tmapi.svn.sourceforge.net/tmapi/?rev=119&view=rev
Author: lheuer
Date: 2009-07-23 17:46:15 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Forgot to update CHANGES.txt - Done
Modified Paths:
--------------
tags/release-2_0_a2/CHANGES.txt
trunk/CHANGES.txt
Modified: tags/release-2_0_a2/CHANGES.txt
===================================================================
--- tags/release-2_0_a2/CHANGES.txt 2009-07-23 17:42:00 UTC (rev 118)
+++ tags/release-2_0_a2/CHANGES.txt 2009-07-23 17:46:15 UTC (rev 119)
@@ -2,12 +2,13 @@
TMAPI Changes
=============
-TMAPI 2.0 alpha2 - 2009-02-xx
+TMAPI 2.0 alpha2 - 2009-07-23
-----------------------------
* Introduced MalformedIRIException
* Renamed ModelConstraintException.getSender() to getReporter()
* More test cases
* Improved Java Docs
+* #2790650 - IRI tests do not belong to the core tests anymore
TMAPI 2.0 alpha1 - 2008-08-26
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2009-07-23 17:42:00 UTC (rev 118)
+++ trunk/CHANGES.txt 2009-07-23 17:46:15 UTC (rev 119)
@@ -2,12 +2,13 @@
TMAPI Changes
=============
-TMAPI 2.0 alpha2 - 2009-02-xx
+TMAPI 2.0 alpha2 - 2009-07-23
-----------------------------
* Introduced MalformedIRIException
* Renamed ModelConstraintException.getSender() to getReporter()
* More test cases
* Improved Java Docs
+* #2790650 - IRI tests do not belong to the core tests anymore
TMAPI 2.0 alpha1 - 2008-08-26
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-07-23 17:42:11
|
Revision: 118
http://tmapi.svn.sourceforge.net/tmapi/?rev=118&view=rev
Author: lheuer
Date: 2009-07-23 17:42:00 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Updated version info
Modified Paths:
--------------
trunk/build.properties
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2009-07-23 17:40:40 UTC (rev 117)
+++ trunk/build.properties 2009-07-23 17:42:00 UTC (rev 118)
@@ -1,5 +1,5 @@
version=2.0
-version_suffix=a2
+version_suffix=b1
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-07-23 17:40:49
|
Revision: 117
http://tmapi.svn.sourceforge.net/tmapi/?rev=117&view=rev
Author: lheuer
Date: 2009-07-23 17:40:40 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Added Paths:
-----------
tags/release-2_0_a2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
