- isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

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

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 00:10:27 2011 New Revision: 879 Log: gdl-frontend: Widgets: changed the behavior of the delete-callback => if a topic is deleted on the server-side, it is also deleted for the topic map on the client side Modified: 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/DeleteCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Tue Sep 13 00:01:58 2011 (r878) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Tue Sep 13 00:10:27 2011 (r879) @@ -54,7 +54,7 @@ builder.setHeader("Content-type", "application/json"); //RootPanel.getBodyElement().setInnerText(delObj.toString()); // TODO: remove - builder.sendRequest(delObj.toString(), new DeleteRequest(delObj)); + builder.sendRequest(delObj.toString(), new DeleteRequest(delObj, env)); }catch(RequestException e){ Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); }catch(ExporterException e){ @@ -68,14 +68,16 @@ private class DeleteRequest implements RequestCallback { private JSONObject objectToBeSend = null; + private Topic topicToBeDeleted = null; @SuppressWarnings("unused") private DeleteRequest(){} - public DeleteRequest(JSONObject objectToBeDeleted){ + public DeleteRequest(JSONObject objectToBeDeleted, Topic topicToBeDeleted){ this.objectToBeSend = objectToBeDeleted; + this.topicToBeDeleted = topicToBeDeleted; } @@ -83,6 +85,7 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { Window.alert("delete operation of the object " + this.objectToBeSend + " succeeded"); + this.topicToBeDeleted.remove(); // TODO: reset the web page } else { Window.alert("delete operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText());

1 0

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

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 00:01:58 2011 New Revision: 878 Log: gdl-frontend: Widgets: added a TODO Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Mon Sep 12 23:19:30 2011 (r877) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Tue Sep 13 00:01:58 2011 (r878) @@ -1,6 +1,9 @@ +* implement export of Fragments, e.g. exportJTM11Fragment(ArrayList<Topic> topics, ArrayList<Association> associaitions), + e.i. the passed topics and associations must be exported with all characteristics and associations, + and all referenced topics must be exported as stubs * implement validation * implement the handling of default-values * Implement TopicMaps data consumption * Implement TopicMaps data generation * Implement HiddenValue -* Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file +* Fix css-pseudo-class-handlers \ No newline at end of file

1 0

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

13 Sep '11

