[tinyTiM-commits] SF.net SVN: tinytim:[221] tinytim/tags/release-1_5_0b2

[<lh...@us...>]

Revision: 221
          http://tinytim.svn.sourceforge.net/tinytim/?rev=221&view=rev
Author:   lheuer
Date:     2008-11-20 16:08:28 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
Fixed bug #2270475
Prepared release

Modified Paths:
--------------
    tinytim/tags/release-1_5_0b2/CHANGES.txt
    tinytim/tags/release-1_5_0b2/build.properties
    tinytim/tags/release-1_5_0b2/src/main/java/org/tinytim/TopicUtils.java
    tinytim/tags/release-1_5_0b2/src/test/java/org/tinytim/TestTopicUtils.java

Modified: tinytim/tags/release-1_5_0b2/CHANGES.txt
===================================================================
--- tinytim/tags/release-1_5_0b2/CHANGES.txt	2008-11-20 16:04:19 UTC (rev 220)
+++ tinytim/tags/release-1_5_0b2/CHANGES.txt	2008-11-20 16:08:28 UTC (rev 221)
@@ -2,6 +2,13 @@
 Changes Log
 ===========
 
+1.5.0 b2 (20.11.2008)
+-----------------------
+Bugfixes:
+---------
+* Bug #2270475 -- Topic types are not considered as dependency
+
+
 1.5.0 beta (08.08.2008)
 -----------------------
 Bugfixes:

Modified: tinytim/tags/release-1_5_0b2/build.properties
===================================================================
--- tinytim/tags/release-1_5_0b2/build.properties	2008-11-20 16:04:19 UTC (rev 220)
+++ tinytim/tags/release-1_5_0b2/build.properties	2008-11-20 16:08:28 UTC (rev 221)
@@ -1,4 +1,4 @@
 version=1.5.0
-version_suffix=beta
+version_suffix=b2
 debug=off
 optimize=on

Modified: tinytim/tags/release-1_5_0b2/src/main/java/org/tinytim/TopicUtils.java
===================================================================
--- tinytim/tags/release-1_5_0b2/src/main/java/org/tinytim/TopicUtils.java	2008-11-20 16:04:19 UTC (rev 220)
+++ tinytim/tags/release-1_5_0b2/src/main/java/org/tinytim/TopicUtils.java	2008-11-20 16:08:28 UTC (rev 221)
@@ -84,7 +84,8 @@
         boolean removable = typeInstanceIdx.getAssociations(topic).isEmpty()
                                 && typeInstanceIdx.getRoles(topic).isEmpty()
                                 && typeInstanceIdx.getOccurrences(topic).isEmpty()
-                                && typeInstanceIdx.getNames(topic).isEmpty();
+                                && typeInstanceIdx.getNames(topic).isEmpty()
+                                && typeInstanceIdx.getTopics(topic).isEmpty();
         typeInstanceIdx.close();
         if (removable) {
             IScopedIndex scopedIdx = idxMan.getScopedIndex();

Modified: tinytim/tags/release-1_5_0b2/src/test/java/org/tinytim/TestTopicUtils.java
===================================================================
--- tinytim/tags/release-1_5_0b2/src/test/java/org/tinytim/TestTopicUtils.java	2008-11-20 16:04:19 UTC (rev 220)
+++ tinytim/tags/release-1_5_0b2/src/test/java/org/tinytim/TestTopicUtils.java	2008-11-20 16:08:28 UTC (rev 221)
@@ -61,6 +61,12 @@
         ((IReifiable) assoc).setReifier(null);
         assertTrue(TopicUtils.isRemovable(topic));
         assertTrue(TopicUtils.isRemovable(topic, true));
+        // Topic type
+        Topic topic2 = _tm.createTopic();
+        topic2.addType(topic);
+        assertFalse(TopicUtils.isRemovable(topic));
+        topic2.removeType(topic);
+        assertTrue(TopicUtils.isRemovable(topic));
     }
 
 }


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