[isidorus-cvs] r773 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base view
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 10:53:48 2011
New Revision: 773
Log:
gdl-frontend: Widgets: implemented filtering for GdlAssociationView, so only associations that are valid to the defined constraints of the GdlAssociationView are represented by this view, currently role-combination-constraints are not examined
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/Utils.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
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 Mon Aug 22 09:00:17 2011 (r772)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 22 10:53:48 2011 (r773)
@@ -633,7 +633,7 @@
// returns the constrained role-types of the passed constraint
- public static Topic getConstraintRolesOfConstraint(Topic topicRoleOrAssociationRoleConstraint) throws InvalidGdlSchemaException {
+ public static Topic getConstraintRoleOfConstraint(Topic topicRoleOrAssociationRoleConstraint) throws InvalidGdlSchemaException {
if(topicRoleOrAssociationRoleConstraint == null) return null;
TopicMap tm = topicRoleOrAssociationRoleConstraint.getTopicMap();
@@ -648,6 +648,22 @@
}
+ // returns the constrained role and player types of the passed constraint
+ public static Pair<Topic, Topic> getConstraintRoleAndPlayerTypeOfConstraint(Topic topicRoleConstraint) throws InvalidGdlSchemaException {
+ if(topicRoleConstraint == null) return null;
+
+ TopicMap tm = topicRoleConstraint.getTopicMap();
+ Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm);
+ Topic constrainedTopicTypeAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedTopicType, tm);
+ Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm);
+ Topic topicType = getTopicByPsi(PSIs.TMCL.tmclTopictype, tm);
+ ArrayList<Topic> result = getOtherPlayerOfBinaryAssociation(topicRoleConstraint, constraintRoleType, constrainedTopicTypeAssocType, null, topicType, constrainedRoleType);
+
+ if(result.size() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(topicRoleConstraint) + " must be bound exactly once to a topic-type via a " + PSIs.TMCL.tmclConstrainedTopicType + " association, but is bound: " + result.size());
+ else return new Pair<Topic, Topic>(getConstraintRoleOfConstraint(topicRoleConstraint), result.get(0));
+ }
+
+
// returns the topic that plays the role of tmcl:constrained in an association
// of the type tmcl:constrained-statement that is bound to the passed topic
// constrinatTopic that plays the role of tmcl:constraint
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Mon Aug 22 09:00:17 2011 (r772)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Mon Aug 22 10:53:48 2011 (r773)
@@ -7,7 +7,6 @@
import com.google.gwt.dom.client.Element;
public class Utils {
-
// returns true if both arrays have the same items
public static <T> boolean compareLists(ArrayList<T> lft, ArrayList<T> rgt){
if(lft == null && rgt == null) return true;
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 22 09:00:17 2011 (r772)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 22 10:53:48 2011 (r773)
@@ -2,45 +2,44 @@
import java.util.ArrayList;
+import com.google.gwt.core.client.JsArray;
import com.google.gwt.user.client.Window;
-
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
-import us.isidor.gdl.anaToMia.Widgets.base.PSIs;
import us.isidor.gdl.anaToMia.Widgets.base.TmHelper;
-import us.isidor.gdl.anaToMia.Widgets.base.Utils;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException;
+import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public abstract class GdlAssociationView extends GdlView {
protected ArrayList<Association> associationsToRepresent = null;
+ protected boolean associationsToRepresentSet = false;
private ArrayList<Topic> associationRoleConstraints = new ArrayList<Topic>();
- private boolean associationRoleconstraintsSet = false;
+ private boolean associationRoleConstraintsSet = false;
private ArrayList<Topic> topicRoleConstraints = new ArrayList<Topic>();
private boolean topicRoleConstraintsSet = false;
private Topic associationType = null;
private boolean associationTypeSet = false;
- private ArrayList<Topic> roleTypes = new ArrayList<Topic>();
- private boolean roleTypesSet = false;
+ private ArrayList<Pair<Topic, Topic>> roleAndPlayerTypes = new ArrayList<Pair<Topic, Topic>>();
+ private boolean roleAndPlayerTypesSet = false;
private ArrayList<Topic> roleCombinationConstraints = new ArrayList<Topic>();
private boolean roleCombinationConstraintsSet = false;
public GdlAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
super(tmRepresentative, receivedData);
- Window.alert("constraints: " +this.getRoleTypes().size() + " >> " + (this instanceof GdlEditorAssociationView));
-
if(this instanceof GdlEditorAssociationView) this.associationsToRepresent = this.filterAssociations();
}
// Return the association-role-constraints this view is bound to
public ArrayList<Topic> getAssociationRoleConstraints() throws InvalidGdlSchemaException {
- if(this.associationRoleconstraintsSet){
+ if(this.associationRoleConstraintsSet){
return this.associationRoleConstraints;
} else {
- this.associationRoleconstraintsSet = true;
+ this.associationRoleConstraintsSet = true;
this.associationRoleConstraints = TmHelper.getAssociationRoleConstraintsForView(this.tmRepresentative);
return this.associationRoleConstraints;
}
@@ -75,24 +74,30 @@
// returns the role-types that are valid to be used
// in associations of the type that is bound to this view
- public ArrayList<Topic> getRoleTypes() throws InvalidGdlSchemaException {
- if(this.roleTypesSet){
- return this.roleTypes;
+ public ArrayList<Pair<Topic, Topic>> getRoleAndPlayerTypes() throws InvalidGdlSchemaException {
+ if(this.roleAndPlayerTypesSet){
+ return this.roleAndPlayerTypes;
} else {
- this.roleTypesSet = true;
+ this.roleAndPlayerTypesSet = true;
ArrayList<Topic> roleTypesOfAssociationRoleConstraints = new ArrayList<Topic>();
for (Topic constraint : this.getAssociationRoleConstraints()){
- Topic top = TmHelper.getConstraintRolesOfConstraint(constraint);
+ Topic top = TmHelper.getConstraintRoleOfConstraint(constraint);
if(!roleTypesOfAssociationRoleConstraints.contains(top)) roleTypesOfAssociationRoleConstraints.add(top);
}
- ArrayList<Topic> roleTypesOfTopicRoleConstraints = new ArrayList<Topic>();
+ ArrayList<Pair<Topic, Topic>> roleTypesOfTopicRoleConstraints = new ArrayList<Pair<Topic, Topic>>();
for (Topic constraint : this.getTopicRoleConstraints()){
- Topic top = TmHelper.getConstraintRolesOfConstraint(constraint);
- if(!roleTypesOfTopicRoleConstraints.contains(top)) roleTypesOfTopicRoleConstraints.add(top);
+ Pair<Topic, Topic> roleAndPlayerType = TmHelper.getConstraintRoleAndPlayerTypeOfConstraint(constraint);
+ if(!roleTypesOfTopicRoleConstraints.contains(roleAndPlayerType)) roleTypesOfTopicRoleConstraints.add(roleAndPlayerType);
+ }
+
+ ArrayList<Pair<Topic, Topic>> result = new ArrayList<Pair<Topic,Topic>>();
+ for (Pair<Topic, Topic> roleAndPlayerType : roleTypesOfTopicRoleConstraints) {
+ if(roleTypesOfAssociationRoleConstraints.contains(roleAndPlayerType.getFirst())) result.add(roleAndPlayerType);
}
- return Utils.union(roleTypesOfAssociationRoleConstraints, roleTypesOfTopicRoleConstraints);
+ this.roleAndPlayerTypes = result;
+ return this.roleAndPlayerTypes;
}
}
@@ -130,10 +135,76 @@
}
+ // returns all associations of the received topicthat have a
+ // correct type determined by this association-view
+ private ArrayList<Association> filterAssociationsByType() throws InvalidGdlSchemaException {
+ ArrayList<Association> allAssociations = new ArrayList<Association>();
+ if(this.receivedData != null)
+ for(int i = 0; i != ((Topic)this.receivedData).getRolesPlayed().length(); ++i)
+ allAssociations.add(((Topic)this.receivedData).getRolesPlayed().get(i).getParent());
+
+ // collect only the associations that match the correct association type
+ ArrayList<Association> filteredAssociationsByType = new ArrayList<Association>();
+ for (Association assoc : allAssociations)
+ if(assoc.getType().equals(this.getAssociationType())) filteredAssociationsByType.add(assoc);
+
+ return filteredAssociationsByType;
+ }
+
+
+ // returns all associations contained in the ArrayList allAssociations
+ // that have the only permitted role types
+ private ArrayList<Association> filterAssociationsByRoleAndPlayerTypes(ArrayList<Association> allAssociations) throws InvalidGdlSchemaException {
+ if(allAssociations == null) return new ArrayList<Association>();
+
+ ArrayList<Association> filteredAssociationsByAssociationRoleConstraints = new ArrayList<Association>();
+ for (Association assoc : allAssociations){
+ JsArray<Role> roles = assoc.getRoles();
+ int i = 0;
+ for( ; i != roles.length(); ++i){
+ Topic rt = roles.get(i).getType();
+ Topic rp = roles.get(i).getPlayer();
+
+ int j = 0;
+ for( ; j != this.getRoleAndPlayerTypes().size(); ++j){
+ Pair<Topic, Topic> pair = this.getRoleAndPlayerTypes().get(j);
+ if(pair.getFirst().equals(rt) && TmHelper.isInstanceOf(rp, pair.getSecond())) break;
+ }
+
+ if(j == this.getRoleAndPlayerTypes().size()) break;
+ }
+
+ if(i == roles.length())filteredAssociationsByAssociationRoleConstraints.add(assoc);
+ }
+
+ return filteredAssociationsByAssociationRoleConstraints;
+ }
+
- public ArrayList<Association> filterAssociations(){
- // TODO: implement => returns an array with associations that
- // must be represetned by this association view
+ // returns all associations contained in the ArrayList allAssociations
+ // that are valid to the role-combination-constraints that belongs to this view
+ private ArrayList<Association> filterAssociationsByRoleCombinations(ArrayList<Association> allAssociations) throws InvalidGdlSchemaException {
+ // TODO: implement
return null;
}
+
+
+ // returns an array with associations that
+ // must be represented by this association view
+ private ArrayList<Association> filterAssociations() throws InvalidGdlSchemaException {
+ ArrayList<Association> filteredAssociations = this.filterAssociationsByType();
+ filteredAssociations = filterAssociationsByRoleAndPlayerTypes(filteredAssociations);
+ filteredAssociations = filterAssociationsByRoleCombinations(filteredAssociations);
+
+ this.associationsToRepresent = filteredAssociations;
+ this.associationsToRepresentSet = true;
+ return this.associationsToRepresent;
+ }
+
+
+ // Returns the associations that are represented by this associaton-view
+ public ArrayList<Association> getAssociationsToRepresent() throws InvalidGdlSchemaException {
+ if(this.associationsToRepresentSet) return this.associationsToRepresent;
+ else return this.filterAssociations();
+ }
}
1
0
[isidorus-cvs] r772 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 09:00:17 2011
New Revision: 772
Log:
gdl-frontend: Widgets: fixed a bug in the test data
Modified:
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/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 Mon Aug 22 07:26:37 2011 (r771)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Mon Aug 22 09:00:17 2011 (r772)
@@ -3889,7 +3889,7 @@
}
],
"associations":[{"item_identifiers":null,
- "type":"si:[pref_4:has-hash]",
+ "type":"si:[pref_4:has-environment]",
"reifier":null,
"scope":null,
"roles":[{
@@ -3907,7 +3907,7 @@
]
},
{"item_identifiers":null,
- "type":"si:[pref_4:has-hash]",
+ "type":"si:[pref_4:has-environment]",
"reifier":null,
"scope":null,
"roles":[{
1
0
[isidorus-cvs] r771 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base view
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 07:26:37 2011
New Revision: 771
Log:
gdl-frontend: Widgets: implemented some helpers to comsume associations by GdlAssociationView instances
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
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/Utils.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 22 06:51:31 2011 (r770)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 22 07:26:37 2011 (r771)
@@ -21,7 +21,7 @@
public final static String tmclNameType = tmcl + "name-type";
public final static String tmclOccurrenceType = tmcl + "occurrence-type";
public final static String tmclAssociationType = tmcl + "association-type";
- public final static String tmclRoleType = "tmcl" + "role-type";
+ public final static String tmclRoleType = tmcl + "role-type";
public final static String tmclConstraint = tmcl + "constraint";
public final static String tmclConstrained = tmcl + "constrained";
public final static String tmclConstrainedStatement = tmcl + "constrained-statement";
@@ -45,6 +45,7 @@
public final static String tmclItemIdentifierConstraint = tmcl + "item-identifier-constraint";
public final static String tmclConstrainedTopicType = tmcl + "constrained-topic-type";
public final static String tmclConstrainedRole = tmcl + "constrained-role";
+ public final static String tmclRoleCombinationConstraint = tmcl + "role-combination-constraint";
}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 22 06:51:31 2011 (r770)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 22 07:26:37 2011 (r771)
@@ -27,22 +27,22 @@
mainPanel.setBorderWidth(1);
mainPanel.setPixelSize(1000, 600);
- ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
- requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier));
+ //ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
+ //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier));
//Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-env", TopicIdentifierTypes.SubjectIdentifier);
//Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-hash", TopicIdentifierTypes.SubjectIdentifier);
- //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier);
+ Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier);
GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
Window.alert("you clicked " + ((Button)event.getSource()).getText());
}
});
- gdlPanel = new GdlPanel(null, requestedTopicsToCreate);
+ gdlPanel = new GdlPanel(requestedTopicToEdit, null);
mainPanel.add(gdlPanel);
gdlPanel.setTmEngine(new JtmsTmEngine());
gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback());
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 Mon Aug 22 06:51:31 2011 (r770)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 22 07:26:37 2011 (r771)
@@ -10,7 +10,6 @@
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap;
-import us.isidor.gdl.anaToMia.Widgets.base.PSIs.TMDM;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException;
import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
@@ -167,9 +166,9 @@
ArrayList<Topic> result = new ArrayList<Topic>();
if(top == null) return result;
TopicMap tm = top.getTopicMap();
- Topic subtype = getTopicByPsi(TMDM.subtype, tm);
- Topic supertype = getTopicByPsi(TMDM.supertype, tm);
- Topic supertypeSubtype = getTopicByPsi(TMDM.supertypeSubtype, tm);
+ Topic subtype = getTopicByPsi(PSIs.TMDM.subtype, tm);
+ Topic supertype = getTopicByPsi(PSIs.TMDM.supertype, tm);
+ Topic supertypeSubtype = getTopicByPsi(PSIs.TMDM.supertypeSubtype, tm);
if(subtype == null || supertype == null || supertypeSubtype == null) return result;
@@ -633,6 +632,22 @@
}
+ // returns the constrained role-types of the passed constraint
+ public static Topic getConstraintRolesOfConstraint(Topic topicRoleOrAssociationRoleConstraint) throws InvalidGdlSchemaException {
+ if(topicRoleOrAssociationRoleConstraint == null) return null;
+
+ TopicMap tm = topicRoleOrAssociationRoleConstraint.getTopicMap();
+ Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm);
+ Topic constrainedRoleAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedRole, tm);
+ Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm);
+ Topic roleType = getTopicByPsi(PSIs.TMCL.tmclRoleType, tm);
+ ArrayList<Topic> result = getOtherPlayerOfBinaryAssociation(topicRoleOrAssociationRoleConstraint, constraintRoleType, constrainedRoleAssocType, null, roleType, constrainedRoleType);
+
+ if(result.size() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(topicRoleOrAssociationRoleConstraint) + " must be bound exactly once to a role-type via a " + PSIs.TMCL.tmclConstrainedRole + " association, but is bound: " + result.size());
+ else return result.get(0);
+ }
+
+
// returns the topic that plays the role of tmcl:constrained in an association
// of the type tmcl:constrained-statement that is bound to the passed topic
// constrinatTopic that plays the role of tmcl:constraint
@@ -649,13 +664,59 @@
ArrayList<Topic> constrainedNameTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constrainedStatementAssocType, null, nameType, constrainedRoleType);
ArrayList<Topic> constrainedOccurrenceTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constrainedStatementAssocType, null, occurrenceType, constrainedRoleType);
ArrayList<Topic> constrainedAssociationTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constrainedStatementAssocType, null, associationType, constrainedRoleType);
-
- ArrayList<Topic> constrainedStatements = Utils.merge(Utils.merge(constrainedNameTypes, constrainedOccurrenceTypes), constrainedAssociationTypes);
+ ArrayList<Topic> constrainedStatements = Utils.merge(Utils.merge(constrainedNameTypes, constrainedOccurrenceTypes), constrainedAssociationTypes);
if(constrainedStatements.size() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(constraintTopic) + " must be bound exactly once to a statement topic via a " + PSIs.TMCL.tmclConstrainedStatement + " association, but is: " + constrainedStatements.size());
else return constrainedStatements.get(0);
}
+
+ // Returns the role-combination-constraints for the passed association-type
+ public static ArrayList<Topic> getRoleCombinationConstraints(Topic associationType){
+ if(associationType == null) return new ArrayList<Topic>();
+
+ TopicMap tm = associationType.getTopicMap();
+ Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm);
+ Topic constrainedStatementAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedStatement, tm);
+ Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm);
+ Topic roleCombinationConstraintType = getTopicByPsi(PSIs.TMCL.tmclRoleCombinationConstraint, tm);
+ return getOtherPlayerOfBinaryAssociation(associationType, constrainedRoleType, constrainedStatementAssocType, null, roleCombinationConstraintType, constraintRoleType);
+ }
+
+
+ // Returns the tmcl:association-role-constraints that are bound to the passed topic, that is
+ // the Topic Maps representative of an gdl:association-view
+ public static ArrayList<Topic> getAssociationRoleConstraintsForView(Topic viewRepresentative) throws InvalidGdlSchemaException {
+ if(viewRepresentative == null) new ArrayList<Topic>();
+
+ TopicMap tm = viewRepresentative.getTopicMap();
+ Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm);
+ Topic associationViewBindingAssocType = getTopicByPsi(PSIs.AssociationType.gdlAssociationViewBinding, tm);
+ Topic tmConstructRoleType = getTopicByPsi(PSIs.RoleType.gdlTmConstruct, tm);
+ Topic associationRoleConstraintType = getTopicByPsi(PSIs.TMCL.tmclAssociationRoleConstraint, tm);
+ ArrayList<Topic> result = getOtherPlayerOfBinaryAssociation(viewRepresentative, descriptorRoleType, associationViewBindingAssocType, null, associationRoleConstraintType, tmConstructRoleType);
+
+ if(result.size() == 0) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(viewRepresentative) + " must be bound to at least one " + PSIs.TMCL.tmclAssociationRoleConstraint + ", but is unbound");
+ else return result;
+ }
+
+
+ // Returns the tmcl:topic-role-constraints that are bound to the passed topic, that is
+ // the Topic Maps representative of an gdl:association-view
+ public static ArrayList<Topic> getTopicRoleConstraintsForView(Topic viewRepresentative) throws InvalidGdlSchemaException {
+ if(viewRepresentative == null) new ArrayList<Topic>();
+
+ TopicMap tm = viewRepresentative.getTopicMap();
+ Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm);
+ Topic associationViewBindingAssocType = getTopicByPsi(PSIs.AssociationType.gdlAssociationViewBinding, tm);
+ Topic tmConstructRoleType = getTopicByPsi(PSIs.RoleType.gdlTmConstruct, tm);
+ Topic topicRoleConstraintType = getTopicByPsi(PSIs.TMCL.tmclTopicRoleConstraint, tm);
+ ArrayList<Topic> result = getOtherPlayerOfBinaryAssociation(viewRepresentative, descriptorRoleType, associationViewBindingAssocType, null, topicRoleConstraintType, tmConstructRoleType);
+
+ if(result.size() == 0) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(viewRepresentative) + " must be bound to at least one " + PSIs.TMCL.tmclTopicRoleConstraint + ", but is unbound");
+ else return result;
+ }
+
// returns the root constraint of a gdl:Value-Group instance, i.e. a tmcl constraint.
// E.g. a value group may be bound to a gdl:Type constraint and this constraint may be bound
@@ -914,6 +975,35 @@
}
+ // Returns all tmcl:topic-role-constraint that the types of this topic
+ // are bound to
+ public static ArrayList<Topic> getTopicRoleConstraintsForTopicInstance(Topic topicInstance){
+ ArrayList<Topic> result = new ArrayList<Topic>();
+ if(topicInstance == null) return result;
+
+ JsArray<Topic> topicTypes = topicInstance.getTypes();
+ for(int i = 0; i != topicTypes.length(); ++i){
+ ArrayList<Topic> resultForType = getTopicRoleConstraintsForTopicType(topicTypes.get(i));
+ result = Utils.merge(result, resultForType);
+ }
+
+ return result;
+ }
+
+
+ // Returns all tmcl:topic-role-constraints the the passed topic is bound to
+ public static ArrayList<Topic> getTopicRoleConstraintsForTopicType(Topic topicType){
+ if(topicType == null) return new ArrayList<Topic>();
+
+ TopicMap tm = topicType.getTopicMap();
+ Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm);
+ Topic constrainedTopicTypeAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedTopicType, tm);
+ Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm);
+ Topic topicRoleConstraintType = getTopicByPsi(PSIs.TMCL.tmclTopicRoleConstraint, tm);
+ return getOtherPlayerOfBinaryAssociation(topicType, constrainedRoleType, constrainedTopicTypeAssocType, null, topicRoleConstraintType, constraintRoleType);
+ }
+
+
// return the occurrence of the passed type, if the topic contains more than one such occurrences,
// this function throws a InvalidgdlSchemaException
public static Occurrence getSingleOccurrence(Topic topic, Topic occurrenceType) throws InvalidGdlSchemaException {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Mon Aug 22 06:51:31 2011 (r770)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Mon Aug 22 07:26:37 2011 (r771)
@@ -21,6 +21,17 @@
return true;
}
+
+
+ // returns a list that contains a union of both lists
+ public static <T> ArrayList<T> union(ArrayList<T> fst, ArrayList<T> snd){
+ ArrayList<T> result = new ArrayList<T>();
+ if(fst == null || snd == null) return result;
+
+ for (T t : fst) if(snd.contains(t)) result.add(t);
+
+ return result;
+ }
// returns an ArrayList that is a merged ArrayList of fst and snd
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 22 06:51:31 2011 (r770)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 22 07:26:37 2011 (r771)
@@ -2,40 +2,138 @@
import java.util.ArrayList;
+import com.google.gwt.user.client.Window;
+
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
+import us.isidor.gdl.anaToMia.Widgets.base.PSIs;
+import us.isidor.gdl.anaToMia.Widgets.base.TmHelper;
+import us.isidor.gdl.anaToMia.Widgets.base.Utils;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException;
public abstract class GdlAssociationView extends GdlView {
protected ArrayList<Association> associationsToRepresent = null;
+ private ArrayList<Topic> associationRoleConstraints = new ArrayList<Topic>();
+ private boolean associationRoleconstraintsSet = false;
+ private ArrayList<Topic> topicRoleConstraints = new ArrayList<Topic>();
+ private boolean topicRoleConstraintsSet = false;
+ private Topic associationType = null;
+ private boolean associationTypeSet = false;
+ private ArrayList<Topic> roleTypes = new ArrayList<Topic>();
+ private boolean roleTypesSet = false;
+ private ArrayList<Topic> roleCombinationConstraints = new ArrayList<Topic>();
+ private boolean roleCombinationConstraintsSet = false;
+
public GdlAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
- super(tmRepresentative, null);
- // TODO: set the associationsToRepresent array by using
- // the associations the passed topic is a player of
- // and the constraints that are bound to this element's
- // value-group instance
+ super(tmRepresentative, receivedData);
+ Window.alert("constraints: " +this.getRoleTypes().size() + " >> " + (this instanceof GdlEditorAssociationView));
+
+ if(this instanceof GdlEditorAssociationView) this.associationsToRepresent = this.filterAssociations();
}
- // return the association-type that this element is bound to through the
- // set association-role- and topic-role- constraints
- public Topic getAssociationType() throws InvalidGdlSchemaException {
- // TODO: implement
- return null;
+ // Return the association-role-constraints this view is bound to
+ public ArrayList<Topic> getAssociationRoleConstraints() throws InvalidGdlSchemaException {
+ if(this.associationRoleconstraintsSet){
+ return this.associationRoleConstraints;
+ } else {
+ this.associationRoleconstraintsSet = true;
+ this.associationRoleConstraints = TmHelper.getAssociationRoleConstraintsForView(this.tmRepresentative);
+ return this.associationRoleConstraints;
+ }
}
- public ArrayList<Topic> getAssociationRoleConstraints(){
- // TODO: implement
- return null;
+ // Return the topic-role-constraints this view is bound to
+ public ArrayList<Topic> getTopicRoleConstraints() throws InvalidGdlSchemaException {
+ if(this.topicRoleConstraintsSet){
+ return this.topicRoleConstraints;
+ } else {
+ this.topicRoleConstraintsSet = true;
+ this.topicRoleConstraints = TmHelper.getTopicRoleConstraintsForView(this.tmRepresentative);
+ return this.topicRoleConstraints;
+ }
+ }
+
+
+ // Returns the role-combination-constraints of the association-
+ // type that is bound to this association-view via the bound
+ // constraints
+ public ArrayList<Topic> getRoleCombinationConstraints() throws InvalidGdlSchemaException {
+ if(this.roleCombinationConstraintsSet){
+ return this.roleCombinationConstraints;
+ } else {
+ this.roleCombinationConstraintsSet = true;
+ this.roleCombinationConstraints = TmHelper.getRoleCombinationConstraints(this.getAssociationType());
+ return this.roleCombinationConstraints;
+ }
}
- public ArrayList<Topic> getTopicRoleConstraints(){
- // TODO: implement
+ // returns the role-types that are valid to be used
+ // in associations of the type that is bound to this view
+ public ArrayList<Topic> getRoleTypes() throws InvalidGdlSchemaException {
+ if(this.roleTypesSet){
+ return this.roleTypes;
+ } else {
+ this.roleTypesSet = true;
+ ArrayList<Topic> roleTypesOfAssociationRoleConstraints = new ArrayList<Topic>();
+ for (Topic constraint : this.getAssociationRoleConstraints()){
+ Topic top = TmHelper.getConstraintRolesOfConstraint(constraint);
+ if(!roleTypesOfAssociationRoleConstraints.contains(top)) roleTypesOfAssociationRoleConstraints.add(top);
+ }
+
+ ArrayList<Topic> roleTypesOfTopicRoleConstraints = new ArrayList<Topic>();
+ for (Topic constraint : this.getTopicRoleConstraints()){
+ Topic top = TmHelper.getConstraintRolesOfConstraint(constraint);
+ if(!roleTypesOfTopicRoleConstraints.contains(top)) roleTypesOfTopicRoleConstraints.add(top);
+ }
+
+ return Utils.union(roleTypesOfAssociationRoleConstraints, roleTypesOfTopicRoleConstraints);
+ }
+ }
+
+
+ // returns the association type that is valid with respect to the
+ // topic- and the association-role-constraints that are bound to this view
+ public Topic getAssociationType() throws InvalidGdlSchemaException {
+ if(this.associationTypeSet){
+ return this.associationType;
+ } else {
+ this.associationTypeSet = true;
+ ArrayList<Topic> assocTypes = new ArrayList<Topic>();
+ for (Topic constraint : this.getAssociationRoleConstraints()){
+ Topic top = TmHelper.getConstrainedStatement(constraint);
+ if(!assocTypes.contains(top)) assocTypes.add(top);
+ }
+
+ for (Topic constraint : this.getTopicRoleConstraints()){
+ Topic top = TmHelper.getConstrainedStatement(constraint);
+ if(!assocTypes.contains(top)) assocTypes.add(top);
+ }
+
+ if(assocTypes.size() != 1){
+ String bindings = "[";
+ for (Topic topic : assocTypes)
+ bindings += TmHelper.getAnyIdOfTopic(topic) + ", ";
+ if(bindings.length() == 1) bindings = "[ ]";
+ else bindings = bindings.substring(0, bindings.length() - 2) + "]";
+ throw new InvalidGdlSchemaException("the association-view " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to topic-role-constraints and association-rle-constraints that own the same constrained-statement, but found the constrained-statements: " + bindings);
+ }
+
+ this.associationType = assocTypes.get(0);
+ return this.associationType;
+ }
+ }
+
+
+
+ public ArrayList<Association> filterAssociations(){
+ // TODO: implement => returns an array with associations that
+ // must be represetned by this association view
return null;
}
}
1
0
[isidorus-cvs] r770 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 06:51:31 2011
New Revision: 770
Log:
gdl-frontend: Widgets: fixed a bug in the tmcl:association-type PSI
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 22 06:29:32 2011 (r769)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 22 06:51:31 2011 (r770)
@@ -20,7 +20,8 @@
public final static String tmclTopictype = tmcl + "topic-type";
public final static String tmclNameType = tmcl + "name-type";
public final static String tmclOccurrenceType = tmcl + "occurrence-type";
- public final static String tmclAssociationType = "tmcl" + "association-type";
+ public final static String tmclAssociationType = tmcl + "association-type";
+ public final static String tmclRoleType = "tmcl" + "role-type";
public final static String tmclConstraint = tmcl + "constraint";
public final static String tmclConstrained = tmcl + "constrained";
public final static String tmclConstrainedStatement = tmcl + "constrained-statement";
@@ -42,6 +43,8 @@
public final static String tmclSubjectIdentifierConstraint = tmcl + "subject-identifier-constraint";
public final static String tmclSubjectLocatorConstraint = tmcl + "subject-locator-constraint";
public final static String tmclItemIdentifierConstraint = tmcl + "item-identifier-constraint";
+ public final static String tmclConstrainedTopicType = tmcl + "constrained-topic-type";
+ public final static String tmclConstrainedRole = tmcl + "constrained-role";
}
1
0
[isidorus-cvs] r769 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 06:29:32 2011
New Revision: 769
Log:
gdl-frontend: Widgets: fixed a bug in the binding of the editor-association-view
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_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm
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_with_test_data.jtm
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 Mon Aug 22 04:06:48 2011 (r768)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Mon Aug 22 06:29:32 2011 (r769)
@@ -166,10 +166,10 @@
{"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:has-environment-editor-association-view]"}]},
{"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-environment-editor-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-environment-editor-association-view]"}]},
- {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]},
- {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]},
- {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]},
- {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-environment-editor-association-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-environment-editor-association-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-environment-editor-association-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-environment-editor-association-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]},
{"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-environment-editor-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
{"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-environment-editor-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
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 Mon Aug 22 04:06:48 2011 (r768)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Mon Aug 22 06:29:32 2011 (r769)
@@ -8602,7 +8602,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8621,7 +8621,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8640,7 +8640,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8659,7 +8659,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
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 Mon Aug 22 04:06:48 2011 (r768)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Mon Aug 22 06:29:32 2011 (r769)
@@ -4899,7 +4899,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4918,7 +4918,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4937,7 +4937,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4956,7 +4956,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
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 Mon Aug 22 04:06:48 2011 (r768)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Mon Aug 22 06:29:32 2011 (r769)
@@ -4955,7 +4955,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4974,7 +4974,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4993,7 +4993,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -5012,7 +5012,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
1
0
[isidorus-cvs] r768 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 22 Aug '11
by lgiessmann＠common-lisp.net 22 Aug '11
22 Aug '11
Author: lgiessmann
Date: Mon Aug 22 04:06:48 2011
New Revision: 768
Log:
gdl-frontend: Widgets: fixed a bug in the "key-label" position and width in the GDL-Schema for the TextGrid-ServiceRegisty
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_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm
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_with_test_data.jtm
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 Fri Aug 19 14:21:44 2011 (r767)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Mon Aug 22 04:06:48 2011 (r768)
@@ -109,8 +109,8 @@
{"subject_identifiers":["[tgg:hash-object-editor-text-env-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
{"subject_identifiers":["[tgg:hash-object-has-environment-environment-role-player]"], "instance_of":["si:[gdlt:Role-Player]"]},
- {"subject_identifiers":["[tgg:hash-object-editor-text-label-key]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_key_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"40px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]},
- {"subject_identifiers":["[tgg:hash-object-editor-text-label-key-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"100px"}, {"type":"si:[gdl:left]", "value":"10px"}]},
+ {"subject_identifiers":["[tgg:hash-object-editor-text-label-key]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_key_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"1000px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]},
+ {"subject_identifiers":["[tgg:hash-object-editor-text-label-key-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"40px"}, {"type":"si:[gdl:left]", "value":"10px"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-label-key-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
{"subject_identifiers":["[tgg:hash-object-editor-text-label-key-value]"], "instance_of":["si:[gdlt:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"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 Fri Aug 19 14:21:44 2011 (r767)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Mon Aug 22 04:06:48 2011 (r768)
@@ -2899,7 +2899,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"100px",
+ "value":"40px",
"scope":null,
"reifier":null
},
@@ -2941,7 +2941,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
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 Fri Aug 19 14:21:44 2011 (r767)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Mon Aug 22 04:06:48 2011 (r768)
@@ -1115,7 +1115,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"100px",
+ "value":"40px",
"scope":null,
"reifier":null
},
@@ -1157,7 +1157,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
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 Fri Aug 19 14:21:44 2011 (r767)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Mon Aug 22 04:06:48 2011 (r768)
@@ -1135,7 +1135,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"100px",
+ "value":"40px",
"scope":null,
"reifier":null
},
@@ -1177,7 +1177,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
1
0
[isidorus-cvs] r767 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view
by lgiessmann＠common-lisp.net 19 Aug '11
by lgiessmann＠common-lisp.net 19 Aug '11
19 Aug '11
Author: lgiessmann
Date: Fri Aug 19 14:21:44 2011
New Revision: 767
Log:
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 19 13:21:58 2011 (r766)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 19 14:21:44 2011 (r767)
@@ -13,9 +13,11 @@
public GdlAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
super(tmRepresentative, null);
- // TODO Auto-generated constructor stub
+ // TODO: set the associationsToRepresent array by using
+ // the associations the passed topic is a player of
+ // and the constraints that are bound to this element's
+ // value-group instance
}
- // TODO: implement
// return the association-type that this element is bound to through the
1
0
[isidorus-cvs] r766 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/isidorus war/gdl_widgets
by lgiessmann＠common-lisp.net 19 Aug '11
by lgiessmann＠common-lisp.net 19 Aug '11
19 Aug '11
Author: lgiessmann
Date: Fri Aug 19 13:21:58 2011
New Revision: 766
Log:
gdl-frontend: Widgets: updated the full GDL and TMCL-Schemas for the TextGrid ServiceRegistry
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java
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/isidorus/LoadSchemaCallback.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Fri Aug 19 13:21:58 2011 (r766)
@@ -23,7 +23,7 @@
// this class can be used as a callback that requests the Topic Map data
// addressable by the URI isidorusUrl
public class LoadSchemaCallback implements ILoadSchemaCallback{
- private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_GDL_Create_HashObject.jtm");//"TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"); // TODO: replace with the correct URL
+ private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm");//"TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"); // TODO: replace with the correct URL
private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null;
private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl);
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 Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Fri Aug 19 13:21:58 2011 (r766)
@@ -1911,7 +1911,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"50px",
+ "value":"70px",
"scope":null,
"reifier":null
}
@@ -2049,7 +2049,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"60px",
"scope":null,
"reifier":null
},
@@ -2109,7 +2109,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"320px",
"scope":null,
"reifier":null
},
@@ -2245,7 +2245,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"50px",
+ "value":"70px",
"scope":null,
"reifier":null
}
@@ -2383,7 +2383,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"60px",
"scope":null,
"reifier":null
},
@@ -2443,7 +2443,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"320px",
"scope":null,
"reifier":null
},
@@ -2589,7 +2589,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -2735,7 +2735,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -2795,7 +2795,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -2899,7 +2899,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -3042,17 +3042,7 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environment-editor-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -3079,14 +3069,14 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:has-hash-editor-association-view]"
+ "subject_identifiers":["[pref_1:has-environment-editor-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -3094,7 +3084,7 @@
],
"names":[{
"item_identifiers":null,
- "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
+ "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
"type":"si:[pref_3:view-name]",
"scope":null,
"variants":null,
@@ -3105,7 +3095,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "value":"has_environment_editor_association_view_id",
"scope":null,
"reifier":null
},
@@ -3209,7 +3199,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -3269,7 +3259,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"360px",
"scope":null,
"reifier":null
},
@@ -3536,7 +3526,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -3682,7 +3672,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -3742,7 +3732,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -3888,7 +3878,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -3911,6 +3901,16 @@
]
},
{
+ "subject_identifiers":["[pref_1:hash-object-has-environment-environment-role-player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Role-Player]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_1:hash-object-creator-text-list-box-env-value-group]"
],
"subject_locators":null,
@@ -3989,7 +3989,25 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-value-group]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Default-Literal-Value]"
+ ],
+ "names":null,
+ "occurrences":[{
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:literal-value]",
+ "value":"environment:",
+ "scope":null,
+ "reifier":null
+ }
+ ]
+ },
+ {
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -3999,7 +4017,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -4026,33 +4044,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"10px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:has-hash-creator-association-view]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Creator-Association-View]"
+ "instance_of":["si:[pref_2:Text]"
],
- "names":[{
+ "names":null,
+ "occurrences":[{
"item_identifiers":null,
- "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
- "type":"si:[pref_3:view-name]",
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:id]",
+ "value":"hash_object_text_label_env_id",
"scope":null,
- "variants":null,
"reifier":null
- }
- ],
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "type":"si:[pref_3:readonly]",
+ "value":"true",
"scope":null,
"reifier":null
},
@@ -4060,42 +4078,30 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"230px",
+ "value":"100px",
"scope":null,
"reifier":null
- }
- ]
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Default-Literal-Value]"
- ],
- "names":null,
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:literal-value]",
- "value":"environment:",
+ "type":"si:[pref_3:background-color]",
+ "value":"gray",
+ "scope":null,
+ "reifier":null
+ },
+ {
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:border-style]",
+ "value":"none",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environement-creator-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -4122,33 +4128,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"10px",
+ "value":"120px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
+ "subject_identifiers":["[pref_1:has-environment-creator-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Text]"
+ "instance_of":["si:[pref_2:Creator-Association-View]"
],
- "names":null,
- "occurrences":[{
+ "names":[{
"item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"hash_object_text_label_env_id",
+ "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
+ "type":"si:[pref_3:view-name]",
"scope":null,
+ "variants":null,
"reifier":null
- },
- {
+ }
+ ],
+ "occurrences":[{
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:readonly]",
- "value":"true",
+ "type":"si:[pref_3:id]",
+ "value":"has_environment_createor_association_view_id",
"scope":null,
"reifier":null
},
@@ -4156,23 +4162,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:background-color]",
- "value":"gray",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:border-style]",
- "value":"none",
+ "value":"230px",
"scope":null,
"reifier":null
}
@@ -4216,7 +4206,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"360px",
"scope":null,
"reifier":null
},
@@ -4490,8 +4480,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_2:Default-Topic-View]",
- "[pref_2:Default-Topic-View]"
+ "subject_identifiers":["[pref_2:Default-Topic-View]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -4597,6 +4586,15 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_2:Role-Player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":null,
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_2:Descriptor]"
],
"subject_locators":null,
@@ -4757,6 +4755,16 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_3:association-view-binding]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_7:association-type]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_3:topic-view-binding]"
],
"subject_locators":null,
@@ -5297,8 +5305,7 @@
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_7:role-type]",
- "si:[pref_4:hash]"
+ "instance_of":["si:[pref_7:role-type]"
],
"names":null,
"occurrences":null
@@ -5328,8 +5335,7 @@
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_7:association-type]",
- "si:[pref_4:has-hash]"
+ "instance_of":["si:[pref_7:association-type]"
],
"names":null,
"occurrences":null
@@ -5389,8 +5395,7 @@
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_7:topic-type]",
- "si:[pref_5:Hash-Object]"
+ "instance_of":["si:[pref_7:topic-type]"
],
"names":null,
"occurrences":null
@@ -5591,8 +5596,7 @@
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_7:occurrence-type]",
- "si:[pref_7:card-min]"
+ "instance_of":["si:[pref_7:occurrence-type]"
],
"names":null,
"occurrences":null
@@ -8434,7 +8438,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-editor-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-editor-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -8453,7 +8457,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-editor-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-editor-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -8478,7 +8482,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8509,6 +8513,25 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -8541,7 +8564,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8560,7 +8583,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -8572,20 +8595,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-editor-association-view-value-group]"
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -8598,7 +8678,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environment-editor-association-view-position]"
},
{
"item_identifiers":null,
@@ -8610,7 +8690,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -8629,7 +8709,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -9254,7 +9334,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -9285,6 +9365,63 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -9317,7 +9454,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -9336,7 +9473,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -9348,20 +9485,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-creator-association-view-value-group]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -9374,7 +9568,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environement-creator-association-view-position]"
},
{
"item_identifiers":null,
@@ -9386,7 +9580,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -9405,7 +9599,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -9754,18 +9948,6 @@
"type":"si:[pref_6:subtype]",
"reifier":null,
"player":"si:[pref_2:TM-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:supertype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Single-Type-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:subtype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Value]"
}
]
},
@@ -9942,6 +10124,25 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_6:supertype-subtype]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_6:supertype]",
+ "reifier":null,
+ "player":"si:[pref_2:Descriptor]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_6:subtype]",
+ "reifier":null,
+ "player":"si:[pref_2:Role-Player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_7:constrained-role]",
"reifier":null,
"scope":null,
@@ -10760,4 +10961,4 @@
],
"item_type":"topicmap",
"reifier":null
-}
\ No newline at end of file
+}
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 Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm Fri Aug 19 13:21:58 2011 (r766)
@@ -40,7 +40,6 @@
<t:subjectIdentifier href="http://psi.topicmaps.org/tmcl/card-min" />
<t:instanceOf>
<t:topicRef href="#t246" />
- <t:topicRef href="#t261" />
</t:instanceOf>
</t:topic>
@@ -182,7 +181,6 @@
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/types/Hash-Object" />
<t:instanceOf>
<t:topicRef href="#t236" />
- <t:topicRef href="#t361" />
</t:instanceOf>
</t:topic>
@@ -225,7 +223,6 @@
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-hash" />
<t:instanceOf>
<t:topicRef href="#t256" />
- <t:topicRef href="#t391" />
</t:instanceOf>
</t:topic>
@@ -247,7 +244,6 @@
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/hash" />
<t:instanceOf>
<t:topicRef href="#t251" />
- <t:topicRef href="#t406" />
</t:instanceOf>
</t:topic>
@@ -642,2340 +638,2343 @@
</t:topic>
<t:topic id="t2611">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/association-view-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2616">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/view-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2621">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/value-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/view-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2626">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/position" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/value-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2631">
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/position" />
+ <t:instanceOf>
+ <t:topicRef href="#t256" />
+ </t:instanceOf>
+ </t:topic>
+
+ <t:topic id="t2636">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/container" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2636">
+ <t:topic id="t2641">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/containee" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2641">
+ <t:topic id="t2646">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-value" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2646">
+ <t:topic id="t2651">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-construct" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2651">
+ <t:topic id="t2656">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/descriptor" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2656">
+ <t:topic id="t2661">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/value-group" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2661">
+ <t:topic id="t2666">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/value" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2666">
+ <t:topic id="t2671">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/ancestor" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2671">
+ <t:topic id="t2676">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/descendant" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2676">
+ <t:topic id="t2681">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Schema" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2681">
+ <t:topic id="t2686">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/schema-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2686">
+ <t:topic id="t2691">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Descriptor" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2691">
+ <t:topic id="t2696">
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Role-Player" />
+ </t:topic>
+
+ <t:topic id="t2701">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Visible-Object" />
</t:topic>
- <t:topic id="t2696">
+ <t:topic id="t2706">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/width" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2701">
+ <t:topic id="t2711">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/height" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2706">
+ <t:topic id="t2716">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/pointer" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2711">
+ <t:topic id="t2721">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/border-style" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2716">
+ <t:topic id="t2726">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/background-color" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2721">
+ <t:topic id="t2731">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/id" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2726">
+ <t:topic id="t2736">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/View" />
</t:topic>
- <t:topic id="t2731">
+ <t:topic id="t2741">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/view-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2736">
+ <t:topic id="t2746">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Topic-View" />
</t:topic>
- <t:topic id="t2741">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Topic-View" />
+ <t:topic id="t2751">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Topic-View" />
</t:topic>
- <t:topic id="t2746">
+ <t:topic id="t2756">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Creator-Topic-View" />
</t:topic>
- <t:topic id="t2751">
+ <t:topic id="t2761">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Association-View" />
</t:topic>
- <t:topic id="t2756">
+ <t:topic id="t2766">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Creator-Association-View" />
</t:topic>
- <t:topic id="t2761">
+ <t:topic id="t2771">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Value" />
</t:topic>
- <t:topic id="t2766">
+ <t:topic id="t2776">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/TM-Value" />
</t:topic>
- <t:topic id="t2771">
+ <t:topic id="t2781">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/TM-Single-Type-Value" />
</t:topic>
- <t:topic id="t2776">
+ <t:topic id="t2786">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Literal-Value" />
</t:topic>
- <t:topic id="t2781">
+ <t:topic id="t2791">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/literal-value" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2786">
+ <t:topic id="t2796">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Value" />
</t:topic>
- <t:topic id="t2791">
+ <t:topic id="t2801">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/fixed" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2796">
+ <t:topic id="t2806">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Literal-Value" />
</t:topic>
- <t:topic id="t2801">
+ <t:topic id="t2811">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Text-Object" />
</t:topic>
- <t:topic id="t2806">
+ <t:topic id="t2816">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/List-Box" />
</t:topic>
- <t:topic id="t2811">
+ <t:topic id="t2821">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Text" />
</t:topic>
- <t:topic id="t2816">
+ <t:topic id="t2826">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/readonly" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2821">
+ <t:topic id="t2831">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/font-size" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2826">
+ <t:topic id="t2836">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Position" />
</t:topic>
- <t:topic id="t2831">
+ <t:topic id="t2841">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/position-style" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2836">
+ <t:topic id="t2846">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/top" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2841">
+ <t:topic id="t2851">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/left" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2846">
+ <t:topic id="t2856">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/right" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2851">
+ <t:topic id="t2861">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Value-Group" />
</t:topic>
- <t:topic id="t2856">
+ <t:topic id="t2866">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Button" />
</t:topic>
- <t:topic id="t2861">
+ <t:topic id="t2871">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Action-Button" />
</t:topic>
- <t:topic id="t2866">
+ <t:topic id="t2876">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Commit-Button" />
</t:topic>
- <t:topic id="t2871">
+ <t:topic id="t2881">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/textgrid-ui-schema" />
<t:instanceOf>
- <t:topicRef href="#t2676" />
+ <t:topicRef href="#t2681" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2681" />
+ <t:topicRef href="#t2686" />
</t:type>
<t:value>GDL Schema for the TextGrid-ServiceRegistry-UI</t:value>
</t:name>
</t:topic>
- <t:topic id="t2876">
+ <t:topic id="t2886">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-default-creator-topic-v…" />
<t:instanceOf>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_default_creator_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">360px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">160px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2881">
+ <t:topic id="t2891">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2886">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env" />
+ <t:topic id="t2896">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-environment-creator-association…" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2766" />
</t:instanceOf>
- <t:occurrence>
- <t:type>
- <t:topicRef href="#t2721" />
- </t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
- </t:occurrence>
- <t:occurrence>
- <t:type>
- <t:topicRef href="#t2816" />
- </t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
- </t:occurrence>
- <t:occurrence>
+ <t:name>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2741" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
- </t:occurrence>
+ <t:value>A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment</t:value>
+ </t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_environment_createor_association_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2891">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
+ <t:topic id="t2901">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environement-creato…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2896">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
- <t:instanceOf>
- <t:topicRef href="#t2851" />
- </t:instanceOf>
- </t:topic>
-
- <t:topic id="t2901">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
+ <t:topic id="t2906">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
</t:occurrence>
- </t:topic>
-
- <t:topic id="t2906">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-hash-creator-association-view" />
- <t:instanceOf>
- <t:topicRef href="#t2756" />
- </t:instanceOf>
- <t:name>
+ <t:occurrence>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2826" />
</t:type>
- <t:value>A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash</t:value>
- </t:name>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
+ </t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_hash_createor_association_view_id</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2726" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
+ </t:occurrence>
+ <t:occurrence>
+ <t:type>
+ <t:topicRef href="#t2721" />
+ </t:type>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
<t:topic id="t2911">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-creator-associ…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
<t:topic id="t2916">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-creator-associ…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
<t:topic id="t2921">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
<t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2791" />
+ </t:type>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
+ </t:occurrence>
+ </t:topic>
+
+ <t:topic id="t2926">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
+ <t:instanceOf>
+ <t:topicRef href="#t2816" />
+ </t:instanceOf>
+ <t:occurrence>
+ <t:type>
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_list_box_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2926">
+ <t:topic id="t2931">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2931">
+ <t:topic id="t2936">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2936">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key" />
+ <t:topic id="t2941">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environment-environ…" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2696" />
+ </t:instanceOf>
+ </t:topic>
+
+ <t:topic id="t2946">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key" />
+ <t:instanceOf>
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2941">
+ <t:topic id="t2951">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2946">
+ <t:topic id="t2956">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2951">
+ <t:topic id="t2961">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">key:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2956">
+ <t:topic id="t2966">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2961">
+ <t:topic id="t2971">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key-positi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2966">
+ <t:topic id="t2976">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key-value-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2971">
+ <t:topic id="t2981">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2976">
+ <t:topic id="t2986">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2981">
+ <t:topic id="t2991">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2986">
+ <t:topic id="t2996">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">value:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2991">
+ <t:topic id="t3001">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2996">
+ <t:topic id="t3006">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value-posi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3001">
+ <t:topic id="t3011">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t3006">
+ <t:topic id="t3016">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button" />
<t:instanceOf>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2871" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_reset_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3011">
+ <t:topic id="t3021">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3016">
+ <t:topic id="t3026">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-va…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t3021">
+ <t:topic id="t3031">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-va…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">reset</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3026">
+ <t:topic id="t3036">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-commit-button" />
<t:instanceOf>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3031">
+ <t:topic id="t3041">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-commit-button-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2856" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5801">
+ <t:topic id="t6004">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Editor-Topic-View" />
</t:topic>
- <t:topic id="t5806">
+ <t:topic id="t6009">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Editor-Association-View" />
</t:topic>
- <t:topic id="t5811">
+ <t:topic id="t6015">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Delete-Button" />
</t:topic>
- <t:topic id="t5816">
+ <t:topic id="t6020">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-default-editor-topic-vi…" />
<t:instanceOf>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_default_editor_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">360px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">160px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5821">
+ <t:topic id="t6025">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5826">
+ <t:topic id="t6030">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5831">
+ <t:topic id="t6035">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5836">
+ <t:topic id="t6040">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-v…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5841">
+ <t:topic id="t6045">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-v…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5846">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-hash-editor-association-view" />
+ <t:topic id="t6050">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-environment-editor-association-…" />
<t:instanceOf>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6009" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
- <t:value>A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash</t:value>
+ <t:value>A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_hash_createor_association_view_id</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_environment_editor_association_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5851">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-editor-associa…" />
+ <t:topic id="t6055">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environment-editor-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5856">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-editor-associa…" />
- <t:instanceOf>
- <t:topicRef href="#t2851" />
- </t:instanceOf>
- </t:topic>
-
- <t:topic id="t5861">
+ <t:topic id="t6060">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5866">
+ <t:topic id="t6065">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-position" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5871">
+ <t:topic id="t6070">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-value-g…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5876">
+ <t:topic id="t6075">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5881">
+ <t:topic id="t6080">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5886">
+ <t:topic id="t6085">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-v…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5891">
+ <t:topic id="t6090">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-v…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">key:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5896">
+ <t:topic id="t6095">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5901">
+ <t:topic id="t6100">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-position" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5906">
+ <t:topic id="t6105">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-value-g…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5911">
+ <t:topic id="t6110">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5916">
+ <t:topic id="t6115">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5921">
+ <t:topic id="t6120">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5926">
+ <t:topic id="t6125">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">value:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5931">
+ <t:topic id="t6130">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5936">
+ <t:topic id="t6135">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5941">
+ <t:topic id="t6140">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5946">
+ <t:topic id="t6145">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_delete_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5951">
+ <t:topic id="t6150">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7501">
+ <t:topic id="t7801">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/cursor" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7509">
+ <t:topic id="t7807">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-creator-topic-v…" />
<t:instanceOf>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_default_creator_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">320px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7514">
+ <t:topic id="t7812">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7519">
+ <t:topic id="t7817">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_text_label_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7524">
+ <t:topic id="t7822">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-posi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7529">
+ <t:topic id="t7827">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7534">
+ <t:topic id="t7832">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">name:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7539">
+ <t:topic id="t7837">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_name_text_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">240px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7544">
+ <t:topic id="t7842">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">50px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7549">
+ <t:topic id="t7847">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7554">
+ <t:topic id="t7852">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button" />
<t:instanceOf>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_commit_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7559">
+ <t:topic id="t7857">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">65px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2856" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8303">
+ <t:topic id="t8602">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-editor-topic-vi…" />
<t:instanceOf>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_default_editor_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">320px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8308">
+ <t:topic id="t8607">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8313">
+ <t:topic id="t8612">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_text_label_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8318">
+ <t:topic id="t8617">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8323">
+ <t:topic id="t8622">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8328">
+ <t:topic id="t8627">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">name:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8333">
+ <t:topic id="t8632">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_name_text_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">240px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8338">
+ <t:topic id="t8637">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-positi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">50px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8343">
+ <t:topic id="t8642">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-value-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8348">
+ <t:topic id="t8647">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_delete_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8353">
+ <t:topic id="t8652">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">65px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t9002">
+ <t:topic id="t9302">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/types/Parameter" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9007">
+ <t:topic id="t9307">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/types/Parameter-Config" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9012">
+ <t:topic id="t9312">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-parameter" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9017">
+ <t:topic id="t9317">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-config" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9022">
+ <t:topic id="t9322">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9027">
+ <t:topic id="t9327">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/configuration" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9032">
+ <t:topic id="t9332">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9037">
+ <t:topic id="t9337">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/operation" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9042">
+ <t:topic id="t9342">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-type" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9047">
+ <t:topic id="t9347">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/description" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9052">
+ <t:topic id="t9352">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/keywords" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9057">
+ <t:topic id="t9357">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/description-location-uri" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9062">
+ <t:topic id="t9362">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/inline-description-location" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9067">
+ <t:topic id="t9367">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/description-location-body" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9072">
+ <t:topic id="t9372">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/target-namespace" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9077">
+ <t:topic id="t9377">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/use-target-ns" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9082">
+ <t:topic id="t9382">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/owner" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9087">
+ <t:topic id="t9387">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/identifier" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9092">
+ <t:topic id="t9392">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/textgrid-url" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9097">
+ <t:topic id="t9397">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/tg-approved" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9102">
+ <t:topic id="t9402">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9107">
+ <t:topic id="t9407">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-id" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9112">
+ <t:topic id="t9412">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-type" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9117">
+ <t:topic id="t9417">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/param" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9122">
+ <t:topic id="t9422">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/mime-type" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9127">
+ <t:topic id="t9427">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/multiple" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9132">
+ <t:topic id="t9432">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/crud" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9137">
+ <t:topic id="t9437">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/needs-b64-encoding" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9142">
+ <t:topic id="t9442">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/example-config" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9147">
+ <t:topic id="t9447">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9152">
+ <t:topic id="t9452">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-id" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9157">
+ <t:topic id="t9457">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/default" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9162">
+ <t:topic id="t9462">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/form" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9167">
+ <t:topic id="t9467">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/data" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9172">
+ <t:topic id="t9472">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-psi-constraint" />
<t:instanceOf>
<t:topicRef href="#t286" />
@@ -3000,7 +2999,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9177">
+ <t:topic id="t9477">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-name-constraint" />
<t:instanceOf>
<t:topicRef href="#t291" />
@@ -3019,7 +3018,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9182">
+ <t:topic id="t9482">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-operation-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3038,7 +3037,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9187">
+ <t:topic id="t9487">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-operation-datatype-constr…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3051,7 +3050,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9192">
+ <t:topic id="t9492">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-service-type-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3070,7 +3069,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9197">
+ <t:topic id="t9497">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-service-type-datatype-con…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3083,7 +3082,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9202">
+ <t:topic id="t9502">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3102,7 +3101,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9207">
+ <t:topic id="t9507">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-datatype-cons…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3115,7 +3114,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9212">
+ <t:topic id="t9512">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-keywords-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3134,7 +3133,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9217">
+ <t:topic id="t9517">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-keywords-datatype-constra…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3147,7 +3146,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9222">
+ <t:topic id="t9522">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-location-uri-…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3166,7 +3165,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9227">
+ <t:topic id="t9527">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-location-uri-…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3179,7 +3178,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9232">
+ <t:topic id="t9532">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-inline-description-locati…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3198,7 +3197,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9237">
+ <t:topic id="t9537">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-inline-description-locati…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3211,7 +3210,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9242">
+ <t:topic id="t9542">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-location-body…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3230,7 +3229,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9247">
+ <t:topic id="t9547">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-description-location-body…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3243,7 +3242,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9252">
+ <t:topic id="t9552">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-target-namespace-constrai…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3262,7 +3261,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9257">
+ <t:topic id="t9557">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-target-namespace-datatype…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3275,7 +3274,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9262">
+ <t:topic id="t9562">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-use-target-ns-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3294,7 +3293,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9267">
+ <t:topic id="t9567">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-use-target-ns-datatype-co…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3307,7 +3306,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9272">
+ <t:topic id="t9572">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-owner-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3326,7 +3325,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9277">
+ <t:topic id="t9577">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-owner-datatype-constraint" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3339,7 +3338,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9282">
+ <t:topic id="t9582">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-identifier-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3358,7 +3357,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9287">
+ <t:topic id="t9587">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-identifier-datatype-const…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3371,7 +3370,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9292">
+ <t:topic id="t9592">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-textgrid-url-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3390,7 +3389,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9297">
+ <t:topic id="t9597">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-textgrid-url-datatype-con…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3403,7 +3402,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9302">
+ <t:topic id="t9602">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-tg-approved-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3422,7 +3421,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9307">
+ <t:topic id="t9607">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/service-tg-approved-datatype-cons…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3435,7 +3434,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9312">
+ <t:topic id="t9612">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-psi-constraint" />
<t:instanceOf>
<t:topicRef href="#t286" />
@@ -3460,7 +3459,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9317">
+ <t:topic id="t9617">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-name-constraint" />
<t:instanceOf>
<t:topicRef href="#t291" />
@@ -3479,7 +3478,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9322">
+ <t:topic id="t9622">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-parameter-id-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3498,7 +3497,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9327">
+ <t:topic id="t9627">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-parameter-id-datatype-c…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3511,7 +3510,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9332">
+ <t:topic id="t9632">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-parameter-type-constrai…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3530,7 +3529,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9337">
+ <t:topic id="t9637">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-parameter-type-datatype…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3543,7 +3542,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9342">
+ <t:topic id="t9642">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-param-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3562,7 +3561,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9347">
+ <t:topic id="t9647">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-param-datatype-constrai…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3575,7 +3574,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9352">
+ <t:topic id="t9652">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-mime-type-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3594,7 +3593,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9357">
+ <t:topic id="t9657">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-mime-type-datatype-cons…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3607,7 +3606,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9362">
+ <t:topic id="t9662">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-multiple-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3626,7 +3625,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9367">
+ <t:topic id="t9667">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-multiple-datatype-const…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3639,7 +3638,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9372">
+ <t:topic id="t9672">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-crud-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3658,7 +3657,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9377">
+ <t:topic id="t9677">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-crud-datatype-constraint" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3671,7 +3670,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9382">
+ <t:topic id="t9682">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-needs-b64-encoding-cons…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3690,7 +3689,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9387">
+ <t:topic id="t9687">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-needs-b64-encoding-data…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3703,7 +3702,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9392">
+ <t:topic id="t9692">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-psi-constraint" />
<t:instanceOf>
<t:topicRef href="#t286" />
@@ -3728,7 +3727,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9397">
+ <t:topic id="t9697">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-name-constraint" />
<t:instanceOf>
<t:topicRef href="#t291" />
@@ -3747,7 +3746,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9402">
+ <t:topic id="t9702">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-parameter-config…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3766,7 +3765,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9407">
+ <t:topic id="t9707">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-parameter-config…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3779,7 +3778,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9412">
+ <t:topic id="t9712">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-default-constrai…" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3798,7 +3797,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9417">
+ <t:topic id="t9717">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-default-datatype…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3811,7 +3810,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9422">
+ <t:topic id="t9722">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-form-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3830,7 +3829,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9427">
+ <t:topic id="t9727">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-form-datatype-co…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3843,7 +3842,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9432">
+ <t:topic id="t9732">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-data-constraint" />
<t:instanceOf>
<t:topicRef href="#t296" />
@@ -3862,7 +3861,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9437">
+ <t:topic id="t9737">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/parameter-config-data-datatype-co…" />
<t:instanceOf>
<t:topicRef href="#t306" />
@@ -3875,7 +3874,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9442">
+ <t:topic id="t9742">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-parameter-parameter-role-cons…" />
<t:instanceOf>
<t:topicRef href="#t311" />
@@ -3894,7 +3893,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9447">
+ <t:topic id="t9747">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-parameter-parameter-associati…" />
<t:instanceOf>
<t:topicRef href="#t316" />
@@ -3913,7 +3912,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9452">
+ <t:topic id="t9752">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-parameter-service-role-constr…" />
<t:instanceOf>
<t:topicRef href="#t311" />
@@ -3932,7 +3931,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9457">
+ <t:topic id="t9757">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-parameter-service-association…" />
<t:instanceOf>
<t:topicRef href="#t316" />
@@ -3951,7 +3950,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9462">
+ <t:topic id="t9762">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-config-parameter-role-constra…" />
<t:instanceOf>
<t:topicRef href="#t311" />
@@ -3970,7 +3969,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9467">
+ <t:topic id="t9767">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-config-parameter-association-…" />
<t:instanceOf>
<t:topicRef href="#t316" />
@@ -3989,7 +3988,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9472">
+ <t:topic id="t9772">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-config-configuration-role-con…" />
<t:instanceOf>
<t:topicRef href="#t311" />
@@ -4008,7 +4007,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9477">
+ <t:topic id="t9777">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/model/has-config-configuration-associat…" />
<t:instanceOf>
<t:topicRef href="#t316" />
@@ -4035,13 +4034,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9027" />
+ <t:topicRef href="#t9327" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9477" />
+ <t:topicRef href="#t9777" />
</t:role>
</t:association>
@@ -4053,13 +4052,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9017" />
+ <t:topicRef href="#t9317" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9477" />
+ <t:topicRef href="#t9777" />
</t:role>
</t:association>
@@ -4071,13 +4070,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9027" />
+ <t:topicRef href="#t9327" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9472" />
+ <t:topicRef href="#t9772" />
</t:role>
</t:association>
@@ -4089,13 +4088,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9017" />
+ <t:topicRef href="#t9317" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9472" />
+ <t:topicRef href="#t9772" />
</t:role>
</t:association>
@@ -4107,13 +4106,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9007" />
+ <t:topicRef href="#t9307" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9472" />
+ <t:topicRef href="#t9772" />
</t:role>
</t:association>
@@ -4125,13 +4124,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9022" />
+ <t:topicRef href="#t9322" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9467" />
+ <t:topicRef href="#t9767" />
</t:role>
</t:association>
@@ -4143,13 +4142,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9017" />
+ <t:topicRef href="#t9317" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9467" />
+ <t:topicRef href="#t9767" />
</t:role>
</t:association>
@@ -4161,13 +4160,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9022" />
+ <t:topicRef href="#t9322" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9462" />
+ <t:topicRef href="#t9762" />
</t:role>
</t:association>
@@ -4179,13 +4178,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9017" />
+ <t:topicRef href="#t9317" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9462" />
+ <t:topicRef href="#t9762" />
</t:role>
</t:association>
@@ -4197,13 +4196,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9462" />
+ <t:topicRef href="#t9762" />
</t:role>
</t:association>
@@ -4221,7 +4220,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9457" />
+ <t:topicRef href="#t9757" />
</t:role>
</t:association>
@@ -4233,13 +4232,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9012" />
+ <t:topicRef href="#t9312" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9457" />
+ <t:topicRef href="#t9757" />
</t:role>
</t:association>
@@ -4257,7 +4256,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9452" />
+ <t:topicRef href="#t9752" />
</t:role>
</t:association>
@@ -4269,13 +4268,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9012" />
+ <t:topicRef href="#t9312" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9452" />
+ <t:topicRef href="#t9752" />
</t:role>
</t:association>
@@ -4293,7 +4292,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9452" />
+ <t:topicRef href="#t9752" />
</t:role>
</t:association>
@@ -4305,13 +4304,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9022" />
+ <t:topicRef href="#t9322" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9447" />
+ <t:topicRef href="#t9747" />
</t:role>
</t:association>
@@ -4323,13 +4322,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9012" />
+ <t:topicRef href="#t9312" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9447" />
+ <t:topicRef href="#t9747" />
</t:role>
</t:association>
@@ -4341,13 +4340,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9022" />
+ <t:topicRef href="#t9322" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9442" />
+ <t:topicRef href="#t9742" />
</t:role>
</t:association>
@@ -4359,13 +4358,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9012" />
+ <t:topicRef href="#t9312" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9442" />
+ <t:topicRef href="#t9742" />
</t:role>
</t:association>
@@ -4377,13 +4376,13 @@
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9442" />
+ <t:topicRef href="#t9742" />
</t:role>
</t:association>
@@ -4395,13 +4394,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9437" />
+ <t:topicRef href="#t9737" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9167" />
+ <t:topicRef href="#t9467" />
</t:role>
</t:association>
@@ -4413,13 +4412,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9432" />
+ <t:topicRef href="#t9732" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9167" />
+ <t:topicRef href="#t9467" />
</t:role>
</t:association>
@@ -4431,13 +4430,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9432" />
+ <t:topicRef href="#t9732" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4449,13 +4448,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9427" />
+ <t:topicRef href="#t9727" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9162" />
+ <t:topicRef href="#t9462" />
</t:role>
</t:association>
@@ -4467,13 +4466,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9422" />
+ <t:topicRef href="#t9722" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9162" />
+ <t:topicRef href="#t9462" />
</t:role>
</t:association>
@@ -4485,13 +4484,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9422" />
+ <t:topicRef href="#t9722" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4503,13 +4502,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9417" />
+ <t:topicRef href="#t9717" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9157" />
+ <t:topicRef href="#t9457" />
</t:role>
</t:association>
@@ -4521,13 +4520,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9412" />
+ <t:topicRef href="#t9712" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9157" />
+ <t:topicRef href="#t9457" />
</t:role>
</t:association>
@@ -4539,13 +4538,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9412" />
+ <t:topicRef href="#t9712" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4557,13 +4556,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9407" />
+ <t:topicRef href="#t9707" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9152" />
+ <t:topicRef href="#t9452" />
</t:role>
</t:association>
@@ -4575,13 +4574,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9402" />
+ <t:topicRef href="#t9702" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9152" />
+ <t:topicRef href="#t9452" />
</t:role>
</t:association>
@@ -4593,13 +4592,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9402" />
+ <t:topicRef href="#t9702" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4611,13 +4610,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9397" />
+ <t:topicRef href="#t9697" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9147" />
+ <t:topicRef href="#t9447" />
</t:role>
</t:association>
@@ -4629,13 +4628,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9397" />
+ <t:topicRef href="#t9697" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9007" />
+ <t:topicRef href="#t9307" />
</t:role>
</t:association>
@@ -4647,13 +4646,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9392" />
+ <t:topicRef href="#t9692" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9007" />
+ <t:topicRef href="#t9307" />
</t:role>
</t:association>
@@ -4665,13 +4664,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9387" />
+ <t:topicRef href="#t9687" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9137" />
+ <t:topicRef href="#t9437" />
</t:role>
</t:association>
@@ -4683,13 +4682,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9382" />
+ <t:topicRef href="#t9682" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9137" />
+ <t:topicRef href="#t9437" />
</t:role>
</t:association>
@@ -4701,13 +4700,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9382" />
+ <t:topicRef href="#t9682" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4719,13 +4718,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9377" />
+ <t:topicRef href="#t9677" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9132" />
+ <t:topicRef href="#t9432" />
</t:role>
</t:association>
@@ -4737,13 +4736,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9372" />
+ <t:topicRef href="#t9672" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9132" />
+ <t:topicRef href="#t9432" />
</t:role>
</t:association>
@@ -4755,13 +4754,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9372" />
+ <t:topicRef href="#t9672" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4773,13 +4772,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9367" />
+ <t:topicRef href="#t9667" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9127" />
+ <t:topicRef href="#t9427" />
</t:role>
</t:association>
@@ -4791,13 +4790,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9362" />
+ <t:topicRef href="#t9662" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9127" />
+ <t:topicRef href="#t9427" />
</t:role>
</t:association>
@@ -4809,13 +4808,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9362" />
+ <t:topicRef href="#t9662" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4827,13 +4826,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9357" />
+ <t:topicRef href="#t9657" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9122" />
+ <t:topicRef href="#t9422" />
</t:role>
</t:association>
@@ -4845,13 +4844,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9352" />
+ <t:topicRef href="#t9652" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9122" />
+ <t:topicRef href="#t9422" />
</t:role>
</t:association>
@@ -4863,13 +4862,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9352" />
+ <t:topicRef href="#t9652" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4881,13 +4880,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9347" />
+ <t:topicRef href="#t9647" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9117" />
+ <t:topicRef href="#t9417" />
</t:role>
</t:association>
@@ -4899,13 +4898,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9342" />
+ <t:topicRef href="#t9642" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9117" />
+ <t:topicRef href="#t9417" />
</t:role>
</t:association>
@@ -4917,13 +4916,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9342" />
+ <t:topicRef href="#t9642" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4935,13 +4934,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9327" />
+ <t:topicRef href="#t9627" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9107" />
+ <t:topicRef href="#t9407" />
</t:role>
</t:association>
@@ -4953,13 +4952,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9322" />
+ <t:topicRef href="#t9622" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9107" />
+ <t:topicRef href="#t9407" />
</t:role>
</t:association>
@@ -4971,13 +4970,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9322" />
+ <t:topicRef href="#t9622" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -4989,13 +4988,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9337" />
+ <t:topicRef href="#t9637" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9112" />
+ <t:topicRef href="#t9412" />
</t:role>
</t:association>
@@ -5007,13 +5006,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9332" />
+ <t:topicRef href="#t9632" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9112" />
+ <t:topicRef href="#t9412" />
</t:role>
</t:association>
@@ -5025,13 +5024,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9332" />
+ <t:topicRef href="#t9632" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -5043,13 +5042,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9317" />
+ <t:topicRef href="#t9617" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9102" />
+ <t:topicRef href="#t9402" />
</t:role>
</t:association>
@@ -5061,13 +5060,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9317" />
+ <t:topicRef href="#t9617" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -5079,13 +5078,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9312" />
+ <t:topicRef href="#t9612" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
</t:association>
@@ -5097,13 +5096,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9307" />
+ <t:topicRef href="#t9607" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9097" />
+ <t:topicRef href="#t9397" />
</t:role>
</t:association>
@@ -5115,13 +5114,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9302" />
+ <t:topicRef href="#t9602" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9097" />
+ <t:topicRef href="#t9397" />
</t:role>
</t:association>
@@ -5133,7 +5132,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9302" />
+ <t:topicRef href="#t9602" />
</t:role>
<t:role>
<t:type>
@@ -5151,13 +5150,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9297" />
+ <t:topicRef href="#t9597" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9092" />
+ <t:topicRef href="#t9392" />
</t:role>
</t:association>
@@ -5169,13 +5168,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9292" />
+ <t:topicRef href="#t9592" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9092" />
+ <t:topicRef href="#t9392" />
</t:role>
</t:association>
@@ -5187,7 +5186,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9292" />
+ <t:topicRef href="#t9592" />
</t:role>
<t:role>
<t:type>
@@ -5205,13 +5204,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9287" />
+ <t:topicRef href="#t9587" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9087" />
+ <t:topicRef href="#t9387" />
</t:role>
</t:association>
@@ -5223,13 +5222,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9282" />
+ <t:topicRef href="#t9582" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9087" />
+ <t:topicRef href="#t9387" />
</t:role>
</t:association>
@@ -5241,7 +5240,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9282" />
+ <t:topicRef href="#t9582" />
</t:role>
<t:role>
<t:type>
@@ -5259,13 +5258,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9277" />
+ <t:topicRef href="#t9577" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9082" />
+ <t:topicRef href="#t9382" />
</t:role>
</t:association>
@@ -5277,13 +5276,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9272" />
+ <t:topicRef href="#t9572" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9082" />
+ <t:topicRef href="#t9382" />
</t:role>
</t:association>
@@ -5295,7 +5294,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9272" />
+ <t:topicRef href="#t9572" />
</t:role>
<t:role>
<t:type>
@@ -5313,13 +5312,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9267" />
+ <t:topicRef href="#t9567" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9077" />
+ <t:topicRef href="#t9377" />
</t:role>
</t:association>
@@ -5331,13 +5330,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9262" />
+ <t:topicRef href="#t9562" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9077" />
+ <t:topicRef href="#t9377" />
</t:role>
</t:association>
@@ -5349,7 +5348,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9262" />
+ <t:topicRef href="#t9562" />
</t:role>
<t:role>
<t:type>
@@ -5367,13 +5366,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9257" />
+ <t:topicRef href="#t9557" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9072" />
+ <t:topicRef href="#t9372" />
</t:role>
</t:association>
@@ -5385,13 +5384,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9252" />
+ <t:topicRef href="#t9552" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9072" />
+ <t:topicRef href="#t9372" />
</t:role>
</t:association>
@@ -5403,7 +5402,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9252" />
+ <t:topicRef href="#t9552" />
</t:role>
<t:role>
<t:type>
@@ -5421,13 +5420,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9247" />
+ <t:topicRef href="#t9547" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9067" />
+ <t:topicRef href="#t9367" />
</t:role>
</t:association>
@@ -5439,13 +5438,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9242" />
+ <t:topicRef href="#t9542" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9067" />
+ <t:topicRef href="#t9367" />
</t:role>
</t:association>
@@ -5457,7 +5456,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9242" />
+ <t:topicRef href="#t9542" />
</t:role>
<t:role>
<t:type>
@@ -5475,13 +5474,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9237" />
+ <t:topicRef href="#t9537" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9062" />
+ <t:topicRef href="#t9362" />
</t:role>
</t:association>
@@ -5493,13 +5492,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9232" />
+ <t:topicRef href="#t9532" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9062" />
+ <t:topicRef href="#t9362" />
</t:role>
</t:association>
@@ -5511,7 +5510,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9232" />
+ <t:topicRef href="#t9532" />
</t:role>
<t:role>
<t:type>
@@ -5529,13 +5528,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9227" />
+ <t:topicRef href="#t9527" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9057" />
+ <t:topicRef href="#t9357" />
</t:role>
</t:association>
@@ -5547,13 +5546,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9222" />
+ <t:topicRef href="#t9522" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9057" />
+ <t:topicRef href="#t9357" />
</t:role>
</t:association>
@@ -5565,7 +5564,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9222" />
+ <t:topicRef href="#t9522" />
</t:role>
<t:role>
<t:type>
@@ -5583,13 +5582,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9217" />
+ <t:topicRef href="#t9517" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9052" />
+ <t:topicRef href="#t9352" />
</t:role>
</t:association>
@@ -5601,13 +5600,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9212" />
+ <t:topicRef href="#t9512" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9052" />
+ <t:topicRef href="#t9352" />
</t:role>
</t:association>
@@ -5619,7 +5618,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9212" />
+ <t:topicRef href="#t9512" />
</t:role>
<t:role>
<t:type>
@@ -5637,13 +5636,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9207" />
+ <t:topicRef href="#t9507" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9047" />
+ <t:topicRef href="#t9347" />
</t:role>
</t:association>
@@ -5655,13 +5654,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9202" />
+ <t:topicRef href="#t9502" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9047" />
+ <t:topicRef href="#t9347" />
</t:role>
</t:association>
@@ -5673,7 +5672,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9202" />
+ <t:topicRef href="#t9502" />
</t:role>
<t:role>
<t:type>
@@ -5691,13 +5690,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9197" />
+ <t:topicRef href="#t9497" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9042" />
+ <t:topicRef href="#t9342" />
</t:role>
</t:association>
@@ -5709,13 +5708,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9192" />
+ <t:topicRef href="#t9492" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9042" />
+ <t:topicRef href="#t9342" />
</t:role>
</t:association>
@@ -5727,7 +5726,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9192" />
+ <t:topicRef href="#t9492" />
</t:role>
<t:role>
<t:type>
@@ -5745,13 +5744,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9187" />
+ <t:topicRef href="#t9487" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9037" />
+ <t:topicRef href="#t9337" />
</t:role>
</t:association>
@@ -5763,13 +5762,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9182" />
+ <t:topicRef href="#t9482" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9037" />
+ <t:topicRef href="#t9337" />
</t:role>
</t:association>
@@ -5781,7 +5780,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9182" />
+ <t:topicRef href="#t9482" />
</t:role>
<t:role>
<t:type>
@@ -5799,13 +5798,13 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9177" />
+ <t:topicRef href="#t9477" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t321" />
</t:type>
- <t:topicRef href="#t9032" />
+ <t:topicRef href="#t9332" />
</t:role>
</t:association>
@@ -5817,7 +5816,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9177" />
+ <t:topicRef href="#t9477" />
</t:role>
<t:role>
<t:type>
@@ -5835,7 +5834,7 @@
<t:type>
<t:topicRef href="#t281" />
</t:type>
- <t:topicRef href="#t9172" />
+ <t:topicRef href="#t9472" />
</t:role>
<t:role>
<t:type>
@@ -5853,7 +5852,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9477" />
+ <t:topicRef href="#t9777" />
</t:role>
<t:role>
<t:type>
@@ -5871,7 +5870,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9472" />
+ <t:topicRef href="#t9772" />
</t:role>
<t:role>
<t:type>
@@ -5889,7 +5888,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9467" />
+ <t:topicRef href="#t9767" />
</t:role>
<t:role>
<t:type>
@@ -5907,7 +5906,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9462" />
+ <t:topicRef href="#t9762" />
</t:role>
<t:role>
<t:type>
@@ -5925,7 +5924,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9457" />
+ <t:topicRef href="#t9757" />
</t:role>
<t:role>
<t:type>
@@ -5943,7 +5942,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9452" />
+ <t:topicRef href="#t9752" />
</t:role>
<t:role>
<t:type>
@@ -5961,7 +5960,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9447" />
+ <t:topicRef href="#t9747" />
</t:role>
<t:role>
<t:type>
@@ -5979,7 +5978,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9442" />
+ <t:topicRef href="#t9742" />
</t:role>
<t:role>
<t:type>
@@ -5997,7 +5996,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9437" />
+ <t:topicRef href="#t9737" />
</t:role>
<t:role>
<t:type>
@@ -6015,7 +6014,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9432" />
+ <t:topicRef href="#t9732" />
</t:role>
<t:role>
<t:type>
@@ -6033,7 +6032,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9427" />
+ <t:topicRef href="#t9727" />
</t:role>
<t:role>
<t:type>
@@ -6051,7 +6050,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9422" />
+ <t:topicRef href="#t9722" />
</t:role>
<t:role>
<t:type>
@@ -6069,7 +6068,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9417" />
+ <t:topicRef href="#t9717" />
</t:role>
<t:role>
<t:type>
@@ -6087,7 +6086,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9412" />
+ <t:topicRef href="#t9712" />
</t:role>
<t:role>
<t:type>
@@ -6105,7 +6104,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9407" />
+ <t:topicRef href="#t9707" />
</t:role>
<t:role>
<t:type>
@@ -6123,7 +6122,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9402" />
+ <t:topicRef href="#t9702" />
</t:role>
<t:role>
<t:type>
@@ -6141,7 +6140,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9397" />
+ <t:topicRef href="#t9697" />
</t:role>
<t:role>
<t:type>
@@ -6159,7 +6158,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9392" />
+ <t:topicRef href="#t9692" />
</t:role>
<t:role>
<t:type>
@@ -6177,7 +6176,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9387" />
+ <t:topicRef href="#t9687" />
</t:role>
<t:role>
<t:type>
@@ -6195,7 +6194,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9382" />
+ <t:topicRef href="#t9682" />
</t:role>
<t:role>
<t:type>
@@ -6213,7 +6212,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9377" />
+ <t:topicRef href="#t9677" />
</t:role>
<t:role>
<t:type>
@@ -6231,7 +6230,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9372" />
+ <t:topicRef href="#t9672" />
</t:role>
<t:role>
<t:type>
@@ -6249,7 +6248,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9367" />
+ <t:topicRef href="#t9667" />
</t:role>
<t:role>
<t:type>
@@ -6267,7 +6266,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9362" />
+ <t:topicRef href="#t9662" />
</t:role>
<t:role>
<t:type>
@@ -6285,7 +6284,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9357" />
+ <t:topicRef href="#t9657" />
</t:role>
<t:role>
<t:type>
@@ -6303,7 +6302,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9352" />
+ <t:topicRef href="#t9652" />
</t:role>
<t:role>
<t:type>
@@ -6321,7 +6320,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9347" />
+ <t:topicRef href="#t9647" />
</t:role>
<t:role>
<t:type>
@@ -6339,7 +6338,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9342" />
+ <t:topicRef href="#t9642" />
</t:role>
<t:role>
<t:type>
@@ -6357,7 +6356,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9337" />
+ <t:topicRef href="#t9637" />
</t:role>
<t:role>
<t:type>
@@ -6375,7 +6374,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9332" />
+ <t:topicRef href="#t9632" />
</t:role>
<t:role>
<t:type>
@@ -6393,7 +6392,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9327" />
+ <t:topicRef href="#t9627" />
</t:role>
<t:role>
<t:type>
@@ -6411,7 +6410,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9322" />
+ <t:topicRef href="#t9622" />
</t:role>
<t:role>
<t:type>
@@ -6429,7 +6428,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9317" />
+ <t:topicRef href="#t9617" />
</t:role>
<t:role>
<t:type>
@@ -6447,7 +6446,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9312" />
+ <t:topicRef href="#t9612" />
</t:role>
<t:role>
<t:type>
@@ -6465,7 +6464,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9307" />
+ <t:topicRef href="#t9607" />
</t:role>
<t:role>
<t:type>
@@ -6483,7 +6482,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9302" />
+ <t:topicRef href="#t9602" />
</t:role>
<t:role>
<t:type>
@@ -6501,7 +6500,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9297" />
+ <t:topicRef href="#t9597" />
</t:role>
<t:role>
<t:type>
@@ -6519,7 +6518,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9292" />
+ <t:topicRef href="#t9592" />
</t:role>
<t:role>
<t:type>
@@ -6537,7 +6536,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9287" />
+ <t:topicRef href="#t9587" />
</t:role>
<t:role>
<t:type>
@@ -6555,7 +6554,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9282" />
+ <t:topicRef href="#t9582" />
</t:role>
<t:role>
<t:type>
@@ -6573,7 +6572,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9277" />
+ <t:topicRef href="#t9577" />
</t:role>
<t:role>
<t:type>
@@ -6591,7 +6590,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9272" />
+ <t:topicRef href="#t9572" />
</t:role>
<t:role>
<t:type>
@@ -6609,7 +6608,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9267" />
+ <t:topicRef href="#t9567" />
</t:role>
<t:role>
<t:type>
@@ -6627,7 +6626,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9262" />
+ <t:topicRef href="#t9562" />
</t:role>
<t:role>
<t:type>
@@ -6645,7 +6644,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9257" />
+ <t:topicRef href="#t9557" />
</t:role>
<t:role>
<t:type>
@@ -6663,7 +6662,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9252" />
+ <t:topicRef href="#t9552" />
</t:role>
<t:role>
<t:type>
@@ -6681,7 +6680,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9247" />
+ <t:topicRef href="#t9547" />
</t:role>
<t:role>
<t:type>
@@ -6699,7 +6698,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9242" />
+ <t:topicRef href="#t9542" />
</t:role>
<t:role>
<t:type>
@@ -6717,7 +6716,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9237" />
+ <t:topicRef href="#t9537" />
</t:role>
<t:role>
<t:type>
@@ -6735,7 +6734,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9232" />
+ <t:topicRef href="#t9532" />
</t:role>
<t:role>
<t:type>
@@ -6753,7 +6752,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9227" />
+ <t:topicRef href="#t9527" />
</t:role>
<t:role>
<t:type>
@@ -6771,7 +6770,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9222" />
+ <t:topicRef href="#t9522" />
</t:role>
<t:role>
<t:type>
@@ -6789,7 +6788,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9217" />
+ <t:topicRef href="#t9517" />
</t:role>
<t:role>
<t:type>
@@ -6807,7 +6806,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9212" />
+ <t:topicRef href="#t9512" />
</t:role>
<t:role>
<t:type>
@@ -6825,7 +6824,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9207" />
+ <t:topicRef href="#t9507" />
</t:role>
<t:role>
<t:type>
@@ -6843,7 +6842,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9202" />
+ <t:topicRef href="#t9502" />
</t:role>
<t:role>
<t:type>
@@ -6861,7 +6860,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9197" />
+ <t:topicRef href="#t9497" />
</t:role>
<t:role>
<t:type>
@@ -6879,7 +6878,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9192" />
+ <t:topicRef href="#t9492" />
</t:role>
<t:role>
<t:type>
@@ -6897,7 +6896,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9187" />
+ <t:topicRef href="#t9487" />
</t:role>
<t:role>
<t:type>
@@ -6915,7 +6914,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9182" />
+ <t:topicRef href="#t9482" />
</t:role>
<t:role>
<t:type>
@@ -6933,7 +6932,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9177" />
+ <t:topicRef href="#t9477" />
</t:role>
<t:role>
<t:type>
@@ -6951,7 +6950,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9172" />
+ <t:topicRef href="#t9472" />
</t:role>
<t:role>
<t:type>
@@ -6969,7 +6968,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9167" />
+ <t:topicRef href="#t9467" />
</t:role>
<t:role>
<t:type>
@@ -6987,7 +6986,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9162" />
+ <t:topicRef href="#t9462" />
</t:role>
<t:role>
<t:type>
@@ -7005,7 +7004,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9157" />
+ <t:topicRef href="#t9457" />
</t:role>
<t:role>
<t:type>
@@ -7023,7 +7022,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9152" />
+ <t:topicRef href="#t9452" />
</t:role>
<t:role>
<t:type>
@@ -7041,7 +7040,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9147" />
+ <t:topicRef href="#t9447" />
</t:role>
<t:role>
<t:type>
@@ -7059,7 +7058,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9142" />
+ <t:topicRef href="#t9442" />
</t:role>
<t:role>
<t:type>
@@ -7077,7 +7076,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9137" />
+ <t:topicRef href="#t9437" />
</t:role>
<t:role>
<t:type>
@@ -7095,7 +7094,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9132" />
+ <t:topicRef href="#t9432" />
</t:role>
<t:role>
<t:type>
@@ -7113,7 +7112,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9127" />
+ <t:topicRef href="#t9427" />
</t:role>
<t:role>
<t:type>
@@ -7131,7 +7130,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9122" />
+ <t:topicRef href="#t9422" />
</t:role>
<t:role>
<t:type>
@@ -7149,7 +7148,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9117" />
+ <t:topicRef href="#t9417" />
</t:role>
<t:role>
<t:type>
@@ -7167,7 +7166,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9112" />
+ <t:topicRef href="#t9412" />
</t:role>
<t:role>
<t:type>
@@ -7185,7 +7184,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9107" />
+ <t:topicRef href="#t9407" />
</t:role>
<t:role>
<t:type>
@@ -7203,7 +7202,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9102" />
+ <t:topicRef href="#t9402" />
</t:role>
<t:role>
<t:type>
@@ -7221,7 +7220,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9097" />
+ <t:topicRef href="#t9397" />
</t:role>
<t:role>
<t:type>
@@ -7239,7 +7238,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9092" />
+ <t:topicRef href="#t9392" />
</t:role>
<t:role>
<t:type>
@@ -7257,7 +7256,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9087" />
+ <t:topicRef href="#t9387" />
</t:role>
<t:role>
<t:type>
@@ -7275,7 +7274,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9082" />
+ <t:topicRef href="#t9382" />
</t:role>
<t:role>
<t:type>
@@ -7293,7 +7292,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9077" />
+ <t:topicRef href="#t9377" />
</t:role>
<t:role>
<t:type>
@@ -7311,7 +7310,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9072" />
+ <t:topicRef href="#t9372" />
</t:role>
<t:role>
<t:type>
@@ -7329,7 +7328,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9067" />
+ <t:topicRef href="#t9367" />
</t:role>
<t:role>
<t:type>
@@ -7347,7 +7346,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9062" />
+ <t:topicRef href="#t9362" />
</t:role>
<t:role>
<t:type>
@@ -7365,7 +7364,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9057" />
+ <t:topicRef href="#t9357" />
</t:role>
<t:role>
<t:type>
@@ -7383,7 +7382,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9052" />
+ <t:topicRef href="#t9352" />
</t:role>
<t:role>
<t:type>
@@ -7401,7 +7400,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9047" />
+ <t:topicRef href="#t9347" />
</t:role>
<t:role>
<t:type>
@@ -7419,7 +7418,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9042" />
+ <t:topicRef href="#t9342" />
</t:role>
<t:role>
<t:type>
@@ -7437,7 +7436,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9037" />
+ <t:topicRef href="#t9337" />
</t:role>
<t:role>
<t:type>
@@ -7455,7 +7454,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9032" />
+ <t:topicRef href="#t9332" />
</t:role>
<t:role>
<t:type>
@@ -7473,7 +7472,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9027" />
+ <t:topicRef href="#t9327" />
</t:role>
<t:role>
<t:type>
@@ -7491,7 +7490,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9022" />
+ <t:topicRef href="#t9322" />
</t:role>
<t:role>
<t:type>
@@ -7509,7 +7508,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9017" />
+ <t:topicRef href="#t9317" />
</t:role>
<t:role>
<t:type>
@@ -7527,7 +7526,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9012" />
+ <t:topicRef href="#t9312" />
</t:role>
<t:role>
<t:type>
@@ -7545,7 +7544,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9007" />
+ <t:topicRef href="#t9307" />
</t:role>
<t:role>
<t:type>
@@ -7563,7 +7562,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t9002" />
+ <t:topicRef href="#t9302" />
</t:role>
<t:role>
<t:type>
@@ -7575,25 +7574,25 @@
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8353" />
+ <t:topicRef href="#t8652" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
</t:association>
@@ -7603,31 +7602,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t421" />
</t:role>
@@ -7635,43 +7634,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8338" />
+ <t:topicRef href="#t8637" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
@@ -7681,75 +7680,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t8328" />
+ <t:topicRef href="#t8627" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8318" />
+ <t:topicRef href="#t8617" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
@@ -7759,15 +7758,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
@@ -7777,31 +7776,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t366" />
</t:role>
@@ -7813,15 +7812,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
</t:association>
@@ -7833,13 +7832,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8353" />
+ <t:topicRef href="#t8652" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -7851,13 +7850,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -7869,13 +7868,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -7887,13 +7886,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8338" />
+ <t:topicRef href="#t8637" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -7905,13 +7904,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -7923,13 +7922,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8328" />
+ <t:topicRef href="#t8627" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -7941,13 +7940,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -7959,13 +7958,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8318" />
+ <t:topicRef href="#t8617" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -7977,13 +7976,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -7995,13 +7994,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -8013,37 +8012,37 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7559" />
+ <t:topicRef href="#t7857" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
</t:association>
@@ -8053,31 +8052,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t421" />
</t:role>
@@ -8085,43 +8084,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7544" />
+ <t:topicRef href="#t7842" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
@@ -8131,75 +8130,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t7534" />
+ <t:topicRef href="#t7832" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7524" />
+ <t:topicRef href="#t7822" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
@@ -8209,15 +8208,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
@@ -8227,31 +8226,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t366" />
</t:role>
@@ -8263,15 +8262,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
</t:association>
@@ -8283,13 +8282,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2786" />
+ <t:topicRef href="#t2796" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2771" />
</t:role>
</t:association>
@@ -8301,13 +8300,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2776" />
+ <t:topicRef href="#t2786" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2771" />
</t:role>
</t:association>
@@ -8319,13 +8318,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7559" />
+ <t:topicRef href="#t7857" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -8337,13 +8336,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:role>
</t:association>
@@ -8355,13 +8354,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -8373,13 +8372,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7544" />
+ <t:topicRef href="#t7842" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -8391,13 +8390,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -8409,13 +8408,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7534" />
+ <t:topicRef href="#t7832" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -8427,13 +8426,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -8445,13 +8444,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7524" />
+ <t:topicRef href="#t7822" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -8463,13 +8462,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -8481,13 +8480,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -8499,13 +8498,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:role>
</t:association>
@@ -8517,7 +8516,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:role>
<t:role>
<t:type>
@@ -8529,25 +8528,25 @@
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5951" />
+ <t:topicRef href="#t6150" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6145" />
</t:role>
</t:association>
@@ -8557,31 +8556,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6145" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t466" />
</t:role>
@@ -8589,43 +8588,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5936" />
+ <t:topicRef href="#t6135" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
@@ -8635,75 +8634,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t5926" />
+ <t:topicRef href="#t6125" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5916" />
+ <t:topicRef href="#t6115" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
@@ -8713,31 +8712,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t451" />
</t:role>
@@ -8745,43 +8744,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5901" />
+ <t:topicRef href="#t6100" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
@@ -8791,75 +8790,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t5891" />
+ <t:topicRef href="#t6090" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5881" />
+ <t:topicRef href="#t6080" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
@@ -8869,15 +8868,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
@@ -8887,39 +8886,57 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5871" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t2941" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5866" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6060" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6065" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6050" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6060" />
</t:role>
</t:association>
@@ -8929,225 +8946,261 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6060" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5856" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t496" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
- </t:type>
- <t:topicRef href="#t5851" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t491" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t481" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6055" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6030" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5841" />
+ <t:topicRef href="#t6050" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5831" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2641" />
+ </t:type>
+ <t:topicRef href="#t6050" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2621" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6030" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6045" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2606" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6035" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6020" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6030" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6030" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2606" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t361" />
+ <t:topicRef href="#t6025" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t6025" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t361" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t351" />
+ <t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t341" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t346" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6020" />
</t:role>
</t:association>
@@ -9159,13 +9212,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2751" />
+ <t:topicRef href="#t2871" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -9177,31 +9230,31 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2761" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6009" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t99" />
+ <t:topicRef href="#t351" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t215" />
+ <t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t5951" />
+ <t:topicRef href="#t2751" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t207" />
+ <t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
@@ -9213,13 +9266,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6150" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9231,13 +9284,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6145" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -9249,13 +9302,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5936" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9267,13 +9320,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6135" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9285,13 +9338,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5926" />
+ <t:topicRef href="#t6130" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9303,13 +9356,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6125" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -9321,13 +9374,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5916" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9339,13 +9392,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6115" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9357,13 +9410,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6110" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9375,13 +9428,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5901" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9393,13 +9446,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6100" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9411,13 +9464,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5891" />
+ <t:topicRef href="#t6095" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9429,13 +9482,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5886" />
+ <t:topicRef href="#t6090" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -9447,13 +9500,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5881" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9465,13 +9518,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6080" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9483,13 +9536,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5871" />
+ <t:topicRef href="#t6075" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9501,13 +9554,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5866" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9519,13 +9572,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6065" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9537,13 +9590,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5856" />
+ <t:topicRef href="#t6060" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9555,13 +9608,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5851" />
+ <t:topicRef href="#t6055" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9573,13 +9626,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6009" />
</t:role>
</t:association>
@@ -9591,13 +9644,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5841" />
+ <t:topicRef href="#t6045" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -9609,13 +9662,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -9627,13 +9680,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5831" />
+ <t:topicRef href="#t6035" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -9645,13 +9698,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6030" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -9663,13 +9716,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6025" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -9681,37 +9734,37 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3031" />
+ <t:topicRef href="#t3041" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t3026" />
+ <t:topicRef href="#t3036" />
</t:role>
</t:association>
@@ -9721,75 +9774,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t3026" />
+ <t:topicRef href="#t3036" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3016" />
+ <t:topicRef href="#t3026" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3021" />
+ <t:topicRef href="#t3031" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3016" />
+ <t:topicRef href="#t3026" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t3021" />
+ <t:topicRef href="#t3031" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3011" />
+ <t:topicRef href="#t3021" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
</t:association>
@@ -9799,31 +9852,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3001" />
+ <t:topicRef href="#t3011" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t466" />
</t:role>
@@ -9831,43 +9884,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3001" />
+ <t:topicRef href="#t3011" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2996" />
+ <t:topicRef href="#t3006" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
@@ -9877,75 +9930,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2981" />
+ <t:topicRef href="#t2991" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2981" />
+ <t:topicRef href="#t2991" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2986" />
+ <t:topicRef href="#t2996" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2976" />
+ <t:topicRef href="#t2986" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
@@ -9955,31 +10008,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2966" />
+ <t:topicRef href="#t2976" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t451" />
</t:role>
@@ -9987,43 +10040,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2966" />
+ <t:topicRef href="#t2976" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2961" />
+ <t:topicRef href="#t2971" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
@@ -10033,75 +10086,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2956" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2956" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2951" />
+ <t:topicRef href="#t2961" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2941" />
+ <t:topicRef href="#t2951" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2896" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
@@ -10111,15 +10164,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
@@ -10131,37 +10184,91 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2931" />
+ <t:topicRef href="#t2941" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2616" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2941" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2651" />
+ </t:type>
+ <t:topicRef href="#t481" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
+ <t:topicRef href="#t2661" />
+ </t:type>
+ <t:topicRef href="#t2936" />
+ </t:role>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2651" />
</t:type>
+ <t:topicRef href="#t2941" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2621" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2661" />
+ </t:type>
+ <t:topicRef href="#t2936" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
<t:topicRef href="#t2926" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2931" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t2896" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2926" />
</t:role>
</t:association>
@@ -10171,94 +10278,130 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2896" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t2926" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2916" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t496" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2886" />
+ </t:role>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2911" />
+ <t:topicRef href="#t491" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2611" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
<t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t481" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
+ <t:topicRef href="#t2901" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2906" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
<t:topicRef href="#t2896" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2636" />
</t:type>
<t:topicRef href="#t2886" />
</t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2641" />
+ </t:type>
+ <t:topicRef href="#t2896" />
+ </t:role>
</t:association>
<t:association>
@@ -10267,15 +10410,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2916" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2901" />
+ <t:topicRef href="#t2906" />
</t:role>
</t:association>
@@ -10285,15 +10428,27 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2891" />
+ <t:topicRef href="#t2916" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2921" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2911" />
</t:role>
<t:role>
<t:type>
@@ -10301,6 +10456,12 @@
</t:type>
<t:topicRef href="#t2886" />
</t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2906" />
+ </t:role>
</t:association>
<t:association>
@@ -10309,15 +10470,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2886" />
+ <t:topicRef href="#t2906" />
</t:role>
</t:association>
@@ -10327,51 +10488,87 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t2881" />
+ <t:topicRef href="#t2891" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2891" />
+ </t:role>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2651" />
</t:type>
+ <t:topicRef href="#t361" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2636" />
+ </t:type>
<t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t361" />
+ <t:topicRef href="#t2886" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t351" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t341" />
+ </t:type>
+ <t:topicRef href="#t2871" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t346" />
+ </t:type>
+ <t:topicRef href="#t2876" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t351" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2866" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2871" />
</t:role>
</t:association>
@@ -10383,7 +10580,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
@@ -10401,7 +10598,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2856" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
@@ -10419,13 +10616,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2856" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -10437,13 +10634,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -10455,13 +10652,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2816" />
</t:role>
</t:association>
@@ -10473,7 +10670,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2701" />
</t:role>
<t:role>
<t:type>
@@ -10491,13 +10688,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2806" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2806" />
+ <t:topicRef href="#t2796" />
</t:role>
</t:association>
@@ -10509,13 +10706,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2691" />
+ <t:topicRef href="#t2806" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2786" />
</t:role>
</t:association>
@@ -10527,13 +10724,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2781" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2786" />
+ <t:topicRef href="#t2776" />
</t:role>
</t:association>
@@ -10545,13 +10742,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2776" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2776" />
+ <t:topicRef href="#t2771" />
</t:role>
</t:association>
@@ -10569,13 +10766,19 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2766" />
+ <t:topicRef href="#t2691" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t351" />
+ </t:type>
<t:role>
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2761" />
</t:role>
<t:role>
<t:type>
@@ -10593,7 +10796,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2766" />
+ <t:topicRef href="#t2736" />
</t:role>
<t:role>
<t:type>
@@ -10611,13 +10814,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2751" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2756" />
</t:role>
</t:association>
@@ -10629,13 +10832,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2751" />
+ <t:topicRef href="#t2746" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2756" />
+ <t:topicRef href="#t2751" />
</t:role>
</t:association>
@@ -10647,13 +10850,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2736" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2751" />
+ <t:topicRef href="#t2746" />
</t:role>
</t:association>
@@ -10665,13 +10868,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2701" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2736" />
</t:role>
</t:association>
@@ -10683,13 +10886,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2736" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2701" />
</t:role>
</t:association>
@@ -10701,49 +10904,49 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2736" />
+ <t:topicRef href="#t2696" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t351" />
+ <t:topicRef href="#t99" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t341" />
+ <t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2691" />
+ <t:topicRef href="#t3041" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t346" />
+ <t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t351" />
+ <t:topicRef href="#t99" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t341" />
+ <t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t3036" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t346" />
+ <t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2691" />
+ <t:topicRef href="#t2876" />
</t:role>
</t:association>
@@ -10761,7 +10964,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -10779,7 +10982,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -10797,7 +11000,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -10815,7 +11018,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2871" />
</t:role>
</t:association>
@@ -10833,7 +11036,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -10851,7 +11054,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -10869,7 +11072,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -10887,7 +11090,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -10905,7 +11108,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -10923,7 +11126,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -10941,7 +11144,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -10959,7 +11162,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -10977,7 +11180,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -10995,7 +11198,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -11013,7 +11216,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -11031,7 +11234,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -11049,7 +11252,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -11067,7 +11270,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -11085,7 +11288,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2696" />
</t:role>
</t:association>
@@ -11103,7 +11306,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -11121,7 +11324,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -11139,7 +11342,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2816" />
</t:role>
</t:association>
@@ -11175,7 +11378,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -11193,7 +11396,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -11211,7 +11414,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2756" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -11229,7 +11432,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -11247,7 +11450,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2766" />
</t:role>
</t:association>
@@ -11265,7 +11468,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -11283,7 +11486,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2756" />
</t:role>
</t:association>
@@ -11301,25 +11504,13 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2681" />
</t:role>
- </t:association>
-
- <t:association>
- <t:type>
- <t:topicRef href="#t99" />
- </t:type>
<t:role>
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2876" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t207" />
- </t:type>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2881" />
</t:role>
</t:association>
@@ -11331,13 +11522,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2856" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2676" />
+ <t:topicRef href="#t246" />
</t:role>
</t:association>
@@ -11349,7 +11540,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2851" />
</t:role>
<t:role>
<t:type>
@@ -11367,7 +11558,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2846" />
</t:role>
<t:role>
<t:type>
@@ -11385,7 +11576,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2841" />
</t:role>
<t:role>
<t:type>
@@ -11421,7 +11612,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2826" />
</t:role>
<t:role>
<t:type>
@@ -11439,7 +11630,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2801" />
</t:role>
<t:role>
<t:type>
@@ -11475,13 +11666,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2741" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t246" />
+ <t:topicRef href="#t241" />
</t:role>
</t:association>
@@ -11499,7 +11690,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t241" />
+ <t:topicRef href="#t246" />
</t:role>
</t:association>
@@ -11511,7 +11702,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2726" />
</t:role>
<t:role>
<t:type>
@@ -11529,7 +11720,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2721" />
</t:role>
<t:role>
<t:type>
@@ -11547,7 +11738,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2716" />
</t:role>
<t:role>
<t:type>
@@ -11565,7 +11756,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2711" />
</t:role>
<t:role>
<t:type>
@@ -11583,7 +11774,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2706" />
</t:role>
<t:role>
<t:type>
@@ -11601,13 +11792,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t246" />
+ <t:topicRef href="#t236" />
</t:role>
</t:association>
@@ -11625,7 +11816,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t236" />
+ <t:topicRef href="#t241" />
</t:role>
</t:association>
@@ -11643,7 +11834,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t241" />
+ <t:topicRef href="#t236" />
</t:role>
</t:association>
@@ -11661,7 +11852,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t236" />
+ <t:topicRef href="#t251" />
</t:role>
</t:association>
@@ -11823,7 +12014,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t251" />
+ <t:topicRef href="#t256" />
</t:role>
</t:association>
@@ -13121,12 +13312,6 @@
</t:type>
<t:topicRef href="#t251" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t406" />
- </t:role>
</t:association>
<t:association>
@@ -13181,12 +13366,6 @@
</t:type>
<t:topicRef href="#t256" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t391" />
- </t:role>
</t:association>
<t:association>
@@ -13295,12 +13474,6 @@
</t:type>
<t:topicRef href="#t236" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t361" />
- </t:role>
</t:association>
<t:association>
@@ -13679,18 +13852,6 @@
</t:type>
<t:topicRef href="#t246" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t261" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t207" />
- </t:type>
- <t:topicRef href="#t246" />
- </t:role>
</t:association>
<t:association>
@@ -13727,18 +13888,6 @@
</t:type>
<t:topicRef href="#t236" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t251" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t251" />
- </t:role>
</t:association>
<t:association>
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 Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Fri Aug 19 13:21:58 2011 (r766)
@@ -127,7 +127,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"50px",
+ "value":"70px",
"scope":null,
"reifier":null
}
@@ -265,7 +265,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"60px",
"scope":null,
"reifier":null
},
@@ -325,7 +325,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"320px",
"scope":null,
"reifier":null
},
@@ -461,7 +461,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"50px",
+ "value":"70px",
"scope":null,
"reifier":null
}
@@ -599,7 +599,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"60px",
"scope":null,
"reifier":null
},
@@ -659,7 +659,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"320px",
"scope":null,
"reifier":null
},
@@ -805,7 +805,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -951,7 +951,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1011,7 +1011,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -1115,7 +1115,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1258,17 +1258,7 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environment-editor-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -1295,14 +1285,14 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:has-hash-editor-association-view]"
+ "subject_identifiers":["[pref_1:has-environment-editor-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -1310,7 +1300,7 @@
],
"names":[{
"item_identifiers":null,
- "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
+ "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
"type":"si:[pref_3:view-name]",
"scope":null,
"variants":null,
@@ -1321,7 +1311,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "value":"has_environment_editor_association_view_id",
"scope":null,
"reifier":null
},
@@ -1425,7 +1415,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1485,7 +1475,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"360px",
"scope":null,
"reifier":null
},
@@ -1752,7 +1742,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -1898,7 +1888,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1958,7 +1948,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -2104,7 +2094,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -2127,6 +2117,16 @@
]
},
{
+ "subject_identifiers":["[pref_1:hash-object-has-environment-environment-role-player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Role-Player]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_1:hash-object-creator-text-list-box-env-value-group]"
],
"subject_locators":null,
@@ -2205,7 +2205,25 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-value-group]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Default-Literal-Value]"
+ ],
+ "names":null,
+ "occurrences":[{
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:literal-value]",
+ "value":"environment:",
+ "scope":null,
+ "reifier":null
+ }
+ ]
+ },
+ {
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2215,7 +2233,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2242,33 +2260,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"10px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:has-hash-creator-association-view]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Creator-Association-View]"
+ "instance_of":["si:[pref_2:Text]"
],
- "names":[{
+ "names":null,
+ "occurrences":[{
"item_identifiers":null,
- "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
- "type":"si:[pref_3:view-name]",
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:id]",
+ "value":"hash_object_text_label_env_id",
"scope":null,
- "variants":null,
"reifier":null
- }
- ],
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "type":"si:[pref_3:readonly]",
+ "value":"true",
"scope":null,
"reifier":null
},
@@ -2276,42 +2294,30 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"230px",
+ "value":"100px",
"scope":null,
"reifier":null
- }
- ]
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Default-Literal-Value]"
- ],
- "names":null,
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:literal-value]",
- "value":"environment:",
+ "type":"si:[pref_3:background-color]",
+ "value":"gray",
+ "scope":null,
+ "reifier":null
+ },
+ {
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:border-style]",
+ "value":"none",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environement-creator-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2338,33 +2344,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"10px",
+ "value":"120px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
+ "subject_identifiers":["[pref_1:has-environment-creator-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Text]"
+ "instance_of":["si:[pref_2:Creator-Association-View]"
],
- "names":null,
- "occurrences":[{
+ "names":[{
"item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"hash_object_text_label_env_id",
+ "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
+ "type":"si:[pref_3:view-name]",
"scope":null,
+ "variants":null,
"reifier":null
- },
- {
+ }
+ ],
+ "occurrences":[{
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:readonly]",
- "value":"true",
+ "type":"si:[pref_3:id]",
+ "value":"has_environment_createor_association_view_id",
"scope":null,
"reifier":null
},
@@ -2372,23 +2378,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:background-color]",
- "value":"gray",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:border-style]",
- "value":"none",
+ "value":"230px",
"scope":null,
"reifier":null
}
@@ -2432,7 +2422,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"300px",
+ "value":"360px",
"scope":null,
"reifier":null
},
@@ -2706,8 +2696,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_2:Default-Topic-View]",
- "[pref_2:Default-Topic-View]"
+ "subject_identifiers":["[pref_2:Default-Topic-View]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2813,6 +2802,15 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_2:Role-Player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":null,
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_2:Descriptor]"
],
"subject_locators":null,
@@ -2973,6 +2971,16 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_3:association-view-binding]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_7:association-type]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_3:topic-view-binding]"
],
"subject_locators":null,
@@ -4727,7 +4735,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-editor-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-editor-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -4746,7 +4754,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-editor-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-editor-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -4771,7 +4779,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4802,6 +4810,25 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -4834,7 +4861,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4853,7 +4880,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4865,20 +4892,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-has-hash-editor-association-view-value-group]"
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -4891,7 +4975,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environment-editor-association-view-position]"
},
{
"item_identifiers":null,
@@ -4903,7 +4987,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -4922,7 +5006,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -5503,7 +5587,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-creator-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-creator-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -5522,7 +5606,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-creator-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-creator-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -5547,7 +5631,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5578,6 +5662,63 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -5610,7 +5751,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5629,7 +5770,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5641,20 +5782,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-has-hash-creator-association-view-value-group]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -5667,7 +5865,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environement-creator-association-view-position]"
},
{
"item_identifiers":null,
@@ -5679,7 +5877,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -5698,7 +5896,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -6047,18 +6245,6 @@
"type":"si:[pref_6:subtype]",
"reifier":null,
"player":"si:[pref_2:TM-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:supertype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Single-Type-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:subtype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Value]"
}
]
},
@@ -6235,6 +6421,25 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_6:supertype-subtype]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_6:supertype]",
+ "reifier":null,
+ "player":"si:[pref_2:Descriptor]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_6:subtype]",
+ "reifier":null,
+ "player":"si:[pref_2:Role-Player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_7:constrained-role]",
"reifier":null,
"scope":null,
@@ -7053,4 +7258,4 @@
],
"item_type":"topicmap",
"reifier":null
-}
\ No newline at end of file
+}
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 Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm Fri Aug 19 13:21:58 2011 (r766)
@@ -638,2096 +638,2099 @@
</t:topic>
<t:topic id="t2611">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/association-view-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2616">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/view-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2621">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/value-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/view-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2626">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/position" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/value-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
</t:topic>
<t:topic id="t2631">
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/position" />
+ <t:instanceOf>
+ <t:topicRef href="#t256" />
+ </t:instanceOf>
+ </t:topic>
+
+ <t:topic id="t2636">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/container" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2636">
+ <t:topic id="t2641">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/containee" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2641">
+ <t:topic id="t2646">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-value" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2646">
+ <t:topic id="t2651">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/tm-construct" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2651">
+ <t:topic id="t2656">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/descriptor" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2656">
+ <t:topic id="t2661">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/value-group" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2661">
+ <t:topic id="t2666">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/value" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2666">
+ <t:topic id="t2671">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/ancestor" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2671">
+ <t:topic id="t2676">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/descendant" />
<t:instanceOf>
<t:topicRef href="#t251" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2676">
+ <t:topic id="t2681">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Schema" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2681">
+ <t:topic id="t2686">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/schema-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2686">
+ <t:topic id="t2691">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Descriptor" />
<t:instanceOf>
<t:topicRef href="#t236" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2691">
+ <t:topic id="t2696">
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Role-Player" />
+ </t:topic>
+
+ <t:topic id="t2701">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Visible-Object" />
</t:topic>
- <t:topic id="t2696">
+ <t:topic id="t2706">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/width" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2701">
+ <t:topic id="t2711">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/height" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2706">
+ <t:topic id="t2716">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/pointer" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2711">
+ <t:topic id="t2721">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/border-style" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2716">
+ <t:topic id="t2726">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/background-color" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2721">
+ <t:topic id="t2731">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/id" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2726">
+ <t:topic id="t2736">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/View" />
</t:topic>
- <t:topic id="t2731">
+ <t:topic id="t2741">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/view-name" />
<t:instanceOf>
<t:topicRef href="#t241" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2736">
+ <t:topic id="t2746">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Topic-View" />
</t:topic>
- <t:topic id="t2741">
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Topic-View" />
+ <t:topic id="t2751">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Topic-View" />
</t:topic>
- <t:topic id="t2746">
+ <t:topic id="t2756">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Creator-Topic-View" />
</t:topic>
- <t:topic id="t2751">
+ <t:topic id="t2761">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Association-View" />
</t:topic>
- <t:topic id="t2756">
+ <t:topic id="t2766">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Creator-Association-View" />
</t:topic>
- <t:topic id="t2761">
+ <t:topic id="t2771">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Value" />
</t:topic>
- <t:topic id="t2766">
+ <t:topic id="t2776">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/TM-Value" />
</t:topic>
- <t:topic id="t2771">
+ <t:topic id="t2781">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/TM-Single-Type-Value" />
</t:topic>
- <t:topic id="t2776">
+ <t:topic id="t2786">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Literal-Value" />
</t:topic>
- <t:topic id="t2781">
+ <t:topic id="t2791">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/literal-value" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2786">
+ <t:topic id="t2796">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Value" />
</t:topic>
- <t:topic id="t2791">
+ <t:topic id="t2801">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/fixed" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2796">
+ <t:topic id="t2806">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Literal-Value" />
</t:topic>
- <t:topic id="t2801">
+ <t:topic id="t2811">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Text-Object" />
</t:topic>
- <t:topic id="t2806">
+ <t:topic id="t2816">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/List-Box" />
</t:topic>
- <t:topic id="t2811">
+ <t:topic id="t2821">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Text" />
</t:topic>
- <t:topic id="t2816">
+ <t:topic id="t2826">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/readonly" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2821">
+ <t:topic id="t2831">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/font-size" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2826">
+ <t:topic id="t2836">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Position" />
</t:topic>
- <t:topic id="t2831">
+ <t:topic id="t2841">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/position-style" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2836">
+ <t:topic id="t2846">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/top" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2841">
+ <t:topic id="t2851">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/left" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2846">
+ <t:topic id="t2856">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/right" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2851">
+ <t:topic id="t2861">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Value-Group" />
</t:topic>
- <t:topic id="t2856">
+ <t:topic id="t2866">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Button" />
</t:topic>
- <t:topic id="t2861">
+ <t:topic id="t2871">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Action-Button" />
</t:topic>
- <t:topic id="t2866">
+ <t:topic id="t2876">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Commit-Button" />
</t:topic>
- <t:topic id="t2871">
+ <t:topic id="t2881">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/textgrid-ui-schema" />
<t:instanceOf>
- <t:topicRef href="#t2676" />
+ <t:topicRef href="#t2681" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2681" />
+ <t:topicRef href="#t2686" />
</t:type>
<t:value>GDL Schema for the TextGrid-ServiceRegistry-UI</t:value>
</t:name>
</t:topic>
- <t:topic id="t2876">
+ <t:topic id="t2886">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-default-creator-topic-v…" />
<t:instanceOf>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_default_creator_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">360px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">160px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2881">
+ <t:topic id="t2891">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2886">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env" />
+ <t:topic id="t2896">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-environment-creator-association…" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2766" />
</t:instanceOf>
- <t:occurrence>
- <t:type>
- <t:topicRef href="#t2721" />
- </t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
- </t:occurrence>
- <t:occurrence>
- <t:type>
- <t:topicRef href="#t2816" />
- </t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
- </t:occurrence>
- <t:occurrence>
+ <t:name>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2741" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
- </t:occurrence>
+ <t:value>A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment</t:value>
+ </t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_environment_createor_association_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2891">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
+ <t:topic id="t2901">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environement-creato…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2896">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
- <t:instanceOf>
- <t:topicRef href="#t2851" />
- </t:instanceOf>
- </t:topic>
-
- <t:topic id="t2901">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
+ <t:topic id="t2906">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
</t:occurrence>
- </t:topic>
-
- <t:topic id="t2906">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-hash-creator-association-view" />
- <t:instanceOf>
- <t:topicRef href="#t2756" />
- </t:instanceOf>
- <t:name>
+ <t:occurrence>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2826" />
</t:type>
- <t:value>A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash</t:value>
- </t:name>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
+ </t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_hash_createor_association_view_id</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2726" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
+ </t:occurrence>
+ <t:occurrence>
+ <t:type>
+ <t:topicRef href="#t2721" />
+ </t:type>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
<t:topic id="t2911">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-creator-associ…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
<t:topic id="t2916">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-creator-associ…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
<t:topic id="t2921">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-env-…" />
<t:instanceOf>
<t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2791" />
+ </t:type>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
+ </t:occurrence>
+ </t:topic>
+
+ <t:topic id="t2926">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
+ <t:instanceOf>
+ <t:topicRef href="#t2816" />
+ </t:instanceOf>
+ <t:occurrence>
+ <t:type>
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_list_box_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2926">
+ <t:topic id="t2931">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2931">
+ <t:topic id="t2936">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-list-box-e…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2936">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key" />
+ <t:topic id="t2941">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environment-environ…" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2696" />
</t:instanceOf>
- <t:occurrence>
- <t:type>
- <t:topicRef href="#t2721" />
+ </t:topic>
+
+ <t:topic id="t2946">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key" />
+ <t:instanceOf>
+ <t:topicRef href="#t2821" />
+ </t:instanceOf>
+ <t:occurrence>
+ <t:type>
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2941">
+ <t:topic id="t2951">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2946">
+ <t:topic id="t2956">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2951">
+ <t:topic id="t2961">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-key-…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">key:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2956">
+ <t:topic id="t2966">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2961">
+ <t:topic id="t2971">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key-positi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2966">
+ <t:topic id="t2976">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-key-value-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2971">
+ <t:topic id="t2981">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2976">
+ <t:topic id="t2986">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2981">
+ <t:topic id="t2991">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t2986">
+ <t:topic id="t2996">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">value:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2991">
+ <t:topic id="t3001">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t2996">
+ <t:topic id="t3006">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value-posi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3001">
+ <t:topic id="t3011">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-text-value-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t3006">
+ <t:topic id="t3016">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button" />
<t:instanceOf>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2871" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_reset_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3011">
+ <t:topic id="t3021">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3016">
+ <t:topic id="t3026">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-va…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t3021">
+ <t:topic id="t3031">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-reset-button-va…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">reset</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3026">
+ <t:topic id="t3036">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-commit-button" />
<t:instanceOf>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t3031">
+ <t:topic id="t3041">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-creator-commit-button-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2856" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5801">
+ <t:topic id="t6004">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Editor-Topic-View" />
</t:topic>
- <t:topic id="t5806">
+ <t:topic id="t6009">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Editor-Association-View" />
</t:topic>
- <t:topic id="t5811">
+ <t:topic id="t6015">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Delete-Button" />
</t:topic>
- <t:topic id="t5816">
+ <t:topic id="t6020">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-default-editor-topic-vi…" />
<t:instanceOf>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_default_editor_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">360px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">160px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5821">
+ <t:topic id="t6025">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5826">
+ <t:topic id="t6030">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5831">
+ <t:topic id="t6035">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5836">
+ <t:topic id="t6040">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-v…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5841">
+ <t:topic id="t6045">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-v…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5846">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-hash-editor-association-view" />
+ <t:topic id="t6050">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-environment-editor-association-…" />
<t:instanceOf>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6009" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
- <t:value>A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash</t:value>
+ <t:value>A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_hash_createor_association_view_id</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">has_environment_editor_association_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5851">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-editor-associa…" />
+ <t:topic id="t6055">
+ <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environment-editor-…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5856">
- <t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-hash-editor-associa…" />
- <t:instanceOf>
- <t:topicRef href="#t2851" />
- </t:instanceOf>
- </t:topic>
-
- <t:topic id="t5861">
+ <t:topic id="t6060">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_env_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5866">
+ <t:topic id="t6065">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-position" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">0px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5871">
+ <t:topic id="t6070">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-value-g…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5876">
+ <t:topic id="t6075">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5881">
+ <t:topic id="t6080">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5886">
+ <t:topic id="t6085">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-v…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5891">
+ <t:topic id="t6090">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-v…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">key:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5896">
+ <t:topic id="t6095">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_key_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5901">
+ <t:topic id="t6100">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-position" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5906">
+ <t:topic id="t6105">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-value-g…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5911">
+ <t:topic id="t6110">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_label_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5916">
+ <t:topic id="t6115">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5921">
+ <t:topic id="t6120">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5926">
+ <t:topic id="t6125">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">value:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5931">
+ <t:topic id="t6130">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_text_value_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">230px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2716" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5936">
+ <t:topic id="t6135">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">120px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5941">
+ <t:topic id="t6140">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t5946">
+ <t:topic id="t6145">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_delete_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t5951">
+ <t:topic id="t6150">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">115px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7501">
+ <t:topic id="t7801">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/cursor" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7509">
+ <t:topic id="t7807">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-creator-topic-v…" />
<t:instanceOf>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_default_creator_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">320px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7514">
+ <t:topic id="t7812">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7519">
+ <t:topic id="t7817">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_text_label_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7524">
+ <t:topic id="t7822">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-posi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7529">
+ <t:topic id="t7827">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-valu…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7534">
+ <t:topic id="t7832">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">name:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7539">
+ <t:topic id="t7837">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_name_text_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">false</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">240px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7544">
+ <t:topic id="t7842">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">50px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7549">
+ <t:topic id="t7847">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t7554">
+ <t:topic id="t7852">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button" />
<t:instanceOf>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_commit_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t7559">
+ <t:topic id="t7857">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button-p…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">65px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2856" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8303">
+ <t:topic id="t8602">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-editor-topic-vi…" />
<t:instanceOf>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:instanceOf>
<t:name>
<t:type>
- <t:topicRef href="#t2731" />
+ <t:topicRef href="#t2741" />
</t:type>
<t:value>GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Environment</t:value>
</t:name>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_default_editor_topic_view_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">300px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">320px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">100px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8308">
+ <t:topic id="t8607">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-view-binding" />
<t:instanceOf>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8313">
+ <t:topic id="t8612">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_text_label_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">40px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">60px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2726" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">gray</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2721" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">none</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8318">
+ <t:topic id="t8617">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-posit…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8323">
+ <t:topic id="t8622">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8328">
+ <t:topic id="t8627">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value" />
<t:instanceOf>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2791" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">name:</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8333">
+ <t:topic id="t8632">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text" />
<t:instanceOf>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_name_text_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2826" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">true</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">240px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8338">
+ <t:topic id="t8637">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-positi…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
- <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">50px</t:resourceData>
+ <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">70px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8343">
+ <t:topic id="t8642">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-value-…" />
<t:instanceOf>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8348">
+ <t:topic id="t8647">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2731" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">environment_delete_button_id</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2711" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">30px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2706" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">80px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2831" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">12px</t:resourceData>
</t:occurrence>
</t:topic>
- <t:topic id="t8353">
+ <t:topic id="t8652">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button-po…" />
<t:instanceOf>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:instanceOf>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2831" />
+ <t:topicRef href="#t2841" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">absolute</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2846" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">65px</t:resourceData>
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2851" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">10px</t:resourceData>
</t:occurrence>
@@ -2735,25 +2738,25 @@
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8353" />
+ <t:topicRef href="#t8652" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
</t:association>
@@ -2763,31 +2766,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t421" />
</t:role>
@@ -2795,43 +2798,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8338" />
+ <t:topicRef href="#t8637" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
@@ -2841,75 +2844,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t8328" />
+ <t:topicRef href="#t8627" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8318" />
+ <t:topicRef href="#t8617" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
@@ -2919,15 +2922,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
</t:association>
@@ -2937,31 +2940,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t366" />
</t:role>
@@ -2973,15 +2976,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
</t:association>
@@ -2993,13 +2996,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8353" />
+ <t:topicRef href="#t8652" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3011,13 +3014,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8647" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -3029,13 +3032,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8642" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -3047,13 +3050,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8338" />
+ <t:topicRef href="#t8637" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3065,13 +3068,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8632" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -3083,13 +3086,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8328" />
+ <t:topicRef href="#t8627" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -3101,13 +3104,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8622" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -3119,13 +3122,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8318" />
+ <t:topicRef href="#t8617" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3137,13 +3140,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8612" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -3155,13 +3158,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8607" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -3173,37 +3176,37 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8602" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7559" />
+ <t:topicRef href="#t7857" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
</t:association>
@@ -3213,31 +3216,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t421" />
</t:role>
@@ -3245,43 +3248,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7544" />
+ <t:topicRef href="#t7842" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
@@ -3291,75 +3294,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t7534" />
+ <t:topicRef href="#t7832" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7524" />
+ <t:topicRef href="#t7822" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
@@ -3369,15 +3372,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
</t:association>
@@ -3387,31 +3390,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t366" />
</t:role>
@@ -3423,15 +3426,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
</t:association>
@@ -3443,13 +3446,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2786" />
+ <t:topicRef href="#t2796" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2771" />
</t:role>
</t:association>
@@ -3461,13 +3464,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2776" />
+ <t:topicRef href="#t2786" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2771" />
</t:role>
</t:association>
@@ -3479,13 +3482,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7559" />
+ <t:topicRef href="#t7857" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3497,13 +3500,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7554" />
+ <t:topicRef href="#t7852" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2876" />
</t:role>
</t:association>
@@ -3515,13 +3518,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7549" />
+ <t:topicRef href="#t7847" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -3533,13 +3536,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7544" />
+ <t:topicRef href="#t7842" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3551,13 +3554,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7539" />
+ <t:topicRef href="#t7837" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -3569,13 +3572,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7534" />
+ <t:topicRef href="#t7832" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -3587,13 +3590,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7529" />
+ <t:topicRef href="#t7827" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -3605,13 +3608,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7524" />
+ <t:topicRef href="#t7822" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -3623,13 +3626,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7519" />
+ <t:topicRef href="#t7817" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -3641,13 +3644,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7514" />
+ <t:topicRef href="#t7812" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -3659,13 +3662,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7509" />
+ <t:topicRef href="#t7807" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2756" />
</t:role>
</t:association>
@@ -3677,7 +3680,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t7501" />
+ <t:topicRef href="#t7801" />
</t:role>
<t:role>
<t:type>
@@ -3689,25 +3692,25 @@
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5951" />
+ <t:topicRef href="#t6150" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6145" />
</t:role>
</t:association>
@@ -3717,31 +3720,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6145" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t466" />
</t:role>
@@ -3749,43 +3752,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5936" />
+ <t:topicRef href="#t6135" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
@@ -3795,75 +3798,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6130" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t5926" />
+ <t:topicRef href="#t6125" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5916" />
+ <t:topicRef href="#t6115" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
@@ -3873,31 +3876,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6110" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t451" />
</t:role>
@@ -3905,43 +3908,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5901" />
+ <t:topicRef href="#t6100" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
@@ -3951,75 +3954,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6095" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t5891" />
+ <t:topicRef href="#t6090" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5881" />
+ <t:topicRef href="#t6080" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
@@ -4029,15 +4032,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6075" />
</t:role>
</t:association>
@@ -4047,177 +4050,171 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5871" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t2941" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
- </t:type>
- <t:topicRef href="#t5866" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6060" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6065" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6050" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6060" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5856" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6060" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
- </t:type>
- <t:topicRef href="#t5851" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t496" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t491" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t5841" />
+ <t:topicRef href="#t481" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5831" />
+ <t:topicRef href="#t6055" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6030" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6050" />
</t:role>
</t:association>
@@ -4227,87 +4224,147 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6050" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2606" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6030" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t361" />
+ <t:topicRef href="#t6045" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t6035" />
</t:role>
<t:role>
<t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6020" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6030" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2641" />
+ </t:type>
+ <t:topicRef href="#t6030" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t351" />
+ <t:topicRef href="#t2606" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t341" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t346" />
+ <t:topicRef href="#t2646" />
+ </t:type>
+ <t:topicRef href="#t6025" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2616" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6025" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2651" />
+ </t:type>
+ <t:topicRef href="#t361" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2636" />
+ </t:type>
+ <t:topicRef href="#t2881" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t6020" />
</t:role>
</t:association>
@@ -4319,13 +4376,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2751" />
+ <t:topicRef href="#t2871" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -4337,31 +4394,31 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2761" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6009" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t99" />
+ <t:topicRef href="#t351" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t215" />
+ <t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t5951" />
+ <t:topicRef href="#t2751" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t207" />
+ <t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
@@ -4373,13 +4430,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5946" />
+ <t:topicRef href="#t6150" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4391,13 +4448,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5941" />
+ <t:topicRef href="#t6145" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t6015" />
</t:role>
</t:association>
@@ -4409,13 +4466,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5936" />
+ <t:topicRef href="#t6140" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4427,13 +4484,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5931" />
+ <t:topicRef href="#t6135" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4445,13 +4502,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5926" />
+ <t:topicRef href="#t6130" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4463,13 +4520,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5921" />
+ <t:topicRef href="#t6125" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -4481,13 +4538,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5916" />
+ <t:topicRef href="#t6120" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4499,13 +4556,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5911" />
+ <t:topicRef href="#t6115" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4517,13 +4574,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5906" />
+ <t:topicRef href="#t6110" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4535,13 +4592,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5901" />
+ <t:topicRef href="#t6105" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4553,13 +4610,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5896" />
+ <t:topicRef href="#t6100" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4571,13 +4628,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5891" />
+ <t:topicRef href="#t6095" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4589,13 +4646,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5886" />
+ <t:topicRef href="#t6090" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -4607,13 +4664,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5881" />
+ <t:topicRef href="#t6085" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4625,13 +4682,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5876" />
+ <t:topicRef href="#t6080" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4643,13 +4700,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5871" />
+ <t:topicRef href="#t6075" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4661,13 +4718,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5866" />
+ <t:topicRef href="#t6070" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4679,13 +4736,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5861" />
+ <t:topicRef href="#t6065" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4697,13 +4754,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5856" />
+ <t:topicRef href="#t6060" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4715,13 +4772,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5851" />
+ <t:topicRef href="#t6055" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4733,13 +4790,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5846" />
+ <t:topicRef href="#t6050" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5806" />
+ <t:topicRef href="#t6009" />
</t:role>
</t:association>
@@ -4751,13 +4808,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5841" />
+ <t:topicRef href="#t6045" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -4769,13 +4826,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5836" />
+ <t:topicRef href="#t6040" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -4787,13 +4844,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5831" />
+ <t:topicRef href="#t6035" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -4805,13 +4862,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5826" />
+ <t:topicRef href="#t6030" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -4823,13 +4880,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5821" />
+ <t:topicRef href="#t6025" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -4841,37 +4898,37 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t5816" />
+ <t:topicRef href="#t6020" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t5801" />
+ <t:topicRef href="#t6004" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3031" />
+ <t:topicRef href="#t3041" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t3026" />
+ <t:topicRef href="#t3036" />
</t:role>
</t:association>
@@ -4881,75 +4938,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t3026" />
+ <t:topicRef href="#t3036" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3016" />
+ <t:topicRef href="#t3026" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3021" />
+ <t:topicRef href="#t3031" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3016" />
+ <t:topicRef href="#t3026" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t3021" />
+ <t:topicRef href="#t3031" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t3011" />
+ <t:topicRef href="#t3021" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
</t:association>
@@ -4959,31 +5016,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t3006" />
+ <t:topicRef href="#t3016" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3001" />
+ <t:topicRef href="#t3011" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t466" />
</t:role>
@@ -4991,43 +5048,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t3001" />
+ <t:topicRef href="#t3011" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2996" />
+ <t:topicRef href="#t3006" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
@@ -5037,75 +5094,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2991" />
+ <t:topicRef href="#t3001" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2981" />
+ <t:topicRef href="#t2991" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2981" />
+ <t:topicRef href="#t2991" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2986" />
+ <t:topicRef href="#t2996" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2976" />
+ <t:topicRef href="#t2986" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
@@ -5115,31 +5172,31 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2971" />
+ <t:topicRef href="#t2981" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2966" />
+ <t:topicRef href="#t2976" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2651" />
</t:type>
<t:topicRef href="#t451" />
</t:role>
@@ -5147,43 +5204,43 @@
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2966" />
+ <t:topicRef href="#t2976" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2961" />
+ <t:topicRef href="#t2971" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
@@ -5193,75 +5250,75 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2956" />
+ <t:topicRef href="#t2966" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2621" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2956" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2621" />
+ <t:topicRef href="#t2626" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2956" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2951" />
+ <t:topicRef href="#t2961" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2941" />
+ <t:topicRef href="#t2951" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2896" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2676" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
@@ -5271,15 +5328,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2936" />
+ <t:topicRef href="#t2946" />
</t:role>
</t:association>
@@ -5291,37 +5348,91 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2931" />
+ <t:topicRef href="#t2941" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2616" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2941" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2651" />
+ </t:type>
+ <t:topicRef href="#t481" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
+ <t:topicRef href="#t2661" />
+ </t:type>
+ <t:topicRef href="#t2936" />
+ </t:role>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2651" />
</t:type>
+ <t:topicRef href="#t2941" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2621" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2661" />
+ </t:type>
+ <t:topicRef href="#t2936" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
<t:topicRef href="#t2926" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2931" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2671" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t2896" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2926" />
</t:role>
</t:association>
@@ -5331,94 +5442,130 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t2896" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t2921" />
+ <t:topicRef href="#t2926" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2916" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t496" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2626" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2886" />
+ </t:role>
+ <t:role>
+ <t:type>
<t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2911" />
+ <t:topicRef href="#t491" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2611" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2666" />
+ <t:topicRef href="#t2656" />
</t:type>
<t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2671" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t486" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2611" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2906" />
+ <t:topicRef href="#t481" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2616" />
+ <t:topicRef href="#t2631" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
+ <t:topicRef href="#t2901" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2906" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
<t:topicRef href="#t2896" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2636" />
</t:type>
<t:topicRef href="#t2886" />
</t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2641" />
+ </t:type>
+ <t:topicRef href="#t2896" />
+ </t:role>
</t:association>
<t:association>
@@ -5427,15 +5574,15 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2656" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2896" />
+ <t:topicRef href="#t2916" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2661" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2901" />
+ <t:topicRef href="#t2906" />
</t:role>
</t:association>
@@ -5445,15 +5592,27 @@
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t2891" />
+ <t:topicRef href="#t2916" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2921" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2911" />
</t:role>
<t:role>
<t:type>
@@ -5461,75 +5620,99 @@
</t:type>
<t:topicRef href="#t2886" />
</t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2906" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2601" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2636" />
+ </t:type>
+ <t:topicRef href="#t2886" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2641" />
+ </t:type>
+ <t:topicRef href="#t2906" />
+ </t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t2606" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2886" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t2886" />
+ <t:topicRef href="#t2891" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2606" />
+ <t:topicRef href="#t2616" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t2876" />
+ <t:topicRef href="#t2891" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2641" />
+ <t:topicRef href="#t2651" />
</t:type>
- <t:topicRef href="#t2881" />
+ <t:topicRef href="#t361" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2611" />
+ <t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2651" />
+ <t:topicRef href="#t2636" />
</t:type>
<t:topicRef href="#t2881" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2646" />
+ <t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t361" />
+ <t:topicRef href="#t2886" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t2601" />
+ <t:topicRef href="#t351" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t2631" />
+ <t:topicRef href="#t341" />
</t:type>
<t:topicRef href="#t2871" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t2636" />
+ <t:topicRef href="#t346" />
</t:type>
<t:topicRef href="#t2876" />
</t:role>
@@ -5543,13 +5726,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2866" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2871" />
</t:role>
</t:association>
@@ -5561,13 +5744,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2856" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2866" />
</t:role>
</t:association>
@@ -5579,13 +5762,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2856" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -5597,13 +5780,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -5615,13 +5798,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -5633,13 +5816,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2811" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2816" />
</t:role>
</t:association>
@@ -5651,13 +5834,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2701" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2806" />
+ <t:topicRef href="#t2811" />
</t:role>
</t:association>
@@ -5669,13 +5852,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2691" />
+ <t:topicRef href="#t2806" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2801" />
+ <t:topicRef href="#t2796" />
</t:role>
</t:association>
@@ -5687,7 +5870,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2806" />
</t:role>
<t:role>
<t:type>
@@ -5705,7 +5888,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2781" />
</t:role>
<t:role>
<t:type>
@@ -5723,14 +5906,20 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2776" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2766" />
+ <t:topicRef href="#t2771" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t351" />
+ </t:type>
<t:role>
<t:type>
<t:topicRef href="#t341" />
@@ -5741,7 +5930,7 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2766" />
+ <t:topicRef href="#t2691" />
</t:role>
</t:association>
@@ -5753,13 +5942,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2766" />
+ <t:topicRef href="#t2761" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2766" />
</t:role>
</t:association>
@@ -5771,13 +5960,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2761" />
+ <t:topicRef href="#t2736" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t2761" />
</t:role>
</t:association>
@@ -5807,7 +5996,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2746" />
</t:role>
<t:role>
<t:type>
@@ -5825,7 +6014,7 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2736" />
</t:role>
<t:role>
<t:type>
@@ -5843,13 +6032,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2736" />
+ <t:topicRef href="#t2701" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2741" />
+ <t:topicRef href="#t2736" />
</t:role>
</t:association>
@@ -5861,13 +6050,13 @@
<t:type>
<t:topicRef href="#t341" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2736" />
+ <t:topicRef href="#t2701" />
</t:role>
</t:association>
@@ -5885,25 +6074,43 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t2726" />
+ <t:topicRef href="#t2696" />
</t:role>
</t:association>
<t:association>
<t:type>
- <t:topicRef href="#t351" />
+ <t:topicRef href="#t99" />
</t:type>
<t:role>
<t:type>
- <t:topicRef href="#t341" />
+ <t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2686" />
+ <t:topicRef href="#t3041" />
</t:role>
<t:role>
<t:type>
- <t:topicRef href="#t346" />
+ <t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2691" />
+ <t:topicRef href="#t2836" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t99" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t215" />
+ </t:type>
+ <t:topicRef href="#t3036" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t207" />
+ </t:type>
+ <t:topicRef href="#t2876" />
</t:role>
</t:association>
@@ -5921,7 +6128,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -5939,7 +6146,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2866" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -5957,7 +6164,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -5975,7 +6182,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2871" />
</t:role>
</t:association>
@@ -5993,7 +6200,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6011,7 +6218,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2861" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6029,7 +6236,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -6047,7 +6254,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -6065,7 +6272,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6083,7 +6290,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6101,7 +6308,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -6119,7 +6326,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6137,7 +6344,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6155,7 +6362,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -6173,7 +6380,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2806" />
</t:role>
</t:association>
@@ -6191,7 +6398,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6209,7 +6416,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6227,7 +6434,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -6245,7 +6452,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2696" />
</t:role>
</t:association>
@@ -6263,7 +6470,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6281,7 +6488,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6299,7 +6506,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2816" />
</t:role>
</t:association>
@@ -6335,7 +6542,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2861" />
</t:role>
</t:association>
@@ -6353,7 +6560,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6371,7 +6578,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2756" />
+ <t:topicRef href="#t2821" />
</t:role>
</t:association>
@@ -6389,7 +6596,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2796" />
+ <t:topicRef href="#t2836" />
</t:role>
</t:association>
@@ -6407,7 +6614,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2851" />
+ <t:topicRef href="#t2766" />
</t:role>
</t:association>
@@ -6425,7 +6632,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2826" />
+ <t:topicRef href="#t2781" />
</t:role>
</t:association>
@@ -6443,7 +6650,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2811" />
+ <t:topicRef href="#t2756" />
</t:role>
</t:association>
@@ -6461,25 +6668,13 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2771" />
+ <t:topicRef href="#t2681" />
</t:role>
- </t:association>
-
- <t:association>
- <t:type>
- <t:topicRef href="#t99" />
- </t:type>
<t:role>
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2876" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t207" />
- </t:type>
- <t:topicRef href="#t2746" />
+ <t:topicRef href="#t2881" />
</t:role>
</t:association>
@@ -6491,13 +6686,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2871" />
+ <t:topicRef href="#t2856" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t2676" />
+ <t:topicRef href="#t246" />
</t:role>
</t:association>
@@ -6509,7 +6704,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2846" />
+ <t:topicRef href="#t2851" />
</t:role>
<t:role>
<t:type>
@@ -6527,7 +6722,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2841" />
+ <t:topicRef href="#t2846" />
</t:role>
<t:role>
<t:type>
@@ -6545,7 +6740,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2836" />
+ <t:topicRef href="#t2841" />
</t:role>
<t:role>
<t:type>
@@ -6581,7 +6776,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2821" />
+ <t:topicRef href="#t2826" />
</t:role>
<t:role>
<t:type>
@@ -6599,7 +6794,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2816" />
+ <t:topicRef href="#t2801" />
</t:role>
<t:role>
<t:type>
@@ -6635,13 +6830,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2781" />
+ <t:topicRef href="#t2741" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t246" />
+ <t:topicRef href="#t241" />
</t:role>
</t:association>
@@ -6659,7 +6854,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t241" />
+ <t:topicRef href="#t246" />
</t:role>
</t:association>
@@ -6671,7 +6866,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2721" />
+ <t:topicRef href="#t2726" />
</t:role>
<t:role>
<t:type>
@@ -6689,7 +6884,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2716" />
+ <t:topicRef href="#t2721" />
</t:role>
<t:role>
<t:type>
@@ -6707,7 +6902,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2711" />
+ <t:topicRef href="#t2716" />
</t:role>
<t:role>
<t:type>
@@ -6725,7 +6920,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2706" />
+ <t:topicRef href="#t2711" />
</t:role>
<t:role>
<t:type>
@@ -6743,7 +6938,7 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2701" />
+ <t:topicRef href="#t2706" />
</t:role>
<t:role>
<t:type>
@@ -6761,13 +6956,13 @@
<t:type>
<t:topicRef href="#t215" />
</t:type>
- <t:topicRef href="#t2696" />
+ <t:topicRef href="#t2691" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t246" />
+ <t:topicRef href="#t236" />
</t:role>
</t:association>
@@ -6785,7 +6980,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t236" />
+ <t:topicRef href="#t241" />
</t:role>
</t:association>
@@ -6803,7 +6998,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t241" />
+ <t:topicRef href="#t236" />
</t:role>
</t:association>
@@ -6821,7 +7016,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t236" />
+ <t:topicRef href="#t251" />
</t:role>
</t:association>
@@ -6983,7 +7178,7 @@
<t:type>
<t:topicRef href="#t207" />
</t:type>
- <t:topicRef href="#t251" />
+ <t:topicRef href="#t256" />
</t:role>
</t:association>
@@ -8857,18 +9052,6 @@
</t:type>
<t:topicRef href="#t236" />
</t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t251" />
- </t:role>
- <t:role>
- <t:type>
- <t:topicRef href="#t215" />
- </t:type>
- <t:topicRef href="#t251" />
- </t:role>
</t:association>
<t:association>
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 Fri Aug 19 11:17:36 2011 (r765)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Fri Aug 19 13:21:58 2011 (r766)
@@ -1135,7 +1135,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:top]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1177,7 +1177,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"100px",
+ "value":"40px",
"scope":null,
"reifier":null
},
@@ -1278,17 +1278,7 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environment-editor-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -1322,7 +1312,7 @@
]
},
{
- "subject_identifiers":["[pref_1:has-hash-editor-association-view]"
+ "subject_identifiers":["[pref_1:has-environment-editor-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -1330,7 +1320,7 @@
],
"names":[{
"item_identifiers":null,
- "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
+ "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
"type":"si:[pref_3:view-name]",
"scope":null,
"variants":null,
@@ -1341,7 +1331,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "value":"has_environment_editor_association_view_id",
"scope":null,
"reifier":null
},
@@ -1772,7 +1762,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -1918,7 +1908,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -1978,7 +1968,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"120px",
"scope":null,
"reifier":null
}
@@ -2124,7 +2114,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
+ "value":"100px",
"scope":null,
"reifier":null
},
@@ -2147,6 +2137,16 @@
]
},
{
+ "subject_identifiers":["[pref_1:hash-object-has-environment-environment-role-player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Role-Player]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_1:hash-object-creator-text-list-box-env-value-group]"
],
"subject_locators":null,
@@ -2225,7 +2225,25 @@
]
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-value-group]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_2:Default-Literal-Value]"
+ ],
+ "names":null,
+ "occurrences":[{
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:literal-value]",
+ "value":"environment:",
+ "scope":null,
+ "reifier":null
+ }
+ ]
+ },
+ {
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2235,7 +2253,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2262,33 +2280,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"60px",
+ "value":"10px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:has-hash-creator-association-view]"
+ "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Creator-Association-View]"
+ "instance_of":["si:[pref_2:Text]"
],
- "names":[{
+ "names":null,
+ "occurrences":[{
"item_identifiers":null,
- "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash",
- "type":"si:[pref_3:view-name]",
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:id]",
+ "value":"hash_object_text_label_env_id",
"scope":null,
- "variants":null,
"reifier":null
- }
- ],
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"has_hash_createor_association_view_id",
+ "type":"si:[pref_3:readonly]",
+ "value":"true",
"scope":null,
"reifier":null
},
@@ -2296,42 +2314,30 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"230px",
+ "value":"100px",
"scope":null,
"reifier":null
- }
- ]
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Default-Literal-Value]"
- ],
- "names":null,
- "occurrences":[{
+ },
+ {
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:literal-value]",
- "value":"environment:",
+ "type":"si:[pref_3:background-color]",
+ "value":"gray",
+ "scope":null,
+ "reifier":null
+ },
+ {
+ "item_identifiers":null,
+ "datatype":"http://www.w3.org/2001/XMLSchema#string",
+ "type":"si:[pref_3:border-style]",
+ "value":"none",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-value-group]"
- ],
- "subject_locators":null,
- "item_identifiers":null,
- "instance_of":["si:[pref_2:Value-Group]"
- ],
- "names":null,
- "occurrences":null
- },
- {
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env-position]"
+ "subject_identifiers":["[pref_1:hash-object-has-environement-creator-association-view-position]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2358,33 +2364,33 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:left]",
- "value":"10px",
+ "value":"120px",
"scope":null,
"reifier":null
}
]
},
{
- "subject_identifiers":["[pref_1:hash-object-creator-text-label-env]"
+ "subject_identifiers":["[pref_1:has-environment-creator-association-view]"
],
"subject_locators":null,
"item_identifiers":null,
- "instance_of":["si:[pref_2:Text]"
+ "instance_of":["si:[pref_2:Creator-Association-View]"
],
- "names":null,
- "occurrences":[{
+ "names":[{
"item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:id]",
- "value":"hash_object_text_label_env_id",
+ "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment",
+ "type":"si:[pref_3:view-name]",
"scope":null,
+ "variants":null,
"reifier":null
- },
- {
+ }
+ ],
+ "occurrences":[{
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:readonly]",
- "value":"true",
+ "type":"si:[pref_3:id]",
+ "value":"has_environment_createor_association_view_id",
"scope":null,
"reifier":null
},
@@ -2392,23 +2398,7 @@
"item_identifiers":null,
"datatype":"http://www.w3.org/2001/XMLSchema#string",
"type":"si:[pref_3:width]",
- "value":"40px",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:background-color]",
- "value":"gray",
- "scope":null,
- "reifier":null
- },
- {
- "item_identifiers":null,
- "datatype":"http://www.w3.org/2001/XMLSchema#string",
- "type":"si:[pref_3:border-style]",
- "value":"none",
+ "value":"230px",
"scope":null,
"reifier":null
}
@@ -2726,8 +2716,7 @@
"occurrences":null
},
{
- "subject_identifiers":["[pref_2:Default-Topic-View]",
- "[pref_2:Default-Topic-View]"
+ "subject_identifiers":["[pref_2:Default-Topic-View]"
],
"subject_locators":null,
"item_identifiers":null,
@@ -2833,6 +2822,15 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_2:Role-Player]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":null,
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_2:Descriptor]"
],
"subject_locators":null,
@@ -2993,6 +2991,16 @@
"occurrences":null
},
{
+ "subject_identifiers":["[pref_3:association-view-binding]"
+ ],
+ "subject_locators":null,
+ "item_identifiers":null,
+ "instance_of":["si:[pref_7:association-type]"
+ ],
+ "names":null,
+ "occurrences":null
+ },
+ {
"subject_identifiers":["[pref_3:topic-view-binding]"
],
"subject_locators":null,
@@ -4827,7 +4835,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4858,6 +4866,25 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-editor-text-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -4890,7 +4917,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4909,7 +4936,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
},
{
"item_identifiers":null,
@@ -4921,20 +4948,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-editor-association-view-value-group]"
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-editor-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -4947,7 +5031,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-editor-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environment-editor-association-view-position]"
},
{
"item_identifiers":null,
@@ -4959,7 +5043,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -4978,7 +5062,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-editor-association-view]"
+ "player":"si:[pref_1:has-environment-editor-association-view]"
}
]
},
@@ -5559,7 +5643,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-creator-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-creator-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -5578,7 +5662,7 @@
"item_identifiers":null,
"type":"si:[pref_3:value-group]",
"reifier":null,
- "player":"si:[pref_1:hash-object-creator-text-label-env-value-group]"
+ "player":"si:[pref_1:hash-object-creator-text-label-key-value-group]"
},
{
"item_identifiers":null,
@@ -5603,7 +5687,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5634,6 +5718,63 @@
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:value-group]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-creator-text-list-box-env-value-group]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-has-environment-environment-role-player]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
"type":"si:[pref_3:view-binding]",
"reifier":null,
"scope":null,
@@ -5666,7 +5807,7 @@
"item_identifiers":null,
"type":"si:[pref_3:ancestor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5685,7 +5826,7 @@
"item_identifiers":null,
"type":"si:[pref_3:container]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
},
{
"item_identifiers":null,
@@ -5697,20 +5838,77 @@
},
{
"item_identifiers":null,
- "type":"si:[pref_3:view-binding]",
+ "type":"si:[pref_3:association-view-binding]",
"reifier":null,
"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-has-hash-creator-association-view-value-group]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
},
{
"item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-hash-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-association-role-constraint]"
+ }
+ ]
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:association-view-binding]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_3:descriptor]",
+ "reifier":null,
+ "player":"si:[pref_1:hash-object-default-creator-topic-view]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_3:tm-construct]",
+ "reifier":null,
+ "player":"si:[pref_4:has-environment-environment-role-constraint]"
}
]
},
@@ -5723,7 +5921,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descriptor]",
"reifier":null,
- "player":"si:[pref_1:hash-object-has-hash-creator-association-view-position]"
+ "player":"si:[pref_1:hash-object-has-environement-creator-association-view-position]"
},
{
"item_identifiers":null,
@@ -5735,7 +5933,7 @@
"item_identifiers":null,
"type":"si:[pref_3:descendant]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -5754,7 +5952,7 @@
"item_identifiers":null,
"type":"si:[pref_3:containee]",
"reifier":null,
- "player":"si:[pref_1:has-hash-creator-association-view]"
+ "player":"si:[pref_1:has-environment-creator-association-view]"
}
]
},
@@ -6103,18 +6301,6 @@
"type":"si:[pref_6:subtype]",
"reifier":null,
"player":"si:[pref_2:TM-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:supertype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Single-Type-Value]"
- },
- {
- "item_identifiers":null,
- "type":"si:[pref_6:subtype]",
- "reifier":null,
- "player":"si:[pref_2:TM-Value]"
}
]
},
@@ -6289,6 +6475,25 @@
}
]
},
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_6:supertype-subtype]",
+ "reifier":null,
+ "scope":null,
+ "roles":[{
+ "item_identifiers":null,
+ "type":"si:[pref_6:supertype]",
+ "reifier":null,
+ "player":"si:[pref_2:Descriptor]"
+ },
+ {
+ "item_identifiers":null,
+ "type":"si:[pref_6:subtype]",
+ "reifier":null,
+ "player":"si:[pref_2:Role-Player]"
+ }
+ ]
+ },
{
"item_identifiers":null,
"type":"si:[pref_7:constrained-role]",
1
0
[isidorus-cvs] r765 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment isidorus text view
by lgiessmann＠common-lisp.net 19 Aug '11
by lgiessmann＠common-lisp.net 19 Aug '11
19 Aug '11
Author: lgiessmann
Date: Fri Aug 19 11:17:36 2011
New Revision: 765
Log:
gdl-frontend: Widgets: changed some methods to be able to instantiate GdlAssociationView instances
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java
branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java Fri Aug 19 11:17:36 2011 (r765)
@@ -32,6 +32,12 @@
// i.e. is is one value of getDefaultTmValue(), getDefaultLiteralValue()
public Topic getDefaultValue() throws InvalidGdlSchemaException;
+
+ // returns true if the default value of the element's value-group is
+ // fixed and cannot be changed by the user
+ public boolean fixedDefaultValue() throws InvalidGdlSchemaException;
+
+
// returns all possible topics that can be used as values for this value group.
// Note, since gdl:Default-TM-Value is treated as a usual value,
// default vaues are also returned by this function
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Fri Aug 19 11:17:36 2011 (r765)
@@ -214,6 +214,7 @@
public final static String gdlTmBinding = gdl + "tm-binding";
public final static String gdlViewBinding = gdl + "view-binding";
public final static String gdlTopicViewBinding = gdl + "topic-view-binding";
+ public final static String gdlAssociationViewBinding = gdl + "association-view-binding";
public final static String gdlValueBinding = gdl + "value-binding";
}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Aug 19 11:17:36 2011 (r765)
@@ -1,6 +1,8 @@
package us.isidor.gdl.anaToMia.Widgets.base;
+import java.util.ArrayList;
+
import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine;
import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes;
@@ -25,22 +27,22 @@
mainPanel.setBorderWidth(1);
mainPanel.setPixelSize(1000, 600);
- //ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
- //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier));
+ ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
+ requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier));
//requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier));
//Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-env", TopicIdentifierTypes.SubjectIdentifier);
//Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-hash", TopicIdentifierTypes.SubjectIdentifier);
- Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier);
+ //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier);
GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
Window.alert("you clicked " + ((Button)event.getSource()).getText());
}
});
- gdlPanel = new GdlPanel(requestedTopicToEdit, null);
+ gdlPanel = new GdlPanel(null, requestedTopicsToCreate);
mainPanel.add(gdlPanel);
gdlPanel.setTmEngine(new JtmsTmEngine());
gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback());
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Fri Aug 19 11:17:36 2011 (r765)
@@ -97,16 +97,17 @@
if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlDefaultEditorTopicView);
return new GdlDefaultEditorTopicView(tmRepresentative, (Topic)receivedData);
}else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialCreatorTopicView)){
+ if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlSpecialCreatorTopicView);
return new GdlSpecialCreatorTopicView(tmRepresentative);
}else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialEditorTopicView)){
if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlSpecialEditorTopicView);
return new GdlSpecialEditorTopicView(tmRepresentative, (Topic)receivedData);
}else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlCreatorAssociationview)){
if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Association when used with " + PSIs.TopicType.gdlCreatorAssociationview);
- return new GdlCreatorAssociationView(tmRepresentative, (Association)receivedData);
+ return new GdlCreatorAssociationView(tmRepresentative, (Topic)receivedData);
}else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlEditorAssociationView)){
if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Associaiton when used with " + PSIs.TopicType.gdlEditorAssociationView);
- return new GdlEditorAssociationView(tmRepresentative, (Association)receivedData);
+ return new GdlEditorAssociationView(tmRepresentative, (Topic)receivedData);
}else{
String values = "";
for(int i = 0; i != tmRepresentative.getTypes().length(); ++i){
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Fri Aug 19 11:17:36 2011 (r765)
@@ -23,7 +23,7 @@
// this class can be used as a callback that requests the Topic Map data
// addressable by the URI isidorusUrl
public class LoadSchemaCallback implements ILoadSchemaCallback{
- private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"); // TODO: replace with the correct URL
+ private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_GDL_Create_HashObject.jtm");//"TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"); // TODO: replace with the correct URL
private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null;
private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl);
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 19 11:17:36 2011 (r765)
@@ -530,7 +530,7 @@
if(readOnlyOcc != null){
String boolStr = readOnlyOcc.getValue().toUpperCase();
- if(boolStr.equals("TRUE")){
+ if(boolStr.equals("TRUE") || this.fixedDefaultValue()){
return true;
} else if(boolStr.equals("FALSE")) {
return false;
@@ -971,6 +971,26 @@
else return this.getDefaultTmValue();
}
+
+ public boolean fixedDefaultValue() throws InvalidGdlSchemaException{
+ Topic defVal = this.getDefaultValue();
+
+ if(defVal == null) return false;
+
+ TopicMap tm = defVal.getTopicMap();
+ Occurrence fixedOcc = TmHelper.getSingleOccurrence(defVal, TmHelper.getTopicByPsi(PSIs.OccurrenceType.gdlFixed, tm));
+
+ if(fixedOcc != null){
+ try{
+ return Boolean.valueOf(fixedOcc.getValue().toLowerCase());
+ }catch(Exception e){
+ throw new InvalidGdlSchemaException("the occurrence of type " + PSIs.OccurrenceType.gdlFixed + " bound to the topic " + TmHelper.getAnyIdOfTopic(defVal) + " must be set to either true or false, but is: " + fixedOcc.getValue());
+ }
+ } else {
+ return false;
+ }
+ }
+
@Override
public ArrayList<Topic> getTmValues() throws InvalidGdlSchemaException {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 19 11:17:36 2011 (r765)
@@ -1,5 +1,7 @@
package us.isidor.gdl.anaToMia.Widgets.view;
+import java.util.ArrayList;
+
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
@@ -7,10 +9,31 @@
public abstract class GdlAssociationView extends GdlView {
+ protected ArrayList<Association> associationsToRepresent = null;
- public GdlAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException {
- super(tmRepresentative, receivedData);
+ public GdlAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
+ super(tmRepresentative, null);
// TODO Auto-generated constructor stub
}
// TODO: implement
+
+
+ // return the association-type that this element is bound to through the
+ // set association-role- and topic-role- constraints
+ public Topic getAssociationType() throws InvalidGdlSchemaException {
+ // TODO: implement
+ return null;
+ }
+
+
+ public ArrayList<Topic> getAssociationRoleConstraints(){
+ // TODO: implement
+ return null;
+ }
+
+
+ public ArrayList<Topic> getTopicRoleConstraints(){
+ // TODO: implement
+ return null;
+ }
}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 19 11:17:36 2011 (r765)
@@ -1,6 +1,5 @@
package us.isidor.gdl.anaToMia.Widgets.view;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
@@ -9,7 +8,7 @@
public class GdlCreatorAssociationView extends GdlAssociationView {
- public GdlCreatorAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException {
+ public GdlCreatorAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
super(tmRepresentative, receivedData);
// TODO Auto-generated constructor stub
}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Aug 19 11:16:49 2011 (r764)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Aug 19 11:17:36 2011 (r765)
@@ -1,7 +1,6 @@
package us.isidor.gdl.anaToMia.Widgets.view;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap;
import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
@@ -10,7 +9,7 @@
public class GdlEditorAssociationView extends GdlAssociationView {
- public GdlEditorAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException {
+ public GdlEditorAssociationView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException {
super(tmRepresentative, receivedData);
// TODO Auto-generated constructor stub
}
1
0
[isidorus-cvs] r764 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 19 Aug '11
by lgiessmann＠common-lisp.net 19 Aug '11
19 Aug '11
Author: lgiessmann
Date: Fri Aug 19 11:16:49 2011
New Revision: 764
Log:
gdl-frontend: Widgets: added a reference to the value-group of the has-environment element of the "http://textgrid.org/serviceregistry/model/types/Hash-Object"-editor-view to the correponding association-role- and topic-role-constraints to be able to consume and generate Topic Maps associations
Modified:
branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm
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 Fri Aug 19 10:04:50 2011 (r763)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Fri Aug 19 11:16:49 2011 (r764)
@@ -19,6 +19,8 @@
{"subject_identifiers":["[tmcl:card-max]"], "instance_of":["si:[tmcl:occurrence-type]"]},
{"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]", "si:[tmcl:role-type]"]},
{"subject_identifiers":["[tmcl:topic-occurrence-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:topic-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:association-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmdm:supertype]"], "instance_of":["si:[tmcl:role-type]"]},
{"subject_identifiers":["[tmdm:subtype]"], "instance_of":["si:[tmcl:role-type]"]},
@@ -27,9 +29,14 @@
{"subject_identifiers":["[tgt:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tgm:hash-key-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
{"subject_identifiers":["[tgm:hash-value-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
-
+ {"subject_identifiers":["[tgm:has-environment-environment-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
+ {"subject_identifiers":["[tgm:has-environment-environment-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
+ {"subject_identifiers":["[tgm:has-environment-hash-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
+ {"subject_identifiers":["[tgm:has-environment-hash-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},
+
{"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:association-view-binding]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[gdl:tm-binding]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[gdl:view-binding]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[gdl:value-binding]"], "instance_of":["si:[tmcl:association-type]"]},
@@ -48,6 +55,7 @@
{"subject_identifiers":["[gdlt:Schema]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]},
{"subject_identifiers":["[gdlt:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[gdlt:Role-Player]"]},
{"subject_identifiers":["[gdlt:Visible-Object]"]},
{"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]},
{"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]},
@@ -93,14 +101,14 @@
{"subject_identifiers":["[tgg:hash-object-editor-text-label-env-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
{"subject_identifiers":["[tgg:hash-object-editor-text-label-env-value]"], "instance_of":["si:[gdlt:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"environment:"}]},
- {"subject_identifiers":["[tgg:has-hash-editor-association-view]"], "instance_of":["si:[gdlt:Editor-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-hash"}], "occurrences":[{"type":"si:[gdl:id]", "value":"has_hash_createor_association_view_id"}, {"type":"si:[gdl:width]", "value":"230px"}]},
- {"subject_identifiers":["[tgg:hash-object-has-hash-editor-association-view-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"120px"}]},
- {"subject_identifiers":["[tgg:hash-object-has-hash-editor-association-view-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
+ {"subject_identifiers":["[tgg:has-environment-editor-association-view]"], "instance_of":["si:[gdlt:Editor-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Editor View for associations of the type http://textgrid.org/serviceregistry/model/has-environment"}], "occurrences":[{"type":"si:[gdl:id]", "value":"has_environment_editor_association_view_id"}, {"type":"si:[gdl:width]", "value":"230px"}]},
+ {"subject_identifiers":["[tgg:hash-object-has-environment-editor-association-view-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"120px"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-env]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-env-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"0px"}, {"type":"si:[gdl:left]", "value":"0px"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-env-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
-
+ {"subject_identifiers":["[tgg:hash-object-has-environment-environment-role-player]"], "instance_of":["si:[gdlt:Role-Player]"]},
+
{"subject_identifiers":["[tgg:hash-object-editor-text-label-key]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_key_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"40px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-label-key-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"100px"}, {"type":"si:[gdl:left]", "value":"10px"}]},
{"subject_identifiers":["[tgg:hash-object-editor-text-label-key-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]},
@@ -124,6 +132,9 @@
],
"associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-occurrence-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:association-role-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Role-Player]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Visible-Object]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:View]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Topic-View]"}]},
@@ -153,16 +164,22 @@
{"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-editor-text-label-env-value]"}]},
{"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-label-env]"}]},
- {"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:has-hash-editor-association-view]"}]},
- {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-hash-editor-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-hash-editor-association-view]"}]},
- {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-has-hash-editor-association-view-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-hash-editor-association-view]"}]},
+ {"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:has-environment-editor-association-view]"}]},
+ {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-environment-editor-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-environment-editor-association-view]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]},
+ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]},
- {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-hash-editor-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
- {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-editor-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
+ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-environment-editor-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
+ {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-environment-editor-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-text-env]"}]},
{"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: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-association-role-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-hash-editor-association-view]"},{"type":"si:[gdl:descendant]", "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]"}]},
{"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-label-key-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-editor-text-label-key-value]"}]},
{"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-label-key-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-label-key]"}]},
1
0