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

[isidorus-cvs] r827 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 05 Sep '11

05 Sep '11

Author: lgiessmann Date: Mon Sep 5 00:55:40 2011 New Revision: 827 Log: gdl-frontend: Widgets: added a commit button for the editor view of instances of http://textgrid.org/sergiceregistry/model/types/Hash-Object; added a hidden value for http://textgrid.org/sergiceregistry/model/hash-type occurrence for the editor view of instances of http://textgrid.org/sergiceregistry/model/types/Hash-Object; chnged the readonly value of the textfiedl for occurrences of the type http://textgrid.org/sergiceregistry/model/value Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Fri Sep 2 09:52:10 2011 (r826) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Mon Sep 5 00:55:40 2011 (r827) @@ -35,6 +35,7 @@ {"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: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: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":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, @@ -53,11 +54,13 @@ {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:hidden-value]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdlt:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, {"subject_identifiers":["[gdlt:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[gdlt:Role-Player]"]}, + {"subject_identifiers":["[gdlt:Hidden-Value]"]}, {"subject_identifiers":["[gdlt:Visible-Object]"]}, {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -95,11 +98,15 @@ {"subject_identifiers":["[gdlt:Button]"]}, {"subject_identifiers":["[gdlt:Action-Button]"]}, {"subject_identifiers":["[gdlt:Delete-Button]"]}, + {"subject_identifiers":["[gdlt:Commit-Button]"]}, {"subject_identifiers":["[tgg:textgrid-ui-schema]"], "instance_of":["si:[gdlt:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for the TextGrid-ServiceRegistry-UI"}]}, {"subject_identifiers":["[tgg:hash-object-default-editor-topic-view]"], "instance_of":["si:[gdlt:Default-Editor-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Editor Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_editor_topic_view_id"}, {"type":"si:[gdl:width]", "value":"362px"}, {"type":"si:[gdl:height]", "value":"160px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, {"subject_identifiers":["[tgg:hash-object-editor-view-binding]"], "instance_of":["si:[gdlt:TM-Single-Type-Value]"]}, + {"subject_identifiers":["[tgg:hash-hash-type-hidden-value]"], "instance_of":["si:[gdlt:Hidden-Value]"]}, + {"subject_identifiers":["[tgg:hash-hash-type-default-value]"], "instance_of":["si:[gdlt:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"confserver"}]}, + {"subject_identifiers":["[tgg:hash-object-editor-text-label-env]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, {"subject_identifiers":["[tgg:hash-object-editor-text-label-env-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, {"subject_identifiers":["[tgg:hash-object-editor-text-label-env-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}, @@ -127,12 +134,15 @@ {"subject_identifiers":["[tgg:hash-object-editor-text-label-value-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}, {"subject_identifiers":["[tgg:hash-object-editor-text-label-value-value]"], "instance_of":["si:[gdlt:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"value:"}]}, - {"subject_identifiers":["[tgg:hash-object-editor-text-value]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_value_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}, {"type":"si:[gdl:padding-left]", "value":"2px"}]}, + {"subject_identifiers":["[tgg:hash-object-editor-text-value]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_value_id"}, {"type":"si:[gdl:readonly]", "value":"false"}, {"type":"si:[gdl:width]", "value":"230px"},{"type":"si:[gdl:pointer]", "value":"text"}, {"type":"si:[gdl:border-style]", "value":"none"}, {"type":"si:[gdl:padding-left]", "value":"2px"}]}, {"subject_identifiers":["[tgg:hash-object-editor-text-value-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"70px"}, {"type":"si:[gdl:left]", "value":"120px"}]}, {"subject_identifiers":["[tgg:hash-object-editor-text-value-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}, {"subject_identifiers":["[tgg:hash-object-editor-delete-button]"], "instance_of":["si:[gdlt:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_delete_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, - {"subject_identifiers":["[tgg:hash-object-editor-delete-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:left]", "value":"10px"}]} + {"subject_identifiers":["[tgg:hash-object-editor-delete-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + + {"subject_identifiers":["[tgg:hash-object-editor-commit-button]"], "instance_of":["si:[gdlt:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-editor-commit-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:right]", "value":"10px"}]} ], "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-occurrence-constraint]"}]}, @@ -147,6 +157,7 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Association-View]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Association-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Editor-Association-View]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Descriptor]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Hidden-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Descriptor]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:TM-Value]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Literal-Value]"}]}, @@ -163,6 +174,10 @@ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgt:Hash-Object]"}]}, {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:tm-value]", "player":"si:[tgg:hash-object-editor-view-binding]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-editor-topic-view]"}, {"type":"si:[gdl:containee]", "player":"si:[tgg:hash-hash-type-hidden-value]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:hidden-value]", "player":"si:[tgg:hash-hash-type-hidden-value]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-hash-type-constraint]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:hidden-value]", "player":"si:[tgg:hash-hash-type-hidden-value]"}, {"type":"si:[gdl:value]", "player":"si:[tgg:hash-hash-type-default-value]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-text-label-env]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-text-label-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-text-label-env]"}]}, {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-editor-text-label-env-value]"}]}, @@ -203,5 +218,8 @@ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-editor-text-value-value-group]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:hash-value-constraint]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-delete-button]"}]}, - {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-delete-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-text-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-delete-button]"}]} + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-delete-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-text-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-delete-button]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-editor-commit-button]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-editor-commit-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-editor-delete-button]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-editor-commit-button]"}]} ]} \ 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 Fri Sep 2 09:52:10 2011 (r826) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Mon Sep 5 00:55:40 2011 (r827) @@ -4,9 +4,9 @@ "tmdm":"http://psi.topicmaps.org/iso13250/model/", "tgt":"http://textgrid.org/serviceregistry/model/types/", "tgm":"http://textgrid.org/serviceregistry/model/"}, - + "item_type":"topicmap", - + "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]"]}, @@ -68,6 +68,8 @@ {"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":"http://www.w3.org/2001/XMLSchema#string"}]}, + {"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: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] r826 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 02 Sep '11

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 09:52:10 2011 New Revision: 826 Log: gdl-frontend: Widgets: implemented the actual request mechanism for submitting hash-object topics Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 09:20:20 2011 (r825) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 09:52:10 2011 (r826) @@ -11,6 +11,8 @@ import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; import com.google.gwt.http.client.URL; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; @@ -28,15 +30,14 @@ public class CommitCallback implements ICommitCallback{ public final String DELETE_REUQEST_URL = ""; // TODO: set actual URL value public final String COMMIT_REQUEST_URL = ""; // TODO: set actual URL value + public final String GET_REQUEST_URL = ""; // TODO: set actual URL value @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) { try{ if("hash_object_commit_button_id".equals(buttonId)){ - this.commitCreatedHashObject(constructs, tmEngine, false); - } else if("edited_hash_object_commit_button_id".equals(buttonId)){ - this.commitCreatedHashObject(constructs, tmEngine, true); + this.commitCreatedHashObject(constructs, tmEngine, "edited_hash_object_commit_button_id".equals(buttonId)); } else if("environment_commit_button_id".equals(buttonId)){ this.commitCreatedEnvironment(constructs, tmEngine); } @@ -153,20 +154,13 @@ } String commitUrl = URL.encode(this.DELETE_REUQEST_URL); - String deleteUrl = URL.encode(this.COMMIT_REQUEST_URL); + String getUrl = URL.encode(this.GET_REQUEST_URL); RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); commitBuilder.setHeader("Content-type", "application/json"); - RequestBuilder deleteBuilder = new RequestBuilder(RequestBuilder.DELETE, deleteUrl); - deleteBuilder.setHeader("Content-type", "application/json"); + RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.GET, getUrl); try{ - if(edited){ - // get the original occurrence - // mark the original occurrence as deleted - // commit the new occurrence - deleteBuilder.sendRequest(null, new HashObjectDeleteOccurrenceRequest(null, jtm)); // TODO: set the sent data to the occurrence that must be deleted - } else{ - commitBuilder.sendRequest(jtm, new HashObjectCommitRequest(jtm)); - } + if(edited)getBuilder.sendRequest(null, new EditedHashObjectCommitRequest(null, jtm, false)); + else commitBuilder.sendRequest(jtm, new HashObjectCommitRequest(jtm)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } @@ -238,24 +232,59 @@ - private class HashObjectDeleteOccurrenceRequest implements RequestCallback{ - private String occurrenceString = null; - private String topicToCommit = null; - - private HashObjectDeleteOccurrenceRequest(String occurrenceToDelete, String topicToCommit){ - this.occurrenceString = occurrenceToDelete; - this.topicToCommit = topicToCommit; + private class EditedHashObjectCommitRequest implements RequestCallback{ + private JSONValue requestedData = null; + private String objectToBeSend = null; + private boolean deletedOldOccurrence = false; + private final String deleteUrl = URL.encode(CommitCallback.this.DELETE_REUQEST_URL); + private final String commitUrl = URL.encode(CommitCallback.this.COMMIT_REQUEST_URL); + + + @SuppressWarnings("unused") + private EditedHashObjectCommitRequest(){} + + + public EditedHashObjectCommitRequest(JSONValue requestedData, String objectToBeSend, boolean deletedOldOccurrence){ + this.requestedData = requestedData; + this.objectToBeSend = objectToBeSend; + this.deletedOldOccurrence = deletedOldOccurrence; } @Override public void onResponseReceived(Request request, Response response) { - // TODO: implement + if (200 == response.getStatusCode()) { + if(this.requestedData == null){ + JSONObject occurrenceToBeDeleted = null; // TODO: get from response + + RequestBuilder deleteBuilder = new RequestBuilder(RequestBuilder.DELETE, this.deleteUrl); + deleteBuilder.setHeader("Content-type", "application/json"); + try{ + deleteBuilder.sendRequest(occurrenceToBeDeleted.toString(), new EditedHashObjectCommitRequest(occurrenceToBeDeleted, this.objectToBeSend, true)); + }catch(RequestException e){ + Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); + } + } else if(deletedOldOccurrence){ + RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, this.commitUrl); + commitBuilder.setHeader("Content-type", "application/json"); + try{ + commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); + }catch(RequestException e){ + Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); + } + } else { + Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + // TODO: reset the web page + } + } else { + Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + } } + @Override public void onError(Request request, Throwable exception) { - // TODO: implement + Window.alert("could not commit the data: " + this.objectToBeSend); } } }

1 0

[isidorus-cvs] r825 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base isidorus
by lgiessmann＠common-lisp.net 02 Sep '11

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 09:20:20 2011 New Revision: 825 Log: gdl-frontend: Widgets: fixed some bugs when building the XHR-Requests 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/isidorus/CommitCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 08:44:57 2011 (r824) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 09:20:20 2011 (r825) @@ -36,8 +36,8 @@ //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); - //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); + Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 08:44:57 2011 (r824) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 09:20:20 2011 (r825) @@ -26,19 +26,22 @@ public class CommitCallback implements ICommitCallback{ - public final String REUQEST_URL = ""; // TODO: set actual URL value + public final String DELETE_REUQEST_URL = ""; // TODO: set actual URL value + public final String COMMIT_REQUEST_URL = ""; // TODO: set actual URL value @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) { try{ if("hash_object_commit_button_id".equals(buttonId)){ - this.commitCreatedHashObject(constructs, tmEngine); + this.commitCreatedHashObject(constructs, tmEngine, false); + } else if("edited_hash_object_commit_button_id".equals(buttonId)){ + this.commitCreatedHashObject(constructs, tmEngine, true); } else if("environment_commit_button_id".equals(buttonId)){ this.commitCreatedEnvironment(constructs, tmEngine); } }catch(ExporterException ee){ - Window.alert("faild to commit the Topic Maps data, because: " + ee.getMessage()); + Window.alert("failed to commit the Topic Maps data, because: " + ee.getMessage()); } } @@ -82,21 +85,19 @@ jtm = tmEngine.exportTm(topics, new ArrayList<Association>()); } - String url = URL.encode(this.REUQEST_URL); + String url = URL.encode(this.COMMIT_REQUEST_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); try{ // a check for an existing environment topic is not necessary, // since it would be exactly the same topic. builder.sendRequest(null, new EnvironmentCommitRequest(jtm)); }catch(RequestException e){ - Window.alert("could not delete the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); + Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } - - // TODO: implement actual commit and check if the topic already exists } - private void commitCreatedHashObject(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException{ + private void commitCreatedHashObject(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, boolean edited) throws ExporterException{ final String carrierPsi = PSIs.GDL.gdl + "hash_object_default_creator_topic_view_id"; ArrayList<Topic> topics = new ArrayList<Topic>(); ArrayList<Association> associations = new ArrayList<Association>(); @@ -143,22 +144,36 @@ Locator psi = tm.createLocator("http://textgrid.org/serviceregistry/hash-object/" + env.getValue() + "/" + key.getValue()); top.removeSubjectIdentifier(carrierLocator); top.addSubjectIdentifier(psi); - } - String jtm = null; - if(topicMaps.size() != 0){ - jtm = tmEngine.exportTm(topicMaps.get(0)); - } else if(associations.size() != 0 || topics.size() != 0){ - jtm = tmEngine.exportTm(topics, associations); + String jtm = null; + if(topicMaps.size() != 0){ + jtm = tmEngine.exportTm(topicMaps.get(0)); + } else if(associations.size() != 0 || topics.size() != 0){ + jtm = tmEngine.exportTm(topics, associations); + } + + String commitUrl = URL.encode(this.DELETE_REUQEST_URL); + String deleteUrl = URL.encode(this.COMMIT_REQUEST_URL); + RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); + commitBuilder.setHeader("Content-type", "application/json"); + RequestBuilder deleteBuilder = new RequestBuilder(RequestBuilder.DELETE, deleteUrl); + deleteBuilder.setHeader("Content-type", "application/json"); + try{ + if(edited){ + // get the original occurrence + // mark the original occurrence as deleted + // commit the new occurrence + deleteBuilder.sendRequest(null, new HashObjectDeleteOccurrenceRequest(null, jtm)); // TODO: set the sent data to the occurrence that must be deleted + } else{ + commitBuilder.sendRequest(jtm, new HashObjectCommitRequest(jtm)); + } + }catch(RequestException e){ + Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); + } } - - Window.alert(jtm); - // TODO: implement actual commit and check if the topic already exists } - - private class EnvironmentCommitRequest implements RequestCallback { private String objectToBeSend = null; @@ -167,8 +182,8 @@ private EnvironmentCommitRequest(){} - public EnvironmentCommitRequest(String objectToBeDeleted){ - this.objectToBeSend = objectToBeDeleted; + public EnvironmentCommitRequest(String objectToBeCommitted){ + this.objectToBeSend = objectToBeCommitted; } @@ -188,5 +203,59 @@ Window.alert("could not commit the data: " + this.objectToBeSend); } } + + + private class HashObjectCommitRequest implements RequestCallback { + private String objectToBeSend = null; + + + @SuppressWarnings("unused") + private HashObjectCommitRequest(){} + + + public HashObjectCommitRequest(String objectToBeCommitted){ + this.objectToBeSend = objectToBeCommitted; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + // TODO: reset the web page + } else { + Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + } + } + + + @Override + public void onError(Request request, Throwable exception) { + Window.alert("could not commit the data: " + this.objectToBeSend); + } + } + + + + private class HashObjectDeleteOccurrenceRequest implements RequestCallback{ + private String occurrenceString = null; + private String topicToCommit = null; + + private HashObjectDeleteOccurrenceRequest(String occurrenceToDelete, String topicToCommit){ + this.occurrenceString = occurrenceToDelete; + this.topicToCommit = topicToCommit; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + // TODO: implement + } + + @Override + public void onError(Request request, Throwable exception) { + // TODO: implement + } + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 08:44:57 2011 (r824) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 09:20:20 2011 (r825) @@ -46,10 +46,11 @@ String url = URL.encode(this.REUQEST_URL); - RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); - + RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); + builder.setHeader("Content-type", "application/json"); + try{ - builder.sendRequest(null, new DeleteRequest(delObj)); + builder.sendRequest(delObj.toString(), new DeleteRequest(delObj)); }catch(RequestException e){ Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); }

1 0

[isidorus-cvs] r824 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 02 Sep '11

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 08:44:57 2011 New Revision: 824 Log: gdl-frontend: Widgets: implemented the actual request mechanism for submitting environment topics Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 08:30:32 2011 (r823) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 2 08:44:57 2011 (r824) @@ -1,13 +1,16 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; import java.util.ArrayList; - - import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; - import com.google.gwt.core.client.JsArray; +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; @@ -21,8 +24,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback; -public class CommitCallback implements ICommitCallback{ +public class CommitCallback implements ICommitCallback{ + public final String REUQEST_URL = ""; // TODO: set actual URL value + + @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) { try{ @@ -76,7 +82,16 @@ jtm = tmEngine.exportTm(topics, new ArrayList<Association>()); } - Window.alert(jtm); + String url = URL.encode(this.REUQEST_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + try{ + // a check for an existing environment topic is not necessary, + // since it would be exactly the same topic. + builder.sendRequest(null, new EnvironmentCommitRequest(jtm)); + }catch(RequestException e){ + Window.alert("could not delete the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); + } + // TODO: implement actual commit and check if the topic already exists } @@ -140,4 +155,38 @@ Window.alert(jtm); // TODO: implement actual commit and check if the topic already exists } + + + + + private class EnvironmentCommitRequest implements RequestCallback { + private String objectToBeSend = null; + + + @SuppressWarnings("unused") + private EnvironmentCommitRequest(){} + + + public EnvironmentCommitRequest(String objectToBeDeleted){ + this.objectToBeSend = objectToBeDeleted; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + // TODO: reset the web page + } else { + Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + } + } + + + @Override + public void onError(Request request, Throwable exception) { + Window.alert("could not commit the data: " + this.objectToBeSend); + } + } + } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 08:30:32 2011 (r823) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 08:44:57 2011 (r824) @@ -51,7 +51,7 @@ try{ builder.sendRequest(null, new DeleteRequest(delObj)); }catch(RequestException e){ - + Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); } } }

1 0

[isidorus-cvs] r823 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base isidorus
by lgiessmann＠common-lisp.net 02 Sep '11

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 08:30:32 2011 New Revision: 823 Log: gdl-frontend: Widgets: implemented the actual request mechanism for deleting topics Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml 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/isidorus/DeleteCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Sep 2 03:58:05 2011 (r822) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Sep 2 08:30:32 2011 (r823) @@ -14,9 +14,12 @@  <inherits name='us.isidor.gdl.anaToMia.TmEngine.GDL_TmEngine' /> - + <inherits name="com.google.gwt.json.JSON" /> + <inherits name="com.google.gwt.http.HTTP" /> +  <entry-point class='us.isidor.gdl.anaToMia.Widgets.base.TestClass'/> +  <source path="base"/> 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 Sep 2 03:58:05 2011 (r822) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 08:30:32 2011 (r823) @@ -1,5 +1,6 @@ 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; @@ -59,7 +60,6 @@ import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.EventHandler; -import com.google.gwt.i18n.client.Messages.Select; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Window; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 03:58:05 2011 (r822) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 08:30:32 2011 (r823) @@ -36,7 +36,7 @@ //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); - //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); + Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override @@ -46,7 +46,7 @@ } }); - gdlPanel = new GdlPanel(null, requestedTopicsToCreate); + gdlPanel = new GdlPanel(requestedTopicToEdit, null); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 03:58:05 2011 (r822) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Fri Sep 2 08:30:32 2011 (r823) @@ -1,6 +1,15 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; import java.util.ArrayList; +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.google.gwt.json.client.JSONArray; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONString; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; @@ -8,7 +17,10 @@ import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public class DeleteCallback implements IDeleteCallback { + public final String REUQEST_URL = ""; // TODO: set actual URL value + @Override public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId) { @@ -23,10 +35,58 @@ if(env.getSubjectIdentifiers().length() != 0){ String psi = env.getSubjectIdentifiers().get(0).getReference(); - Window.alert("psi of the topic to be deleted: " + psi); - // TODO: send actual delete request + JSONObject topObj = new JSONObject(); + JSONArray psis = new JSONArray(); + psis.set(0, new JSONString(psi)); + topObj.put("subjectIdentifiers", psis); + + JSONObject delObj = new JSONObject(); + delObj.put("type", new JSONString("Topic")); + delObj.put("delete", topObj); + + + String url = URL.encode(this.REUQEST_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + + try{ + builder.sendRequest(null, new DeleteRequest(delObj)); + }catch(RequestException e){ + + } } } } } + + + private class DeleteRequest implements RequestCallback { + private JSONObject objectToBeSend = null; + + + @SuppressWarnings("unused") + private DeleteRequest(){} + + + public DeleteRequest(JSONObject objectToBeDeleted){ + this.objectToBeSend = objectToBeDeleted; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + Window.alert("delete operation of the object " + this.objectToBeSend + " successed"); + // TODO: reset the web page + } else { + Window.alert("delete operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + } + } + + + @Override + public void onError(Request request, Throwable exception) { + Window.alert("could not delete the data: " + this.objectToBeSend); + + } + } }

1 0

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

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 03:58:05 2011 New Revision: 822 Log: gdl-frontend: Widgets: fixed a bug when validating gdlt:Role-Player insance of existing and changed roles Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java 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 Sep 2 03:54:41 2011 (r821) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 03:58:05 2011 (r822) @@ -2335,13 +2335,13 @@ } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ // TODO: implement } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){ + Topic player = TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup()); + if(validate) this.validateTmValue(player); if(roles.size() > idx){ - Topic player = TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup()); - if(validate) this.validateTmValue(player); changedRole = roles.get(idx); changedRole.setPlayer(player); } else { - changedRole = ((Association)localCarrier).createRole(roleType, TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup())); + changedRole = ((Association)localCarrier).createRole(roleType, player); } } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlType)){ // TODO: implement

1 0

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

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 03:54:41 2011 New Revision: 821 Log: gdl-frontend: Widgets: implemented the validation of gdlt:Role-Player values 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/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java 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 Sep 2 02:59:10 2011 (r820) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 03:54:41 2011 (r821) @@ -109,6 +109,8 @@ protected boolean cardMinSet = false; protected int cardMax = 0; protected boolean cardMaxSet = false; + protected ArrayList<Topic> rawTmValues = new ArrayList<Topic>(); + protected boolean rawTmValuesSet = false; // some constructors @@ -2096,8 +2098,9 @@ } - // returns all topic maps values that are valid and declared for the value-group - // of this element - or an empty ArrayList + // returns all topic maps values represented by topics of the type gdlt:Tm-Value + // that are valid and declared for the value-group of this element - or + // an empty ArrayList public ArrayList<Topic> getTmValues() throws InvalidGdlSchemaException { if(this.tmValueTopicsSet){ return this.tmValueTopics; @@ -2235,6 +2238,33 @@ } } + + // validates the the tm values of a constraint + private void validateTmValue(Topic selectedPlayer) throws InvalidContentException, InvalidGdlSchemaException, ExecutionException { + if(this.getRawTmValues().size() != 0 && !this.getRawTmValues().contains(selectedPlayer)){ + throw new InvalidContentException("the topic " + TmHelper.getAnyIdOfTopic(selectedPlayer) + " does not satisfy the contraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " and the topic values: " + Utils.topicArrayToString(this.getRawTmValues())); + } else { + if(!this.getTmValuesForConstraint().contains(selectedPlayer)){ + throw new InvalidContentException("the topic " + TmHelper.getAnyIdOfTopic(selectedPlayer) + " does not satisfy the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " and topic values: " + Utils.topicArrayToString(this.getTmValuesForConstraint())); + } + } + } + + + + // returns the actual topics that are set as possible tm-values + private ArrayList<Topic> getRawTmValues() throws InvalidGdlSchemaException{ + if(this.rawTmValuesSet){ + return this.rawTmValues; + } else { + this.rawTmValuesSet = true; + ArrayList<Topic> tmValues = this.getTmValues(); + for (Topic tmValue : tmValues) this.rawTmValues = Utils.union(this.rawTmValues, TmHelper.getValuesForTmValue(tmValue)); + return this.rawTmValues; + } + } + + // returns the actual data that is hold by this instance public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); @@ -2306,8 +2336,10 @@ // TODO: implement } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){ if(roles.size() > idx){ + Topic player = TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup()); + if(validate) this.validateTmValue(player); changedRole = roles.get(idx); - changedRole.setPlayer(TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup())); + changedRole.setPlayer(player); } else { changedRole = ((Association)localCarrier).createRole(roleType, TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup())); } 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 Fri Sep 2 02:59:10 2011 (r820) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 2 03:54:41 2011 (r821) @@ -715,7 +715,7 @@ } - // returns a topic or associaitons that is represented by the nearest instance of GdlView + // returns a topic or associations that is represented by the nearest instance of GdlView public static Construct getNearestTopicOrAssociation(GdlVisibleObject elem) throws InvalidGdlSchemaException{ if(elem == null) return null; @@ -1021,6 +1021,7 @@ return result; } + // returns the topic that can be used to satisfy the passed constraint. public static ArrayList<Topic> getTmValuesForConstraint(Topic constraint, Topic valueGroup) throws InvalidGdlSchemaException, ExecutionException { ArrayList<Topic> result = new ArrayList<Topic>(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Fri Sep 2 02:59:10 2011 (r820) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Fri Sep 2 03:54:41 2011 (r821) @@ -2,6 +2,8 @@ import java.util.ArrayList; import com.google.gwt.core.client.JavaScriptObject; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.Pattern; import com.google.gwt.core.client.JsArray; import com.google.gwt.dom.client.Element; @@ -18,6 +20,21 @@ } return result.substring(0, result.length() - 2) + "]"; + } + + + // returns a string of the form [item1, item2, ... ] for all + // topics of an ArrayList, whereas each item is any identifier + // of the topic + public static String topicArrayToString(ArrayList<Topic> topicList){ + if(topicList == null || topicList.size() == 0) return "[ ]"; + + String result = "["; + for (Topic top : topicList) { + result += TmHelper.getAnyIdOfTopic(top) + ", "; + } + + return result.substring(0, result.length() - 2) + "]"; }

1 0

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

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 02:59:10 2011 New Revision: 820 Log: gdl-frontend: Widgets: excluded the validation of literal-values of topic-names and topic-occurrences to a separate function Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java 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 Sep 2 02:47:08 2011 (r819) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 02:59:10 2011 (r820) @@ -2214,6 +2214,27 @@ public abstract ArrayList<String> getSelectedValues(); + // validates names, occurrences and identifiers for tha passed value + private void validateLiteralValue(String selectedValue) throws InvalidContentException, InvalidGdlSchemaException{ + ArrayList<Pattern> validLiteralValues = new ArrayList<Pattern>(); + for (String literal : this.getLiterals()) validLiteralValues.add(new Pattern(literal)); + if(validLiteralValues.size() == 0) validLiteralValues.add(new Pattern(this.getLiteralValueForConstraint())); + int i = 0; + for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(selectedValue)) break; + + if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){ + if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-name " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); + } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicOccurrenceConstraint)){ + if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-occurrence " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); + } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint)){ + + } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){ + + } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ + + } + } + // returns the actual data that is hold by this instance public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); @@ -2222,10 +2243,6 @@ if(carrier == null) localCarrier = TmHelper.getNearestTopicOrAssociation(this); //TODO: finalise - ArrayList<Pattern> validLiteralValues = new ArrayList<Pattern>(); - for (String literal : this.getLiterals()) validLiteralValues.add(new Pattern(literal)); - if(validLiteralValues.size() == 0) validLiteralValues.add(new Pattern(this.getLiteralValueForConstraint())); - for (int idx = 0; idx != this.getSelectedValues().size(); ++idx){ if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ @@ -2233,18 +2250,14 @@ } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){ - } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){ + } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){ if(!(localCarrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getRootConstraint()) + " must be bound to a Topic, but is: " + localCarrier.getClass()); Topic nameType = TmHelper.getConstrainedStatement(this.getConstraint()); JsArray<Name> names = ((Topic)localCarrier).getNames(nameType); Name changedName = null; if(this.getRootConstraint().equals(this.getConstraint())){ - if(validate){ - int i = 0; - for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(this.getSelectedValues().get(idx))) break; - if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + this.getSelectedValues().get(idx) + " for the topic-name " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); - } + if(validate) this.validateLiteralValue(this.getSelectedValues().get(idx)); if(names.length() > idx){ changedName = names.get(idx); @@ -2264,11 +2277,7 @@ Occurrence changedOccurrence = null; if(this.getRootConstraint().equals(this.getConstraint())){ - if(validate){ - int i = 0; - for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(this.getSelectedValues().get(idx))) break; - if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + this.getSelectedValues().get(idx) + " for the topic-occurrence " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); - } + if(validate) this.validateLiteralValue(this.getSelectedValues().get(idx)); if(occurrences.length() > idx){ changedOccurrence = occurrences.get(idx);

1 0

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

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 02:47:08 2011 New Revision: 819 Log: gdl-frontend: Widgets: implemented the validation of literal-values of topic-names and topic-occurrences 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/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/Utils.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/environment/Pattern.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/GdlTopicView.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/GdlPanel.java Fri Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Sep 2 02:47:08 2011 (r819) @@ -264,9 +264,9 @@ // this method is responsible for generating a Topic Map fo the user's // data by using the view's getContent method. - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent() throws Exception { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(boolean validate) throws Exception { try{ - return this.view.getContent(null, false); + return this.view.getContent(null, validate); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.TopicMapsGenerationError, e); 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 Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 02:47:08 2011 (r819) @@ -59,6 +59,7 @@ import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.i18n.client.Messages.Select; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Window; @@ -2214,13 +2215,17 @@ // returns the actual data that is hold by this instance - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); if(this.getRootConstraint() == null) return result; Construct localCarrier = carrier; if(carrier == null) localCarrier = TmHelper.getNearestTopicOrAssociation(this); //TODO: finalise + ArrayList<Pattern> validLiteralValues = new ArrayList<Pattern>(); + for (String literal : this.getLiterals()) validLiteralValues.add(new Pattern(literal)); + if(validLiteralValues.size() == 0) validLiteralValues.add(new Pattern(this.getLiteralValueForConstraint())); + for (int idx = 0; idx != this.getSelectedValues().size(); ++idx){ if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ @@ -2235,6 +2240,12 @@ Name changedName = null; if(this.getRootConstraint().equals(this.getConstraint())){ + if(validate){ + int i = 0; + for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(this.getSelectedValues().get(idx))) break; + if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + this.getSelectedValues().get(idx) + " for the topic-name " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); + } + if(names.length() > idx){ changedName = names.get(idx); changedName.setValue(this.getSelectedValues().get(idx)); @@ -2250,9 +2261,15 @@ if(!(localCarrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getRootConstraint()) + " must be bound to a Topic, but is: " + localCarrier.getClass()); Topic occurrenceType = TmHelper.getConstrainedStatement(this.getConstraint()); JsArray<Occurrence> occurrences = ((Topic)localCarrier).getOccurrences(occurrenceType); - + Occurrence changedOccurrence = null; if(this.getRootConstraint().equals(this.getConstraint())){ + if(validate){ + int i = 0; + for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(this.getSelectedValues().get(idx))) break; + if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + this.getSelectedValues().get(idx) + " for the topic-occurrence " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues)); + } + if(occurrences.length() > idx){ changedOccurrence = occurrences.get(idx); changedOccurrence.setValue(this.getSelectedValues().get(idx)); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Sep 2 02:47:08 2011 (r819) @@ -31,12 +31,12 @@ mainPanel.setPixelSize(1000, 600); ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); - requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); + requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); + //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override @@ -46,7 +46,7 @@ } }); - gdlPanel = new GdlPanel(requestedTopicToEdit, null); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Fri Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Fri Sep 2 02:47:08 2011 (r819) @@ -7,6 +7,20 @@ import com.google.gwt.dom.client.Element; public class Utils { + // returns a string of the form [item1, item2, ... ] for all + // items of an ArrayList + public static <T> String arrayToString(ArrayList<T> data){ + if(data == null || data.size() == 0) return "[ ]"; + + String result = "["; + for (T t : data) { + result += t + ", "; + } + + return result.substring(0, result.length() - 2) + "]"; + } + + // returns true if both arrays have the same items public static <T> boolean compareLists(ArrayList<T> lft, ArrayList<T> rgt){ if(lft == null && rgt == null) return true; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Fri Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Fri Sep 2 02:47:08 2011 (r819) @@ -42,7 +42,7 @@ TmEngine tmEngine = this.owner.getRoot().getTmEngine(); ICommitCallback callback = this.owner.getRoot().getCommitCallback(); - callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, false), tmEngine, this.owner.getId()); + callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, true), tmEngine, this.owner.getId()); }catch(Exception e){ e.printStackTrace(); Window.alert("caught: " + e.getMessage()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/Pattern.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/Pattern.java Fri Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/Pattern.java Fri Sep 2 02:47:08 2011 (r819) @@ -46,7 +46,7 @@ public final static int MULTILINE = 1; /** - * Declares that characters are matched reglardless of case. + * Declares that characters are matched regardless of case. */ public final static int CASE_INSENSITIVE = 2; @@ -178,5 +178,10 @@ return parts; } + + @Override + public String toString(){ + return this.pattern(); + } } 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 Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Sep 2 02:47:08 2011 (r819) @@ -185,13 +185,13 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException{ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException{ ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); for (Widget ctrl : this.subElements) { if(ctrl instanceof ButtonableObject){ if(((ButtonableObject)ctrl).getMainObject() instanceof AssociationItem){ - for (Pair<Construct, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null, onlyValidate)) { + for (Pair<Construct, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null, validate)) { result.add(pair); } } @@ -264,14 +264,14 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); Association localCarrier = this.getRepresentedAssociation(); for (Widget ctrl : this.subElements) { if(ctrl instanceof GdlVisibleObject){ - ((GdlVisibleObject)ctrl).getContent(localCarrier, onlyValidate); + ((GdlVisibleObject)ctrl).getContent(localCarrier, validate); } } result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Association)); 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 Sep 2 02:00:04 2011 (r818) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Sep 2 02:47:08 2011 (r819) @@ -140,7 +140,7 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); Topic localCarrier = (Topic)this.receivedData; @@ -152,7 +152,7 @@ if(i == result.size()) result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic)); if(ctrl instanceof GdlVisibleObject){ - for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier, onlyValidate)) { + for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier, validate)) { if((this.receivedData != null || (ctrl instanceof GdlView)) && !this.indirectlyContained(pair, result))result.add(pair); } }

1 0

[isidorus-cvs] r818 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button container text view
by lgiessmann＠common-lisp.net 02 Sep '11

02 Sep '11

Author: lgiessmann Date: Fri Sep 2 02:00:04 2011 New Revision: 818 Log: gdl-frontend: Widgets: changed the base-structure for validating user data 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/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/GdlCommitButton.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/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/text/GdlInfo.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/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/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/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Sep 2 02:00:04 2011 (r818) @@ -266,7 +266,7 @@ // data by using the view's getContent method. public ArrayList<Pair<Construct, TopicMapsTypes>> getContent() throws Exception { try{ - return this.view.getContent(null); + return this.view.getContent(null, false); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.TopicMapsGenerationError, e); 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Sep 2 02:00:04 2011 (r818) @@ -38,11 +38,4 @@ public void fixValue(){ // has no effect on this element } - - - @Override - public void validate() throws ExecutionException { - // this element has no editable content and is always valid - return; - } } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Sep 2 02:00:04 2011 (r818) @@ -18,6 +18,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidContentException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.MultipleHandlerRegistration; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; @@ -2213,7 +2214,7 @@ // returns the actual data that is hold by this instance - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); if(this.getRootConstraint() == null) return result; Construct localCarrier = carrier; @@ -2297,10 +2298,4 @@ return result; } - - - // validates the entered user data, if it is invalid a ExecutionException is thrown - public void validate() throws ExecutionException{ - // TODO: implement - } } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Sep 2 02:00:04 2011 (r818) @@ -270,11 +270,4 @@ public void fixValue(){ // has no effect on this element } - - - @Override - public void validate() throws ExecutionException { - // this element has no editable content and is always valid - return; - } } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Fri Sep 2 02:00:04 2011 (r818) @@ -42,7 +42,7 @@ TmEngine tmEngine = this.owner.getRoot().getTmEngine(); ICommitCallback callback = this.owner.getRoot().getCommitCallback(); - callback.commitTmConstruct(this.owner.getGdlParent().getContent(null), tmEngine, this.owner.getId()); + callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, false), tmEngine, this.owner.getId()); }catch(Exception e){ e.printStackTrace(); Window.alert("caught: " + e.getMessage()); 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Fri Sep 2 02:00:04 2011 (r818) @@ -38,7 +38,7 @@ public void onClick(ClickEvent event) { try{ IDeleteCallback callback = this.owner.getRoot().getDeleteCallback(); - callback.deleteTmConstruct(this.owner.getGdlParent().getContent(null), this.owner.getId()); + callback.deleteTmConstruct(this.owner.getGdlParent().getContent(null, false), this.owner.getId()); }catch(Exception e){ e.printStackTrace(); Window.alert("caught: " + e.getMessage()); 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Sep 2 02:00:04 2011 (r818) @@ -275,21 +275,8 @@ contents.add(content); } } - - - public void validate() throws ExecutionException { - for (GdlVisibleObject content : this.contents) content.validate(); - } } - - @Override - public void validate() throws ExecutionException { - for (Widget ctrl : this.subElements) { - ((ListWidget)((ButtonableObject)ctrl).getMainObject()).validate(); - } - } - @Override public GdlVisibleObject append(Topic ancestor, Topic current) throws InvalidGdlSchemaException, ExecutionException { @@ -429,13 +416,6 @@ } - public void validate() throws ExecutionException { - for (Pair<ListItem, Integer> item: this.itemsAndIndexes) { - item.getFirst().validate(); - } - } - - public void setId(String id){ DOM.setElementAttribute(this.basePanel.getElement(), "id", id); } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Sep 2 02:00:04 2011 (r818) @@ -244,14 +244,6 @@ } - @Override - public void validate() throws ExecutionException { - for (Widget ctrl : this.subElements) { - ((UnitWidget)((ButtonableObject)ctrl).getMainObject()).validate(); - } - } - - protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ private CaptionPanel basePanel = new CaptionPanel(); private AbsolutePanel containerPanel = new AbsolutePanel(); @@ -378,14 +370,5 @@ e.printStackTrace(); } } - - - public void validate() throws ExecutionException{ - for (Widget ctrl : this.subElements) { - if(ctrl instanceof GdlVisibleObject){ - ((GdlVisibleObject)ctrl).validate(); - } - } - } } } \ No newline at end of file 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Sep 2 02:00:04 2011 (r818) @@ -108,11 +108,4 @@ public ArrayList<String> getSelectedValues(){ return new ArrayList<String>(); } - - - @Override - public void validate() throws ExecutionException { - // this element has no editable content and is always valid - return; - } } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Sep 2 02:00:04 2011 (r818) @@ -58,13 +58,6 @@ } - @Override - public void validate() throws ExecutionException { - // this element has no editable content and is always valid - return; - } - - private ReferenceWidget createReference() throws InvalidGdlSchemaException, ExecutionException { ReferenceWidget reference = new ReferenceWidget(); DOM.setElementAttribute(reference.getElement(), "id", this.getId() + "__GDL_" + this.subElements.size()); 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Sep 2 02:00:04 2011 (r818) @@ -449,13 +449,6 @@ } - @Override - public void validate() throws ExecutionException { - // this element has no editable content and is always valid - return; - } - - // this class represents the acutal content of this widget, i.e. // it wraps a h1, h2, h3 or h4 element protected class TitleWidget extends Composite implements HasMouseDownHandlers, HasMouseUpHandlers, HasMouseOverHandlers, HasMouseOutHandlers, HasBlurHandlers, HasFocusHandlers{ 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Sep 2 02:00:04 2011 (r818) @@ -16,6 +16,7 @@ import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidContentException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; @@ -184,13 +185,13 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException{ ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); for (Widget ctrl : this.subElements) { if(ctrl instanceof ButtonableObject){ if(((ButtonableObject)ctrl).getMainObject() instanceof AssociationItem){ - for (Pair<Construct, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null)) { + for (Pair<Construct, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null, onlyValidate)) { result.add(pair); } } @@ -223,13 +224,6 @@ return result; } - - - @Override - public void validate() throws ExecutionException { - for (Widget ctrl : this.subElements) - if(ctrl instanceof AssociationItem) ((AssociationItem)ctrl).validate(); - } // This class represents a single association that is displayed. @@ -270,14 +264,14 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); Association localCarrier = this.getRepresentedAssociation(); for (Widget ctrl : this.subElements) { if(ctrl instanceof GdlVisibleObject){ - ((GdlVisibleObject)ctrl).getContent(localCarrier); + ((GdlVisibleObject)ctrl).getContent(localCarrier, onlyValidate); } } result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Association)); 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Sep 2 02:00:04 2011 (r818) @@ -18,6 +18,7 @@ import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidContentException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; @@ -139,7 +140,7 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean onlyValidate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException { ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); Topic localCarrier = (Topic)this.receivedData; @@ -151,7 +152,7 @@ if(i == result.size()) result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic)); if(ctrl instanceof GdlVisibleObject){ - for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier)) { + for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier, onlyValidate)) { if((this.receivedData != null || (ctrl instanceof GdlView)) && !this.indirectlyContained(pair, result))result.add(pair); } } 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 Sep 2 00:58:42 2011 (r817) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Fri Sep 2 02:00:04 2011 (r818) @@ -125,14 +125,4 @@ return this.hiddenValues; } } - - - @Override - public void validate() throws ExecutionException { - for (Widget ctrl : this.subElements) { - if(ctrl instanceof GdlVisibleObject){ - ((GdlVisibleObject)ctrl).validate(); - } - } - } } \ No newline at end of file

1 0