Author: lgiessmann Date: Mon Sep 12 23:19:30 2011 New Revision: 877 Log: gdl-frontend: Widgets: changed the identifier of the schema topic map, so the backend and frontend topic map identifiers are equal 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/isidorus/IsidorusConstants.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 Mon Sep 12 09:30:54 2011 (r876) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Sep 12 23:19:30 2011 (r877) @@ -14,6 +14,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; +import us.isidor.gdl.anaToMia.Widgets.isidorus.IsidorusConstants; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; @@ -43,7 +44,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 = PSIs.GDL.gdl + "topicmap/tm-1"; + private final String REQUESTED_SCHEMA_TOPIC_MAP_LOCATOR = IsidorusConstants.TOPIC_MAP_IDENTIFIER; // 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/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 09:30:54 2011 (r876) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 23:19:30 2011 (r877) @@ -1,14 +1,15 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; -import com.google.gwt.core.client.GWT; + import com.google.gwt.user.client.Window; public class IsidorusConstants { + public final static String TOPIC_MAP_IDENTIFIER = "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm"; public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 09:30:54 2011 New Revision: 876 Log: gdl-frontend: Widgets: changed the behavior of the commit callback => old psis 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/IsidorusConstants.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 Mon Sep 12 06:17:58 2011 (r875) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 09:30:54 2011 (r876) @@ -45,11 +45,22 @@ this.commitCreatedEnvironment(constructs, tmEngine); } }catch(Exception e){ + e.printStackTrace(); Window.alert("failed to commit the Topic Maps data, because: " + e.getMessage()); } } + // remove all psis from the passed topic + private void removeSubjectIdentifiers(Topic top){ + if(top == null) return; + JsArray<Locator> psis = top.getSubjectIdentifiers(); + ArrayList<Locator> jPsis = new ArrayList<Locator>(); + for(int i = 0; i != psis.length(); ++i)jPsis.add(psis.get(i)); + for (Locator jPsi : jPsis)top.removeSubjectIdentifier(jPsi); + } + + private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException { final String carrierPsi = PSIs.GDL.gdl + "environment_default_creator_topic_view_id"; ArrayList<Topic> topics = new ArrayList<Topic>(); @@ -77,13 +88,11 @@ if(top != null){ // remove old psis - JsArray<Locator> psis = top.getSubjectIdentifiers(); - for(int i = 0; i != psis.length(); ++i)top.removeSubjectIdentifier(psis.get(i)); + this.removeSubjectIdentifiers(top); - // set the new vaid psi + // set the new valid psi Name envName = top.getNames().get(0); Locator psi = tm.createLocator("http://textgrid.org/serviceregistry/environment/" + envName.getValue()); - top.removeSubjectIdentifier(carrierLocator); top.addSubjectIdentifier(psi); } @@ -101,6 +110,7 @@ // since it would be exactly the same topic. builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm)); }catch(RequestException e){ + e.printStackTrace(); Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } } @@ -151,7 +161,7 @@ Name env = assoc.getRoles(TmHelper.getTopicByPsi("http://textgrid.org/serviceregistry/model/environment", tm)).get(0).getPlayer().getNames().get(0); Occurrence key = top.getOccurrences(TmHelper.getTopicByPsi("http://textgrid.org/serviceregistry/model/key", tm)).get(0); Locator psi = tm.createLocator("http://textgrid.org/serviceregistry/hash-object/" + env.getValue() + "/" + key.getValue()); - top.removeSubjectIdentifier(carrierLocator); + this.removeSubjectIdentifiers(top); top.addSubjectIdentifier(psi); String jtm = null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 06:17:58 2011 (r875) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 09:30:54 2011 (r876) @@ -1,6 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -8,6 +9,6 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 06:17:58 2011 New Revision: 875 Log: gdl-frontend: Widgets: changed the behavior of the commit callback 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/GdlDeleteButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.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/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/button/GdlCommitButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Mon Sep 12 06:17:58 2011 (r875) @@ -7,9 +7,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.view.GdlAssociationView; -import us.isidor.gdl.anaToMia.Widgets.view.GdlTopicView; - import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; @@ -31,17 +28,6 @@ } - public void resetCarriers(){ - GdlVisibleObject parent = this.getGdlParent(); - - while(parent != null){ - if(parent instanceof GdlTopicView)((GdlTopicView)parent).resetRepresentedTopic(); - if(parent instanceof GdlAssociationView)((GdlAssociationView)parent).resetRepresentedAssociations(); - parent = parent.getGdlParent(); - } - } - - protected class CommitButtonClickHandler implements ClickHandler { public CommitButtonClickHandler() { } @@ -51,7 +37,7 @@ try{ ICommitCallback callback = GdlCommitButton.this.getRoot().getCommitCallback(); - callback.commitTmConstruct(GdlCommitButton.this.getGdlParent().getContent(null, true), GdlCommitButton.this, GdlCommitButton.this.getRoot().getTmEngine()); + callback.commitTmConstruct(GdlCommitButton.this.getGdlParent().getContent(null, true), GdlCommitButton.this.getId(), GdlCommitButton.this.getRoot().getTmEngine()); }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 Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Mon Sep 12 06:17:58 2011 (r875) @@ -10,8 +10,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.view.GdlAssociationView; -import us.isidor.gdl.anaToMia.Widgets.view.GdlTopicView; public class GdlDeleteButton extends GdlActionButton { // TODO: implement @@ -28,17 +26,6 @@ } - public void resetCarriers(){ - GdlVisibleObject parent = this.getGdlParent(); - - while(parent != null){ - if(parent instanceof GdlTopicView)((GdlTopicView)parent).resetRepresentedTopic(); - if(parent instanceof GdlAssociationView)((GdlAssociationView)parent).resetRepresentedAssociations(); - parent = parent.getGdlParent(); - } - } - - protected class DeleteButtonClickHandler implements ClickHandler { private GdlDeleteButton owner = null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java Mon Sep 12 06:17:58 2011 (r875) @@ -5,9 +5,9 @@ import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.button.GdlCommitButton; + public interface ICommitCallback { - public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine); + public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine); } 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 Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 06:17:58 2011 (r875) @@ -3,7 +3,6 @@ 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.button.GdlCommitButton; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.Request; @@ -38,13 +37,12 @@ @Override - public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine) { + public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) { try{ - String buttonId = sender == null ? null : sender.getId(); if("hash_object_commit_button_id".equals(buttonId)){ this.commitCreatedHashObject(constructs, tmEngine, "edited_hash_object_commit_button_id".equals(buttonId)); } else if("environment_commit_button_id".equals(buttonId)){ - this.commitCreatedEnvironment(constructs, sender, tmEngine); + this.commitCreatedEnvironment(constructs, tmEngine); } }catch(Exception e){ Window.alert("failed to commit the Topic Maps data, because: " + e.getMessage()); @@ -52,7 +50,7 @@ } - private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine) throws ExporterException { + private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException { final String carrierPsi = PSIs.GDL.gdl + "environment_default_creator_topic_view_id"; ArrayList<Topic> topics = new ArrayList<Topic>(); ArrayList<TopicMap> topicMaps = new ArrayList<TopicMap>(); @@ -73,11 +71,16 @@ } else if(topics.size() != 0){ tm = topics.get(0).getTopicMap(); - top = topics.get(0); + top = topics.get(0); carrierLocator = tm.createLocator(carrierPsi); } if(top != null){ + // remove old psis + JsArray<Locator> psis = top.getSubjectIdentifiers(); + for(int i = 0; i != psis.length(); ++i)top.removeSubjectIdentifier(psis.get(i)); + + // set the new vaid psi Name envName = top.getNames().get(0); Locator psi = tm.createLocator("http://textgrid.org/serviceregistry/environment/" + envName.getValue()); top.removeSubjectIdentifier(carrierLocator); @@ -96,7 +99,7 @@ try{ // a check for an existing environment topic is not necessary, // since it would be exactly the same topic. - builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm, sender)); + builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } @@ -177,16 +180,14 @@ private class EnvironmentCommitRequest implements RequestCallback { private String objectToBeSend = null; - private GdlCommitButton sender = null; @SuppressWarnings("unused") private EnvironmentCommitRequest(){} - public EnvironmentCommitRequest(String objectToBeCommitted, GdlCommitButton sender){ + public EnvironmentCommitRequest(String objectToBeCommitted){ this.objectToBeSend = objectToBeCommitted; - this.sender = sender; } @@ -194,7 +195,6 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); - this.sender.resetCarriers(); // TODO: reset the web page } else { Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Sep 12 06:17:58 2011 (r875) @@ -47,17 +47,6 @@ super(tmRepresentative, receivedData, gdlParent); } - - public void resetRepresentedAssociations(){ - for (Widget ctrl : this.subElements) { - if(ctrl instanceof ButtonableObject){ - if(((ButtonableObject)ctrl).getMainObject() instanceof AssociationItem){ - ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).resetRepresentedAssociation(); - } - } - } - } - // content orientation has no effect on a view, so here must the original method // defined in GdlVisibleObject implemented @Override @@ -264,14 +253,6 @@ } - // can be called to set the represented topic to null, e.g. - // if a created association was submitted and a new association is created, - // so the old carrier is reset as well - public void resetRepresentedAssociation(){ - this.representedAssociation = null; - } - - @SuppressWarnings("unused") private AssociationItem(){ super(); 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 Mon Sep 12 05:59:41 2011 (r874) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Sep 12 06:17:58 2011 (r875) @@ -224,12 +224,4 @@ return (Topic)this.receivedData; } } - - - // can be called to set the represented topic to null, e.g. - // if a created topic was submitted and a new topic is created, - // so the old carrier is reset as well - public void resetRepresentedTopic(){ - this.representedTopic = null; - } }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 05:59:41 2011 New Revision: 874 Log: gdl-frontend: Widgets: fixed some error messages 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 branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.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 Mon Sep 12 05:47:59 2011 (r873) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 05:59:41 2011 (r874) @@ -193,7 +193,7 @@ @Override public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { - Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); this.sender.resetCarriers(); // TODO: reset the web page } else { @@ -225,7 +225,7 @@ @Override public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { - Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); // TODO: reset the web page } else { Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); @@ -284,7 +284,7 @@ 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"); + Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); // TODO: reset the web page } } else { 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 Mon Sep 12 05:47:59 2011 (r873) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Mon Sep 12 05:59:41 2011 (r874) @@ -82,7 +82,7 @@ @Override public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { - Window.alert("delete operation of the object " + this.objectToBeSend + " successed"); + Window.alert("delete operation of the object " + this.objectToBeSend + " succeeded"); // TODO: reset the web page } else { Window.alert("delete operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 05:47:59 2011 (r873) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 05:59:41 2011 (r874) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -9,6 +8,6 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 05:47:59 2011 New Revision: 873 Log: gdl-frontend: Widgets: fixed a bug when committing jtm-fragments 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/isidorus/IsidorusConstants.java 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 Mon Sep 12 05:18:04 2011 (r872) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Mon Sep 12 05:47:59 2011 (r873) @@ -43,18 +43,15 @@ protected class CommitButtonClickHandler implements ClickHandler { - private GdlCommitButton owner = null; - - public CommitButtonClickHandler() { } @Override public void onClick(ClickEvent event) { try{ - ICommitCallback callback = this.owner.getRoot().getCommitCallback(); + ICommitCallback callback = GdlCommitButton.this.getRoot().getCommitCallback(); - callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, true), GdlCommitButton.this, this.owner.getRoot().getTmEngine()); + callback.commitTmConstruct(GdlCommitButton.this.getGdlParent().getContent(null, true), GdlCommitButton.this, GdlCommitButton.this.getRoot().getTmEngine()); }catch(Exception e){ e.printStackTrace(); Window.alert("caught: " + e.getMessage()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 05:18:04 2011 (r872) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 12 05:47:59 2011 (r873) @@ -1,6 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -8,6 +9,6 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 05:18:04 2011 New Revision: 872 Log: gdl-frontend: Widgets: add new functionality to the GdlCommitButton => after a commit of a created topic/association the carrier is reset 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/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/environment/ICommitCallback.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/view/GdlAssociationView.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/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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Sep 12 05:18:04 2011 (r872) @@ -211,7 +211,7 @@ } ArrayList<Pair<Construct, TopicMapsTypes>> data = new ArrayList<Pair<Construct,TopicMapsTypes>>(); data.add(new Pair<Construct, TopicMapsTypes>(this.requestedSchemaTm, TopicMapsTypes.TopicMap)); - this.commitCallback.commitTmConstruct(data, this.tmEngine, null); + this.commitCallback.commitTmConstruct(data, null, this.tmEngine); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.CommitError, e); @@ -276,7 +276,6 @@ } - // Creates the actual view from the requested topic map public void createView(){ try{ 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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Mon Sep 12 05:18:04 2011 (r872) @@ -1,12 +1,15 @@ package us.isidor.gdl.anaToMia.Widgets.button; -import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; + 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; import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.view.GdlAssociationView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlTopicView; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; @@ -24,25 +27,34 @@ public GdlCommitButton(Topic tmRepresentative, Construct receivedData, GdlVisibleObject parent) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative, receivedData, parent); ((Button)this.subElements.get(0)).setText("commit"); - this.getButton().addClickHandler(new CommitButtonClickHandler(this)); + this.getButton().addClickHandler(new CommitButtonClickHandler()); } - protected class CommitButtonClickHandler implements ClickHandler { - private GdlCommitButton owner = null; + public void resetCarriers(){ + GdlVisibleObject parent = this.getGdlParent(); - public CommitButtonClickHandler(GdlCommitButton owner){ - this.owner = owner; + while(parent != null){ + if(parent instanceof GdlTopicView)((GdlTopicView)parent).resetRepresentedTopic(); + if(parent instanceof GdlAssociationView)((GdlAssociationView)parent).resetRepresentedAssociations(); + parent = parent.getGdlParent(); } + } + + + protected class CommitButtonClickHandler implements ClickHandler { + private GdlCommitButton owner = null; + + + public CommitButtonClickHandler() { } @Override public void onClick(ClickEvent event) { try{ - TmEngine tmEngine = this.owner.getRoot().getTmEngine(); ICommitCallback callback = this.owner.getRoot().getCommitCallback(); - callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, true), tmEngine, this.owner.getId()); + callback.commitTmConstruct(this.owner.getGdlParent().getContent(null, true), GdlCommitButton.this, this.owner.getRoot().getTmEngine()); }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/GdlCreateButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Mon Sep 12 05:18:04 2011 (r872) @@ -8,6 +8,7 @@ import com.google.gwt.user.client.ui.Button; public class GdlCreateButton extends GdlActionButton { + // TOOD: is this class really necessary or is GdlCommitButton sufficient??? // TODO: implement protected GdlCreateButton(){ 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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Mon Sep 12 05:18:04 2011 (r872) @@ -10,6 +10,8 @@ import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.view.GdlAssociationView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlTopicView; public class GdlDeleteButton extends GdlActionButton { // TODO: implement @@ -26,6 +28,17 @@ } + public void resetCarriers(){ + GdlVisibleObject parent = this.getGdlParent(); + + while(parent != null){ + if(parent instanceof GdlTopicView)((GdlTopicView)parent).resetRepresentedTopic(); + if(parent instanceof GdlAssociationView)((GdlAssociationView)parent).resetRepresentedAssociations(); + parent = parent.getGdlParent(); + } + } + + protected class DeleteButtonClickHandler implements ClickHandler { private GdlDeleteButton owner = null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java Mon Sep 12 05:18:04 2011 (r872) @@ -1,11 +1,13 @@ package us.isidor.gdl.anaToMia.Widgets.environment; import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; +import us.isidor.gdl.anaToMia.Widgets.button.GdlCommitButton; public interface ICommitCallback { - public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmengine, String buttonId); + public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine); } 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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 05:18:04 2011 (r872) @@ -3,6 +3,7 @@ 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.button.GdlCommitButton; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.Request; @@ -37,20 +38,21 @@ @Override - public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) { + public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine) { try{ + String buttonId = sender == null ? null : sender.getId(); if("hash_object_commit_button_id".equals(buttonId)){ this.commitCreatedHashObject(constructs, tmEngine, "edited_hash_object_commit_button_id".equals(buttonId)); } else if("environment_commit_button_id".equals(buttonId)){ - this.commitCreatedEnvironment(constructs, tmEngine); + this.commitCreatedEnvironment(constructs, sender, tmEngine); } - }catch(ExporterException ee){ - Window.alert("failed to commit the Topic Maps data, because: " + ee.getMessage()); + }catch(Exception e){ + Window.alert("failed to commit the Topic Maps data, because: " + e.getMessage()); } } - private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException { + private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, GdlCommitButton sender, TmEngine tmEngine) throws ExporterException { final String carrierPsi = PSIs.GDL.gdl + "environment_default_creator_topic_view_id"; ArrayList<Topic> topics = new ArrayList<Topic>(); ArrayList<TopicMap> topicMaps = new ArrayList<TopicMap>(); @@ -94,9 +96,7 @@ try{ // a check for an existing environment topic is not necessary, // since it would be exactly the same topic. - - //Window.alert(jtm); // TODO: remove - builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm)); + builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm, sender)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } @@ -177,14 +177,16 @@ private class EnvironmentCommitRequest implements RequestCallback { private String objectToBeSend = null; + private GdlCommitButton sender = null; @SuppressWarnings("unused") private EnvironmentCommitRequest(){} - public EnvironmentCommitRequest(String objectToBeCommitted){ + public EnvironmentCommitRequest(String objectToBeCommitted, GdlCommitButton sender){ this.objectToBeSend = objectToBeCommitted; + this.sender = sender; } @@ -192,6 +194,7 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { Window.alert("commit operation of the object " + this.objectToBeSend + " successed"); + this.sender.resetCarriers(); // TODO: reset the web page } else { Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Sep 12 05:18:04 2011 (r872) @@ -48,6 +48,16 @@ } + public void resetRepresentedAssociations(){ + for (Widget ctrl : this.subElements) { + if(ctrl instanceof ButtonableObject){ + if(((ButtonableObject)ctrl).getMainObject() instanceof AssociationItem){ + ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).resetRepresentedAssociation(); + } + } + } + } + // content orientation has no effect on a view, so here must the original method // defined in GdlVisibleObject implemented @Override @@ -221,11 +231,11 @@ // TODO: implement // reifier => topic-role - // item-identifeir => topic-role + // item-identifier => topic-role // type => association-role // reifier => association-role // item-identifier => association-role - // scope => assocition-role + // scope => association-role } return result; @@ -238,12 +248,27 @@ // represented by this class public class AssociationItem extends GdlView { private int indexInParent = -1; + private Association representedAssociation = null; @SuppressWarnings("unchecked") public Association getRepresentedAssociation() throws InvalidGdlSchemaException{ - if(this.receivedData != null) return (Association)this.receivedData; - else return this.tmRepresentative.getTopicMap().createAssociation(((GdlAssociationView)this.getGdlParent()).getAssociationType(), (JsArray<Topic>)JsArray.createArray()); + if(this.receivedData != null){ + return (Association)this.receivedData; + } else if (this.representedAssociation != null){ + return this.representedAssociation; + } else{ + this.representedAssociation = this.tmRepresentative.getTopicMap().createAssociation(((GdlAssociationView)this.getGdlParent()).getAssociationType(), (JsArray<Topic>)JsArray.createArray()); + return this.representedAssociation; + } + } + + + // can be called to set the represented topic to null, e.g. + // if a created association was submitted and a new association is created, + // so the old carrier is reset as well + public void resetRepresentedAssociation(){ + this.representedAssociation = null; } 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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Mon Sep 12 05:18:04 2011 (r872) @@ -22,4 +22,12 @@ public GdlPanel getRoot(){ return this.rootPanel; } + + + // removes and destroys the carrier topic that is created when the getContent + // method is invoked, so duplicate data entries are not produced! + public void resetCarrier(){ + //TODO: implement => call for this instance and each child creator instance + + } } 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 Mon Sep 12 02:31:58 2011 (r871) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Sep 12 05:18:04 2011 (r872) @@ -146,8 +146,7 @@ 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; - if(localCarrier == null) localCarrier = this.getRepresentedTopic(); + Topic localCarrier = this.getRepresentedTopic(); for (Widget ctrl : this.subElements) { int i = 0; @@ -225,4 +224,12 @@ return (Topic)this.receivedData; } } + + + // can be called to set the represented topic to null, e.g. + // if a created topic was submitted and a new topic is created, + // so the old carrier is reset as well + public void resetRepresentedTopic(){ + this.representedTopic = null; + } }

1 0

[isidorus-cvs] r871 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 12 Sep '11

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 02:31:58 2011 New Revision: 871 Log: gdl-backend: removed the json-interface-caching mechanism of the gdl-frontend (for now) Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 12 02:19:01 2011 (r870) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 12 02:31:58 2011 (r871) @@ -125,17 +125,9 @@ (with-writer-lock (let ((result (jtm-delete-interface:mark-as-deleted-from-jtm json-data :revision (get-revision)))) - (if result - (progn - (when (typep result 'd:TopicC) - (append ;;the append function is used only for suppress - ;;style warnings of unused delete return values - (delete (elephant::oid result) *type-table*) - (delete (elephant::oid result) *instance-table*))) - (format nil "")) ;operation succeeded - (progn - (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) - (format nil "object not found"))))))) + (unless result + (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) + (format nil "object not found")))))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) @@ -150,10 +142,8 @@ (hunchentoot:raw-post-data :external-format external-format :force-text t))) (with-writer-lock - (let ((frag (jtm-importer:import-construct-from-jtm-string - json-data :revision (get-revision) :tm-id *gdl-tm-id*))) - (when frag - (push-to-cache (d:topic frag))))))) + (jtm-importer:import-construct-from-jtm-string + json-data :revision (get-revision) :tm-id *gdl-tm-id*)))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) Modified: branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp Mon Sep 12 02:19:01 2011 (r870) +++ branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp Mon Sep 12 02:31:58 2011 (r871) @@ -578,11 +578,11 @@ (handler-case (progn (json-tmcl::topictype-p topic-instance topictype topictype-constraint nil 0) - (push (elephant::oid topic-instance) *type-table*)) + (pushnew (elephant::oid topic-instance) *type-table*)) (condition () nil))) (handler-case (progn (json-tmcl::valid-instance-p topic-instance nil nil 0) - (push (elephant::oid topic-instance) *instance-table*)) + (pushnew (elephant::oid topic-instance) *instance-table*)) (condition () nil)))

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 02:19:01 2011 New Revision: 870 Log: gdl-frontend: Widgets: fixed a bug when sending the commit request for http://textgrid.org/serviceregistry/model/types/Environment instances 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 Mon Sep 12 01:58:19 2011 (r869) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 02:19:01 2011 (r870) @@ -96,7 +96,7 @@ // since it would be exactly the same topic. //Window.alert(jtm); // TODO: remove - builder.sendRequest(null, new EnvironmentCommitRequest(jtm)); + builder.sendRequest(jtm, new EnvironmentCommitRequest(jtm)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); }

1 0