August 2011 - isidorus-cvs@common-lisp.net

[isidorus-cvs] r753 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/container war/gdl_widgets
by lgiessmann＠common-lisp.net 18 Aug '11

18 Aug '11

Author: lgiessmann Date: Thu Aug 18 01:40:40 2011 New Revision: 753 Log: gdl-frontend: Widgets: finalised the GDL-Schema defintion for creating instances of http://textgrid.org/serviceregistry/model/Hash-Object; fixed a bug in Utils.merge(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt 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/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Thu Aug 18 01:40:40 2011 (r753) @@ -1,3 +1,4 @@ +* finalise the GDL-Schema for creating and editing instances of tgm:Hash-Object => AssociationView + Hidden-Value (type-occurrence) * Implement all IHasValueGroup to: * GdlText * GdlInfo 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 Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Thu Aug 18 01:40:40 2011 (r753) @@ -33,6 +33,7 @@ //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/test-environment", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/hash-object-instance", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { 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 Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Thu Aug 18 01:40:40 2011 (r753) @@ -650,7 +650,7 @@ ArrayList<Topic> constrainedOccurrenceTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constrainedStatementAssocType, null, occurrenceType, constrainedRoleType); ArrayList<Topic> constrainedAssociationTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constrainedStatementAssocType, null, associationType, constrainedRoleType); - ArrayList<Topic> constrainedStatements = Utils.union(Utils.union(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); @@ -843,7 +843,7 @@ Topic constrainedStatementAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedStatement, tm); ArrayList<Topic> nameTypeTopics = getOtherPlayerOfBinaryAssociation(rootConstraint, constraintRoleType, constrainedStatementAssocType, null, nameType, constrainedRoleType); ArrayList<Topic> occurrenceTypeTopics = getOtherPlayerOfBinaryAssociation(rootConstraint, constraintRoleType, constrainedStatementAssocType, null, occurrenceType, constrainedRoleType); - ArrayList<Topic> typeTopics = Utils.union(nameTypeTopics, occurrenceTypeTopics); + ArrayList<Topic> typeTopics = Utils.merge(nameTypeTopics, occurrenceTypeTopics); if(typeTopics.size() != 1){ throw new InvalidGdlSchemaException("the constraint " + getAnyIdOfTopic(rootConstraint) + " must be bound extactly once to an occurrence or name type, but is: " + typeTopics.size()); @@ -891,7 +891,7 @@ Topic occurrenceType = getTopicByPsi(PSIs.TMCL.tmclOccurrenceType, tm); ArrayList<Topic> nameTypes = getOtherPlayerOfBinaryAssociation(constraint, constraintRoleType, constrainedStatementAssocType, null, nameType, constrainedRoleType); ArrayList<Topic> occurrenceTypes = getOtherPlayerOfBinaryAssociation(constraint, constraintRoleType, constrainedStatementAssocType, null, occurrenceType, constrainedRoleType); - ArrayList<Topic> nameOrOccurrenceTypes = Utils.union(nameTypes, occurrenceTypes); + ArrayList<Topic> nameOrOccurrenceTypes = Utils.merge(nameTypes, occurrenceTypes); if(nameOrOccurrenceTypes.size() == 0){ return result; 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 Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Thu Aug 18 01:40:40 2011 (r753) @@ -21,14 +21,14 @@ return true; } + - - // returns an ArrayList that is a union of fst and snd - public static <T> ArrayList<T> union(ArrayList<T> fst, ArrayList<T> snd){ + // returns an ArrayList that is a merged ArrayList of fst and snd + public static <T> ArrayList<T> merge(ArrayList<T> fst, ArrayList<T> snd){ ArrayList<T> result = new ArrayList<T>(); if(fst != null) for (T t : fst) if(!result.contains(t)) result.add(t); - if(snd != null) for (T t : fst) if(!result.contains(t)) result.add(t); + if(snd != null) for (T t : snd) if(!result.contains(t)) result.add(t); return result; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Thu Aug 18 01:40:40 2011 (r753) @@ -215,7 +215,7 @@ ArrayList<Topic> nameConstraints = TmHelper.getOtherPlayerOfBinaryAssociation(this.tmRepresentative, descriptorRoleType, tmBindingAssocType, null, tmclTopicNameConstraintType, tmConstructRoleType); ArrayList<Topic> variantConstraints = TmHelper.getOtherPlayerOfBinaryAssociation(this.tmRepresentative, descriptorRoleType, tmBindingAssocType, null, tmclVariantNameConstraintType, tmConstructRoleType); ArrayList<Topic> occurrenceConstraints = TmHelper.getOtherPlayerOfBinaryAssociation(this.tmRepresentative, descriptorRoleType, tmBindingAssocType, null, tmclTopicOccurrenceConstraintType, tmConstructRoleType); - ArrayList<Topic> allConstraints = Utils.union(Utils.union(nameConstraints, variantConstraints), occurrenceConstraints); + ArrayList<Topic> allConstraints = Utils.merge(Utils.merge(nameConstraints, variantConstraints), occurrenceConstraints); if(allConstraints.size() > 1) throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " can be bound only to one constraint, but is " + allConstraints.size()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Thu Aug 18 01:40:40 2011 (r753) @@ -19,13 +19,15 @@ {"subject_identifiers":["[tmcl:card-min]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"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-name-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:topic-occurrence-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]"]}, {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[tgm: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":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, @@ -50,6 +52,7 @@ {"subject_identifiers":["[gdl:Visible-Object]"]}, {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:pointer]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -72,33 +75,62 @@ {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[gdl:Text]"]}, {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:font-size]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:Position]"]}, {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:right]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:Value-Group]"]}, + {"subject_identifiers":["[gdl:Button]"]}, + {"subject_identifiers":["[gdl:Action-Button]"]}, + {"subject_identifiers":["[gdl:Commit-Button]"]}, {"subject_identifiers":["[tgg:textgrid-ui-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for the TextGrid-ServiceRegistry-UI"}]}, - {"subject_identifiers":["[tgg:hash-object-default-creator-topic-view]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_creator_topic_view_id"}, {"type":"si:[gdl:width]", "value":"300px"}, {"type":"si:[gdl:height]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, + {"subject_identifiers":["[tgg:hash-object-default-creator-topic-view]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_creator_topic_view_id"}, {"type":"si:[gdl:width]", "value":"300px"}, {"type":"si:[gdl:height]", "value":"160px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, {"subject_identifiers":["[tgg:hash-object-creator-view-binding]"], "instance_of":["si:[gdl:TM-Single-Type-Value]"]}, {"subject_identifiers":["[tgg:hash-object-text-label-env]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_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-text-label-env-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, {"subject_identifiers":["[tgg:hash-object-text-label-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, - {"subject_identifiers":["[tgg:hash-object-text-label-env-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"name:"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"environment:"}]}, {"subject_identifiers":["[tgg:has-hash-creator-association-view]"], "instance_of":["si:[gdl:Creator-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Creator 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-creator-association-view-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, {"subject_identifiers":["[tgg:hash-object-has-hash-creator-association-view-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, - {"subject_identifiers":["[tgg:hash-object-text-list-box-env]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-list-box-env]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_list_box_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"}]}, {"subject_identifiers":["[tgg:hash-object-text-list-box-env-position]"], "instance_of":["si:[gdl: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-text-list-box-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]} + {"subject_identifiers":["[tgg:hash-object-text-list-box-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-key]"], "instance_of":["si:[gdl: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-text-label-key-position]"], "instance_of":["si:[gdl: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-text-label-key-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-key-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"key:"}]}, + + {"subject_identifiers":["[tgg:hash-object-text-key]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_key_id"}, {"type":"si:[gdl:readonly]", "value":"false"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, + {"subject_identifiers":["[tgg:hash-object-text-key-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"40px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-key-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-value]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_value_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-text-label-value-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"70px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-value-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-value-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"value:"}]}, + + {"subject_identifiers":["[tgg:hash-object-text-value]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_value_id"}, {"type":"si:[gdl:readonly]", "value":"false"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, + {"subject_identifiers":["[tgg:hash-object-text-value-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"70px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-value-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-reset-button]"], "instance_of":["si:[gdl:Action-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_reset_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-reset-button-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-reset-button-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-reset-button-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"reset"}]}, + + {"subject_identifiers":["[tgg:hash-object-commit-button]"], "instance_of":["si:[gdl:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-commit-button-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:right]", "value":"10px"}]} ], - "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-name-constraint]"}]}, + "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:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Visible-Object]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:View]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Topic-View]"}]}, @@ -116,6 +148,9 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Position]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value-Group]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Button]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Action-Button]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Action-Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Commit-Button]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:textgrid-ui-schema]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-default-creator-topic-view]"}]}, {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgm:Hash-Object]"}]}, @@ -130,10 +165,35 @@ {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-label-key]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-key-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-key]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-key-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-key]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-key]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-key-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-key]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-key]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-key-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-key]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-key-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-key-constraint]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-label-value]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-value-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-key]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-value]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-value-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-value-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-value-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-value]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-value]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-value-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-value-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-value]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-value-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-value-constraint]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-reset-button]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-reset-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-reset-button]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-reset-button-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-reset-button-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-reset-button-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-reset-button-value]"}]}, - - {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, - {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, - {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env]"}]} + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-commit-button]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-commit-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-reset-button]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-commit-button]"}]} ]} \ No newline at end of file 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 Wed Aug 17 09:16:43 2011 (r752) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Thu Aug 18 01:40:40 2011 (r753) @@ -0,0 +1,201 @@ +{"version":"1.1", + + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", + "tgm":"http://textgrid.org/serviceregistry/model/", + "tgg":"http://textgrid.org/serviceregistry/gdl/", + "gdl":"http://psi.isidor.us/gdl/"}, + + "item_type":"topicmap", + + "item_identifiers":["[tg:services-tm]"], + + "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:occurrence-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:card-min]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"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":["[tmdm:supertype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:subtype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tg:hash-object-instance]"], "instance_of":["si:[tgm:Hash-Object]"]}, + {"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":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:topic-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]"]}, + {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[gdl:container]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-construct]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descriptor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value-group]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[gdl:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:Visible-Object]"]}, + {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:pointer]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:View]"]}, + {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Editor-Topic-View]"]}, + {"subject_identifiers":["[gdl:Association-View]"]}, + {"subject_identifiers":["[gdl:Editor-Association-View]"]}, + {"subject_identifiers":["[gdl:Value]"]}, + {"subject_identifiers":["[gdl:TM-Value]"]}, + {"subject_identifiers":["[gdl:TM-Single-Type-Value]"]}, + {"subject_identifiers":["[gdl:Literal-Value]"]}, + {"subject_identifiers":["[gdl:literal-value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Value]"]}, + {"subject_identifiers":["[gdl:fixed]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Literal-Value]"]}, + {"subject_identifiers":["[gdl:Text-Object]"]}, + {"subject_identifiers":["[gdl:Text]"]}, + {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:font-size]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Position]"]}, + {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:right]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Value-Group]"]}, + {"subject_identifiers":["[gdl:Button]"]}, + {"subject_identifiers":["[gdl:Action-Button]"]}, + {"subject_identifiers":["[gdl:Delete-Button]"]}, + + {"subject_identifiers":["[tgg:textgrid-ui-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for the TextGrid-ServiceRegistry-UI"}]}, + {"subject_identifiers":["[tgg:hash-object-default-editor-topic-view]"], "instance_of":["si:[gdl:Default-Editor-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_editor_topic_view_id"}, {"type":"si:[gdl:width]", "value":"300px"}, {"type":"si:[gdl:height]", "value":"160px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, + {"subject_identifiers":["[tgg:hash-object-editor-view-binding]"], "instance_of":["si:[gdl:TM-Single-Type-Value]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-env]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_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-text-label-env-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"environment:"}]}, + + {"subject_identifiers":["[tgg:has-hash-editor-association-view]"], "instance_of":["si:[gdl: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:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-has-hash-editor-association-view-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-env]"], "instance_of":["si:[gdl: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-text-env-position]"], "instance_of":["si:[gdl: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-text-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-key]"], "instance_of":["si:[gdl: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-text-label-key-position]"], "instance_of":["si:[gdl: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-text-label-key-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-key-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"key:"}]}, + + {"subject_identifiers":["[tgg:hash-object-text-key]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_key_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, + {"subject_identifiers":["[tgg:hash-object-text-key-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"40px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-key-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-value]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_value_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-text-label-value-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"70px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-value-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-value-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"value:"}]}, + + {"subject_identifiers":["[tgg:hash-object-text-value]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_value_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, + {"subject_identifiers":["[tgg:hash-object-text-value-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"70px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-value-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-delete-button]"], "instance_of":["si:[gdl:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_delete_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-delete-button-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + + + + {"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tgm:key]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:value]"], "instance_of":["si:[tmcl:occurrence-type]"]} + ], + + "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:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Visible-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Editor-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Association-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Editor-Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Descriptor]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Literal-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Position]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value-Group]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Button]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Action-Button]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Action-Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Delete-Button]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:textgrid-ui-schema]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgm:Hash-Object]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:tm-value]", "player":"si:[tgg:hash-object-editor-view-binding]"}]}, + + {"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-text-label-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-env-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-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-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:has-hash-editor-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-editor-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-env]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-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:hash-object-text-label-key]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-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-text-label-key]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-key-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-key]"}]}, + + {"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-text-key]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-key-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-key]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-key]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-key-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-key]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-key-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-key-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-text-label-value]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-value-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-key]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-value]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-value-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-value-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-value-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-value]"}]}, + + {"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-text-value]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-value-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-value-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-value]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-value-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-value-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-delete-button]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-delete-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-delete-button]"}]}, + + + + + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:value]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-constraint]"}]} + ]} \ No newline at end of file

