isidorus-cvs

Download

isidorus-cvs@common-lisp.net

August 2011

1 participants
117 discussions

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

16 Aug '11

Author: lgiessmann Date: Tue Aug 16 01:40:02 2011 New Revision: 733 Log: gdl-frontend: Widgets: fixed the required TMCL schema for TextGrid Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 08:46:44 2011 (r732) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Tue Aug 16 01:40:02 2011 (r733) @@ -42,7 +42,7 @@ {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tgm:Environment]"], "instance_of":["si:[tmcl:topic-type]"]}, - {"subject_identifiers":["[tgm:type]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:hash-type]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[tgm:key]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[tgm:value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -53,18 +53,16 @@ {"subject_identifiers":["[tgm:service]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[tgm:hash]"], "instance_of":["si:[tmcl:role-type]"]}, - {"subject_identifiers":["[tgm:parameter]"], "instance_of":["si:[tmcl:role-type]"]}, - {"subject_identifiers":["[tgm:config]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[tgm:environment]"], "instance_of":["si:[tmcl:role-type]"]}, - {"subject_identifiers":["[tgm:environment-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/environment/.+"}]}, + {"subject_identifiers":["[tgm:environment-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/environment/.+$"}]}, {"subject_identifiers":["[tgm:environment-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:environment-name-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, - {"subject_identifiers":["[tgm:hash-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/hashobject/.+"}]}, - {"subject_identifiers":["[tgm:hash-type-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-type-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, - {"subject_identifiers":["[tgm:hash-type-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:hash-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/hashobject/.+/.+$"}]}, + {"subject_identifiers":["[tgm:hash-hash-type-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-hash-type-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + {"subject_identifiers":["[tgm:hash-hash-type-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, {"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-key-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, {"subject_identifiers":["[tgm:hash-key-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, @@ -74,13 +72,11 @@ {"subject_identifiers":["[tgm:has-environment-environment-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-environment-environment-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, - {"subject_identifiers":["[tgm:has-environment-hash-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-environment-hash-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-hash-hash-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-hash-hash-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, - {"subject_identifiers":["[tgm:has-hash-service-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-hash-service-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]} ], @@ -98,10 +94,10 @@ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-regular-expression-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, - {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, - {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-regular-expression-constraint]"}]}, - {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-datatype-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-hash-type-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash-type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-hash-type-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash-type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-hash-type-regular-expression-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash-type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-hash-type-datatype-constraint]"}]}, {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-constraint]"}]}, {"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:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-regular-expression-constraint]"}]}, @@ -116,7 +112,6 @@ {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, @@ -128,7 +123,6 @@ {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-association-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-association-role-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Service]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:service]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]},

1 0

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

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 08:46:44 2011 New Revision: 732 Log: gdl-frontend: Widgets: started to implement the optional TMCL schema for the TextGrid ServiceRegistry, i.e. for the topic types http://textgrid.org/serviceregistry/model/Service, http://textgrid.org/serviceregistry/model/Parameter and Parameter-Config Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Mon Aug 15 08:34:52 2011 (r731) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Mon Aug 15 08:46:44 2011 (r732) @@ -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_TMCL_2010-05-03_required.jtm"); //"test.gdl.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_TMCL_2010-05-03_optional.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/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm Mon Aug 15 08:34:52 2011 (r731) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm Mon Aug 15 08:46:44 2011 (r732) @@ -0,0 +1,102 @@ +{"version":"1.1", + + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tgm":"http://textgrid.org/serviceregistry/model/"}, + + "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:regexp]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tmcl:datatype]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]", "si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmcl:subject-identifier-constraint]"], "instance_of":["si:[tmcl:topic-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":["[tmcl:occurrence-datatype-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:topic-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tmcl:constrained-topic-type]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tmcl:constrained-role]"], "instance_of":["si:[tmcl:association-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:Service]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:Parameter]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:Parameter-Config]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[tgm:service-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[tgm:operation]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:type]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:description]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:keywords]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:description-location-uri]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:inline-descriptionLocaton]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:description-location-body]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:target-namespace]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:use-target-ns]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tgm:parameter-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[tgm:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:param]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:mimetype]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:multiple]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:crud]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:needs-b64-encoding]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:example-config]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tgm:parameter-config-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[tgm:default]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:form]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:data]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tgm:service-name-constraint]"], "instance_of":["si:[tmcl:topic-name-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-operation-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-operation-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-description-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-description-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-keywords-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-keywords-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-description-location-uri-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-description-location-uri-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-inline-description-location-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-inline-description-location-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]}, + {"subject_identifiers":["[tgm:service-description-location-body-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-description-location-body-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-target-namespace-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-target-namespace-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"subject_identifiers":["[tgm:service-use-target-namespace-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-use-target-namespace-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]}, + {"subject_identifiers":["[tgm:service-owner-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-owner-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]}, + {"subject_identifiers":["[tgm:service-identifier-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-identifier-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]}, + {"subject_identifiers":["[tgm:service-textgrid-url-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-textgrid-url-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]}, + {"subject_identifiers":["[tgm:service-tg-approved-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:service-tg-approved-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#boolean"}]} + + ], +"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:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:subject-identifier-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-occurrence-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:association-role-constraint]"}]} + ]} \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 08:34:52 2011 (r731) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 08:46:44 2011 (r732) @@ -39,7 +39,7 @@ {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[tgm:Service]"], "instance_of":["si:[tmcl:topic-type]"]}, - {"subject_identifiers":["[tgm:HashObject]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tgm:Environment]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tgm:type]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -92,21 +92,21 @@ {"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:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-psi-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-psi-constraint]"}]}, {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-psi-constraint]"}]}, {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-regular-expression-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-regular-expression-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-datatype-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-constraint]"}]}, {"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:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-regular-expression-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-datatype-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-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]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:value]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-regular-expression-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:value]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-datatype-constraint]"}]}, @@ -117,13 +117,13 @@ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]}, - {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Hash-Object]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-association-role-constraint]"}]},

1 0

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

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 08:34:52 2011 New Revision: 731 Log: gdl-frontend: Widgets: fixed the TMCL schema for TextGrid => occurrence values that contains curies are changed to the corresponding full URIs Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 07:39:54 2011 (r730) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 08:34:52 2011 (r731) @@ -1,4 +1,5 @@ {"version":"1.1", + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", "tmdm":"http://psi.topicmaps.org/iso13250/model/", "tgm":"http://textgrid.org/serviceregistry/model/"}, @@ -63,13 +64,13 @@ {"subject_identifiers":["[tgm:hash-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/hashobject/.+"}]}, {"subject_identifiers":["[tgm:hash-type-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-type-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, - {"subject_identifiers":["[tgm:hash-type-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + {"subject_identifiers":["[tgm:hash-type-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, {"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-key-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, - {"subject_identifiers":["[tgm:hash-key-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + {"subject_identifiers":["[tgm:hash-key-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, {"subject_identifiers":["[tgm:hash-value-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:hash-value-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, - {"subject_identifiers":["[tgm:hash-value-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + {"subject_identifiers":["[tgm:hash-value-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"http://www.w3.org/2001/XMLSchema#string"}]}, {"subject_identifiers":["[tgm:has-environment-environment-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[tgm:has-environment-environment-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]},

1 0

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

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 07:39:54 2011 New Revision: 730 Log: gdl-frontend: Widgets: defined the TMCL schema that is required for the TextGrid ServiceRegistry, i.e. the schema for the topic types http://textgrid.org/serviceregistry/model/HashObject and http://textgrid.org/serviceregistry/model/Environment Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Mon Aug 15 05:46:48 2011 (r729) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Mon Aug 15 07:39:54 2011 (r730) @@ -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() + "test.gdl.jtm"); //"TextGrid.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_TMCL_2010-05-03_required.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/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 05:46:48 2011 (r729) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Aug 15 07:39:54 2011 (r730) @@ -0,0 +1,136 @@ +{"version":"1.1", + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tgm":"http://textgrid.org/serviceregistry/model/"}, + + "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:regexp]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tmcl:datatype]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]", "si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmcl:subject-identifier-constraint]"], "instance_of":["si:[tmcl:topic-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":["[tmcl:regular-expression-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:occurrence-datatype-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:topic-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tmcl:constrained-topic-type]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tmcl:constrained-role]"], "instance_of":["si:[tmcl:association-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:Service]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:HashObject]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tgm:Environment]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[tgm:type]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:key]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tgm:value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + + {"subject_identifiers":["[tgm:environment-name]"], "instance_of":["si:[tmcl:name-type]"]}, + + {"subject_identifiers":["[tgm:has-hash]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[tgm:has-environment]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[tgm:service]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tgm:hash]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tgm:parameter]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tgm:config]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tgm:environment]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[tgm:environment-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/environment/.+"}]}, + {"subject_identifiers":["[tgm:environment-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:environment-name-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + + {"subject_identifiers":["[tgm:hash-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/hashobject/.+"}]}, + {"subject_identifiers":["[tgm:hash-type-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-type-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + {"subject_identifiers":["[tgm:hash-type-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + {"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-key-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + {"subject_identifiers":["[tgm:hash-key-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + {"subject_identifiers":["[tgm:hash-value-constraint]"], "instance_of":["si:[tmcl:topic-occurrence-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:hash-value-regular-expression-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^.+$"}]}, + {"subject_identifiers":["[tgm:hash-value-datatype-constraint]"], "instance_of":["si:[tmcl:occurrence-datatype-constraint]"], "occurrences":[{"type":"si:[tmcl:datatype]", "value":"xsd:string"}]}, + + {"subject_identifiers":["[tgm:has-environment-environment-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:has-environment-environment-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + + {"subject_identifiers":["[tgm:has-environment-hash-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:has-environment-hash-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + + {"subject_identifiers":["[tgm:has-hash-hash-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:has-hash-hash-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + + {"subject_identifiers":["[tgm:has-hash-service-role-constraint]"], "instance_of":["si:[tmcl:topic-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[tgm:has-hash-service-association-role-constraint]"], "instance_of":["si:[tmcl:association-role-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]} + ], + + "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:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:subject-identifier-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-occurrence-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:regular-expression-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:association-role-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-psi-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-psi-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-regular-expression-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-regular-expression-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:type]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-type-datatype-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-constraint]"}]}, + {"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:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-regular-expression-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:key]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-key-datatype-constraint]"}]}, + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-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]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:value]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-regular-expression-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:value]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:hash-value-datatype-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-environment-association-role-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-environment]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:HashObject]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-association-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-hash-association-role-constraint]"}]}, + + {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:Service]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:service]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:has-hash]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-association-role-constraint]"}]}, + {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:service]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:has-hash-service-association-role-constraint]"}]} + ]} \ No newline at end of file

1 0

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

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 05:46:48 2011 New Revision: 729 Log: gdl-frontend: Widgets: created the skeleton for the TMCL/GDL schema definition for the TextGrid ServiceRegistry Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_required.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm - copied unchanged from r725, branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid.jtm Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid.jtm Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_required.jtm ============================================================================== Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm ============================================================================== Copied: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm (from r725, branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid.jtm) ==============================================================================

1 0

[isidorus-cvs] r728 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: lib src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/container src/us/isidor/gdl/anaToMia/Widgets/environment src/us/isidor/gdl/anaToMia/Widgets/text
by lgiessmann＠common-lisp.net 15 Aug '11

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 05:40:19 2011 New Revision: 728 Log: gdl-frontend: Widgets: implemented the consumption of SubjectIdentifiers, SubjectLocators, ItemIdentifiers, TopicNames and TopicOccurrences in GdlText Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/lib/GDL_TopicMaps_Model.jar branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java 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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/lib/GDL_TopicMaps_Model.jar ============================================================================== Binary file (source and/or target). No diff available. Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 15 05:40:19 2011 (r728) @@ -4,9 +4,12 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Variant; import us.isidor.gdl.anaToMia.Widgets.button.GdlActionButton; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -90,7 +93,7 @@ this.tmRepresentative = tmRepresentative; this.tm = this.tmRepresentative.getTopicMap(); - if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic or an Association, but is: " + receivedData.getClass()); + if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && !(receivedData instanceof Name) && !(receivedData instanceof Variant) && !(receivedData instanceof Occurrence) && !(receivedData instanceof Role) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic, Association, Topic-Name, Name-Variant, Topic-Occurrence or Association-Role, but is: " + receivedData.getClass()); this.receivedData = receivedData; this.setId(this.getId()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 15 05:40:19 2011 (r728) @@ -20,6 +20,7 @@ public final static String tmclTopictype = tmcl + "topic-type"; public final static String tmclNameType = tmcl + "name-type"; public final static String tmclOccurrenceType = tmcl + "occurrence-type"; + public final static String tmclAssociationType = "tmcl" + "association-type"; public final static String tmclConstraint = tmcl + "constraint"; public final static String tmclConstrained = tmcl + "constrained"; public final static String tmclConstrainedStatement = tmcl + "constrained-statement"; @@ -30,6 +31,7 @@ public final static String tmclReifierConstraint = tmcl + "reifier-constraint"; public final static String tmclScopeConstraint = tmcl + "scope-constraint"; public final static String tmclTopicNameConstraint = tmcl + "topic-name-constraint"; + public final static String tmclVariantNameConstraint = tmcl + "variant-name-constraint"; public final static String tmclTopicOccurrenceConstraint = tmcl + "topic-occurrence-constraint"; public final static String tmclTopicRoleConstraint = tmcl + "topic-role-constraint"; public final static String tmclAssociationRoleConstraint = tmcl + "association-role-constraint"; @@ -37,6 +39,9 @@ public final static String tmclAllowed = tmcl + "allowed"; public final static String tmclAllowedReifier = tmcl + "allowed-reifier"; public final static String tmclConstrainedScope = tmcl + "constrained-scope"; + public final static String tmclSubjectIdentifierConstraint = tmcl + "subject-identifier-constraint"; + public final static String tmclSubjectLocatorConstraint = tmcl + "subject-locator-constraint"; + public final static String tmclItemIdentifierConstraint = tmcl + "item-identifier-constraint"; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 15 05:40:19 2011 (r728) @@ -21,7 +21,7 @@ @Override public void onModuleLoad() { - try{ + try{ RootPanel.get("GWT_Content").add(mainPanel); mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 15 05:40:19 2011 (r728) @@ -626,6 +626,30 @@ else return null; } + + // returns the topic that plays the role of tmcl:constrained in an association + // of the type tmcl:constrained-statement that is bound to the passed topic + // constrinatTopic that plays the role of tmcl:constraint + public static Topic getConstrainedStatement(Topic constraintTopic) throws InvalidGdlSchemaException{ + if(constraintTopic == null) return null; + + TopicMap tm = constraintTopic.getTopicMap(); + Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); + Topic constraintStatementAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedStatement, tm); + Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm); + Topic nameType = getTopicByPsi(PSIs.TMCL.tmclNameType, tm); + Topic occurrenceType = getTopicByPsi(PSIs.TMCL.tmclOccurrenceType, tm); + Topic associationType = getTopicByPsi(PSIs.TMCL.tmclAssociationType, tm); + ArrayList<Topic> constrainedNameTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constraintStatementAssocType, null, nameType, constrainedRoleType); + ArrayList<Topic> constrainedOccurrenceTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constraintStatementAssocType, null, occurrenceType, constrainedRoleType); + ArrayList<Topic> constrainedAssociationTypes = getOtherPlayerOfBinaryAssociation(constraintTopic, constraintRoleType, constraintStatementAssocType, null, associationType, constrainedRoleType); + + ArrayList<Topic> constrainedStatements = Utils.union(Utils.union(constrainedNameTypes, constrainedOccurrenceTypes), constrainedAssociationTypes); + + if(constrainedStatements.size() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(constraintTopic) + "must be bound exactly once to a statement topic via a " + PSIs.TMCL.tmclConstrainedStatement + " association, but is: " + constrainedStatements.size()); + else return constrainedStatements.get(0); + } + // returns the root constraint of a gdl:Value-Group instance, i.e. a tmcl constraint. // E.g. a value group may be bound to a gdl:Type constraint and this constraint may be bound 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 Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 15 05:40:19 2011 (r728) @@ -30,12 +30,14 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; +import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -47,26 +49,28 @@ import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; -public class GdlUnit extends GdlTextObject implements IGdlContainer { +public class GdlUnit extends GdlTextObject implements IGdlContainer { + private Topic constraintTopic = null; + private boolean constraintTopicSet = false; + + // some constructors protected GdlUnit() throws InvalidGdlSchemaException, ExecutionException { super(); - this.createUnit(); } public GdlUnit(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative, receivedData); - // create a unit for each tm-element - this.createUnit(); + // create a unit for each tm-element and set the current element, e.g. current topic, occurrence, name, ... + this.createUnit(null); this.setNthButtons(); } - // creates a unit element or returns the one, if there is a unit element - // in the subElements array - private void createUnit() throws InvalidGdlSchemaException, ExecutionException{ - UnitWidget unit = new UnitWidget(this.getTmRepresentative()); + // creates a unit element => UnitWidget + private UnitWidget createUnit(Construct currentElement) throws InvalidGdlSchemaException, ExecutionException{ + UnitWidget unit = new UnitWidget(this.getTmRepresentative(), currentElement); ActiveStyleHandler asHandler = new ActiveStyleHandler(this); FocusStyleHandler fsHandler = new FocusStyleHandler(this); HoverStyleHandler hsHandler = new HoverStyleHandler(this); @@ -91,6 +95,8 @@ lastTopic = currentTopic; currentTopic = TmHelper.getNextContainee(currentTopic, objectsContained); } + + return unit; } @@ -191,13 +197,40 @@ } + // returns the constraint that the GdlUnit instance is bound to or null + // if it is not bound to a constraint topic + public Topic getConstraint() throws InvalidGdlSchemaException { + if(this.constraintTopicSet){ + return this.constraintTopic; + } else { + this.constraintTopicSet = true; + TopicMap tm = this.tmRepresentative.getTopicMap(); + Topic descriptorRoleType = TmHelper.getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); + Topic tmBindingAssocType = TmHelper.getTopicByPsi(PSIs.AssociationType.gdlTmBinding, tm); + Topic tmConstructRoleType = TmHelper.getTopicByPsi(PSIs.RoleType.gdlTmConstruct, tm); + Topic tmclTopicNameConstraintType = TmHelper.getTopicByPsi(PSIs.TMCL.tmclTopicNameConstraint, tm); + Topic tmclVariantNameConstraintType = TmHelper.getTopicByPsi(PSIs.TMCL.tmclVariantNameConstraint, tm); + Topic tmclTopicOccurrenceConstraintType = TmHelper.getTopicByPsi(PSIs.TMCL.tmclTopicOccurrenceConstraint, tm); + + 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); + if(allConstraints.size() > 1) + throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " can be bound only to one constraint, but is " + allConstraints.size()); + + if(allConstraints.size() == 0) return null; + else return allConstraints.get(0); + } + } + protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ private CaptionPanel basePanel = new CaptionPanel(); private AbsolutePanel containerPanel = new AbsolutePanel(); private Topic tmRepresentative = null; private ArrayList<Widget> subElements = new ArrayList<Widget>(); - + private Construct currentElement = null; private UnitWidget(){ initWidget(this.basePanel); @@ -206,24 +239,24 @@ } - public UnitWidget(Topic tmRepresentative){ + public UnitWidget(Topic tmRepresentative, Construct currentElement){ this(); this.tmRepresentative = tmRepresentative; + this.currentElement = currentElement; } public Topic getTmRepresentative(){ return this.tmRepresentative; } - - + // appends a new element in form of a topic to this unit-widget public GdlVisibleObject append(Topic ancestor, Topic current) throws ExecutionException, InvalidGdlSchemaException { if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); - GdlVisibleObject newObj = GdlInstantiator.instantiate(current, GdlUnit.this.receivedData); + GdlVisibleObject newObj = GdlInstantiator.instantiate(current, this.currentElement); GdlVisibleObject oldObj = null; for (Widget widget : this.subElements){ if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ @@ -253,6 +286,7 @@ DOM.setElementAttribute(this.basePanel.getElement(), "id", id); } + public String getCaption() { return this.basePanel.getCaptionText(); } 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 Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Mon Aug 15 05:40:19 2011 (r728) @@ -5,8 +5,12 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Variant; import us.isidor.gdl.anaToMia.Widgets.base.GdlSpace; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -44,7 +48,7 @@ // returns a java instance of a GdlVisibleObject that corresponds to the // set topic type of the passed topic instance public static GdlVisibleObject instantiate(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ - if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic or an Association, but is: " + receivedData.getClass()); + if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && !(receivedData instanceof Name) && !(receivedData instanceof Variant) && !(receivedData instanceof Occurrence) && !(receivedData instanceof Role) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic, Association, Topic-Name, Name-Variant, Topic-Occurrence or Association-Role, but is: " + receivedData.getClass()); if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpace)){ return new GdlSpace(tmRepresentative, receivedData); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 15 04:11:51 2011 (r727) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 15 05:40:19 2011 (r728) @@ -14,6 +14,8 @@ import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Reifiable; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ReifiableStub; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -25,6 +27,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.Pattern; import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; @@ -60,8 +63,59 @@ public GdlText(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative, receivedData); - // TODO: create a text element for each TM-elem + // TODO: create a text element for each TM-elem, at least one empty elem this.createNewTextArea().setText("Text"); // TODO: remove only for debugging + + + // TODO: move to GdlVisibleObject + if(receivedData != null){ + if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint)){ + if(!(receivedData instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + receivedData.getClass()); + + Pattern rex = new Pattern(this.getLiteralValueForConstraint()); + for(int i = 0; i != ((Topic)receivedData).getSubjectIdentifiers().length(); ++i){ + String psi = ((Topic)receivedData).getSubjectIdentifiers().get(i).getReference(); + if(rex.matches(psi)){ + this.createNewTextArea().setText(psi); + } + } + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){ + if(!(receivedData instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + receivedData.getClass()); + + Pattern rex = new Pattern(this.getLiteralValueForConstraint()); + for(int i = 0; i != ((Topic)receivedData).getSubjectLocators().length(); ++i){ + String sl = ((Topic)receivedData).getSubjectLocators().get(i).getReference(); + if(rex.matches(sl)){ + this.createNewTextArea().setText(sl); + } + } + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ + if(!(this.receivedData instanceof Reifiable)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Reifiable, but is: " + receivedData.getClass()); + + Pattern rex = new Pattern(this.getLiteralValueForConstraint()); + for(int i = 0; i != ((ReifiableStub)receivedData).getItemIdentifiers().length(); ++i){ + String ii = ((Topic)receivedData).getItemIdentifiers().get(i).getReference(); + if(rex.matches(ii)){ + this.createNewTextArea().setText(ii); + } + } + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){ + if(!(receivedData instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + receivedData.getClass()); + + Topic nameType = TmHelper.getConstrainedStatement(this.getConstraint()); + for(int i = 0; i != ((Topic)this.receivedData).getNames(nameType).length(); ++i) + this.createNewTextArea().setText(((Topic)this.receivedData).getNames(nameType).get(i).getValue()); + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclTopicOccurrenceConstraint)){ + if(!(receivedData instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + receivedData.getClass()); + + Topic occurrenceType = TmHelper.getConstrainedStatement(this.getConstraint()); + for(int i = 0; i != ((Topic)this.receivedData).getOccurrences(occurrenceType).length(); ++i) + this.createNewTextArea().setText(((Topic)this.receivedData).getNames(occurrenceType).get(i).getValue()); + } + // TODO: implement type, variant, datatype, ... constraints + } else { + // TODO: implement: set default values or generate at least one field + } this.setNthButtons(); }

1 0

[isidorus-cvs] r727 - in branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model: .gwt src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel
by lgiessmann＠common-lisp.net 15 Aug '11

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 04:11:51 2011 New Revision: 727 Log: gdl-frontend: Topic Maps Model: added the class TypedStub to be able to use getType() and setType() on typable objects Added: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/TypedStub.java Modified: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Modified: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Mon Aug 15 01:26:58 2011 (r726) +++ branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Mon Aug 15 04:11:51 2011 (r727) @@ -3910,3 +3910,981 @@ Translatable source found in... Removing invalidated units Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:89) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:90) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:91) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes Added: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/TypedStub.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/TypedStub.java Mon Aug 15 04:11:51 2011 (r727) @@ -0,0 +1,53 @@ +package us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel; + +import com.google.gwt.core.client.JavaScriptObject; +import com.google.gwt.core.client.JsArray; + +public class TypedStub extends JavaScriptObject implements Typed { + protected TypedStub(){} + + + public final native String getId() /*-{ + return this.getId() + ""; + }-*/; + + + public final native void addItemIdentifier(Locator itemIdentifier) /*-{ + this.addItemIdentifier(itemIdentifier); + }-*/; + + + public final native JsArray<Locator> getItemIdentifiers() /*-{ + return this.getItemIdentifiers(); + }-*/; + + + public final native TopicMap getParent() /*-{ + return this.getParent(); + }-*/; + + + public final native TopicMap getTopicMap() /*-{ + return this.getTopicMap(); + }-*/; + + + public final native void remove() /*-{ + this.remove(); + }-*/; + + + public final native void removeItemIdentifier(Locator itemIdentifier) /*-{ + this.removeItemIdentifier(itemIdentifier); + }-*/; + + + public final native Topic getType() /*-{ + return this.getType(); + }-*/; + + + public final native void setType(Topic type) /*-{ + this.setType(type); + }-*/; +}

1 0

[isidorus-cvs] r726 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/button src/us/isidor/gdl/anaToMia/Widgets/complexData src/us/isidor/gdl/anaToMia/Widgets/container src/us/isidor/gdl/anaToMia/Widgets/environment src/us/isidor/gdl/anaToMia/Widgets/text src/us/isidor/gdl/anaToMia/Widgets/view war/gdl_widgets
by lgiessmann＠common-lisp.net 15 Aug '11

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 01:26:58 2011 New Revision: 726 Log: gdl-frontend: Widgets: fixed the test jtm gdl-schema Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java - copied, changed from r725, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java 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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Aug 15 01:26:58 2011 (r726) @@ -42,7 +42,7 @@ // the topic map that is the base of the created GDL view private TopicMap requestedSchemaTm = null; // the locator of the topic map "requestedSchemaTm" - private final String REQUESTED_SCHEMA_TOPIC_MAP_LOCATOR = GdlPsis.gdl + "topicmap/tm-1"; + private final String REQUESTED_SCHEMA_TOPIC_MAP_LOCATOR = PSIs.gdl + "topicmap/tm-1"; // callback instance for getting/loading the GDL schema private ILoadSchemaCallback loadSchemaCallback = null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java Mon Aug 15 01:26:58 2011 (r726) @@ -64,7 +64,7 @@ public AutoNumUnitValue getTop() throws InvalidGdlSchemaException { Occurrence topOcc = null; - topOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTop); + topOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTop); if(topOcc == null) return null; else return new AutoNumUnitValue(topOcc.getValue()); @@ -73,7 +73,7 @@ public AutoNumUnitValue getRight() throws InvalidGdlSchemaException { Occurrence rightOcc = null; - rightOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlRight); + rightOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlRight); if(rightOcc == null) return null; else return new AutoNumUnitValue(rightOcc.getValue()); @@ -82,7 +82,7 @@ public AutoNumUnitValue getBottom() throws InvalidGdlSchemaException { Occurrence bottomOcc = null; - bottomOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBottom); + bottomOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBottom); if(bottomOcc == null) return null; else return new AutoNumUnitValue(bottomOcc.getValue()); @@ -91,7 +91,7 @@ public AutoNumUnitValue getLeft() throws InvalidGdlSchemaException { Occurrence leftOcc = null; - leftOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlLeft); + leftOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlLeft); if(leftOcc == null) return null; else return new AutoNumUnitValue(leftOcc.getValue()); @@ -100,7 +100,7 @@ public PositionStyleValue getPositionStyle()throws InvalidGdlSchemaException { Occurrence positionStyleOcc = null; - positionStyleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPositionStyle); + positionStyleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPositionStyle); if(positionStyleOcc == null) return null; else try{ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 15 01:26:58 2011 (r726) @@ -222,9 +222,9 @@ // returns the string value of a gdl:id occurrence public String getId() throws InvalidGdlSchemaException { - JsArray<Occurrence> idOccs = getOccurrences(GdlPsis.OccurrenceType.gdlId); + JsArray<Occurrence> idOccs = getOccurrences(PSIs.OccurrenceType.gdlId); if(idOccs.length() != 1){ - throw new InvalidGdlSchemaException("The topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to exactly one occurrence of the type " + GdlPsis.OccurrenceType.gdlId + ", but is bound " + idOccs.length() + " times to it"); + throw new InvalidGdlSchemaException("The topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to exactly one occurrence of the type " + PSIs.OccurrenceType.gdlId + ", but is bound " + idOccs.length() + " times to it"); } else { return idOccs.get(0).getValue(); } @@ -234,7 +234,7 @@ // returns a Display instance of a gdl:display occurrence. // If no gdl:display occurrence is set, the default value is returned public Display getDisplay() throws InvalidGdlSchemaException { - Occurrence displayOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlDisplay); + Occurrence displayOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlDisplay); if(displayOcc != null){ String value = displayOcc.getValue().toLowerCase(); @@ -247,7 +247,7 @@ } else if(value.equals("block")){ return Display.BLOCK; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlDisplay + " must be set to one of \"none\", \"inline\", \"inline-block\" or \"block\", but is \"" + displayOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlDisplay + " must be set to one of \"none\", \"inline\", \"inline-block\" or \"block\", but is \"" + displayOcc.getValue() + "\""); } } else { return Display.INLINE_BLOCK; @@ -258,7 +258,7 @@ // returns an AutoNumValue instance of a gdl:z-index occurrence. // If no gdl:z-index occurrence is set, the default value is returned public AutoNumValue getZindex() throws InvalidGdlSchemaException { - Occurrence zOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlZindex); + Occurrence zOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlZindex); if(zOcc != null){ return new AutoNumValue(zOcc.getValue()); } else { @@ -270,7 +270,7 @@ // returns a Float instance of a gdl:float occurrence or the default value for // this property if no gdl:float occurrence is available public Float getFloat() throws InvalidGdlSchemaException { - Occurrence floatOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFloat); + Occurrence floatOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFloat); if(floatOcc != null){ String value = floatOcc.getValue().toLowerCase(); @@ -281,7 +281,7 @@ } else if (value.equals("right")){ return Float.RIGHT; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlFloat + " must be set to one of \"none\", \"left\" or \"right\", but is \"" + floatOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlFloat + " must be set to one of \"none\", \"left\" or \"right\", but is \"" + floatOcc.getValue() + "\""); } } else { return Float.NONE; @@ -292,13 +292,13 @@ // returns a ClearValue instance of a gdl:clear occurrence or the default value for // this property if no gdl:clear occurrence is available public ClearValue getClear() throws InvalidGdlSchemaException { - Occurrence clearOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlClear); + Occurrence clearOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlClear); if(clearOcc != null){ try{ return ClearValue.valueOf(clearOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlClear + " must be set to one of \"none\", \"left\", \"right\" or \"both\", but is \"" + clearOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlClear + " must be set to one of \"none\", \"left\", \"right\" or \"both\", but is \"" + clearOcc.getValue() + "\""); } } else { return ClearValue.NONE; @@ -309,13 +309,13 @@ // returns a ContentOrientationValue instance of a gdl:content-orientation occurrence or the default value for // this property if no gdl:content-orientation occurrence is available public ContentOrientationValue getContentOrientation() throws InvalidGdlSchemaException { - Occurrence orientationOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlContentOrientation); + Occurrence orientationOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlContentOrientation); if(orientationOcc != null){ try{ return ContentOrientationValue.valueOf(orientationOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlContentOrientation + " must be set to one of \"horizontal\" or \"vertical\", but is \"" + orientationOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlContentOrientation + " must be set to one of \"horizontal\" or \"vertical\", but is \"" + orientationOcc.getValue() + "\""); } } else { return ContentOrientationValue.VERTICAL; @@ -330,9 +330,9 @@ public VerticalAlign getVerticalAlign(String styleClass) throws InvalidGdlSchemaException { Occurrence vaOcc = null; if(styleClass != null){ - vaOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlVerticalAlign, styleClass); + vaOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlVerticalAlign, styleClass); } else { - vaOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlVerticalAlign); + vaOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlVerticalAlign); } if(vaOcc == null && styleClass != null){ @@ -358,7 +358,7 @@ }else if(value.equals("text-bottom")) { return VerticalAlign.TEXT_BOTTOM; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlVerticalAlign + " must be set to one of \"baseline\", \"sub\", \"super\", \"top\", \"text-top\", \"middle\", \"bottom\" or \"text-bottom\", but is \"" + vaOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlVerticalAlign + " must be set to one of \"baseline\", \"sub\", \"super\", \"top\", \"text-top\", \"middle\", \"bottom\" or \"text-bottom\", but is \"" + vaOcc.getValue() + "\""); } } } @@ -371,9 +371,9 @@ public NumUnitValue getMargin(String styleClass) throws InvalidGdlSchemaException { Occurrence marginOcc = null; if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMargin, styleClass); + marginOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMargin, styleClass); } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMargin); + marginOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMargin); } if(marginOcc == null && styleClass != null){ @@ -392,9 +392,9 @@ public NumUnitValue getMarginTop(String styleClass) throws InvalidGdlSchemaException { Occurrence marginOcc = null; if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMarginTop, styleClass); + marginOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMarginTop, styleClass); } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMarginTop); + marginOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMarginTop); } if(marginOcc == null){ @@ -411,9 +411,9 @@ public NumUnitValue getMarginRight(String styleClass) throws InvalidGdlSchemaException { Occurrence marginOcc = null; if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMarginRight, styleClass); + marginOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMarginRight, styleClass); } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMarginRight); + marginOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMarginRight); } if(marginOcc == null){ @@ -430,9 +430,9 @@ public NumUnitValue getMarginBottom(String styleClass) throws InvalidGdlSchemaException { Occurrence marginOcc = null; if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMarginBottom, styleClass); + marginOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMarginBottom, styleClass); } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMarginBottom); + marginOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMarginBottom); } if(marginOcc == null){ @@ -449,9 +449,9 @@ public NumUnitValue getMarginLeft(String styleClass) throws InvalidGdlSchemaException { Occurrence marginOcc = null; if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMarginLeft, styleClass); + marginOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMarginLeft, styleClass); } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMarginLeft); + marginOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMarginLeft); } if(marginOcc == null){ @@ -469,9 +469,9 @@ public ColorValue getBorderColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderColor); } if(colorOcc == null && styleClass != null){ @@ -490,9 +490,9 @@ public ColorValue getBorderTopColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopColor); } if(colorOcc == null ){ @@ -509,9 +509,9 @@ public ColorValue getBorderRightColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightColor); } if(colorOcc == null ){ @@ -528,9 +528,9 @@ public ColorValue getBorderBottomColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomColor); } if(colorOcc == null ){ @@ -547,9 +547,9 @@ public ColorValue getBorderLeftColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftColor); } if(colorOcc == null ){ @@ -567,9 +567,9 @@ public BorderStyleValue getBorderStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle); } if(styleOcc == null && styleClass != null){ @@ -593,9 +593,9 @@ public BorderStyleValue getBorderTopStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopStyle); } if(styleOcc == null){ @@ -617,9 +617,9 @@ public BorderStyleValue getBorderRightStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightStyle); } if(styleOcc == null){ @@ -641,9 +641,9 @@ public BorderStyleValue getBorderBottomStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomStyle); } if(styleOcc == null){ @@ -665,9 +665,9 @@ public BorderStyleValue getBorderLeftStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftStyle); } if(styleOcc == null){ @@ -690,9 +690,9 @@ public AbsoluteNumValue getBorderWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth); } if(widthOcc == null && styleClass != null){ @@ -711,9 +711,9 @@ public AbsoluteNumValue getBorderTopWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopWidth); } if(widthOcc == null){ @@ -730,9 +730,9 @@ public AbsoluteNumValue getBorderRightWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightWidth); } if(widthOcc == null){ @@ -749,9 +749,9 @@ public AbsoluteNumValue getBorderBottomWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomWidth); } if(widthOcc == null){ @@ -768,9 +768,9 @@ public AbsoluteNumValue getBorderLeftWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftWidth); } if(widthOcc == null){ @@ -788,9 +788,9 @@ public NumUnitValue getBorderRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius); } if(radiusOcc == null && styleClass != null){ @@ -809,9 +809,9 @@ public NumUnitValue getBorderTopLeftRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopLeftRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopLeftRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopLeftRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopLeftRadius); } if(radiusOcc == null && styleClass != null){ @@ -830,9 +830,9 @@ public NumUnitValue getBorderTopRightRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopRightRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopRightRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopRightRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopRightRadius); } if(radiusOcc == null && styleClass != null){ @@ -851,9 +851,9 @@ public NumUnitValue getBorderBottomLeftRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomLeftRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomLeftRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomLeftRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomLeftRadius); } if(radiusOcc == null && styleClass != null){ @@ -872,9 +872,9 @@ public NumUnitValue getBorderBottomRightRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomRightRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomRightRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomRightRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomRightRadius); } if(radiusOcc == null && styleClass != null){ @@ -894,9 +894,9 @@ public NumUnitValue getPadding(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPadding, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPadding, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPadding); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPadding); } if(paddingOcc == null && styleClass != null){ @@ -915,9 +915,9 @@ public NumUnitValue getPaddingTop(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingTop, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPaddingTop, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingTop); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPaddingTop); } if(paddingOcc == null){ @@ -934,9 +934,9 @@ public NumUnitValue getPaddingRight(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingRight, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPaddingRight, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingRight); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPaddingRight); } if(paddingOcc == null){ @@ -953,9 +953,9 @@ public NumUnitValue getPaddingBottom(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingBottom, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPaddingBottom, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingBottom); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPaddingBottom); } if(paddingOcc == null){ @@ -972,9 +972,9 @@ public NumUnitValue getPaddingLeft(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingLeft, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPaddingLeft, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPaddingLeft); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPaddingLeft); } if(paddingOcc == null){ @@ -992,9 +992,9 @@ public AutoNumUnitValue getWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlWidth); } if(widthOcc == null && styleClass != null){ @@ -1014,9 +1014,9 @@ public AutoNumUnitValue getMinWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMinWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMinWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMinWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMinWidth); } if(widthOcc == null && styleClass != null){ @@ -1036,9 +1036,9 @@ public AutoNumUnitValue getMaxWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMaxWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMaxWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMaxWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMaxWidth); } if(widthOcc == null && styleClass != null){ @@ -1058,9 +1058,9 @@ public AutoNumUnitValue getHeight(String styleClass) throws InvalidGdlSchemaException { Occurrence heightOcc = null; if(styleClass != null){ - heightOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlHeight, styleClass); + heightOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlHeight, styleClass); } else { - heightOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlHeight); + heightOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlHeight); } if(heightOcc == null && styleClass != null){ @@ -1080,9 +1080,9 @@ public AutoNumUnitValue getMinHeight(String styleClass) throws InvalidGdlSchemaException { Occurrence heightOcc = null; if(styleClass != null){ - heightOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMinHeight, styleClass); + heightOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMinHeight, styleClass); } else { - heightOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMinHeight); + heightOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMinHeight); } if(heightOcc == null && styleClass != null){ @@ -1102,9 +1102,9 @@ public AutoNumUnitValue getMaxHeight(String styleClass) throws InvalidGdlSchemaException { Occurrence heightOcc = null; if(styleClass != null){ - heightOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlMaxHeight, styleClass); + heightOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlMaxHeight, styleClass); } else { - heightOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMaxHeight); + heightOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMaxHeight); } if(heightOcc == null && styleClass != null){ @@ -1124,9 +1124,9 @@ public CursorValue getCursor(String styleClass) throws InvalidGdlSchemaException { Occurrence cursorOcc = null; if(styleClass != null){ - cursorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlCursor, styleClass); + cursorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlCursor, styleClass); } else { - cursorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlCursor); + cursorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlCursor); } if(cursorOcc == null && styleClass != null){ @@ -1153,9 +1153,9 @@ public ColorValue getBackgroundColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBackgroundColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBackgroundColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBackgroundColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBackgroundColor); } if(colorOcc == null && styleClass != null){ @@ -1461,14 +1461,14 @@ if(styleClass == null){ DOM.setStyleAttribute(this.getElement(), cssProperty, cssValue); - } else if(styleClass.equals(GdlPsis.Scope.gdlActive)){ + } else if(styleClass.equals(PSIs.Scope.gdlActive)){ this.activeCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if(styleClass.equals(GdlPsis.Scope.gdlFocus)){ + } else if(styleClass.equals(PSIs.Scope.gdlFocus)){ this.focusCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if (styleClass.equals(GdlPsis.Scope.gdlHover)){ + } else if (styleClass.equals(PSIs.Scope.gdlHover)){ this.hoverCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); } else { - String values = GdlPsis.Scope.gdlActive + ", " + GdlPsis.Scope.gdlFocus + ", " + GdlPsis.Scope.gdlHover; + String values = PSIs.Scope.gdlActive + ", " + PSIs.Scope.gdlFocus + ", " + PSIs.Scope.gdlHover; throw new InvalidGdlSchemaException("GDL defines only the style classes " + values + ", but found " + styleClass); } } @@ -1480,14 +1480,14 @@ if(styleClass == null){ DOM.setStyleAttribute(elem.getElement(), cssProperty, cssValue); - } else if(styleClass.equals(GdlPsis.Scope.gdlActive)){ + } else if(styleClass.equals(PSIs.Scope.gdlActive)){ this.activeCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if(styleClass.equals(GdlPsis.Scope.gdlFocus)){ + } else if(styleClass.equals(PSIs.Scope.gdlFocus)){ this.focusCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if (styleClass.equals(GdlPsis.Scope.gdlHover)){ + } else if (styleClass.equals(PSIs.Scope.gdlHover)){ this.hoverCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); } else { - String values = GdlPsis.Scope.gdlActive + ", " + GdlPsis.Scope.gdlFocus + ", " + GdlPsis.Scope.gdlHover; + String values = PSIs.Scope.gdlActive + ", " + PSIs.Scope.gdlFocus + ", " + PSIs.Scope.gdlHover; throw new InvalidGdlSchemaException("GDL defines only the style classes " + values + ", but found " + styleClass); } } @@ -1499,14 +1499,14 @@ if(styleClass == null){ DOM.setStyleAttribute(elem, cssProperty, cssValue); - } else if(styleClass.equals(GdlPsis.Scope.gdlActive)){ + } else if(styleClass.equals(PSIs.Scope.gdlActive)){ this.activeCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if(styleClass.equals(GdlPsis.Scope.gdlFocus)){ + } else if(styleClass.equals(PSIs.Scope.gdlFocus)){ this.focusCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); - } else if (styleClass.equals(GdlPsis.Scope.gdlHover)){ + } else if (styleClass.equals(PSIs.Scope.gdlHover)){ this.hoverCssNamesAndStyles.add(new Pair<String, String>(cssProperty, cssValue)); } else { - String values = GdlPsis.Scope.gdlActive + ", " + GdlPsis.Scope.gdlFocus + ", " + GdlPsis.Scope.gdlHover; + String values = PSIs.Scope.gdlActive + ", " + PSIs.Scope.gdlFocus + ", " + PSIs.Scope.gdlHover; throw new InvalidGdlSchemaException("GDL defines only the style classes " + values + ", but found " + styleClass); } } @@ -1514,7 +1514,7 @@ // sets all GDL styles that are defined by the topic map representative to tha passed widget public void setGdlStyle(Widget widget) throws InvalidGdlSchemaException, ExecutionException { - String[] styleClasses = new String[]{null, GdlPsis.Scope.gdlActive, GdlPsis.Scope.gdlFocus, GdlPsis.Scope.gdlHover}; + String[] styleClasses = new String[]{null, PSIs.Scope.gdlActive, PSIs.Scope.gdlFocus, PSIs.Scope.gdlHover}; for (String styleClass : styleClasses) { this.setVerticalAlign(widget, this.getVerticalAlign(styleClass), styleClass); Copied and modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java (from r725, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java) ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Mon Aug 15 00:59:52 2011 (r725, copy source) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/PSIs.java Mon Aug 15 01:26:58 2011 (r726) @@ -2,7 +2,7 @@ -public class GdlPsis { +public class PSIs { public final static String gdl = "http://psi.isidor.us/gdl/"; // some psis of the TMDM Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 15 01:26:58 2011 (r726) @@ -22,7 +22,6 @@ @Override public void onModuleLoad() { try{ - Window.alert("TEST !!!"); RootPanel.get("GWT_Content").add(mainPanel); mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); @@ -51,121 +50,7 @@ } }); - mainPanel.add(requestButton); - - /* - // only for testing - - Topic tmpRepresentative = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator("http://test.org/test-top")); - Topic gdlBackgroundColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBackgroundColor)); - Topic gdlId = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlId)); - Topic gdlWidth = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlWidth)); - Topic gdlHeight = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlHeight)); - Topic gdlBorderRadius = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderRadius)); - Topic gdlBorderBottomRightRadius = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderBottomRightRadius)); - Topic gdlPadding = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlPadding)); - Topic gdlPaddingLeft = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlPaddingLeft)); - Topic gdlCursor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlCursor)); - Topic gdlMarginTop = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlMarginTop)); - Topic gdlBorderColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderColor)); - Topic gdlBorderTopColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderTopColor)); - Topic gdlBorderRightColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderRightColor)); - Topic gdlBorderBottomColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderBottomColor)); - Topic gdlBorderStyle = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderStyle)); - Topic gdlBorderWidth = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlBorderWidth)); - Topic gdlFontSize = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlFontSize)); - Topic gdlHover = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.Scope.gdlHover)); - Topic gdlActive = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.Scope.gdlActive)); - Topic gdlFocus = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.Scope.gdlFocus)); - Topic gdlReadonly = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlReadonly)); - Topic gdlResize = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlResize)); - Topic gdlTextDecoration = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlTextDecoration)); - Topic gdlDisplay = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlDisplay)); - Topic gdlContentOrientation = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlContentOrientation)); - Topic gdlListStyleType = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlListStyleType)); - Topic gdlDirection = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlDirection)); - Topic gdlUnitBorderTopPadding = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitBorderTopPadding)); - Topic gdlUnitBorderColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitBorderColor)); - Topic gdlUnitBorderWidth = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitBorderWidth)); - Topic gdlUnitName = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitName)); - Topic gdlUnitBorderLeftMargin = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitBorderLeftMargin)); - Topic gdlUnitBorderRadius = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlUnitBorderRadius)); - Topic gdlColor = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlColor)); - Topic gdlLetterSpacing = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator(GdlPsis.OccurrenceType.gdlLetterSpacing)); - - - - tmpRepresentative.createOccurrence(gdlId, "ID_1", null); - tmpRepresentative.createOccurrence(gdlBackgroundColor, "red", null); - tmpRepresentative.createOccurrence(gdlWidth, "100px", null); - tmpRepresentative.createOccurrence(gdlHeight, "100px", null); - tmpRepresentative.createOccurrence(gdlBorderRadius, "30px", null); - tmpRepresentative.createOccurrence(gdlBorderBottomRightRadius, "2%", null); - tmpRepresentative.createOccurrence(gdlPadding, "5px", null); - tmpRepresentative.createOccurrence(gdlPaddingLeft, "5%", null); - tmpRepresentative.createOccurrence(gdlCursor, CursorValue.HELP.getCssValue(), null); - tmpRepresentative.createOccurrence(gdlMarginTop, "50pt", null); - tmpRepresentative.createOccurrence(gdlBorderColor, "lime", null); - tmpRepresentative.createOccurrence(gdlBorderTopColor, "#00f", null); - tmpRepresentative.createOccurrence(gdlBorderRightColor, "rgb(0, 255, 0)", null); - tmpRepresentative.createOccurrence(gdlBorderBottomColor, "rgb(100%, 100%, 0%)", null); - tmpRepresentative.createOccurrence(gdlBorderStyle, "dashed", null); - tmpRepresentative.createOccurrence(gdlBorderWidth, "5px", null); - tmpRepresentative.createOccurrence(gdlReadonly, "false", null); - tmpRepresentative.createOccurrence(gdlResize, "both", null); - tmpRepresentative.createOccurrence(gdlFontSize, "15pt", null); - tmpRepresentative.createOccurrence(gdlTextDecoration, "underline", null); - tmpRepresentative.createOccurrence(gdlDisplay, "inline", null); - tmpRepresentative.createOccurrence(gdlContentOrientation, "vertical", null); - tmpRepresentative.createOccurrence(gdlListStyleType, "square", null); - tmpRepresentative.createOccurrence(gdlDirection, "ltr", null); - tmpRepresentative.createOccurrence(gdlUnitBorderTopPadding, "100px", null); - tmpRepresentative.createOccurrence(gdlUnitName, "Unit Name", null); - tmpRepresentative.createOccurrence(gdlUnitBorderLeftMargin, "30px", null); - tmpRepresentative.createOccurrence(gdlUnitBorderRadius, "30px", null); - tmpRepresentative.createOccurrence(gdlColor, "yellow", null); - tmpRepresentative.createOccurrence(gdlLetterSpacing, "10px", null); - Occurrence bgcHover = tmpRepresentative.createOccurrence(gdlBackgroundColor, "green", null); - bgcHover.addTheme(gdlHover); - Occurrence bgcActive = tmpRepresentative.createOccurrence(gdlBackgroundColor, "purple", null); - bgcActive.addTheme(gdlActive); - Occurrence bgcFocus = tmpRepresentative.createOccurrence(gdlBackgroundColor, "silver", null); - bgcFocus.addTheme(gdlFocus); - Occurrence fsHover = tmpRepresentative.createOccurrence(gdlFontSize, "25pt", null); - fsHover.addTheme(gdlHover); - Occurrence ubcHover = tmpRepresentative.createOccurrence(gdlUnitBorderColor, "blue", null); - ubcHover.addTheme(gdlHover); - Occurrence ubwHover = tmpRepresentative.createOccurrence(gdlUnitBorderWidth, "5px", null); - ubwHover.addTheme(gdlHover); - Occurrence tdHover = tmpRepresentative.createOccurrence(gdlTextDecoration, "overline", null); - tdHover.addTheme(gdlHover); - - - - GdlView tmp = new GdlView(tmpRepresentative) { - - @Override - public boolean validate() { - return false; - } - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - return null; - } - - @Override - public ArrayList<String> getStringValue() { - return null; - } - - @Override - public TopicMap getContent() { - return null; - } - }; - this.mainPanel.add(tmp); - */ + mainPanel.add(requestButton); }catch(Exception e){ e.printStackTrace(); Window.alert(">> e >> " + e.getClass() + " >> " + e.getMessage()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 15 01:26:58 2011 (r726) @@ -10,7 +10,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TMDM; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs.TMDM; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; @@ -312,10 +312,10 @@ public static ArrayList<Topic> topicContains(Topic container) { if(container == null) return new ArrayList<Topic>(); TopicMap tm = container.getTopicMap(); - Topic containsAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlContains, tm); - Topic containerRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainer, tm); - Topic visibleObject = getTopicByPsi(GdlPsis.TopicType.gdlVisibleObject, tm); - Topic containeeRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainee, tm); + Topic containsAssocType = getTopicByPsi(PSIs.AssociationType.gdlContains, tm); + 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); } @@ -325,10 +325,10 @@ public static ArrayList<Topic> topicContainsInfo(Topic container) { if(container == null) return new ArrayList<Topic>(); TopicMap tm = container.getTopicMap(); - Topic containsAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlContains, tm); - Topic containerRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainer, tm); - Topic info = getTopicByPsi(GdlPsis.TopicType.gdlInfo, tm); - Topic containeeRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainee, tm); + Topic containsAssocType = getTopicByPsi(PSIs.AssociationType.gdlContains, tm); + Topic containerRoleType = getTopicByPsi(PSIs.RoleType.gdlContainer, tm); + Topic info = getTopicByPsi(PSIs.TopicType.gdlInfo, tm); + Topic containeeRoleType = getTopicByPsi(PSIs.RoleType.gdlContainee, tm); return getOtherPlayerOfBinaryAssociation(container, containerRoleType, containsAssocType, null, info, containeeRoleType); } @@ -345,27 +345,27 @@ if(container == null) return result; TopicMap tm = container.getTopicMap(); - Topic containsAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlContains, tm); - Topic containerRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainer, tm); - Topic actionButtonType = getTopicByPsi(GdlPsis.TopicType.gdlActionButton, tm); - Topic containeeRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainee, tm); + Topic containsAssocType = getTopicByPsi(PSIs.AssociationType.gdlContains, tm); + Topic containerRoleType = getTopicByPsi(PSIs.RoleType.gdlContainer, tm); + Topic actionButtonType = getTopicByPsi(PSIs.TopicType.gdlActionButton, tm); + Topic containeeRoleType = getTopicByPsi(PSIs.RoleType.gdlContainee, tm); ArrayList<Topic> actionButtons = getOtherPlayerOfBinaryAssociation(container, containerRoleType, containsAssocType, null, actionButtonType, containeeRoleType); - Topic actionButtonRoleType = getTopicByPsi(GdlPsis.RoleType.gdlActionButton, tm); - Topic buttonPosition = getTopicByPsi(GdlPsis.AssociationType.gdlButtonPosition, tm); - Topic nthElementType = getTopicByPsi(GdlPsis.TopicType.gdlNthElement, tm); - Topic nthElementRoleType = getTopicByPsi(GdlPsis.RoleType.gdlNthElement, tm); - Topic nthValueOccType = getTopicByPsi(GdlPsis.OccurrenceType.gdlNthValue, tm); + Topic actionButtonRoleType = getTopicByPsi(PSIs.RoleType.gdlActionButton, tm); + Topic buttonPosition = getTopicByPsi(PSIs.AssociationType.gdlButtonPosition, tm); + Topic nthElementType = getTopicByPsi(PSIs.TopicType.gdlNthElement, tm); + Topic nthElementRoleType = getTopicByPsi(PSIs.RoleType.gdlNthElement, tm); + Topic nthValueOccType = getTopicByPsi(PSIs.OccurrenceType.gdlNthValue, tm); ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(nthElementType, nthElementRoleType)); for (Topic actionButton : actionButtons) { ArrayList<Association> assocs = getAssociationsOfTopic(actionButton, actionButtonRoleType, buttonPosition, null, rolePlayertypesAndTypes); if(assocs.size() == 0) continue; - if(assocs.size() > 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(actionButton) + " must be bound none or once to a " + GdlPsis.AssociationType.gdlButtonPosition + " association, but is: " + assocs.size()); + if(assocs.size() > 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(actionButton) + " must be bound none or once to a " + PSIs.AssociationType.gdlButtonPosition + " association, but is: " + assocs.size()); if(assocs.size() == 1) { Topic nthElem = assocs.get(0).getRoles(nthElementRoleType).get(0).getPlayer(); JsArray<Occurrence> occs = nthElem.getOccurrences(nthValueOccType); - if(occs.length() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(nthElem) + " must be bound exactly once to a " + GdlPsis.OccurrenceType.gdlNthValue + " occurrence, but is: " + occs.length()); + if(occs.length() != 1) throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(nthElem) + " must be bound exactly once to a " + PSIs.OccurrenceType.gdlNthValue + " occurrence, but is: " + occs.length()); int val = 0; try{ if(occs.get(0).getValue().toLowerCase().equals("last")){ @@ -374,7 +374,7 @@ Integer.valueOf(occs.get(0).getValue()); } }catch(NumberFormatException e){ - throw new InvalidGdlSchemaException("The topic " + getAnyIdOfTopic(nthElem) + " must contain a value of the form <positive-integer>|\"last\" in the occurrence " + GdlPsis.OccurrenceType.gdlNthValue + ", but it contains: " + occs.get(0).getValue()); + throw new InvalidGdlSchemaException("The topic " + getAnyIdOfTopic(nthElem) + " must contain a value of the form <positive-integer>|\"last\" in the occurrence " + PSIs.OccurrenceType.gdlNthValue + ", but it contains: " + occs.get(0).getValue()); } result.add(new Pair<Topic, Integer>(actionButton, val)); @@ -389,12 +389,12 @@ public static ArrayList<Pair<Topic, Integer>> listContains(Topic list) throws InvalidGdlSchemaException { if(list == null) return new ArrayList<Pair<Topic,Integer>>(); TopicMap tm = list.getTopicMap(); - Topic containsAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlContains, tm); - Topic containerRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainer, tm); - Topic visibleObject = getTopicByPsi(GdlPsis.TopicType.gdlVisibleObject, tm); - Topic containeeRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainee, tm); - Topic nthElement = getTopicByPsi(GdlPsis.TopicType.gdlNthElement, tm); - Topic nthElementRoleType = getTopicByPsi(GdlPsis.RoleType.gdlNthElement, tm); + Topic containsAssocType = getTopicByPsi(PSIs.AssociationType.gdlContains, tm); + Topic containerRoleType = getTopicByPsi(PSIs.RoleType.gdlContainer, tm); + Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); + Topic containeeRoleType = getTopicByPsi(PSIs.RoleType.gdlContainee, tm); + Topic nthElement = getTopicByPsi(PSIs.TopicType.gdlNthElement, tm); + Topic nthElementRoleType = getTopicByPsi(PSIs.RoleType.gdlNthElement, tm); ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(visibleObject, containeeRoleType)); @@ -404,16 +404,16 @@ List<Pair<Topic, Integer>> result = new ArrayList<Pair<Topic,Integer>>(); for (Association validAssoc : validAssociations) { Topic idx = validAssoc.getRoles(nthElementRoleType).get(0).getPlayer(); - JsArray<Occurrence> idxOccs = idx.getOccurrences(tm.getTopicBySubjectIdentifier(tm.createLocator(GdlPsis.OccurrenceType.gdlNthValue))); + JsArray<Occurrence> idxOccs = idx.getOccurrences(tm.getTopicBySubjectIdentifier(tm.createLocator(PSIs.OccurrenceType.gdlNthValue))); ArrayList<Occurrence> validIdxOccs = new ArrayList<Occurrence>(); for(int i = 0; i != idxOccs.length(); ++i) if(idxOccs.get(i).getScope().length() == 0) validIdxOccs.add(idxOccs.get(i)); if(validIdxOccs.size() != 1){ - throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(idx) + " must be bound exaclty once to an occurrence of the type " + GdlPsis.OccurrenceType.gdlNthValue + " but is bound " + validIdxOccs.size() + " times"); + throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(idx) + " must be bound exaclty once to an occurrence of the type " + PSIs.OccurrenceType.gdlNthValue + " but is bound " + validIdxOccs.size() + " times"); }else{ Occurrence validOcc = validIdxOccs.get(0); if(!validOcc.getValue().toUpperCase().equals("LAST") && !Utils.isDecNumber(validOcc.getValue())){ - throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(idx) + " must be bound exaclty once to an occurrence of the type " + GdlPsis.OccurrenceType.gdlNthValue + " with a the value \"last\" or <positive integer>, but is " + validOcc.getValue()); + throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(idx) + " must be bound exaclty once to an occurrence of the type " + PSIs.OccurrenceType.gdlNthValue + " with a the value \"last\" or <positive integer>, but is " + validOcc.getValue()); } int idxValue = -1; // -1 represents last @@ -455,12 +455,12 @@ if(containees == null || containees.size() == 0 || container == null) return null; TopicMap tm = containees.get(0).getTopicMap(); - Topic descendantRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescendant, tm); - Topic positionAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlPosition, tm); - Topic position = getTopicByPsi(GdlPsis.TopicType.gdlPosition, tm); - Topic visibleObject = getTopicByPsi(GdlPsis.TopicType.gdlVisibleObject, tm); - Topic ancestorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlAncestor, tm); - Topic descriptorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); + Topic descendantRoleType = getTopicByPsi(PSIs.RoleType.gdlDescendant, tm); + Topic positionAssocType = getTopicByPsi(PSIs.AssociationType.gdlPosition, tm); + Topic position = getTopicByPsi(PSIs.TopicType.gdlPosition, tm); + Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); + Topic ancestorRoleType = getTopicByPsi(PSIs.RoleType.gdlAncestor, tm); + Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(visibleObject, descendantRoleType)); @@ -494,12 +494,12 @@ if (current == null || containees == null || containees.size() == 0) return null; TopicMap tm = current.getTopicMap(); - Topic descendantRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescendant, tm); - Topic positionAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlPosition, tm); - Topic visibleObject = getTopicByPsi(GdlPsis.TopicType.gdlVisibleObject, tm); - Topic ancestorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlAncestor, tm); - Topic position = getTopicByPsi(GdlPsis.TopicType.gdlPosition, tm); - Topic descriptorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); + Topic descendantRoleType = getTopicByPsi(PSIs.RoleType.gdlDescendant, tm); + Topic positionAssocType = getTopicByPsi(PSIs.AssociationType.gdlPosition, tm); + Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); + Topic ancestorRoleType = getTopicByPsi(PSIs.RoleType.gdlAncestor, tm); + Topic position = getTopicByPsi(PSIs.TopicType.gdlPosition, tm); + Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(visibleObject, descendantRoleType)); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(position, descriptorRoleType)); @@ -532,13 +532,13 @@ // get all potential valid associations that models a position association TopicMap tm = ancestor.getTopicMap(); - Topic ancestorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlAncestor, tm); - Topic positionAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlPosition, tm); + Topic ancestorRoleType = getTopicByPsi(PSIs.RoleType.gdlAncestor, tm); + Topic positionAssocType = getTopicByPsi(PSIs.AssociationType.gdlPosition, tm); ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); - Topic descriptor = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); - Topic descendantRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescendant, tm); - Topic visibleObject = getTopicByPsi(GdlPsis.TopicType.gdlVisibleObject, tm); - Topic position = getTopicByPsi(GdlPsis.TopicType.gdlPosition, tm); + Topic descriptor = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); + Topic descendantRoleType = getTopicByPsi(PSIs.RoleType.gdlDescendant, tm); + Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); + 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); @@ -592,10 +592,10 @@ if(visibleElement == null) throw null; TopicMap tm = visibleElement.getTopicMap(); - Topic descriptorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); - Topic viewBindingAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlViewBinding, tm); - Topic valueGroupType = getTopicByPsi(GdlPsis.TopicType.gdlValueGroup, tm); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); + Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); + Topic viewBindingAssocType = getTopicByPsi(PSIs.AssociationType.gdlViewBinding, tm); + Topic valueGroupType = getTopicByPsi(PSIs.TopicType.gdlValueGroup, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); ArrayList<Topic> valueGroups = getOtherPlayerOfBinaryAssociation(visibleElement, descriptorRoleType, viewBindingAssocType, null, valueGroupType, valueGroupRoleType); if(valueGroups.size() == 1) return valueGroups.get(0); @@ -609,11 +609,11 @@ if(valueGroup == null) return null; TopicMap tm = valueGroup.getTopicMap(); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); - Topic descriptorType = getTopicByPsi(GdlPsis.TopicType.gdlDescriptor, tm); - Topic tmBindingAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, tm); - Topic tmclConstraintType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); - Topic tmConstructRoleType = getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); + Topic descriptorType = getTopicByPsi(PSIs.TopicType.gdlDescriptor, tm); + Topic tmBindingAssocType = getTopicByPsi(PSIs.AssociationType.gdlTmBinding, tm); + Topic tmclConstraintType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); + Topic tmConstructRoleType = getTopicByPsi(PSIs.RoleType.gdlTmConstruct, tm); ArrayList<Topic> tmclConstraints = getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, tmBindingAssocType, null, tmclConstraintType, tmConstructRoleType); ArrayList<Topic> gdlConstraints = getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, tmBindingAssocType, null, descriptorType, tmConstructRoleType); @@ -635,15 +635,15 @@ Topic localCurrentConstraint = currentConstraint == null ? getConstraintOfValueGroup(valueGroup) : currentConstraint; TopicMap tm = valueGroup.getTopicMap(); - Topic tmclConstraintType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); + Topic tmclConstraintType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); if(isInstanceOf(localCurrentConstraint, tmclConstraintType)) return localCurrentConstraint; else { // get next constraint and invoke this method recursively - Topic descriptorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); - Topic tmBindingAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, tm); - Topic tmConstructRoleType = getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, tm); - Topic gdlDescriptor = getTopicByPsi(GdlPsis.TopicType.gdlDescriptor, tm); + Topic descriptorRoleType = getTopicByPsi(PSIs.RoleType.gdlDescriptor, tm); + Topic tmBindingAssocType = getTopicByPsi(PSIs.AssociationType.gdlTmBinding, tm); + Topic tmConstructRoleType = getTopicByPsi(PSIs.RoleType.gdlTmConstruct, tm); + Topic gdlDescriptor = getTopicByPsi(PSIs.TopicType.gdlDescriptor, tm); ArrayList<Topic> nextTmclConstraints = getOtherPlayerOfBinaryAssociation(localCurrentConstraint, descriptorRoleType, tmBindingAssocType, null, tmclConstraintType, tmConstructRoleType); ArrayList<Topic> nextGdlConstraints = getOtherPlayerOfBinaryAssociation(localCurrentConstraint, descriptorRoleType, tmBindingAssocType, null, gdlDescriptor, tmConstructRoleType); @@ -653,7 +653,7 @@ if(nextTmclConstraints.size() == 1) return nextTmclConstraints.get(0); else if(nextGdlConstraints.size() == 1) return getRootConstraintOfValueGroup(valueGroup, nextGdlConstraints.get(0)); - else throw new InvalidGdlSchemaException("the value group " + getAnyIdOfTopic(valueGroup) + " must be bound to exaclty on root constraint of the type " + GdlPsis.TMCL.tmclConstraint + " but is unbound"); + else throw new InvalidGdlSchemaException("the value group " + getAnyIdOfTopic(valueGroup) + " must be bound to exaclty on root constraint of the type " + PSIs.TMCL.tmclConstraint + " but is unbound"); } } @@ -663,16 +663,16 @@ if(valueGroup == null) return null; TopicMap tm = valueGroup.getTopicMap(); - Topic valueBindingAssocTopic = getTopicByPsi(GdlPsis.AssociationType.gdlValueBinding, tm); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); - Topic valueRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValue, tm); - Topic defaultTmValueType = getTopicByPsi(GdlPsis.TopicType.gdlDefaultTmValue, tm); + Topic valueBindingAssocTopic = getTopicByPsi(PSIs.AssociationType.gdlValueBinding, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); + Topic valueRoleType = getTopicByPsi(PSIs.RoleType.gdlValue, tm); + Topic defaultTmValueType = getTopicByPsi(PSIs.TopicType.gdlDefaultTmValue, tm); ArrayList<Topic> defaultTmValues = getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, valueBindingAssocTopic, null, defaultTmValueType, valueRoleType); if(defaultTmValues.size() == 1) return defaultTmValues.get(0); else if(defaultTmValues.size() == 0) return null; - else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(valueGroup) + " must be bound none or once to a " + GdlPsis.TopicType.gdlDefaultTmValue + ", but is: " + defaultTmValues.size()); + else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(valueGroup) + " must be bound none or once to a " + PSIs.TopicType.gdlDefaultTmValue + ", but is: " + defaultTmValues.size()); } @@ -681,16 +681,16 @@ if(valueGroup == null) return null; TopicMap tm = valueGroup.getTopicMap(); - Topic valueBindingAssocTopic = getTopicByPsi(GdlPsis.AssociationType.gdlValueBinding, tm); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); - Topic valueRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValue, tm); - Topic defaultLiteralValueType = getTopicByPsi(GdlPsis.TopicType.gdlDefaultLiteralValue, tm); + Topic valueBindingAssocTopic = getTopicByPsi(PSIs.AssociationType.gdlValueBinding, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); + Topic valueRoleType = getTopicByPsi(PSIs.RoleType.gdlValue, tm); + Topic defaultLiteralValueType = getTopicByPsi(PSIs.TopicType.gdlDefaultLiteralValue, tm); ArrayList<Topic> defaultTmValues = getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, valueBindingAssocTopic, null, defaultLiteralValueType, valueRoleType); if(defaultTmValues.size() == 1) return defaultTmValues.get(0); else if(defaultTmValues.size() == 0) return null; - else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(valueGroup) + " must be bound none or once to a " + GdlPsis.TopicType.gdlDefaultLiteralValue + ", but is: " + defaultTmValues.size()); + else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(valueGroup) + " must be bound none or once to a " + PSIs.TopicType.gdlDefaultLiteralValue + ", but is: " + defaultTmValues.size()); } @@ -700,10 +700,10 @@ if(valueGroup == null) return result; TopicMap tm = valueGroup.getTopicMap(); - Topic valueBindingAssocTopic = getTopicByPsi(GdlPsis.AssociationType.gdlValueBinding, tm); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); - Topic valueRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValue, tm); - Topic tmValueType = getTopicByPsi(GdlPsis.TopicType.gdlTmValue, tm); + Topic valueBindingAssocTopic = getTopicByPsi(PSIs.AssociationType.gdlValueBinding, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); + Topic valueRoleType = getTopicByPsi(PSIs.RoleType.gdlValue, tm); + Topic tmValueType = getTopicByPsi(PSIs.TopicType.gdlTmValue, tm); return getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, valueBindingAssocTopic, null, tmValueType, valueRoleType); } @@ -715,10 +715,10 @@ if(valueGroup == null) return result; TopicMap tm = valueGroup.getTopicMap(); - Topic valueBindingAssocTopic = getTopicByPsi(GdlPsis.AssociationType.gdlValueBinding, tm); - Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); - Topic valueRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValue, tm); - Topic literalValueType = getTopicByPsi(GdlPsis.TopicType.gdlLiteralValue, tm); + Topic valueBindingAssocTopic = getTopicByPsi(PSIs.AssociationType.gdlValueBinding, tm); + Topic valueGroupRoleType = getTopicByPsi(PSIs.RoleType.gdlValueGroup, tm); + Topic valueRoleType = getTopicByPsi(PSIs.RoleType.gdlValue, tm); + Topic literalValueType = getTopicByPsi(PSIs.TopicType.gdlLiteralValue, tm); return getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, valueBindingAssocTopic, null, literalValueType, valueRoleType); } @@ -729,17 +729,17 @@ ArrayList<Topic> result = new ArrayList<Topic>(); if(constraint == null || valueGroup == null) return result; - if(isInstanceOf(constraint, GdlPsis.TopicType.gdlType)){ + if(isInstanceOf(constraint, PSIs.TopicType.gdlType)){ return getTmValuesForTypeConstraint(constraint, valueGroup); - } else if(isInstanceOf(constraint, GdlPsis.TopicType.gdlVariantNameReifier)){ + } else if(isInstanceOf(constraint, PSIs.TopicType.gdlVariantNameReifier)){ return getTmValuesForVariantNameReifierConstraint(constraint); - } else if(isInstanceOf(constraint, GdlPsis.TopicType.gdlVariantNameScope)){ + } else if(isInstanceOf(constraint, PSIs.TopicType.gdlVariantNameScope)){ return getTmValuesForVariantNameScopeConstraint(constraint); - } else if(isInstanceOf(constraint, GdlPsis.TopicType.gdlRolePlayer)){ + } else if(isInstanceOf(constraint, PSIs.TopicType.gdlRolePlayer)){ return getTmValuesForRolePlayerConstraint(constraint); - } else if(isInstanceOf(constraint, GdlPsis.TMCL.tmclReifierConstraint)){ + } else if(isInstanceOf(constraint, PSIs.TMCL.tmclReifierConstraint)){ return getTmValuesForReifierConstraint(constraint); - } else if(isInstanceOf(constraint, GdlPsis.TMCL.tmclScopeConstraint)){ + } else if(isInstanceOf(constraint, PSIs.TMCL.tmclScopeConstraint)){ return getTmValuesForScopeConstraint(constraint); } @@ -753,9 +753,9 @@ if(scopeConstraint == null) return result; TopicMap tm = scopeConstraint.getTopicMap(); - Topic constraintRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); - Topic constrainedScopeAssocType = getTopicByPsi(GdlPsis.TMCL.tmclConstrainedScope, tm); - Topic constrainedRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstrained, tm); + Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); + Topic constrainedScopeAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedScope, tm); + Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm); ArrayList<Topic> scopeTypes = getOtherPlayerOfBinaryAssociation(scopeConstraint, constraintRoleType, constrainedScopeAssocType, null, constrainedRoleType); if(scopeTypes.size() != 1){ @@ -774,10 +774,10 @@ if(reifierConstraint == null) return result; TopicMap tm = reifierConstraint.getTopicMap(); - Topic allowsRoleType = getTopicByPsi(GdlPsis.TMCL.tmclAllows, tm); - Topic allowedRoleType = getTopicByPsi(GdlPsis.TMCL.tmclAllowed, tm); - Topic allowedReifierAssocType = getTopicByPsi(GdlPsis.TMCL.tmclAllowedReifier, tm); - Topic topicType = getTopicByPsi(GdlPsis.TMCL.tmclTopictype, tm); + Topic allowsRoleType = getTopicByPsi(PSIs.TMCL.tmclAllows, tm); + Topic allowedRoleType = getTopicByPsi(PSIs.TMCL.tmclAllowed, tm); + Topic allowedReifierAssocType = getTopicByPsi(PSIs.TMCL.tmclAllowedReifier, tm); + Topic topicType = getTopicByPsi(PSIs.TMCL.tmclTopictype, tm); ArrayList<Topic> reifierTypes = getOtherPlayerOfBinaryAssociation(reifierConstraint, allowsRoleType, allowedReifierAssocType, null, topicType, allowedRoleType); if(reifierTypes.size() != 1){ @@ -804,13 +804,13 @@ Topic rootConstraint = getRootConstraintOfValueGroup(valueGroup, typeConstraint); if(rootConstraint == null) return result; - if(isInstanceOf(rootConstraint, GdlPsis.TMCL.tmclTopicNameConstraint) || isInstanceOf(rootConstraint, GdlPsis.TMCL.tmclTopicOccurrenceConstraint)){ + if(isInstanceOf(rootConstraint, PSIs.TMCL.tmclTopicNameConstraint) || isInstanceOf(rootConstraint, PSIs.TMCL.tmclTopicOccurrenceConstraint)){ TopicMap tm = rootConstraint.getTopicMap(); - Topic constraintRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); - Topic constrainedRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstrained, tm); - Topic nameType = getTopicByPsi(GdlPsis.TMCL.tmclNameType, tm); - Topic occurrenceType = getTopicByPsi(GdlPsis.TMCL.tmclOccurrenceType, tm); - Topic constrainedStatementAssocType = getTopicByPsi(GdlPsis.TMCL.tmclConstrainedStatement, tm); + Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); + Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm); + Topic nameType = getTopicByPsi(PSIs.TMCL.tmclNameType, tm); + Topic occurrenceType = getTopicByPsi(PSIs.TMCL.tmclOccurrenceType, tm); + 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); @@ -825,10 +825,10 @@ JsArray<Topic> allTopics = tm.getTopics(); for(int i = 0; i != allTopics.length(); ++i) if(isSupertypeOf(allTopics.get(i), typeTopics.get(0))) result.add(allTopics.get(i)); } - } else if(isInstanceOf(rootConstraint, GdlPsis.TMCL.tmclAssociationRoleConstraint)){ - throw new ExecutionException(GdlPsis.TMCL.tmclAssociationRoleConstraint + " is not implemented yet"); - } else if(isInstanceOf(rootConstraint, GdlPsis.TMCL.tmclTopicRoleConstraint)){ - throw new ExecutionException(GdlPsis.TMCL.tmclTopicRoleConstraint + " is not implemented yet"); + } else if(isInstanceOf(rootConstraint, PSIs.TMCL.tmclAssociationRoleConstraint)){ + throw new ExecutionException(PSIs.TMCL.tmclAssociationRoleConstraint + " is not implemented yet"); + } else if(isInstanceOf(rootConstraint, PSIs.TMCL.tmclTopicRoleConstraint)){ + throw new ExecutionException(PSIs.TMCL.tmclTopicRoleConstraint + " is not implemented yet"); } return result; @@ -854,11 +854,11 @@ if(constraint == null) return result; TopicMap tm = constraint.getTopicMap(); - Topic constraintRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); - Topic constrainedStatementAssocType = getTopicByPsi(GdlPsis.TMCL.tmclConstrainedStatement, tm); - Topic constrainedRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstrained, tm); - Topic nameType = getTopicByPsi(GdlPsis.TMCL.tmclNameType, tm); - Topic occurrenceType = getTopicByPsi(GdlPsis.TMCL.tmclOccurrenceType, tm); + Topic constraintRoleType = getTopicByPsi(PSIs.TMCL.tmclConstraint, tm); + Topic constrainedStatementAssocType = getTopicByPsi(PSIs.TMCL.tmclConstrainedStatement, tm); + Topic constrainedRoleType = getTopicByPsi(PSIs.TMCL.tmclConstrained, tm); + Topic nameType = getTopicByPsi(PSIs.TMCL.tmclNameType, tm); + 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); @@ -866,19 +866,19 @@ if(nameOrOccurrenceTypes.size() == 0){ return result; } else if(nameOrOccurrenceTypes.size() > 1){ - throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(constraint) + " must be bound maximum once to a topic via a " + GdlPsis.TMCL.tmclConstrainedStatement + ", but is: " + nameOrOccurrenceTypes.size()); + throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(constraint) + " must be bound maximum once to a topic via a " + PSIs.TMCL.tmclConstrainedStatement + ", but is: " + nameOrOccurrenceTypes.size()); } else { - Topic regularExpressionConstraintType = getTopicByPsi(GdlPsis.TMCL.tmclRegularExpressionConstraint, tm); + Topic regularExpressionConstraintType = getTopicByPsi(PSIs.TMCL.tmclRegularExpressionConstraint, tm); ArrayList<Topic> regularExpressionConstraints = getOtherPlayerOfBinaryAssociation(nameOrOccurrenceTypes.get(0), constrainedRoleType, constrainedStatementAssocType, null, regularExpressionConstraintType, constraintRoleType); if(regularExpressionConstraints.size() == 0) { return ".*"; } else if(regularExpressionConstraints.size() == 1){ - Topic regexpOccurrenceType = getTopicByPsi(GdlPsis.TMCL.tmclRegexp, tm); + Topic regexpOccurrenceType = getTopicByPsi(PSIs.TMCL.tmclRegexp, tm); Occurrence rex = getSingleOccurrence(regularExpressionConstraints.get(0), regexpOccurrenceType); return rex.getValue(); } else { - throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(nameOrOccurrenceTypes.get(0)) + " must be bound maximum once to a " + GdlPsis.TMCL.tmclRegularExpressionConstraint + ", but is: " + regularExpressionConstraints.size()); + throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(nameOrOccurrenceTypes.get(0)) + " must be bound maximum once to a " + PSIs.TMCL.tmclRegularExpressionConstraint + ", but is: " + regularExpressionConstraints.size()); } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 15 01:26:58 2011 (r726) @@ -9,7 +9,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; @@ -79,9 +79,9 @@ public TextAlignValue getTextAlign(String styleClass) throws InvalidGdlSchemaException { Occurrence textAlignOcc = null; if(styleClass != null){ - textAlignOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlTextAlign, styleClass); + textAlignOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlTextAlign, styleClass); } else { - textAlignOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTextAlign); + textAlignOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTextAlign); } if(textAlignOcc == null && styleClass != null){ @@ -92,7 +92,7 @@ try{ return TextAlignValue.valueOf(textAlignOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextAlign + " must be set to one of \"left\", \"right\", \"center\" or \"justify\", but is \"" + textAlignOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTextAlign + " must be set to one of \"left\", \"right\", \"center\" or \"justify\", but is \"" + textAlignOcc.getValue() + "\""); } } } @@ -105,9 +105,9 @@ public AbsoluteNumValue getBorderWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth); } if(widthOcc == null && styleClass != null){ @@ -128,9 +128,9 @@ public NumUnitValue getPadding(String styleClass) throws InvalidGdlSchemaException { Occurrence paddingOcc = null; if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlPadding, styleClass); + paddingOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlPadding, styleClass); } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlPadding); + paddingOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlPadding); } if(paddingOcc == null && styleClass != null){ @@ -151,9 +151,9 @@ public ColorValue getBorderColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderColor); } if(colorOcc == null && styleClass != null){ @@ -174,9 +174,9 @@ public BorderStyleValue getBorderStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle); } if(styleOcc == null && styleClass != null){ @@ -201,9 +201,9 @@ public CursorValue getCursor(String styleClass) throws InvalidGdlSchemaException { Occurrence cursorOcc = null; if(styleClass != null){ - cursorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlCursor, styleClass); + cursorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlCursor, styleClass); } else { - cursorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlCursor); + cursorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlCursor); } if(cursorOcc == null && styleClass != null){ @@ -231,9 +231,9 @@ public NumUnitValue getBorderRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius); } if(radiusOcc == null && styleClass != null){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Aug 15 01:26:58 2011 (r726) @@ -2,14 +2,14 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; public class GdlAudio extends GdlComplexData { // some constructors protected GdlAudio() throws ExecutionException { - throw new ExecutionException(GdlPsis.TopicType.gdlAudio + " is not implemented by anaToMia yet"); + throw new ExecutionException(PSIs.TopicType.gdlAudio + " is not implemented by anaToMia yet"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Mon Aug 15 01:26:58 2011 (r726) @@ -2,14 +2,14 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; public class GdlImage extends GdlComplexData { // some constructors protected GdlImage() throws ExecutionException { - throw new ExecutionException(GdlPsis.TopicType.gdlImage + " is not implemented by anaToMia yet"); + throw new ExecutionException(PSIs.TopicType.gdlImage + " is not implemented by anaToMia yet"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Mon Aug 15 01:26:58 2011 (r726) @@ -2,14 +2,14 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; public class GdlVideo extends GdlComplexData { // some constructors protected GdlVideo() throws ExecutionException { - throw new ExecutionException(GdlPsis.TopicType.gdlVideo + " is not implemented by anaToMia yet"); + throw new ExecutionException(PSIs.TopicType.gdlVideo + " is not implemented by anaToMia yet"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 15 01:26:58 2011 (r726) @@ -31,7 +31,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -100,7 +100,7 @@ // returns the property of a gdl:ordered occurrence, otherwise the default value if no occurrence is set public boolean getOrdered() throws InvalidGdlSchemaException{ - Occurrence orderedOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlOrdered); + Occurrence orderedOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlOrdered); if(orderedOcc != null){ String boolStr = orderedOcc.getValue().toUpperCase(); @@ -109,7 +109,7 @@ } else if(boolStr.equals("FALSE")) { return false; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlOrdered + " must be set to one of \"true\" or \"false\", but is \"" + orderedOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlOrdered + " must be set to one of \"true\" or \"false\", but is \"" + orderedOcc.getValue() + "\""); } } else { return false; @@ -119,7 +119,7 @@ // returns a ListStyleTypeValeu instance that describes this instance's list style type property public ListStyleTypeValue getListStyleType() throws InvalidGdlSchemaException { - Occurrence typeOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlListStyleType); + Occurrence typeOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlListStyleType); if(typeOcc != null){ try{ @@ -127,7 +127,7 @@ }catch(IllegalArgumentException e){ String values = "deciaml, decimal-leading-zero, lower-greek, lower-roman, armenian, georgian, upper-roman, " + "lower-alpha, upper-alpha, lower-latin, upper-latin, disc, circle, square or none"; - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlListStyleType + " must be set to one of " + values + " , but is \"" + typeOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlListStyleType + " must be set to one of " + values + " , but is \"" + typeOcc.getValue() + "\""); } } else if(this.getOrdered()){ return ListStyleTypeValue.DECIMAL; @@ -139,13 +139,13 @@ // returns a ListStylePositionValue instance that describes this instance's list style position property public ListStylePositionValue getListStylePosition() throws InvalidGdlSchemaException { - Occurrence positionOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlListStylePosition); + Occurrence positionOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlListStylePosition); if(positionOcc != null){ try{ return ListStylePositionValue.valueOf(positionOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlListStylePosition + " must be set to one of inside or outside, but is \"" + positionOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlListStylePosition + " must be set to one of inside or outside, but is \"" + positionOcc.getValue() + "\""); } } else{ return ListStylePositionValue.OUTSIDE; 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 Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 15 01:26:58 2011 (r726) @@ -32,7 +32,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -101,7 +101,7 @@ // returns a String instance that represents the literal value of this elements name. public String getUnitName() throws InvalidGdlSchemaException { - Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitName); + Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlUnitName); if(nameOcc == null){ return ""; @@ -125,9 +125,9 @@ public BorderStyleValue getBorderStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle); } if(styleOcc == null && styleClass != null){ @@ -309,7 +309,7 @@ public void onAttach(){ super.onAttach(); try{ - String[] styleClasses = new String[]{null, GdlPsis.Scope.gdlActive, GdlPsis.Scope.gdlFocus, GdlPsis.Scope.gdlHover}; + String[] styleClasses = new String[]{null, PSIs.Scope.gdlActive, PSIs.Scope.gdlFocus, PSIs.Scope.gdlHover}; for (String styleClass : styleClasses) { GdlUnit.this.setTextDecoration(this, GdlUnit.this.getTextDecoration(styleClass), styleClass); } 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 Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Mon Aug 15 01:26:58 2011 (r726) @@ -8,7 +8,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlSpace; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.base.Utils; @@ -46,63 +46,63 @@ public static GdlVisibleObject instantiate(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic or an Association, but is: " + receivedData.getClass()); - if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpace)){ + if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpace)){ return new GdlSpace(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlTitle)){ return new GdlTitle(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlInfo)){ return new GdlInfo(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlReference)){ return new GdlReference(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlRadioButton)){ return new GdlRadioButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlCheckBox)){ return new GdlCheckBox(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlValidateButton)){ return new GdlValidateButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlCreateButton)){ return new GdlCreateButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDeleteButton)){ return new GdlDeleteButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlCommitButton)){ return new GdlCommitButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlActionButton)){ return new GdlActionButton(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlImage)){ return new GdlImage(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlVideo)){ return new GdlVideo(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlAudio)){ return new GdlAudio(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDatePicker)){ return new GdlDatePicker(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlTimePicker)){ return new GdlTimePicker(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDateTimePicker)){ return new GdlDateTimePicker(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlUnit)){ return new GdlUnit(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlText)){ return new GdlText(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlList)){ return new GdlList(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlListBox)){ return new GdlListBox(tmRepresentative, receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + GdlPsis.TopicType.gdlDefaultEditorTopicView); + }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); return new GdlDefaultEditorTopicView(tmRepresentative, (Topic)receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialCreatorTopicView)){ return new GdlSpecialCreatorTopicView(tmRepresentative); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + GdlPsis.TopicType.gdlSpecialEditorTopicView); + }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); return new GdlSpecialEditorTopicView(tmRepresentative, (Topic)receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Association when used with " + GdlPsis.TopicType.gdlCreatorAssociationview); + }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); return new GdlCreatorAssociationView(tmRepresentative, (Association)receivedData); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Associaiton when used with " + GdlPsis.TopicType.gdlEditorAssociationView); + }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); return new GdlEditorAssociationView(tmRepresentative, (Association)receivedData); }else{ String values = ""; @@ -120,7 +120,7 @@ // returns a GdlDefaultCreatorTopicView that corresponds to the passed arguments public static GdlDefaultCreatorTopicView instantiateDefaultCreatorTopicView(ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopics, TopicMap schemaTm) throws InvalidGdlSchemaException, ExecutionException{ - ArrayList<Topic> views = getViewTopics(requestedTopics, TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, schemaTm), schemaTm); + ArrayList<Topic> views = getViewTopics(requestedTopics, TmHelper.getTopicByPsi(PSIs.TopicType.gdlDefaultCreatorTopicView, schemaTm), schemaTm); if(views.size() != 1){ String values = ""; @@ -132,7 +132,7 @@ bindings += ", " + TmHelper.getAnyIdOfTopic(top); if(bindings.length() >= 2)bindings = bindings.substring(2); else bindings = "[]"; - throw new InvalidGdlSchemaException("the combination of topics requested (" + values + ") must be bound exactly once to a " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " but is bound to " + bindings); + throw new InvalidGdlSchemaException("the combination of topics requested (" + values + ") must be bound exactly once to a " + PSIs.TopicType.gdlDefaultCreatorTopicView + " but is bound to " + bindings); } return new GdlDefaultCreatorTopicView(views.get(0)); @@ -155,11 +155,11 @@ // get all TM-Values, i.e. TM-Multiple-Type-Value and TM-Single-Type-Value (only if requstedTops.sie() == 1) ArrayList<Topic> tmValues = new ArrayList<Topic>(); - Topic tmConstruct = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, schemaTm); - Topic tmBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, schemaTm); - Topic descriptor = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, schemaTm); - Topic tmMultipleTypeValue = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlTmMultipleTypeValue, schemaTm); - Topic tmSingleTypeValue = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlTmSingleTypeValue, schemaTm); + Topic tmConstruct = TmHelper.getTopicByPsi(PSIs.RoleType.gdlTmConstruct, schemaTm); + Topic tmBinding = TmHelper.getTopicByPsi(PSIs.AssociationType.gdlTmBinding, schemaTm); + Topic descriptor = TmHelper.getTopicByPsi(PSIs.RoleType.gdlDescriptor, schemaTm); + Topic tmMultipleTypeValue = TmHelper.getTopicByPsi(PSIs.TopicType.gdlTmMultipleTypeValue, schemaTm); + Topic tmSingleTypeValue = TmHelper.getTopicByPsi(PSIs.TopicType.gdlTmSingleTypeValue, schemaTm); for (Topic requestedTopic : requestedTops) { ArrayList<Topic> allTmValues = TmHelper.getOtherPlayerOfBinaryAssociation(requestedTopic, tmConstruct, tmBinding, null, descriptor); // filter only the valid tm-values for this scenario @@ -176,8 +176,8 @@ // get all views that are bound to the found tm-values ArrayList<Topic> views = new ArrayList<Topic>(); - Topic tmValueRoleType = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, schemaTm); - Topic topicViewBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, schemaTm); + Topic tmValueRoleType = TmHelper.getTopicByPsi(PSIs.RoleType.gdlTmValue, schemaTm); + Topic topicViewBinding = TmHelper.getTopicByPsi(PSIs.AssociationType.gdlTopicViewBinding, schemaTm); for (Topic tmValue : tmValues) { ArrayList<Topic> allViews = TmHelper.getOtherPlayerOfBinaryAssociation(tmValue, tmValueRoleType, topicViewBinding, null, viewSupertype, descriptor); for (Topic view : allViews) @@ -198,15 +198,15 @@ if(requestedTop == null) throw new InvalidGdlSchemaException("the topic " + requestedTopic.getFirst() + " was not found!"); // get all tm-instance-value topics bound to the requested topic - Topic tmConstruct = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, schemaTm); - Topic tmBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, schemaTm); - Topic descriptor = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, schemaTm); + Topic tmConstruct = TmHelper.getTopicByPsi(PSIs.RoleType.gdlTmConstruct, schemaTm); + Topic tmBinding = TmHelper.getTopicByPsi(PSIs.AssociationType.gdlTmBinding, schemaTm); + Topic descriptor = TmHelper.getTopicByPsi(PSIs.RoleType.gdlDescriptor, schemaTm); ArrayList<Topic> tmInstanceValues = TmHelper.getOtherPlayerOfBinaryAssociation(requestedTop, tmConstruct, tmBinding, null, descriptor); // get all views bound to the found tm-instance-values - Topic defaultEditorTopicView = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, schemaTm); - Topic tmValue = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, schemaTm); - Topic topicViewBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, schemaTm); + Topic defaultEditorTopicView = TmHelper.getTopicByPsi(PSIs.TopicType.gdlDefaultEditorTopicView, schemaTm); + Topic tmValue = TmHelper.getTopicByPsi(PSIs.RoleType.gdlTmValue, schemaTm); + Topic topicViewBinding = TmHelper.getTopicByPsi(PSIs.AssociationType.gdlTopicViewBinding, schemaTm); ArrayList<Topic> views = new ArrayList<Topic>(); for (Topic tmInstanceValue : tmInstanceValues) { ArrayList<Topic> tmpViews = TmHelper.getOtherPlayerOfBinaryAssociation(tmInstanceValue, tmValue, topicViewBinding, null, defaultEditorTopicView, descriptor); @@ -220,7 +220,7 @@ for (Topic top : views) bindings += ", " + TmHelper.getAnyIdOfTopic(top); if(bindings.length() >= 2)bindings = bindings.substring(2); - throw new InvalidGdlSchemaException("the topic " + requestedTopic.getFirst() + " requested for editing must be bound to exaclty one " + GdlPsis.TopicType.gdlDefaultEditorTopicView + ", but is bound to " + bindings); + throw new InvalidGdlSchemaException("the topic " + requestedTopic.getFirst() + " requested for editing must be bound to exaclty one " + PSIs.TopicType.gdlDefaultEditorTopicView + ", but is bound to " + bindings); }else { ArrayList<Pair<String, TopicIdentifierTypes>> typesOfRequestedTopic = new ArrayList<Pair<String,TopicIdentifierTypes>>(); @@ -238,7 +238,7 @@ for (Topic top : views) bindings += ", " + TmHelper.getAnyIdOfTopic(top); if(bindings.length() >= 2)bindings = bindings.substring(2); - throw new InvalidGdlSchemaException("the combination of topic types (" + values + ") for the requested topic " + requestedTopic.getFirst() + " must be bound exactly once to a " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " but is bound to " + bindings); + throw new InvalidGdlSchemaException("the combination of topic types (" + values + ") for the requested topic " + requestedTopic.getFirst() + " must be bound exactly once to a " + PSIs.TopicType.gdlDefaultEditorTopicView + " but is bound to " + bindings); } return new GdlDefaultEditorTopicView(views.get(0), requestedTop); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 15 01:26:58 2011 (r726) @@ -10,7 +10,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -68,7 +68,7 @@ // returns the gdl:multiple property - if no value is set the default value is returned public boolean getMultiple() throws InvalidGdlSchemaException { - Occurrence multipleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlMultiple); + Occurrence multipleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlMultiple); if(multipleOcc != null){ String boolStr = multipleOcc.getValue().toUpperCase(); @@ -77,7 +77,7 @@ } else if(boolStr.equals("FALSE")) { return false; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlMargin + " must be set to one of \"true\" or \"false\", but is \"" + multipleOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlMargin + " must be set to one of \"true\" or \"false\", but is \"" + multipleOcc.getValue() + "\""); } } else { return false; @@ -87,7 +87,7 @@ // returns the gdl:one-per-group property - if no value is set the default value is returned public boolean getOnePerGroup() throws InvalidGdlSchemaException { - Occurrence onePerGroupOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlOnePerGroup); + Occurrence onePerGroupOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlOnePerGroup); if(onePerGroupOcc != null){ String boolStr = onePerGroupOcc.getValue().toUpperCase(); @@ -96,7 +96,7 @@ } else if(boolStr.equals("FALSE")) { return false; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlOnePerGroup + " must be set to one of \"true\" or \"false\", but is \"" + onePerGroupOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlOnePerGroup + " must be set to one of \"true\" or \"false\", but is \"" + onePerGroupOcc.getValue() + "\""); } } else { return false; @@ -107,15 +107,15 @@ // returns an int instance of a gdl:size occurrence. // If no gdl:size occurrence is set, the default value is returned public int getSize() throws InvalidGdlSchemaException { - Occurrence rowsOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlSize); + Occurrence rowsOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlSize); if(rowsOcc != null){ try{ int value = Integer.valueOf(rowsOcc.getValue()); - if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlSize + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); + if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlSize + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); else return value; }catch(NumberFormatException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlSize + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlSize + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); } } else { return 1; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 15 01:26:58 2011 (r726) @@ -16,7 +16,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -74,14 +74,14 @@ public ColorValue getColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlColor, styleClass); + colorOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlColor, styleClass); } else { - colorOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlColor); + colorOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlColor); } - if(colorOcc == null && (styleClass == null || styleClass.equals(GdlPsis.Scope.gdlFocus) || styleClass.equals(GdlPsis.Scope.gdlHover))){ + if(colorOcc == null && (styleClass == null || styleClass.equals(PSIs.Scope.gdlFocus) || styleClass.equals(PSIs.Scope.gdlHover))){ return new ColorValue("#0000FF"); - }else if(colorOcc == null && styleClass.equals(GdlPsis.Scope.gdlActive)){ + }else if(colorOcc == null && styleClass.equals(PSIs.Scope.gdlActive)){ return null; }else { return new ColorValue(colorOcc.getValue()); @@ -97,9 +97,9 @@ public CursorValue getCursor(String styleClass) throws InvalidGdlSchemaException { Occurrence cursorOcc = null; if(styleClass != null){ - cursorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlCursor, styleClass); + cursorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlCursor, styleClass); } else { - cursorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlCursor); + cursorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlCursor); } if(cursorOcc == null && styleClass != null){ @@ -126,9 +126,9 @@ public TextDecorationValue getTextDecoration(String styleClass) throws InvalidGdlSchemaException { Occurrence decorationOcc = null; if(styleClass != null){ - decorationOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlTextDecoration, styleClass); + decorationOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlTextDecoration, styleClass); } else { - decorationOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTextDecoration); + decorationOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTextDecoration); } if(decorationOcc == null && styleClass != null){ @@ -139,7 +139,7 @@ try{ return TextDecorationValue.valueOf(decorationOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextDecoration + " must be set to one of \"underline\", \"overline\", \"line-through\", \"blink\" or \"none\", but is \"" + decorationOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTextDecoration + " must be set to one of \"underline\", \"overline\", \"line-through\", \"blink\" or \"none\", but is \"" + decorationOcc.getValue() + "\""); } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 15 01:26:58 2011 (r726) @@ -16,7 +16,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValueGroup; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -104,9 +104,9 @@ public AbsoluteNumValue getBorderWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderWidth); } if(widthOcc == null) return null; @@ -119,9 +119,9 @@ public AbsoluteNumValue getBorderTopWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopWidth); } if(widthOcc == null) return null; @@ -134,9 +134,9 @@ public AbsoluteNumValue getBorderRightWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightWidth); } if(widthOcc == null) return null; @@ -149,9 +149,9 @@ public AbsoluteNumValue getBorderBottomWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomWidth); } if(widthOcc == null) return null; @@ -164,9 +164,9 @@ public AbsoluteNumValue getBorderLeftWidth(String styleClass) throws InvalidGdlSchemaException { Occurrence widthOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftWidth, styleClass); + widthOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftWidth, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftWidth); + widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftWidth); } if(widthOcc == null) return null; @@ -178,9 +178,9 @@ public NumUnitValue getBorderRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRadius); } if(radiusOcc == null) return null; @@ -192,9 +192,9 @@ public NumUnitValue getBorderTopLeftRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopLeftRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopLeftRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopLeftRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopLeftRadius); } if(radiusOcc == null) return null; @@ -206,9 +206,9 @@ public NumUnitValue getBorderTopRightRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopRightRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopRightRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopRightRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopRightRadius); } if(radiusOcc == null) return null; @@ -220,9 +220,9 @@ public NumUnitValue getBorderBottomLeftRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomLeftRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomLeftRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomLeftRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomLeftRadius); } if(radiusOcc == null) return null; @@ -234,9 +234,9 @@ public NumUnitValue getBorderBottomRightRadius(String styleClass) throws InvalidGdlSchemaException { Occurrence radiusOcc = null; if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomRightRadius, styleClass); + radiusOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomRightRadius, styleClass); } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomRightRadius); + radiusOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomRightRadius); } if(radiusOcc == null) return null; @@ -248,9 +248,9 @@ public ColorValue getBorderColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderColor); } if(colorOcc == null ) return null; @@ -262,9 +262,9 @@ public ColorValue getBorderTopColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopColor); } if(colorOcc == null ) return null; @@ -276,9 +276,9 @@ public ColorValue getBorderRightColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightColor); } if(colorOcc == null ) return null; @@ -290,9 +290,9 @@ public ColorValue getBorderBottomColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomColor); } if(colorOcc == null ) return null; @@ -304,9 +304,9 @@ public ColorValue getBorderLeftColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftColor, styleClass); + colorOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftColor, styleClass); } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftColor); + colorOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftColor); } if(colorOcc == null ) return null; @@ -318,9 +318,9 @@ public BorderStyleValue getBorderStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderStyle); } if(styleOcc == null) { @@ -340,9 +340,9 @@ public BorderStyleValue getBorderTopStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderTopStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderTopStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderTopStyle); } if(styleOcc == null) { @@ -362,9 +362,9 @@ public BorderStyleValue getBorderRightStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderRightStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderRightStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderRightStyle); } if(styleOcc == null) { @@ -384,9 +384,9 @@ public BorderStyleValue getBorderBottomStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderBottomStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderBottomStyle); } if(styleOcc == null) { @@ -406,9 +406,9 @@ public BorderStyleValue getBorderLeftStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftStyle, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftStyle, styleClass); } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderLeftStyle); + styleOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlBorderLeftStyle); } if(styleOcc == null) { @@ -427,13 +427,13 @@ // returns a TextType instance of a gdl:text-type occurrence. // If no gdl:text-type occurrence is set, the default value is returned public TextTypeValue getTextType() throws InvalidGdlSchemaException { - Occurrence typeOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTextType); + Occurrence typeOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTextType); if(typeOcc != null){ try{ return TextTypeValue.valueOf(typeOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextType + " must be set to one of \"text\" or \"password\", but is \"" + typeOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTextType + " must be set to one of \"text\" or \"password\", but is \"" + typeOcc.getValue() + "\""); } } else { return TextTypeValue.Text; @@ -444,7 +444,7 @@ // returns a boolean instance of a gdl:readonly occurrence. // If no gdl:readonly occurrence is set, the default value is returned public boolean getReadonly() throws InvalidGdlSchemaException { - Occurrence readOnlyOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlReadonly); + Occurrence readOnlyOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlReadonly); if(readOnlyOcc != null){ String boolStr = readOnlyOcc.getValue().toUpperCase(); @@ -453,7 +453,7 @@ } else if(boolStr.equals("FALSE")) { return false; } else { - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlReadonly + " must be set to one of \"true\" or \"false\", but is \"" + readOnlyOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlReadonly + " must be set to one of \"true\" or \"false\", but is \"" + readOnlyOcc.getValue() + "\""); } } else { return true; @@ -464,15 +464,15 @@ // returns an int instance of a gdl:rows occurrence. // If no gdl:rows occurrence is set, the default value is returned public int getRows() throws InvalidGdlSchemaException { - Occurrence rowsOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlRows); + Occurrence rowsOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlRows); if(rowsOcc != null){ try{ int value = Integer.valueOf(rowsOcc.getValue()); - if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); + if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); else return value; }catch(NumberFormatException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + rowsOcc.getValue() + "\""); } } else { return 1; @@ -483,15 +483,15 @@ // returns a boolean instance of a gdl:cols occurrence. // If no gdl:cols occurrence is set, the default value is returned public int getCols() throws InvalidGdlSchemaException { - Occurrence colsOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlCols); + Occurrence colsOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlCols); if(colsOcc != null){ try{ int value = Integer.valueOf(colsOcc.getValue()); - if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlCols + " must be set to a positive integer, but is \"" + colsOcc.getValue() + "\""); + if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlCols + " must be set to a positive integer, but is \"" + colsOcc.getValue() + "\""); else return value; }catch(NumberFormatException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlCols + " must be set to a positive integer, but is \"" + colsOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlCols + " must be set to a positive integer, but is \"" + colsOcc.getValue() + "\""); } } else { return 5; @@ -502,13 +502,13 @@ // returns a boolean instance of a gdl:resize occurrence. // If no gdl:resize occurrence is set, the default value is returned public ResizeValue getResize() throws InvalidGdlSchemaException { - Occurrence resizeOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlResize); + Occurrence resizeOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlResize); if(resizeOcc != null){ try{ return ResizeValue.valueOf(resizeOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlResize + " must be set to one of \"both\", \"vertical\", \"horizontal\" or \"none\", but is \"" + resizeOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlResize + " must be set to one of \"both\", \"vertical\", \"horizontal\" or \"none\", but is \"" + resizeOcc.getValue() + "\""); } } else { return ResizeValue.NONE; @@ -564,8 +564,8 @@ // sets the rows property if gdl:width is not set public void setRows(Widget widget, int value) throws InvalidGdlSchemaException, ExecutionException { - if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + value + "\""); - Occurrence heightOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlHeight); + if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + value + "\""); + Occurrence heightOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlHeight); // rows is only treated if height is not set if(heightOcc == null) ((TextArea)widget).setVisibleLines(value); @@ -574,8 +574,8 @@ // sets the cols property if gdl:height is not set public void setCols(Widget widget, int value) throws InvalidGdlSchemaException, ExecutionException { - if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + value + "\""); - Occurrence widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlWidth); + if(value < 0) throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlRows + " must be set to a positive integer, but is \"" + value + "\""); + Occurrence widthOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlWidth); // cols is only treated if width is not set if(widthOcc == null) DOM.setElementAttribute(widget.getElement(), "cols", String.valueOf(value)); @@ -884,7 +884,7 @@ @Override public Topic getDefaultValue() throws InvalidGdlSchemaException { - if(this.getDefaultLiteralValue() != null && this.getDefaultTmValue() != null) throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.getValueGroup()) + " must be bound to maximal one " + GdlPsis.TopicType.gdlDefaultValue + ", but is: 2"); + if(this.getDefaultLiteralValue() != null && this.getDefaultTmValue() != null) throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.getValueGroup()) + " must be bound to maximal one " + PSIs.TopicType.gdlDefaultValue + ", but is: 2"); else if(this.getDefaultLiteralValue() != null) return this.getDefaultLiteralValue(); else return this.getDefaultTmValue(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Mon Aug 15 01:26:58 2011 (r726) @@ -6,7 +6,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -39,9 +39,9 @@ public DirectionValue getDirection(String styleClass) throws InvalidGdlSchemaException { Occurrence directionOcc = null; if(styleClass != null){ - directionOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlDirection, styleClass); + directionOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlDirection, styleClass); } else { - directionOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlDirection); + directionOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlDirection); } if(directionOcc == null && styleClass != null){ @@ -52,7 +52,7 @@ try{ return DirectionValue.valueOf(directionOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlDirection + " must be set to one of \"ltr\" or \"rtl\", but is \"" + directionOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlDirection + " must be set to one of \"ltr\" or \"rtl\", but is \"" + directionOcc.getValue() + "\""); } } } @@ -64,9 +64,9 @@ public TextAlignValue getTextAlign(String styleClass) throws InvalidGdlSchemaException { Occurrence textAlignOcc = null; if(styleClass != null){ - textAlignOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlTextAlign, styleClass); + textAlignOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlTextAlign, styleClass); } else { - textAlignOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTextAlign); + textAlignOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTextAlign); } if(textAlignOcc == null && styleClass != null){ @@ -77,7 +77,7 @@ try{ return TextAlignValue.valueOf(textAlignOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextAlign + " must be set to one of \"left\", \"right\", \"center\" or \"justify\", but is \"" + textAlignOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTextAlign + " must be set to one of \"left\", \"right\", \"center\" or \"justify\", but is \"" + textAlignOcc.getValue() + "\""); } } } @@ -89,9 +89,9 @@ public NormalNumUnitValue getLineHeight(String styleClass) throws InvalidGdlSchemaException { Occurrence lineHeightOcc = null; if(styleClass != null){ - lineHeightOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlLineHeight, styleClass); + lineHeightOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlLineHeight, styleClass); } else { - lineHeightOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlLineHeight); + lineHeightOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlLineHeight); } if(lineHeightOcc == null && styleClass != null){ @@ -110,9 +110,9 @@ public TextDecorationValue getTextDecoration(String styleClass) throws InvalidGdlSchemaException { Occurrence decorationOcc = null; if(styleClass != null){ - decorationOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlTextDecoration, styleClass); + decorationOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlTextDecoration, styleClass); } else { - decorationOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTextDecoration); + decorationOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTextDecoration); } if(decorationOcc == null && styleClass != null){ @@ -123,7 +123,7 @@ try{ return TextDecorationValue.valueOf(decorationOcc.getValue().toUpperCase().replace("-", "_")); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextDecoration + " must be set to one of \"underline\", \"overline\", \"line-through\", \"blink\" or \"none\", but is \"" + decorationOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTextDecoration + " must be set to one of \"underline\", \"overline\", \"line-through\", \"blink\" or \"none\", but is \"" + decorationOcc.getValue() + "\""); } } } @@ -135,9 +135,9 @@ public ColorValue getColor(String styleClass) throws InvalidGdlSchemaException { Occurrence colorOcc = null; if(styleClass != null){ - colorOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlColor, styleClass); + colorOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlColor, styleClass); } else { - colorOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlColor); + colorOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlColor); } if(colorOcc == null && styleClass != null){ @@ -154,9 +154,9 @@ public String getFontFamily(String styleClass) throws InvalidGdlSchemaException { Occurrence fontOcc = null; if(styleClass != null){ - fontOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlFontfamily, styleClass); + fontOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlFontfamily, styleClass); } else { - fontOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFontfamily); + fontOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFontfamily); } if(fontOcc == null){ @@ -173,9 +173,9 @@ public FontStyle getFontStyle(String styleClass) throws InvalidGdlSchemaException { Occurrence styleOcc = null; if(styleClass != null){ - styleOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlFontStyle, styleClass); + styleOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlFontStyle, styleClass); } else { - styleOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFontStyle); + styleOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFontStyle); } if(styleOcc == null && styleClass != null){ @@ -186,7 +186,7 @@ try{ return FontStyle.valueOf(styleOcc.getValue().toUpperCase()); }catch(IllegalArgumentException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlFontStyle + " must be set to one of \"normal\", \"italic\" or \"oblique\", but is \"" + styleOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlFontStyle + " must be set to one of \"normal\", \"italic\" or \"oblique\", but is \"" + styleOcc.getValue() + "\""); } } } @@ -198,9 +198,9 @@ public PositiveNumUnitValue getFontSize(String styleClass) throws InvalidGdlSchemaException { Occurrence sizeOcc = null; if(styleClass != null){ - sizeOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlFontSize, styleClass); + sizeOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlFontSize, styleClass); } else { - sizeOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFontSize); + sizeOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFontSize); } if(sizeOcc == null && styleClass != null){ @@ -219,9 +219,9 @@ public FontWeightValue getFontWeight(String styleClass) throws InvalidGdlSchemaException { Occurrence weightOcc = null; if(styleClass != null){ - weightOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlFontWeight, styleClass); + weightOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlFontWeight, styleClass); } else { - weightOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFontWeight); + weightOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFontWeight); } if(weightOcc == null && styleClass != null){ @@ -233,7 +233,7 @@ return FontWeightValue.fromString(weightOcc.getValue()); }catch(IllegalArgumentException e){ String values = "normal, bold, bolder, lighter, 100, 200, 300, 400, 500, 600, 700, 800 or 900"; - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlFontWeight + " must be set to one of " + values + ", but found " + weightOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlFontWeight + " must be set to one of " + values + ", but found " + weightOcc.getValue() + "\""); } } } @@ -245,9 +245,9 @@ public NormalNumUnitValue getLetterSpacing(String styleClass) throws InvalidGdlSchemaException { Occurrence spacingOcc = null; if(styleClass != null){ - spacingOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlLetterSpacing, styleClass); + spacingOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlLetterSpacing, styleClass); } else { - spacingOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlLetterSpacing); + spacingOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlLetterSpacing); } if(spacingOcc == null && styleClass != null){ @@ -266,9 +266,9 @@ public NormalNumUnitValue getWordSpacing(String styleClass) throws InvalidGdlSchemaException { Occurrence spacingOcc = null; if(styleClass != null){ - spacingOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlWordSpacing, styleClass); + spacingOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlWordSpacing, styleClass); } else { - spacingOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlWordSpacing); + spacingOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlWordSpacing); } if(spacingOcc == null && styleClass != null){ @@ -349,7 +349,7 @@ public void setGdlStyle(Widget widget) throws InvalidGdlSchemaException, ExecutionException { super.setGdlStyle(widget); - String[] styleClasses = new String[]{null, GdlPsis.Scope.gdlActive, GdlPsis.Scope.gdlFocus, GdlPsis.Scope.gdlHover}; + String[] styleClasses = new String[]{null, PSIs.Scope.gdlActive, PSIs.Scope.gdlFocus, PSIs.Scope.gdlHover}; for (String styleClass : styleClasses) { this.setColor(widget, this.getColor(styleClass), styleClass); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 15 01:26:58 2011 (r726) @@ -5,7 +5,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -100,9 +100,9 @@ public PositiveNumUnitValue getFontSize(String styleClass) throws InvalidGdlSchemaException { Occurrence sizeOcc = null; if(styleClass != null){ - sizeOcc = super.getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlFontSize, styleClass); + sizeOcc = super.getNoneOrOneScopedOccurrence(PSIs.OccurrenceType.gdlFontSize, styleClass); } else { - sizeOcc = super.getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFontSize); + sizeOcc = super.getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlFontSize); } if(sizeOcc == null && styleClass != null){ @@ -122,14 +122,14 @@ // returns the property of a gdl:title-order occurrence, otherwise the default value if no occurrence is set public int getTitleOrder() throws InvalidGdlSchemaException{ - Occurrence orderOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlTitleOrder); + Occurrence orderOcc = getNoneOrOneUnscopedOccurrence(PSIs.OccurrenceType.gdlTitleOrder); if(orderOcc != null){ try{ int titleOrder = Integer.valueOf(orderOcc.getValue()); return titleOrder; }catch(NumberFormatException e){ - throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTitleOrder + " must be set to one of \"1\", \"2\", \"3\" or \"4\", but is \"" + orderOcc.getValue() + "\""); + throw new InvalidGdlSchemaException("The occurrence " + PSIs.OccurrenceType.gdlTitleOrder + " must be set to one of \"1\", \"2\", \"3\" or \"4\", but is \"" + orderOcc.getValue() + "\""); } } else { return 1; @@ -147,9 +147,9 @@ // adds a stly property and value as a pair to the corresponding array list private void addStyleToStore(String styleClass, String property, String value){ if(styleClass == null) return; - else if(styleClass.equals(GdlPsis.Scope.gdlActive)) this.titleActiveCssNamesAndStyles.add(new Pair<String, String>(property, value)); - else if(styleClass.equals(GdlPsis.Scope.gdlFocus)) this.titleFocusCssNamesAndStyles.add(new Pair<String, String>(property, value)); - else if(styleClass.equals(GdlPsis.Scope.gdlHover)) this.titleHoverCssNamesAndStyles.add(new Pair<String, String>(property, value)); + else if(styleClass.equals(PSIs.Scope.gdlActive)) this.titleActiveCssNamesAndStyles.add(new Pair<String, String>(property, value)); + else if(styleClass.equals(PSIs.Scope.gdlFocus)) this.titleFocusCssNamesAndStyles.add(new Pair<String, String>(property, value)); + else if(styleClass.equals(PSIs.Scope.gdlHover)) this.titleHoverCssNamesAndStyles.add(new Pair<String, String>(property, value)); } 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 Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 15 01:26:58 2011 (r726) @@ -10,7 +10,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -60,9 +60,9 @@ public String getViewName()throws InvalidGdlSchemaException { - JsArray<Name> viewNames = super.tmRepresentative.getNames(tm.getTopicBySubjectIdentifier(tm.createLocator(GdlPsis.NameType.gdlViewName))); + JsArray<Name> viewNames = super.tmRepresentative.getNames(tm.getTopicBySubjectIdentifier(tm.createLocator(PSIs.NameType.gdlViewName))); if(viewNames.length() != 1){ - throw new InvalidGdlSchemaException("A view must be bound to a " + GdlPsis.NameType.gdlViewName + " instance"); + throw new InvalidGdlSchemaException("A view must be bound to a " + PSIs.NameType.gdlViewName + " instance"); } return viewNames.get(0).getValue(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Mon Aug 15 00:59:52 2011 (r725) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Mon Aug 15 01:26:58 2011 (r726) @@ -78,6 +78,7 @@ {"subject_identifiers":["[gdl:float]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:clear]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:resize]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:vertical-align]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:action-button]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:font-size]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, @@ -118,9 +119,9 @@ {"subject_identifiers":["[doc:unit-1-radio-button]"], "instance_of":["si:[gdl:Radio-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_radio_button_id"},{"type":"si:[gdl:content-orientation]", "value":"horizontal"}, {"type":"si:[gdl:background-color]", "value": "lime"}, {"type":"si:[gdl:margin-left]", "value":"15pt"}, {"type":"si:[gdl:font-size]", "value":"8pt"}]}, {"subject_identifiers":["[doc:unit-1-check-box]"], "instance_of":["si:[gdl:Check-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_check_box_id"},{"type":"si:[gdl:content-orientation]", "value":"vertical"}, {"type":"si:[gdl:background-color]", "value": "lime"}, {"type":"si:[gdl:margin]", "value":"30pt"}, {"type":"si:[gdl:font-size]", "value":"8pt"}]}, {"subject_identifiers":["[doc:unit-1-action-button]"], "instance_of":["si:[gdl:Action-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_action_button"}]}, - {"subject_identifiers":["[doc:list-item-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}, {"type":"si:[gdl:margin-bottom]", "value":"5px"}]}, - {"subject_identifiers":["[doc:list-item-3]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_3_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}]}, - {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, + {"subject_identifiers":["[doc:list-item-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}, {"type":"si:[gdl:margin-bottom]", "value":"5px"}, {"type":"si:[gdl:vertical-align]", "value":"middle"}]}, + {"subject_identifiers":["[doc:list-item-3]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_3_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}, {"type":"si:[gdl:vertical-align]", "value":"middle"}]}, + {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}, {"type":"si:[gdl:vertical-align]", "value":"middle"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}, {"type":"si:[gdl:resize]", "value":"both"}, {"type":"si:[gdl:border-style]", "value":"none"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, {"subject_identifiers":["[doc:unit-1]"], "instance_of":["si:[gdl:Unit]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:unit-name]", "value":"unit 1"}, {"type":"si:[gdl:width]", "value":"400px"}, {"type":"si:[gdl:height]", "value":"200px"}, {"type":"si:[gdl:border-style]", "value":"dashed"}, {"type":"si:[gdl:border-width]", "value":"1px"}, {"type":"si:[gdl:text-decoration]", "value":"line-through"},{"type":"si:[gdl:background-color]", "value":"lime"}]},

1 0

[isidorus-cvs] r725 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button complexData container environment isidorus text view
by lgiessmann＠common-lisp.net 15 Aug '11

15 Aug '11

Author: lgiessmann Date: Mon Aug 15 00:59:52 2011 New Revision: 725 Log: gdl-frontend: Widgets: chaged the public construcgtors of GdlVisibleObject(s) to the signature (Topic tmRepresentative, Construct receivedData), so the consuming of received Topic Maps data can be implemented in each class Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java 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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.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/GdlSpace.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.base; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -11,8 +12,8 @@ } - public GdlSpace(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlSpace(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); this.setGdlStyle(this); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,6 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.base; import java.util.ArrayList; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; @@ -72,6 +75,7 @@ protected ArrayList<Pair<Widget, ArrayList<EventHandler>>> eventHandlers = new ArrayList<Pair<Widget, ArrayList<EventHandler>>>(); protected ArrayList<Pair<Topic, Integer>> actionButtonsAndPositions = null; protected ArrayList<GdlInfo> infoElements = new ArrayList<GdlInfo>(); + protected Construct receivedData = null; // some constructors @@ -81,10 +85,13 @@ } - public GdlVisibleObject(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public GdlVisibleObject(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ this(); this.tmRepresentative = tmRepresentative; this.tm = this.tmRepresentative.getTopicMap(); + + if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic or an Association, but is: " + receivedData.getClass()); + this.receivedData = receivedData; this.setId(this.getId()); this.setGdlStyle(); @@ -102,7 +109,7 @@ ArrayList<Topic> infos = TmHelper.topicContainsInfo(this.tmRepresentative); for (Topic info : infos){ - GdlInfo elem = (GdlInfo)GdlInstantiator.instantiate(info); + GdlInfo elem = (GdlInfo)GdlInstantiator.instantiate(info, this.receivedData); this.infoElements.add(elem); elem.setPosition(this); } @@ -151,7 +158,7 @@ // add buttons that are not bound to the current sub element, but belong to it for (Topic currentButton : currentButtons) - if(!((ButtonableObject)this.subElements.get(i)).containsButton(currentButton)) ((ButtonableObject)this.subElements.get(i)).addButton((GdlActionButton)GdlInstantiator.instantiate(currentButton)); + if(!((ButtonableObject)this.subElements.get(i)).containsButton(currentButton)) ((ButtonableObject)this.subElements.get(i)).addButton((GdlActionButton)GdlInstantiator.instantiate(currentButton, null)); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -4,6 +4,8 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; @@ -25,8 +27,8 @@ } - public GdlActionButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlActionButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: set all tm values this.createButton().setText("Action-Button"); // TODO: remove set text Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -11,7 +12,7 @@ } - public GdlButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,6 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.button; import com.google.gwt.user.client.ui.CheckBox; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -11,8 +13,8 @@ } - public GdlCheckBox(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlCheckBox(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a check box for each tm construct this.createcheckBox().setText("Check Box 1"); this.createcheckBox().setText("Check Box 2"); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -13,8 +14,8 @@ } - public GdlCommitButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlCommitButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); ((Button)this.subElements.get(0)).setText("commit"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -13,8 +14,8 @@ } - public GdlCreateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlCreateButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); ((Button)this.subElements.get(0)).setText("create"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -3,6 +3,7 @@ import com.google.gwt.user.client.ui.Button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -15,8 +16,8 @@ } - public GdlDeleteButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlDeleteButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); ((Button)this.subElements.get(0)).setText("delete"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -10,8 +11,8 @@ } - public GdlInputButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlInputButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -2,6 +2,8 @@ import com.google.gwt.user.client.ui.RadioButton; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -12,8 +14,8 @@ } - public GdlRadioButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlRadioButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a radio button for each tm construct this.createRadioButton().setText("Radio Button 1"); this.createRadioButton().setText("Radio Button 2"); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java Mon Aug 15 00:59:52 2011 (r725) @@ -2,6 +2,7 @@ import com.google.gwt.user.client.ui.Button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -14,8 +15,8 @@ } - public GdlValidateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlValidateButton(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); ((Button)this.subElements.get(0)).setText("validate"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -12,7 +13,7 @@ } - public GdlAudio(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public GdlAudio(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ this(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -12,7 +13,7 @@ } - public GdlComplexData(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlComplexData(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Mon Aug 15 00:59:52 2011 (r725) @@ -22,6 +22,8 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; import com.google.gwt.user.datepicker.client.DatePicker; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -40,8 +42,8 @@ } - public GdlDatePicker(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlDatePicker(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // create a date widget for each tm-construct this.createDateWidget(); this.setNthButtons(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -14,8 +15,8 @@ } - public GdlDateTimePicker(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlDateTimePicker(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // create a date-time widget for each tm-construct } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -12,7 +13,7 @@ } - public GdlImage(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public GdlImage(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ this(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -14,8 +15,8 @@ } - public GdlTimePicker(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlTimePicker(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // create a time widget for each tm-construct } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -12,7 +13,7 @@ } - public GdlVideo(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public GdlVideo(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ this(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 15 00:59:52 2011 (r725) @@ -26,6 +26,8 @@ import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.HandlerRegistration; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; @@ -56,8 +58,8 @@ } - public GdlList(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlList(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); this.createList(); ArrayList<Topic> objectsContained = this.contains(); @@ -407,7 +409,7 @@ for (Pair<Topic, Integer> pair : this.storedItems) if(pair.getFirst().equals(current)) idx = pair.getSecond(); ListWidget list = (ListWidget)((ButtonableObject)this.subElements.get(0)).getMainObject(); - GdlVisibleObject newObj = GdlInstantiator.instantiate(current); + GdlVisibleObject newObj = GdlInstantiator.instantiate(current, this.receivedData); list.insertWidget(newObj, idx); return newObj; 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 Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 15 00:59:52 2011 (r725) @@ -26,6 +26,8 @@ import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; @@ -53,8 +55,8 @@ } - public GdlUnit(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlUnit(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // create a unit for each tm-element this.createUnit(); this.setNthButtons(); @@ -221,7 +223,7 @@ if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); - GdlVisibleObject newObj = GdlInstantiator.instantiate(current); + GdlVisibleObject newObj = GdlInstantiator.instantiate(current, GdlUnit.this.receivedData); GdlVisibleObject oldObj = null; for (Widget widget : this.subElements){ if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Mon Aug 15 00:59:52 2011 (r725) @@ -2,6 +2,9 @@ import java.util.ArrayList; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlSpace; @@ -40,61 +43,67 @@ public class GdlInstantiator { // returns a java instance of a GdlVisibleObject that corresponds to the // set topic type of the passed topic instance - public static GdlVisibleObject instantiate(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public static GdlVisibleObject instantiate(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + if(!(receivedData instanceof Topic) && !(receivedData instanceof Association) && receivedData != null) throw new ExecutionException("receivedData must be either a Topic or an Association, but is: " + receivedData.getClass()); + if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpace)){ - return new GdlSpace(tmRepresentative); + return new GdlSpace(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ - return new GdlTitle(tmRepresentative); + return new GdlTitle(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ - return new GdlInfo(tmRepresentative); + return new GdlInfo(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ - return new GdlReference(tmRepresentative); + return new GdlReference(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ - return new GdlRadioButton(tmRepresentative); + return new GdlRadioButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ - return new GdlCheckBox(tmRepresentative); + return new GdlCheckBox(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ - return new GdlValidateButton(tmRepresentative); + return new GdlValidateButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ - return new GdlCreateButton(tmRepresentative); + return new GdlCreateButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ - return new GdlDeleteButton(tmRepresentative); + return new GdlDeleteButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ - return new GdlCommitButton(tmRepresentative); + return new GdlCommitButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ - return new GdlActionButton(tmRepresentative); + return new GdlActionButton(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ - return new GdlImage(tmRepresentative); + return new GdlImage(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ - return new GdlVideo(tmRepresentative); + return new GdlVideo(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ - return new GdlAudio(tmRepresentative); + return new GdlAudio(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ - return new GdlDatePicker(tmRepresentative); + return new GdlDatePicker(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ - return new GdlTimePicker(tmRepresentative); + return new GdlTimePicker(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ - return new GdlDateTimePicker(tmRepresentative); + return new GdlDateTimePicker(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ - return new GdlUnit(tmRepresentative); + return new GdlUnit(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ - return new GdlText(tmRepresentative); + return new GdlText(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ - return new GdlList(tmRepresentative); + return new GdlList(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ - return new GdlListBox(tmRepresentative); + return new GdlListBox(tmRepresentative, receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ - return new GdlDefaultEditorTopicView(tmRepresentative); + if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + GdlPsis.TopicType.gdlDefaultEditorTopicView); + return new GdlDefaultEditorTopicView(tmRepresentative, (Topic)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ return new GdlSpecialCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ - return new GdlSpecialEditorTopicView(tmRepresentative); + if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + GdlPsis.TopicType.gdlSpecialEditorTopicView); + return new GdlSpecialEditorTopicView(tmRepresentative, (Topic)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ - return new GdlCreatorAssociationView(tmRepresentative); + if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Association when used with " + GdlPsis.TopicType.gdlCreatorAssociationview); + return new GdlCreatorAssociationView(tmRepresentative, (Association)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ - return new GdlEditorAssociationView(tmRepresentative); + if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Associaiton when used with " + GdlPsis.TopicType.gdlEditorAssociationView); + return new GdlEditorAssociationView(tmRepresentative, (Association)receivedData); }else{ String values = ""; for(int i = 0; i != tmRepresentative.getTypes().length(); ++i){ @@ -205,7 +214,7 @@ } if(views.size() == 1){ - return new GdlDefaultEditorTopicView(views.get(0)); + return new GdlDefaultEditorTopicView(views.get(0), requestedTop); }else if(views.size() > 1){ String bindings = ""; for (Topic top : views) @@ -232,7 +241,7 @@ throw new InvalidGdlSchemaException("the combination of topic types (" + values + ") for the requested topic " + requestedTopic.getFirst() + " must be bound exactly once to a " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " but is bound to " + bindings); } - return new GdlDefaultEditorTopicView(views.get(0)); + return new GdlDefaultEditorTopicView(views.get(0), requestedTop); } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Mon Aug 15 00:59:52 2011 (r725) @@ -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() + "test.gdl.2.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.gdl.jtm"); //"TextGrid.jtm"); // TODO: replace with the correct URL private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null; private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Mon Aug 15 00:59:52 2011 (r725) @@ -7,6 +7,8 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -23,8 +25,8 @@ } - public GdlInfo(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlInfo(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); RootPanel.get().add(this); super.setGdlStyle(); // TODO: create an info element for each tm construct Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 15 00:59:52 2011 (r725) @@ -6,6 +6,8 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; @@ -23,8 +25,8 @@ } - public GdlListBox(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlListBox(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a ListBox element for each TM-elem this.createNewListBox().addItem("List-Box"); this.setNthButtons(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 15 00:59:52 2011 (r725) @@ -12,6 +12,8 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; @@ -31,8 +33,8 @@ super(); } - public GdlReference(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlReference(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a Reference element for each TM-elem ReferenceWidget ref = this.createReference(); // TODO: remove ref.setText("Reference"); // TODO: remove Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 15 00:59:52 2011 (r725) @@ -58,8 +58,8 @@ } - public GdlText(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlText(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a text element for each TM-elem this.createNewTextArea().setText("Text"); // TODO: remove only for debugging this.setNthButtons(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Mon Aug 15 00:59:52 2011 (r725) @@ -2,6 +2,8 @@ import com.google.gwt.dom.client.Style.FontStyle; import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; @@ -25,8 +27,8 @@ } - public GdlTextObject(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlTextObject(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); super.setGdlStyle(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,6 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.text; import java.util.ArrayList; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; @@ -55,8 +57,8 @@ } - public GdlTitle(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlTitle(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); // TODO: create a Title element for each TM-elem this.createTitle().setText("Title"); this.setNthButtons(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -7,8 +8,8 @@ public abstract class GdlAssociationView extends GdlView { - public GdlAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } // TODO: implement Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,5 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -8,8 +9,8 @@ public class GdlCreatorAssociationView extends GdlAssociationView { - public GdlCreatorAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlCreatorAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -11,7 +11,7 @@ // TODO: implement public GdlDefaultCreatorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + super(tmRepresentative, null); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -8,8 +8,8 @@ public class GdlDefaultEditorTopicView extends GdlDefaultTopicView { - public GdlDefaultEditorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlDefaultEditorTopicView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -6,8 +6,8 @@ public abstract class GdlDefaultTopicView extends GdlTopicView { - public GdlDefaultTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlDefaultTopicView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } // TODO: implement Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Mon Aug 15 00:59:52 2011 (r725) @@ -1,6 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.view; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -9,8 +10,8 @@ public class GdlEditorAssociationView extends GdlAssociationView { - public GdlEditorAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlEditorAssociationView(Topic tmRepresentative, Association receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -10,7 +10,7 @@ // TODO: implement public GdlSpecialCreatorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + super(tmRepresentative, null); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -10,8 +10,8 @@ // TODO: implement - public GdlSpecialEditorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlSpecialEditorTopicView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -6,8 +6,8 @@ public abstract class GdlSpecialTopicView extends GdlTopicView { - public GdlSpecialTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { - super(tmRepresentative); + public GdlSpecialTopicView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException { + super(tmRepresentative, receivedData); // TODO Auto-generated constructor stub } // TODO: implement Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Aug 15 00:59:52 2011 (r725) @@ -7,7 +7,7 @@ public abstract class GdlTopicView extends GdlView { - public GdlTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlTopicView(Topic tmRepresentative, Topic receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); } } 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 Fri Aug 12 11:06:46 2011 (r724) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 15 00:59:52 2011 (r725) @@ -3,6 +3,8 @@ 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; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; @@ -24,8 +26,8 @@ } - public GdlView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - super(tmRepresentative); + public GdlView(Topic tmRepresentative, Construct receivedData) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative, receivedData); ArrayList<Topic> objectsContained = this.contains(); Topic currentTopic = this.getStartElement(objectsContained); @@ -96,7 +98,7 @@ if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); - GdlVisibleObject newObj = GdlInstantiator.instantiate(current); + GdlVisibleObject newObj = GdlInstantiator.instantiate(current, this.receivedData); GdlVisibleObject oldObj = null; for (Widget widget : super.subElements){ if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){

1 0

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

12 Aug '11

Author: lgiessmann Date: Fri Aug 12 11:06:46 2011 New Revision: 724 Log: Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.2.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 12 04:48:04 2011 (r723) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 12 11:06:46 2011 (r724) @@ -1,12 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlCreatorAssociationView extends GdlAssociationView {

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →