[isidorus-cvs] r1030 - trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Thu Oct 27 01:08:00 2011
New Revision: 1030

Log:
gdl-frontend: Widgets: finalised GdlTopicView.indirectlyContained(...)

Modified:
   trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java

Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java
==============================================================================
--- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java	Wed Oct 26 10:06:49 2011	(r1029)
+++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java	Thu Oct 27 01:08:00 2011	(r1030)
@@ -93,7 +93,10 @@
 		if(container == null) return false;
 		
 		TopicMapsTypes newType = pair.getSecond();
-		if(newType.equals(TopicMapsTypes.Name)){
+		if(newType.equals(TopicMapsTypes.Locator)){
+			// remove all locators
+			return true;
+		} else if(newType.equals(TopicMapsTypes.Name)){
 			Name name = (Name)pair.getFirst();
 			for (Pair<Object, TopicMapsTypes> item : container) {
 				if(item.getSecond().equals(TopicMapsTypes.Topic)){
@@ -187,14 +190,22 @@
 			// subject-identifier
 			// subject-locator
 			// item-identifier
+			// reifier => name
+			// reifier => occurrence
+			// reifier => association
+			// reifier => role
 			// topic-name
 			// variant-name
 			// *topic-occurrence
 			// type => topic-name
 			// type => topic-occurrence
-			// datatype => topic-occurrence
+			// datatype => topic-occurrence + variant-name
 			// scope => topic-name
 			// scope => topic-occurrence
+			// scope => association
+			// variant-name-reifier
+			// variant-name-identifiers
+			// variant-name-scope
 		}
 		
 		return result;