Author: lgiessmann Date: Thu Dec 22 06:28:02 2011 New Revision: 1069

Log: gdl-frontend: Widgets: fixed some spelling errors in the TMLC-definition of TG_Ontology.jtm; chaged the class TestClass for working with the newly created TMCL-Schema

Modified: trunk/src/anaToMia/GDL_Widgets/gwt-unitCache/gwt-unitCache-0000013465EABE62 trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/TG_Ontology.jtm

Modified: trunk/src/anaToMia/GDL_Widgets/gwt-unitCache/gwt-unitCache-0000013465EABE62 ============================================================================== Binary file (source and/or target). No diff available.

Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Thu Dec 22 05:55:31 2011 (r1068) +++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Thu Dec 22 06:28:02 2011 (r1069) @@ -27,9 +27,9 @@

public class TestClass implements EntryPoint{ - public final String MODEL_PREF = "http://services.org/serviceregistry/model/types/"; - public final String SERVICE_PSI = MODEL_PREF + "Service"; - public final String SORT_SERVICE = "http://service.org/serviceregistry/psis/service/sort-service"; + public final String TYPES_PREF = "http://services.org/serviceregistry/model/types/"; + public final String PROJECT_PSI = TYPES_PREF + "Project"; + public final String TEST_PROJECT_PSI = "http://textgrid.org/serviceregistry/project/test-project"; HorizontalPanel mainPanel = new HorizontalPanel(); GdlPanel gdlPanel = null;

@@ -39,11 +39,8 @@ RootPanel.get("GWT_Content").add(mainPanel); mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); - - ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>(SERVICE_PSI, TopicIdentifierTypes.SubjectIdentifier)); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>(SORT_SERVICE, TopicIdentifierTypes.SubjectIdentifier); + Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>(TEST_PROJECT_PSI, TopicIdentifierTypes.SubjectIdentifier); gdlPanel = new GdlPanel(requestedTopicToEdit, null);

GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() {

Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java Thu Dec 22 05:55:31 2011 (r1068) +++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java Thu Dec 22 06:28:02 2011 (r1069) @@ -23,9 +23,9 @@ // this class can be used as a callback that requests the Topic Map data // addressable by the URI requestUrl public class TestLoadSchemaCallback implements ILoadSchemaCallback{ - private final String requestUrl = URL.encode(GWT.getModuleBaseURL() + "Service_GDL_Schema.jtm"); - private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null; + private final String requestUrl = URL.encode(GWT.getModuleBaseURL() + "TG_Ontology.jtm"); + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = null; + private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://test.psi", TopicIdentifierTypes.SubjectIdentifier); private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, requestUrl);

Modified: trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/TG_Ontology.jtm ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/TG_Ontology.jtm Thu Dec 22 05:55:31 2011 (r1068) +++ trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/TG_Ontology.jtm Thu Dec 22 06:28:02 2011 (r1069) @@ -35,6 +35,8 @@ {"subject_identifiers":["[tmcl:topic-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:association-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:role-combination-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:regular-expression-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:occurrence-datatype-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},

{"subject_identifiers":["[tgt:User]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tgt:Project]"], "instance_of":["si:[tmcl:topic-type]"]}, @@ -77,7 +79,7 @@ {"subject_identifiers":["[tgm:project-id]"], "instance_of":["si:[tmcl:occurrence-type]"]},

{"subject_identifiers":["[tgm:project-manager]"], "instance_of":["si:[tmcl:occurrence-type]"]}, - {"subject_identifiers":["[tgm:athority-to-delete]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:authority-to-delete]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[tgm:editor]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[tgm:observer]"], "instance_of":["si:[tmcl:occurrence-type]"]},

@@ -164,7 +166,7 @@

{"subject_identifiers":["[tgm:project-psi-constraint]"], "instance_of":["si:[tmcl:subject-identifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}, {"type":"si:[tmcl:regexp]", "value":"^http://textgrid.org/serviceregistry/project/.+$%22%7D%5D%7D, {"subject_identifiers":["[tgm:project-name-constraint]"], "instance_of":["si:[tmcl:topic-name-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, - {"subject_identifiers":["[tgm:user-given-name-rex-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + {"subject_identifiers":["[tgm:project-name-rex-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]},

{"subject_identifiers":["[tgm:project-id-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:project-id-rex-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, @@ -270,6 +272,9 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:association-role-constraint]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:role-combination-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:regular-expression-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:occurrence-datatype-constraint]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tgt:Project-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[tgt:Container]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tgt:Container]"},{"type":"si:[tmdm:subtype]", "player":"si:[tgt:Collection]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tgt:Container]"},{"type":"si:[tmdm:subtype]", "player":"si:[tgt:Aggregation]"}]}, @@ -405,7 +410,7 @@ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:metadata-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:metadata-name-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:metadata-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:metadata-name-rex-constraint]"}]},

- {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[tgm:Metaproperty-psi-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[tgt:Metaproperty]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[tgm:metaproperty-psi-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[tgt:Metaproperty]"}]}, {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Metaproperty]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:key-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:key-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:key-rex-constraint]"}]}, @@ -515,14 +520,14 @@ {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Project]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:project-contains-role-combination-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:project]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:project-contains-role-combination-constraint]"}]}, {"type":"si:[tmcl:other-constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Project-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:project-contains-role-combination-constraint]"}]}, - {"type":"si:[tmcl:other-constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:project-object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:pproject-contains-role-combination-constraint]"}]}, + {"type":"si:[tmcl:other-constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:project-object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:project-contains-role-combination-constraint]"}]},

{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Container]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:container-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:container-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:container]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:container-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:container-has-item-association-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:container]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:container-has-item-association-role-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Congtainer-Item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:item-has-item-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgt:Container-Item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:item-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:item-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:container-item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:item-has-item-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-item]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:item-has-item-association-role-constraint]"}]},