[isidorus-cvs] r784 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base war/gdl_widgets

25 Aug 2011

Author: lgiessmann
Date: Thu Aug 25 05:51:35 2011
New Revision: 784
Log:
gdl-frontend: Widgets: changed the GDL-Schema => gdl:display-by associations currently own always a role of the type gdl:descriptor with a player of the type gdlt:Value-Group or gdlt:TM-Value. The type gdl:value-group is not used any more in this association!
Modified:
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java
==============================================================================

--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java	Thu Aug 25 05:51:35 2011	(r784)
@@ -1077,10 +1077,10 @@
// Returns the topic that is bound to the passed tm-value or value-group topic
    // and represents the representation schema of the topics that must be displayed 
-	public static Topic getDisplayByTopicOf(Topic tmValueOrvalueGroup) throws InvalidGdlSchemaException{
-		if(tmValueOrvalueGroup == null) return null;
+	public static Topic getDisplayByTopicOf(Topic tmValueOrValueGroup) throws InvalidGdlSchemaException{
+		if(tmValueOrValueGroup == null) return null;
    	
-		TopicMap tm = tmValueOrvalueGroup.getTopicMap();
+		TopicMap tm = tmValueOrValueGroup.getTopicMap();
    	Topic displayByAssocType = getTopicByPsi(PSIs.GDL.AssociationType.gdlDisplayBy, tm);
    	Topic descriptorRoleType = getTopicByPsi(PSIs.GDL.RoleType.gdlDescriptor, tm);
    	Topic tmConstruct = getTopicByPsi(PSIs.GDL.RoleType.gdlTmConstruct, tm);
@@ -1088,14 +1088,14 @@
    	Topic subjectLocatorConstraintType = getTopicByPsi(PSIs.TMCL.tmclSubjectLocatorConstraint, tm);
    	Topic itemIdentifierConstraintType = getTopicByPsi(PSIs.TMCL.tmclItemIdentifierConstraint, tm);
    	Topic topicNameConstraintType = getTopicByPsi(PSIs.TMCL.tmclTopicNameConstraint, tm);
-		ArrayList<Topic> resultPsi = getOtherPlayerOfBinaryAssociation(tmValueOrvalueGroup, descriptorRoleType, displayByAssocType, null, tmConstruct, subjectIdentifierConstraintType);
-		ArrayList<Topic> resultSl = getOtherPlayerOfBinaryAssociation(tmValueOrvalueGroup, descriptorRoleType, displayByAssocType, null, tmConstruct, subjectLocatorConstraintType);
-		ArrayList<Topic> resultIi = getOtherPlayerOfBinaryAssociation(tmValueOrvalueGroup, descriptorRoleType, displayByAssocType, null, tmConstruct, itemIdentifierConstraintType);
-		ArrayList<Topic> resultName = getOtherPlayerOfBinaryAssociation(tmValueOrvalueGroup, descriptorRoleType, displayByAssocType, null, tmConstruct, topicNameConstraintType);
+		ArrayList<Topic> resultPsi = getOtherPlayerOfBinaryAssociation(tmValueOrValueGroup, descriptorRoleType, displayByAssocType, null, subjectIdentifierConstraintType, tmConstruct);
+		ArrayList<Topic> resultSl = getOtherPlayerOfBinaryAssociation(tmValueOrValueGroup, descriptorRoleType, displayByAssocType, null, subjectLocatorConstraintType, tmConstruct);
+		ArrayList<Topic> resultIi = getOtherPlayerOfBinaryAssociation(tmValueOrValueGroup, descriptorRoleType, displayByAssocType, null, itemIdentifierConstraintType, tmConstruct);
+		ArrayList<Topic> resultName = getOtherPlayerOfBinaryAssociation(tmValueOrValueGroup, descriptorRoleType, displayByAssocType, null, topicNameConstraintType, tmConstruct);
    	
    	ArrayList<Topic> result = Utils.union(Utils.union(Utils.union(resultPsi, resultSl), resultIi), resultName);
    	
-		if(result.size() > 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(tmValueOrvalueGroup) + " must be bound none or once to a tmcl:constraint via a " + PSIs.GDL.AssociationType.gdlDisplayBy + " assciation, but is: " + result.size());
+		if(result.size() > 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(tmValueOrValueGroup) + " must be bound none or once to a tmcl:constraint via a " + PSIs.GDL.AssociationType.gdlDisplayBy + " assciation, but is: " + result.size());
    	else if(result.size() == 1) return result.get(0);
    	else return null;
    }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -187,7 +187,7 @@
    			 {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-text-list-box-env]"}]},
    			 {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-text-list-box-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgg:hash-object-has-environment-environment-role-player]"}]},
    			 {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-environment-environment-role-player]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]},
- 				 {"type":"si:[gdl:display-by]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-text-list-box-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:environment-name-constraint]"}]},
+ 				 {"type":"si:[gdl:display-by]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-text-list-box-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:environment-name-constraint]"}]},
    			 
    			 {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-creator-text-label-key]"}]},
    			 {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-text-label-key-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-environment-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-creator-text-label-key]"}]},
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -180,7 +180,7 @@
    			 {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
    			 {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgg:hash-object-has-environment-environment-role-player]"}]},
    			 {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-environment-environment-role-player]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]},
- 				 {"type":"si:[gdl:display-by]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:environment-name-constraint]"}]},
+ 				 {"type":"si:[gdl:display-by]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-env-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:environment-name-constraint]"}]},
    			 
    			 {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-text-label-key]"}]},
    			 {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-label-key-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-environment-editor-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-text-label-key]"}]},
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -10496,7 +10496,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
                 },
@@ -11880,7 +11880,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
                 },
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -8944,7 +8944,7 @@
     </t:type>
     <t:role>
       <t:type>
-        <t:topicRef href="#t2661" />
+        <t:topicRef href="#t2656" />
       </t:type>
       <t:topicRef href="#t6068" />
     </t:role>
@@ -10258,7 +10258,7 @@
     </t:type>
     <t:role>
       <t:type>
-        <t:topicRef href="#t2661" />
+        <t:topicRef href="#t2656" />
       </t:type>
       <t:topicRef href="#t2946" />
     </t:role>
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -4893,7 +4893,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
                 },
@@ -5764,7 +5764,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
                 },
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -4108,7 +4108,7 @@
     </t:type>
     <t:role>
       <t:type>
-        <t:topicRef href="#t2661" />
+        <t:topicRef href="#t2656" />
       </t:type>
       <t:topicRef href="#t6068" />
     </t:role>
@@ -5422,7 +5422,7 @@
     </t:type>
     <t:role>
       <t:type>
-        <t:topicRef href="#t2661" />
+        <t:topicRef href="#t2656" />
       </t:type>
       <t:topicRef href="#t2946" />
     </t:role>
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm	Thu Aug 25 04:55:40 2011	(r783)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm	Thu Aug 25 05:51:35 2011	(r784)
@@ -4949,7 +4949,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
                 },
@@ -5820,7 +5820,7 @@
             "scope":null,
             "roles":[{
                     "item_identifiers":null,
-                    "type":"si:[pref_3:value-group]",
+                    "type":"si:[pref_3:descriptor]",
                     "reifier":null,
                     "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
                 },

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[isidorus-cvs] r784 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base war/gdl_widgets