1 0

[isidorus-cvs] r752 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 09:16:43 2011 New Revision: 752 Log: gdl-frontend: Widgets: fixed some bugs when a a visible-object follows after a container-element in the GUI Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.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 Wed Aug 17 08:30:29 2011 (r751) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Aug 17 09:16:43 2011 (r752) @@ -473,7 +473,7 @@ JsArray<Role> descendantRoles = descendantAssociation.getRoles(descendantRoleType); for(int i = 0; i != descendantRoles.length(); ++i){ Topic player = descendantRoles.get(i).getPlayer(); - if(isInstanceOf(player, visibleObject) && !validDescendants.contains(player)) validDescendants.add(player); + if(isInstanceOf(player, visibleObject) && !validDescendants.contains(player) && containees.contains(player)) validDescendants.add(player); } } @@ -483,7 +483,7 @@ for (Topic topic : validDescendants) bindings += ", " + getAnyIdOfTopic(topic); if(bindings.length() == 0) bindings = "[]"; else bindings = bindings.substring(2); - throw new InvalidGdlSchemaException("the topic " + top + " must be bound to exaclty one descendant element, but found " + bindings); + throw new InvalidGdlSchemaException("the topic " + top + " must be bound to exactly one descendant element, but found " + bindings); }else { return validDescendants.get(0); } @@ -542,7 +542,12 @@ Topic position = getTopicByPsi(PSIs.TopicType.gdlPosition, tm); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(position, descriptor)); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(visibleObject, descendantRoleType)); - ArrayList<Association> posAssocs = getAssociationsOfTopic(ancestor, ancestorRoleType, positionAssocType, null, rolePlayertypesAndTypes); + ArrayList<Association> possiblePosAssocs = getAssociationsOfTopic(ancestor, ancestorRoleType, positionAssocType, null, rolePlayertypesAndTypes); + ArrayList<Association> posAssocs = new ArrayList<Association>(); + for (Association candidate : possiblePosAssocs) { + JsArray<Role> descendantRole = candidate.getRoles(descendantRoleType); + if(descendantRole.length() == 1 && descendantRole.get(0).getPlayer().equals(descendant)) posAssocs.add(candidate); + } if(posAssocs.size() != 1){ String top1 = getAnyIdOfTopic(ancestor); @@ -554,7 +559,7 @@ bindings += ", " + getAnyIdOfTopic(assoc.getRoles(descriptor).get(i).getPlayer()); if(bindings.length() == 0) bindings = "[]"; else bindings = bindings.substring(2); - throw new InvalidGdlSchemaException("the topics " + top1 + " and " + top2 + " must be bound to exaclty one position topic, but is bound to " + bindings); + throw new InvalidGdlSchemaException("the topics " + top1 + " and " + top2 + " must be bound to exactly one position topic, but is bound to " + bindings); }else { ArrayList<Topic> positions = new ArrayList<Topic>(); for (Association assoc : posAssocs) {

1 0

[isidorus-cvs] r751 - trunk/src/rest_interface
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 08:30:29 2011 New Revision: 751 Log: trunk: fixed a furhter potential bug with weak-pointers in the RESTful-interface Modified: trunk/src/rest_interface/set-up-json-interface.lisp Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp Wed Aug 17 07:17:08 2011 (r750) +++ trunk/src/rest_interface/set-up-json-interface.lisp Wed Aug 17 08:30:29 2011 (r751) @@ -412,29 +412,34 @@ (declare (ignorable param)) (let ((http-method (hunchentoot:request-method*))) (if (eq http-method :GET) - (progn - (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 - (handler-case - (with-reader-lock - (json:encode-json-to-string - (map 'list - (lambda(item) - (map 'list - (lambda(psi-oid) - (d:uri (elephant::controller-recreate-instance - elephant:*store-controller* psi-oid))) - (getf item :psis))) - *overview-table*))) - (condition (err) (progn - (setf (hunchentoot:return-code*) - hunchentoot:+http-internal-server-error+) - (setf (hunchentoot:content-type*) "text") - (format nil "Condition: \"~a\"" err))))) - (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) + (progn + (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 + ;(handler-case + (with-reader-lock + (let* ((psi-instances + (map 'list + (lambda(item) + (let ((psi-strs (getf item :psis))) + (map 'list + (lambda(psi-oid) + (d:uri (elephant::controller-recreate-instance + elephant:*store-controller* psi-oid))) + psi-strs))) + *overview-table*)) + (result (json:encode-json-to-string psi-instances))) + result)) + ;(condition (err) (progn + ;(setf (hunchentoot:return-code*) + ;hunchentoot:+http-internal-server-error+) + ;(setf (hunchentoot:content-type*) "text") + ;(format nil "Condition: \"~a\"" err))))) + ) + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) + (defun return-json-fragment(&optional psi) - "returns the json-fragmen belonging to the psi passed by the parameter psi. + "returns the json-fragmen belonging to the psi passed by the parameter psi. If the topic is marked as deleted the corresponding fragment is treated as non-existent and an HTTP 404 is set." (assert psi) @@ -443,22 +448,24 @@ (let ((identifier (string-replace psi "%23" "#"))) (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 (with-reader-lock - (handler-case - (let* ((fragment (get-latest-fragment-of-topic identifier)) - (top (when fragment (topic fragment))) - (result (when top (d:serialize-fragment fragment (fragment-serializer))))) - (if result - result - (progn - (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) - (setf (hunchentoot:content-type*) "text") - (format nil "Topic \"~a\" not found" psi)))) - (condition (err) - (progn - (setf (hunchentoot:return-code*) - hunchentoot:+http-internal-server-error+) - (setf (hunchentoot:content-type*) "text") - (format nil "Condition: \"~a\"" err)))))) + ;(handler-case + (let* ((fragment (get-latest-fragment-of-topic identifier)) + (top (when fragment (topic fragment))) + (serializer (fragment-serializer)) + (result (when top (d:serialize-fragment fragment serializer)))) + (if result + result + (progn + (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) + (setf (hunchentoot:content-type*) "text") + (format nil "Topic \"~a\" not found" psi)))) + ;(condition (err) + ;(progn + ;(setf (hunchentoot:return-code*) + ;hunchentoot:+http-internal-server-error+) + ;(setf (hunchentoot:content-type*) "text") + ;(format nil "Condition: \"~a\"" err)))))) + )) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))

1 0

[isidorus-cvs] r750 - trunk/src/rest_interface
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 07:17:08 2011 New Revision: 750 Log: trunk:rest-interface: fixed a bug with weak-pointers in a let-statement of a RESTful-handler Modified: trunk/src/rest_interface/set-up-json-interface.lisp Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp Wed Aug 17 06:33:41 2011 (r749) +++ trunk/src/rest_interface/set-up-json-interface.lisp Wed Aug 17 07:17:08 2011 (r750) @@ -434,32 +434,32 @@ (defun return-json-fragment(&optional psi) - "returns the json-fragmen belonging to the psi passed by the parameter psi. + "returns the json-fragmen belonging to the psi passed by the parameter psi. If the topic is marked as deleted the corresponding fragment is treated as non-existent and an HTTP 404 is set." (assert psi) (let ((http-method (hunchentoot:request-method*))) (if (eq http-method :GET) - (let ((identifier (string-replace psi "%23" "#"))) - (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 - (with-reader-lock - (let ((fragment (get-latest-fragment-of-topic identifier))) - (if (and fragment (find-item-by-revision (topic fragment) 0)) - (handler-case - (d:serialize-fragment fragment (fragment-serializer)) - ;(export-construct-as-isidorus-json-string - ;fragment :revision 0) - (condition (err) + (let ((identifier (string-replace psi "%23" "#"))) + (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 + (with-reader-lock + (handler-case + (let* ((fragment (get-latest-fragment-of-topic identifier)) + (top (when fragment (topic fragment))) + (result (when top (d:serialize-fragment fragment (fragment-serializer))))) + (if result + result (progn - (setf (hunchentoot:return-code*) - hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) (setf (hunchentoot:content-type*) "text") - (format nil "Condition: \"~a\"" err)))) - (progn - (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) - (setf (hunchentoot:content-type*) "text") - (format nil "Topic \"~a\" not found" psi)))))) - (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) + (format nil "Topic \"~a\" not found" psi)))) + (condition (err) + (progn + (setf (hunchentoot:return-code*) + hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "Condition: \"~a\"" err)))))) + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) (defun return-json-rdf-fragment(&optional psi)

1 0

[isidorus-cvs] r749 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 06:33:41 2011 New Revision: 749 Log: trunk: changed some addresses Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 06:25:39 2011 (r748) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 06:33:41 2011 (r749) @@ -3,10 +3,10 @@ ;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") (setf rest-interface:*users* (list (list :uname "isidorus" :passwd "Ar8g7Pw"))) (setf rest-interface:*use-http-authentication* 2) ;only the host page isidorus.html and the commit handlers are protected -(setf rest-interface:*local-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip -(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*local-backup-remote-address* "12.34.56.78") ;the allowed other remove peer ip +(setf rest-interface:*remote-backup-remote-address* "12.34.56.78") ;the allowed other remove peer ip (setf rest-interface:*shutdown-remote-address* "127.0.0.1") ;the allowed other remove peer ip -(rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "143.93.190.176" :port 7000) +(rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "12.34.56,78" :port 12345) (rest-interface:start-admin-server) (format t "will enter die-when-finished") (rest-interface:die-when-finished)

1 0

[isidorus-cvs] r748 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 06:25:39 2011 New Revision: 748 Log: gdl-frontend: Widgets: started to implement the GDl-Schema for creating instances of http://textgrid.org/serviceregistry/model/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Wed Aug 17 04:59:20 2011 (r747) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Wed Aug 17 06:25:39 2011 (r748) @@ -0,0 +1,139 @@ +{"version":"1.1", + + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", + "tgm":"http://textgrid.org/serviceregistry/model/", + "tgg":"http://textgrid.org/serviceregistry/gdl/", + "gdl":"http://psi.isidor.us/gdl/"}, + + "item_type":"topicmap", + + "item_identifiers":["[tg:services-tm]"], + + "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:occurrence-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:card-min]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"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-name-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]"]}, + {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"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: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]"]}, + {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[gdl:container]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-construct]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descriptor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value-group]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[gdl:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:Visible-Object]"]}, + {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:View]"]}, + {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Creator-Topic-View]"]}, + {"subject_identifiers":["[gdl:Association-View]"]}, + {"subject_identifiers":["[gdl:Creator-Association-View]"]}, + {"subject_identifiers":["[gdl:Value]"]}, + {"subject_identifiers":["[gdl:TM-Value]"]}, + {"subject_identifiers":["[gdl:TM-Single-Type-Value]"]}, + {"subject_identifiers":["[gdl:Literal-Value]"]}, + {"subject_identifiers":["[gdl:literal-value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Value]"]}, + {"subject_identifiers":["[gdl:fixed]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Literal-Value]"]}, + {"subject_identifiers":["[gdl:Text-Object]"]}, + {"subject_identifiers":["[gdl:List-Box]"]}, + {"subject_identifiers":["[gdl:Text]"]}, + {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Position]"]}, + {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:right]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:textgrid-ui-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for the TextGrid-ServiceRegistry-UI"}]}, + {"subject_identifiers":["[tgg:hash-object-default-creator-topic-view]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_creator_topic_view_id"}, {"type":"si:[gdl:width]", "value":"300px"}, {"type":"si:[gdl:height]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, + {"subject_identifiers":["[tgg:hash-object-creator-view-binding]"], "instance_of":["si:[gdl:TM-Single-Type-Value]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-env]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_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-text-label-env-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"name:"}]}, + + {"subject_identifiers":["[tgg:has-hash-creator-association-view]"], "instance_of":["si:[gdl:Creator-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Creator 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-creator-association-view-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-has-hash-creator-association-view-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-list-box-env]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-list-box-env-position]"], "instance_of":["si:[gdl: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-text-list-box-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]} + + ], + + "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-name-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Visible-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Creator-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Association-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Creator-Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Descriptor]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Literal-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:List-Box]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Position]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value-Group]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:textgrid-ui-schema]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-default-creator-topic-view]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgm:Hash-Object]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:tm-value]", "player":"si:[tgg:hash-object-creator-view-binding]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-env-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + + + + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env]"}]} + ]} \ No newline at end of file

1 0

[isidorus-cvs] r747 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 04:59:20 2011 New Revision: 747 Log: trunk: shell_scripts: adapted the script fillDB.sh for the TextGrid isidorus server and user Modified: trunk/src/shell_scripts/fillDB.sh Modified: trunk/src/shell_scripts/fillDB.sh ============================================================================== --- trunk/src/shell_scripts/fillDB.sh Wed Aug 17 04:27:45 2011 (r746) +++ trunk/src/shell_scripts/fillDB.sh Wed Aug 17 04:59:20 2011 (r747) @@ -1,9 +1,9 @@ #!/bin/bash export LANG=de_DE.UTF-8 cd /home/isidorus/.sbcl/site/isidorus/src -sbcl << END +su -l -s /bin/bash isidorus -c sbcl << END (setf sb-impl::*default-external-format* :UTF-8) (asdf:operate 'asdf:load-op 'isidorus) -(xtm-importer:setup-repository "/home/isidorus/textgrid.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") +(xtm-importer:setup-repository "/home/isidorus/latestDump20110711.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") (elephant:close-store) END

1 0

[isidorus-cvs] r746 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment isidorus view
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 04:27:45 2011 New Revision: 746 Log: gdl-frontend: Widgets: fixed some bugs when consuming Topic Maps data 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/TmHelper.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/view/GdlView.java 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 Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Aug 17 04:27:45 2011 (r746) @@ -27,18 +27,19 @@ 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/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/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/test-environment", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/test-environment", 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, requestedTopicsToCreate); + 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/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Aug 17 04:27:45 2011 (r746) @@ -110,7 +110,7 @@ // returns true if the topic instance if an instance of the topic type public static boolean isInstanceOf(Topic instance, Topic type){ if(instance == null || (instance.getTypes().length() != 0 && type == null)) return false; - if(instance.getTypes().length() == 0 && type == null) return true; + if(instance.getTypes().length() == 0 && type == null) return false; // type must be always set! JsArray<Topic> types = instance.getTypes(); for(int i = 0; i != types.length(); ++i){ @@ -317,7 +317,7 @@ Topic containerRoleType = getTopicByPsi(PSIs.RoleType.gdlContainer, tm); Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); Topic containeeRoleType = getTopicByPsi(PSIs.RoleType.gdlContainee, tm); - + return getOtherPlayerOfBinaryAssociation(container, containerRoleType, containsAssocType, null, visibleObject, containeeRoleType); } 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 Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Aug 17 04:27:45 2011 (r746) @@ -94,18 +94,18 @@ }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDefaultEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlDefaultEditorTopicView); + 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)){ return new GdlSpecialCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + 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)) throw new ExecutionException("receivedData must be of type Association when used with " + 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); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlEditorAssociationView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Associaiton when used with " + 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); }else{ String values = ""; 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 Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Aug 17 04:27:45 2011 (r746) @@ -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_Edit_Environment.jtm"); //"test.gdl.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_GDL_Create_HashObject.jtm"); //"test.gdl.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/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Aug 17 04:27:45 2011 (r746) @@ -3,7 +3,6 @@ import java.util.ArrayList; import com.google.gwt.core.client.JsArray; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;

1 0

[isidorus-cvs] r745 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 03:19:14 2011 New Revision: 745 Log: trunk: shell_scripts: added a simple script for loading data into the DB Added: trunk/src/shell_scripts/fillDB.sh (contents, props changed) Added: trunk/src/shell_scripts/fillDB.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/fillDB.sh Wed Aug 17 03:19:14 2011 (r745) @@ -0,0 +1,9 @@ +#!/bin/bash +export LANG=de_DE.UTF-8 +cd /home/isidorus/.sbcl/site/isidorus/src +sbcl << END +(setf sb-impl::*default-external-format* :UTF-8) +(asdf:operate 'asdf:load-op 'isidorus) +(xtm-importer:setup-repository "/home/isidorus/textgrid.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") +(elephant:close-store) +END

1 0

[isidorus-cvs] r744 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 02:56:52 2011 New Revision: 744 Log: trunk: shell_scripts: changed the state of the http-basic-authentication mechanism in the start script for TextGrid Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:49:33 2011 (r743) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:56:52 2011 (r744) @@ -2,10 +2,10 @@ (asdf:operate 'asdf:load-op 'isidorus) ;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") (setf rest-interface:*users* (list (list :uname "isidorus" :passwd "Ar8g7Pw"))) -(setf rest-interface:*use-http-authentication* 1) ;only the host page isidorus.html is protected, note: all RESTful handlers can be invoked without any authentication mechanism!!! -(setf rest-interface:*local-backup-remote-address* "143.93.190.247") -(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") -(setf rest-interface:*shutdown-remote-address* "127.0.0.1") +(setf rest-interface:*use-http-authentication* 2) ;only the host page isidorus.html and the commit handlers are protected +(setf rest-interface:*local-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*shutdown-remote-address* "127.0.0.1") ;the allowed other remove peer ip (rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "143.93.190.176" :port 7000) (rest-interface:start-admin-server) (format t "will enter die-when-finished")

1 0