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

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

Revision: 197
          http://tinytim.svn.sourceforge.net/tinytim/?rev=197&view=rev
Author:   lheuer
Date:     2008-11-15 13:02:58 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
- Restricted constructor visibility of abstract classes to protected
- Simplified theme handling for variants in NameImpl
- Docs

Modified Paths:
--------------
    tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMap.java
    tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMapSystem.java
    tinytim/trunk/src/main/java/org/tinytim/core/NameImpl.java
    tinytim/trunk/src/main/java/org/tinytim/core/ScopedImpl.java
    tinytim/trunk/src/main/java/org/tinytim/core/TypedImpl.java
    tinytim/trunk/src/main/java/org/tinytim/core/value/BooleanLiteral.java

Modified: tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMap.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMap.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMap.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -23,7 +23,7 @@
  * 
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
 abstract class AbstractTopicMap extends ConstructImpl implements ITopicMap {
 

Modified: tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMapSystem.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMapSystem.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/AbstractTopicMapSystem.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -37,7 +37,7 @@
     protected final Map<String, Boolean> _features;
     protected final Map<String, Object> _properties;
 
-    AbstractTopicMapSystem(Map<String, Boolean> features, Map<String, Object> properties) throws TMAPIException {
+    protected AbstractTopicMapSystem(Map<String, Boolean> features, Map<String, Object> properties) throws TMAPIException {
         _features = features;
         _properties = properties;
     }

Modified: tinytim/trunk/src/main/java/org/tinytim/core/NameImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/NameImpl.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/NameImpl.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -102,11 +102,9 @@
     public void addTheme(Topic theme) {
         IScope scope = _scope;
         super.addTheme(theme);
-        if (scope != _scope) {
-            if (_variants != null) {
-                for (Variant variant: _variants) {
-                    ((VariantImpl) variant)._addNameTheme(theme);
-                }
+        if (_variants != null && scope != _scope) {
+            for (Variant variant: _variants) {
+                ((VariantImpl) variant)._addNameTheme(theme);
             }
         }
     }
@@ -118,11 +116,9 @@
     public void removeTheme(Topic theme) {
         IScope scope = _scope;
         super.removeTheme(theme);
-        if (scope != _scope) {
-            if (_variants != null) {
-                for (Variant variant: _variants) {
-                    ((VariantImpl) variant)._removeNameTheme(theme);
-                }
+        if (_variants != null && scope != _scope) {
+            for (Variant variant: _variants) {
+                ((VariantImpl) variant)._removeNameTheme(theme);
             }
         }
     }

Modified: tinytim/trunk/src/main/java/org/tinytim/core/ScopedImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/ScopedImpl.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/ScopedImpl.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -38,12 +38,12 @@
 
     protected IScope _scope;
 
-    ScopedImpl(ITopicMap tm) {
+    protected ScopedImpl(ITopicMap tm) {
         super(tm);
         _scope = Scope.UCS;
     }
 
-    ScopedImpl(ITopicMap topicMap, Topic type, IScope scope) {
+    protected ScopedImpl(ITopicMap topicMap, Topic type, IScope scope) {
         super(topicMap, type);
         _scope = scope;
     }

Modified: tinytim/trunk/src/main/java/org/tinytim/core/TypedImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/TypedImpl.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/TypedImpl.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -38,11 +38,11 @@
     private Topic _type;
     private Topic _reifier;
 
-    TypedImpl(ITopicMap tm) {
+    protected TypedImpl(ITopicMap tm) {
         super(tm);
     }
 
-    TypedImpl(ITopicMap topicMap, Topic type) {
+    protected TypedImpl(ITopicMap topicMap, Topic type) {
         super(topicMap);
         _type = type;
     }

Modified: tinytim/trunk/src/main/java/org/tinytim/core/value/BooleanLiteral.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/value/BooleanLiteral.java	2008-11-14 15:51:56 UTC (rev 196)
+++ tinytim/trunk/src/main/java/org/tinytim/core/value/BooleanLiteral.java	2008-11-15 13:02:58 UTC (rev 197)
@@ -26,7 +26,7 @@
  * 
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
 final class BooleanLiteral implements ILiteral {
 


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