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

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

22 Sep '11

Author: lgiessmann Date: Thu Sep 22 04:41:54 2011 New Revision: 959 Log: gdl-frontend: Widgets: added a "wait-screen" whenthe user is committing data., so it is ensured that a button can be clicked only once during one operation 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/GdlWebPage.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 Wed Sep 21 07:22:50 2011 (r958) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Thu Sep 22 04:41:54 2011 (r959) @@ -36,19 +36,29 @@ public final String DELETE_REUQEST_URL = IsidorusConstants.DELETE_REQUEST_URL; public final String COMMIT_REQUEST_URL = IsidorusConstants.COMMIT_REQUEST_URL; public final String GET_REQUEST_URL = IsidorusConstants.GET_FRAGMENT_REQUEST_URL; + private GdlWebPage gdlWebPage = null; - public CommitCallback(){} + @SuppressWarnings("unused") + private CommitCallback(){} + + + public CommitCallback(GdlWebPage gdlWebPage){ + this.gdlWebPage = gdlWebPage; + } @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) { try{ if("creator_hash_object_commit_button_id".equals(buttonId)){ + if(this.gdlWebPage != null) this.gdlWebPage.createLoadScreenPanel("Committing Data", "committing the currently created Hash-Object topic to " + this.COMMIT_REQUEST_URL); this.commitCreatedHashObject(constructs, tmEngine, false); }else if("editor_hash_object_commit_button_id".equals(buttonId)){ + if(this.gdlWebPage != null) this.gdlWebPage.createLoadScreenPanel("Updating Data", "updating the currently changed Hash-Object topic on " + this.COMMIT_REQUEST_URL); this.commitCreatedHashObject(constructs, tmEngine, true); } else if("environment_commit_button_id".equals(buttonId)){ + if(this.gdlWebPage != null) this.gdlWebPage.createLoadScreenPanel("Committing Data", "committing the currently created Environment topic to " + this.COMMIT_REQUEST_URL); this.commitCreatedEnvironment(constructs, tmEngine); } }catch(Exception e){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 07:22:50 2011 (r958) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Thu Sep 22 04:41:54 2011 (r959) @@ -168,7 +168,7 @@ GdlPanel gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback(GdlWebPage.this)); - gdlPanel.setCommitCallback(new CommitCallback()); + gdlPanel.setCommitCallback(new CommitCallback(GdlWebPage.this)); gdlPanel.setDeleteCallback(new DeleteCallback(GdlWebPage.this)); gdlPanel.addStyleName(GdlWebPage.this.GDL_PANEL_STYLE_NAME); GdlWebPage.this.setGdlPanel(gdlPanel); @@ -192,7 +192,7 @@ GdlPanel gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 362, 160); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback(GdlWebPage.this)); - gdlPanel.setCommitCallback(new CommitCallback()); + gdlPanel.setCommitCallback(new CommitCallback(GdlWebPage.this)); gdlPanel.setDeleteCallback(new DeleteCallback(GdlWebPage.this)); GdlWebPage.this.setGdlPanel(gdlPanel); gdlPanel.loadSchema();

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 07:22:50 2011 New Revision: 958 Log: gdl-frontend: Widgets: fixed a bug in the delete operation handler of environment topics 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/HashObjectPsiContainer.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 Wed Sep 21 06:56:39 2011 (r957) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Wed Sep 21 07:22:50 2011 (r958) @@ -176,7 +176,7 @@ RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); builder.setHeader("Content-type", "application/json"); - builder.sendRequest(delObj.toString(), new DeleteRequest(delObj, top)); + builder.sendRequest(delObj.toString(), new DeleteRequest(delObj)); }catch(RequestException e){ Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); }catch(ExporterException e){ @@ -188,16 +188,14 @@ private class DeleteRequest implements RequestCallback { private JSONObject objectToBeSend = null; - private Topic topicToBeDeleted = null; @SuppressWarnings("unused") private DeleteRequest(){} - public DeleteRequest(JSONObject objectToBeDeleted, Topic topicToBeDeleted){ + public DeleteRequest(JSONObject objectToBeDeleted){ this.objectToBeSend = objectToBeDeleted; - this.topicToBeDeleted = topicToBeDeleted; } @@ -205,7 +203,6 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { Window.Location.reload(); - this.topicToBeDeleted.remove(); } 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/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:56:39 2011 (r957) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 07:22:50 2011 (r958) @@ -3,7 +3,6 @@ import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -171,13 +170,7 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { ++this.objectsDeleted; - if(this.objectsDeleted == this.hashObjectsToDelete.size()){ - TopicMap tm = environmentTopic.getTopicMap(); - for (String psi : this.hashObjectsToDelete) { - Topic top = tm.getTopicBySubjectIdentifier(tm.createLocator(psi)); - top.remove(); - } - + if(this.objectsDeleted == this.hashObjectsToDelete.size()){ JSONObject delObj = HashObjectPsiContainer.this.createObjectToBeDeleted(this.environmentPsi); String url = URL.encode(HashObjectPsiContainer.this.DELETE_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url);

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 06:56:39 2011 New Revision: 957 Log: gdl-frontend: Widgets: fixed a bug in the method HashObjectPsiContainer.createObjectToBeDeleted(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:29:26 2011 (r956) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:56:39 2011 (r957) @@ -78,8 +78,7 @@ private void deleteHashObject(String psi, DeleteAllHashObjectsRequest reqCallback){ if(psi != null || reqCallback != null){ - Window.alert(">> " + psi); - JSONObject delObj = this.createObjectToBeDelete(psi); + JSONObject delObj = this.createObjectToBeDeleted(psi); try{ String url = URL.encode(this.DELETE_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); @@ -93,17 +92,17 @@ } - private JSONObject createObjectToBeDelete(String psi){ + private JSONObject createObjectToBeDeleted(String psi){ JSONArray psis = new JSONArray(); psis.set(0, new JSONString(psi)); - + JSONObject delObj = new JSONObject(); delObj.put("type", new JSONString("Topic")); - + String[] pref = Utils.splitUriByLastFragment(psi); - JSONValue val = JSONParser.parseStrict("{\"version\":\"1.1\",\"prefixes\":{\"pref\":" + pref[0] + "},\"subject_identifiers\":[\"[pref:" + pref[1] + "]\"]}"); + JSONValue val = JSONParser.parseStrict("{\"version\":\"1.1\",\"prefixes\":{\"pref\":\"" + pref[0] + "\"},\"subject_identifiers\":[\"[pref:" + pref[1] + "]\"]}"); delObj.put("delete", val.isObject()); - + return delObj; } @@ -179,7 +178,7 @@ top.remove(); } - JSONObject delObj = HashObjectPsiContainer.this.createObjectToBeDelete(this.environmentPsi); + JSONObject delObj = HashObjectPsiContainer.this.createObjectToBeDeleted(this.environmentPsi); String url = URL.encode(HashObjectPsiContainer.this.DELETE_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); builder.setHeader("Content-type", "application/json");

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 06:29:26 2011 New Revision: 956 Log: gdl-frontend: Widgets: fixed a bug in the delete operation handler of environment topics 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/HashObjectPsiContainer.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 Wed Sep 21 06:02:11 2011 (r955) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Wed Sep 21 06:29:26 2011 (r956) @@ -89,7 +89,7 @@ DeleteCallback.this.gdlWebPage.resetPage(); } else { try{ - this.hashObjectPsiContainer = new HashObjectPsiContainer(env); + this.hashObjectPsiContainer = new HashObjectPsiContainer(env, DeleteCallback.this.gdlWebPage); DeleteCallback.this.gdlWebPage.createLoadScreenPanel("Wating for Data", "Requesting all PSIs of instances of " + IsidorusConstants.HASH_OBJECT_PSI + " that are associated with " + env.getSubjectIdentifiers().get(0).getReference() + " from " + url); builder.sendRequest(this.createTmSparqlQuery(env), new GetHashObjectPsisRequest()); }catch(RequestException e){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:02:11 2011 (r955) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:29:26 2011 (r956) @@ -4,6 +4,7 @@ import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import com.google.gwt.event.dom.client.ClickEvent; @@ -37,10 +38,12 @@ private CheckBoxClickHandler cbxClickHandler = new CheckBoxClickHandler(); private final String DELETE_URL = IsidorusConstants.DELETE_REQUEST_URL; private Topic environmentTopic = null; + private GdlWebPage gdlWebPage = null; - public HashObjectPsiContainer(Topic environmentTopic) throws ExecutionException { - if(environmentTopic == null) throw new ExecutionException("environmentTopic must not be null"); + public HashObjectPsiContainer(Topic environmentTopic, GdlWebPage gdlWebPage) throws ExecutionException { + if(environmentTopic == null || gdlWebPage == null) throw new ExecutionException("environmentTopic and gdlWebPage must not be null"); + this.gdlWebPage = gdlWebPage; this.environmentTopic = environmentTopic; this.initWidget(this.containerPanel); this.containerPanel.add(this.commitButton); @@ -73,6 +76,38 @@ } + private void deleteHashObject(String psi, DeleteAllHashObjectsRequest reqCallback){ + if(psi != null || reqCallback != null){ + Window.alert(">> " + psi); + JSONObject delObj = this.createObjectToBeDelete(psi); + try{ + String url = URL.encode(this.DELETE_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); + builder.setHeader("Content-type", "application/json"); + + builder.sendRequest(delObj.toString(), reqCallback); + }catch(RequestException e){ + Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); + } + } + } + + + private JSONObject createObjectToBeDelete(String psi){ + JSONArray psis = new JSONArray(); + psis.set(0, new JSONString(psi)); + + JSONObject delObj = new JSONObject(); + delObj.put("type", new JSONString("Topic")); + + String[] pref = Utils.splitUriByLastFragment(psi); + JSONValue val = JSONParser.parseStrict("{\"version\":\"1.1\",\"prefixes\":{\"pref\":" + pref[0] + "},\"subject_identifiers\":[\"[pref:" + pref[1] + "]\"]}"); + delObj.put("delete", val.isObject()); + + return delObj; + } + + private class CheckBoxClickHandler implements ClickHandler{ @Override public void onClick(ClickEvent event) { @@ -107,43 +142,13 @@ if(!allValuesChecked){ Window.alert("to delete the an environment topic, please select explicit all associated hash-object topics to be deleted!"); } else { + HashObjectPsiContainer.this.gdlWebPage.createLoadScreenPanel("Wating for Completing a Delete Request", "deleting all associated Hash-Object topics of the Environment Topic " + TmHelper.getAnyIdOfTopic(this.environmentTopic) + " from " + HashObjectPsiContainer.this.DELETE_URL); DeleteAllHashObjectsRequest reqCallback = new DeleteAllHashObjectsRequest(HashObjectPsiContainer.this.psiCheckBoxes, this.environmentTopic); for (CheckBox cbx : HashObjectPsiContainer.this.psiCheckBoxes) HashObjectPsiContainer.this.deleteHashObject(cbx.getText(), reqCallback); } } } - - private void deleteHashObject(String psi, DeleteAllHashObjectsRequest reqCallback){ - if(psi != null || reqCallback != null){ - JSONObject delObj = this.createObjectToBeDelete(psi); - try{ - String url = URL.encode(this.DELETE_URL); - RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); - builder.setHeader("Content-type", "application/json"); - - builder.sendRequest(delObj.toString(), reqCallback); - }catch(RequestException e){ - Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); - } - } - } - - - private JSONObject createObjectToBeDelete(String psi){ - JSONArray psis = new JSONArray(); - psis.set(0, new JSONString(psi)); - - JSONObject delObj = new JSONObject(); - delObj.put("type", new JSONString("Topic")); - - String[] pref = Utils.splitUriByLastFragment(psi); - JSONValue val = JSONParser.parseStrict("{\"version\":\"1.1\",\"prefixes\":{\"pref\":" + pref[0] + "},\"subject_identifiers\":[\"[pref:" + pref[1] + "]\"]}"); - delObj.put("delete", val.isObject()); - - return delObj; - } - private class DeleteAllHashObjectsRequest implements RequestCallback { private ArrayList<String> hashObjectsToDelete = new ArrayList<String>();

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 06:02:11 2011 New Revision: 955 Log: gdl-frontend: Widgets: finalised the implementation of the delete-operation of environment topics 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/HashObjectPsiContainer.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 Wed Sep 21 04:20:42 2011 (r954) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Wed Sep 21 06:02:11 2011 (r955) @@ -23,6 +23,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; 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.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; @@ -38,7 +39,7 @@ "?topics model:environment env:"; private final String TM_SPARQL_QUERY_PART_2 = ".\n}"; private GdlWebPage gdlWebPage = null; - private HashObjectPsiContainer hashObjectPsiContainer = new HashObjectPsiContainer(); + private HashObjectPsiContainer hashObjectPsiContainer = null; @SuppressWarnings("unused") @@ -83,13 +84,23 @@ private void deleteEnvironmentTopic(Topic env){ String url = URL.encode(this.TM_SPARQL_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url); - try{ - DeleteCallback.this.gdlWebPage.createLoadScreenPanel("Wating for Data", "Requesting all PSIs of instances of " + IsidorusConstants.HASH_OBJECT_PSI + " that are associated with " + env.getSubjectIdentifiers().get(0).getReference() + " from " + url); - builder.sendRequest(this.createTmSparqlQuery(env), new GetHashObjectPsisRequest()); - }catch(RequestException e){ - e.printStackTrace(); - Window.alert("could not request existing instances of " + IsidorusConstants.HASH_OBJECT_PSI + ", because(" + e.getClass() + "): " + e.getMessage()); + if(env.getSubjectIdentifiers().length() == 0){ + Window.alert("illegal environment topic detected, because: the topic " + env + " has no subject identifier"); DeleteCallback.this.gdlWebPage.resetPage(); + } else { + try{ + this.hashObjectPsiContainer = new HashObjectPsiContainer(env); + DeleteCallback.this.gdlWebPage.createLoadScreenPanel("Wating for Data", "Requesting all PSIs of instances of " + IsidorusConstants.HASH_OBJECT_PSI + " that are associated with " + env.getSubjectIdentifiers().get(0).getReference() + " from " + url); + builder.sendRequest(this.createTmSparqlQuery(env), new GetHashObjectPsisRequest()); + }catch(RequestException e){ + e.printStackTrace(); + Window.alert("could not delete the topic " + TmHelper.getAnyIdOfTopic(env) + ", because(" + e.getClass() + "): " + e.getMessage()); + DeleteCallback.this.gdlWebPage.resetPage(); + } catch(ExecutionException e){ + e.printStackTrace(); + Window.alert("could not delete the topic " + TmHelper.getAnyIdOfTopic(env) + ", because(" + e.getClass() + "): " + e.getMessage()); + DeleteCallback.this.gdlWebPage.resetPage(); + } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 04:20:42 2011 (r954) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 06:02:11 2011 (r955) @@ -1,11 +1,24 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; - import java.util.ArrayList; - +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.base.Utils; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +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.JSONParser; +import com.google.gwt.json.client.JSONString; +import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Button; @@ -22,20 +35,24 @@ private Button commitButton = new Button("delete the Environment topic and all its Hash-Object topics"); private final String ERROR_STYLE_CLASS = "bad_input"; private CheckBoxClickHandler cbxClickHandler = new CheckBoxClickHandler(); + private final String DELETE_URL = IsidorusConstants.DELETE_REQUEST_URL; + private Topic environmentTopic = null; - public HashObjectPsiContainer(){ + public HashObjectPsiContainer(Topic environmentTopic) throws ExecutionException { + if(environmentTopic == null) throw new ExecutionException("environmentTopic must not be null"); + this.environmentTopic = environmentTopic; this.initWidget(this.containerPanel); this.containerPanel.add(this.commitButton); - this.commitButton.addClickHandler(new HashObjectPsiContainerClickHandler()); + this.commitButton.addClickHandler(new HashObjectPsiContainerClickHandler(this.environmentTopic)); DOM.setStyleAttribute(this.commitButton.getElement(), "width", "100%"); DOM.setStyleAttribute(this.commitButton.getElement(), "marginTop", "1em"); } - public void addHashObjectPsi(String psi){ + public void addHashObjectPsi(String psi) { if(psi == null) return; - + this.commitButton.removeFromParent(); CheckBox cbx = new CheckBox(psi); this.psiCheckBoxes.add(cbx); @@ -47,7 +64,7 @@ this.containerPanel.insert(cbx, widgetIdx); break; } - } + } cbx.addClickHandler(this.cbxClickHandler); @@ -69,7 +86,12 @@ private class HashObjectPsiContainerClickHandler implements ClickHandler { - public HashObjectPsiContainerClickHandler(){} + private Topic environmentTopic = null; + + + public HashObjectPsiContainerClickHandler(Topic environmentTopic){ + this.environmentTopic = environmentTopic; + } @Override @@ -85,9 +107,131 @@ if(!allValuesChecked){ Window.alert("to delete the an environment topic, please select explicit all associated hash-object topics to be deleted!"); } else { - // TODO: delete all hash-objects - // TODO: delete the environment + DeleteAllHashObjectsRequest reqCallback = new DeleteAllHashObjectsRequest(HashObjectPsiContainer.this.psiCheckBoxes, this.environmentTopic); + for (CheckBox cbx : HashObjectPsiContainer.this.psiCheckBoxes) HashObjectPsiContainer.this.deleteHashObject(cbx.getText(), reqCallback); } } } + + + private void deleteHashObject(String psi, DeleteAllHashObjectsRequest reqCallback){ + if(psi != null || reqCallback != null){ + JSONObject delObj = this.createObjectToBeDelete(psi); + try{ + String url = URL.encode(this.DELETE_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); + builder.setHeader("Content-type", "application/json"); + + builder.sendRequest(delObj.toString(), reqCallback); + }catch(RequestException e){ + Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage()); + } + } + } + + + private JSONObject createObjectToBeDelete(String psi){ + JSONArray psis = new JSONArray(); + psis.set(0, new JSONString(psi)); + + JSONObject delObj = new JSONObject(); + delObj.put("type", new JSONString("Topic")); + + String[] pref = Utils.splitUriByLastFragment(psi); + JSONValue val = JSONParser.parseStrict("{\"version\":\"1.1\",\"prefixes\":{\"pref\":" + pref[0] + "},\"subject_identifiers\":[\"[pref:" + pref[1] + "]\"]}"); + delObj.put("delete", val.isObject()); + + return delObj; + } + + + private class DeleteAllHashObjectsRequest implements RequestCallback { + private ArrayList<String> hashObjectsToDelete = new ArrayList<String>(); + private int objectsDeleted = 0; + private Topic environmentTopic = null; + private String environmentPsi = null; + + + @SuppressWarnings("unused") + private DeleteAllHashObjectsRequest(){} + + + public DeleteAllHashObjectsRequest(ArrayList<CheckBox> hashObjectToDelete, Topic environmentTopic){ + if(hashObjectToDelete != null) for (CheckBox cbx : hashObjectToDelete) this.hashObjectsToDelete.add(cbx.getText()); + this.environmentTopic = environmentTopic; + this.environmentPsi = this.environmentTopic.getSubjectIdentifiers().get(0).getReference(); // it's ensured that the passed topic has at least one psi before + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + ++this.objectsDeleted; + if(this.objectsDeleted == this.hashObjectsToDelete.size()){ + TopicMap tm = environmentTopic.getTopicMap(); + for (String psi : this.hashObjectsToDelete) { + Topic top = tm.getTopicBySubjectIdentifier(tm.createLocator(psi)); + top.remove(); + } + + JSONObject delObj = HashObjectPsiContainer.this.createObjectToBeDelete(this.environmentPsi); + String url = URL.encode(HashObjectPsiContainer.this.DELETE_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); + builder.setHeader("Content-type", "application/json"); + try{ + builder.sendRequest(delObj.toString(), new EnvironemntDeleteRequest(delObj, this.environmentTopic)); + }catch(RequestException e){ + Window.alert("delete operation of the object " + delObj + " failed, because: (" + e.getClass() + ")\n" + e.getMessage()); + } + } + } else { + Window.alert("could not delete all topics of " + Utils.arrayToString(this.hashObjectsToDelete) + ", because(" + response.getStatusCode() + "): " + response.getStatusText()); + } + } + + + @Override + public void onError(Request request, Throwable exception) { + String message = null; + Class<? extends Throwable> eClass = null; + if(exception != null){ + message = exception.getMessage(); + eClass = exception.getClass(); + } + Window.alert("could not delete all topics of " + Utils.arrayToString(this.hashObjectsToDelete) + ", because(" + eClass + "): " + message); + } + } + + + private class EnvironemntDeleteRequest implements RequestCallback { + private JSONObject objectToBeSend = null; + private Topic topicToBeDeleted = null; + + + @SuppressWarnings("unused") + private EnvironemntDeleteRequest(){} + + + public EnvironemntDeleteRequest(JSONObject objectToBeDeleted, Topic topicToBeDeleted){ + this.objectToBeSend = objectToBeDeleted; + this.topicToBeDeleted = topicToBeDeleted; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + Window.Location.reload(); + this.topicToBeDeleted.remove(); + } 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] r954 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 21 Sep '11

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 04:20:42 2011 New Revision: 954 Log: gdl-frontend: Widgets: if the user clicked the delete button of an environment topic, this button is disabled, so the user is only able to click the delete button of the generated HashObjectPsiContainer panel 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/HashObjectPsiContainer.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 Wed Sep 21 04:06:00 2011 (r953) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Wed Sep 21 04:20:42 2011 (r954) @@ -1,6 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; import java.util.ArrayList; +import com.google.gwt.dom.client.ButtonElement; +import com.google.gwt.dom.client.Element; import com.google.gwt.http.client.Request; import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestCallback; @@ -12,6 +14,7 @@ import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; @@ -49,6 +52,11 @@ @Override public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) { + if(buttonId != null){ + Element elem = DOM.getElementById(buttonId); + ButtonElement btnElem = (ButtonElement)elem; + btnElem.setDisabled(true); + } this.deleteTopic(constructs, tmEngine); } @@ -59,13 +67,12 @@ Topic top = (Topic)pair.getFirst(); if(TmHelper.isInstanceOf(top, IsidorusConstants.ENVIRONMENT_PSI)) this.deleteEnvironmentTopic(top); - else this.deleteNonEnvironment(top, tmEngine); + else this.deleteNonEnvironmentTopic(top, tmEngine); } } } - private String createTmSparqlQuery(Topic environment){ String psi = environment.getSubjectIdentifiers().get(0).getReference(); String psiSuffix = Utils.splitUriByLastFragment(psi)[1]; @@ -140,7 +147,7 @@ } - private void deleteNonEnvironment(Topic top, TmEngine tmEngine){ + private void deleteNonEnvironmentTopic(Topic top, TmEngine tmEngine){ if(top.getSubjectIdentifiers().length() != 0){ String psi = top.getSubjectIdentifiers().get(0).getReference(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 04:06:00 2011 (r953) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 04:20:42 2011 (r954) @@ -21,6 +21,7 @@ private VerticalPanel containerPanel = new VerticalPanel(); private Button commitButton = new Button("delete the Environment topic and all its Hash-Object topics"); private final String ERROR_STYLE_CLASS = "bad_input"; + private CheckBoxClickHandler cbxClickHandler = new CheckBoxClickHandler(); public HashObjectPsiContainer(){ @@ -48,11 +49,25 @@ } } + cbx.addClickHandler(this.cbxClickHandler); + if(widgetIdx == this.containerPanel.getWidgetCount()) this.containerPanel.add(cbx); this.containerPanel.insert(this.commitButton, this.containerPanel.getWidgetCount()); } + private class CheckBoxClickHandler implements ClickHandler{ + @Override + public void onClick(ClickEvent event) { + Object obj = event.getSource(); + if(obj instanceof CheckBox){ + CheckBox source = (CheckBox) obj; + if(source.getValue()) source.removeStyleName(HashObjectPsiContainer.this.ERROR_STYLE_CLASS); + } + } + } + + private class HashObjectPsiContainerClickHandler implements ClickHandler { public HashObjectPsiContainerClickHandler(){}

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 04:06:00 2011 New Revision: 953 Log: gdl-frontend: Widgets: fixed a bug in the project's css file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 03:57:49 2011 (r952) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 04:06:00 2011 (r953) @@ -69,7 +69,7 @@ } -.main_panel tr td { +.content_panel > tbody > tr > td { width: 50%; }

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 03:57:49 2011 New Revision: 952 Log: gdl-frontend: Widgets: fixed a bug in the style of the GdlWebPage's main panel Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:50:47 2011 (r951) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:57:49 2011 (r952) @@ -54,7 +54,7 @@ public void createWebPage(){ - this.contentPanel.addStyleName(this.MAIN_PANEL_STYLE_CLASS); + this.mainPanel.addStyleName(this.MAIN_PANEL_STYLE_CLASS); this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em"); try{

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 03:50:47 2011 New Revision: 951 Log: gdl-frontend: Widgets: changed the style of the GdlWebPage's main panel => static width Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:39:11 2011 (r950) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:50:47 2011 (r951) @@ -42,6 +42,7 @@ private final String GDL_PANEL_STYLE_NAME = "gdl_panel"; private final String CREATE_NEW_BUTTON_STYLE_NAME = "create_new_button"; private final String HASH_OBJECT_PSI_CONTAINER_STYLE_NAME = "hash_object_psi_container"; + private final String MAIN_PANEL_STYLE_CLASS = "content_panel"; private HashObjectPsiContainer hashObjectPsicontainer = null; @@ -53,6 +54,7 @@ public void createWebPage(){ + this.contentPanel.addStyleName(this.MAIN_PANEL_STYLE_CLASS); this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em"); try{ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 03:39:11 2011 (r950) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 03:50:47 2011 (r951) @@ -65,6 +65,12 @@ .hash_object_psi_container { border: rgb(134, 169, 203) 1px solid; border-radius: 5px; + padding: 0.5em; +} + + +.main_panel tr td { + width: 50%; }

1 0

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

21 Sep '11

Author: lgiessmann Date: Wed Sep 21 03:39:11 2011 New Revision: 950 Log: gdl-frontend: Widgets: changed the style of the HashObjectPsiContainer Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:08:03 2011 (r949) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Wed Sep 21 03:39:11 2011 (r950) @@ -41,6 +41,7 @@ private LoadScreenPanel loadScreenPanel = null; private final String GDL_PANEL_STYLE_NAME = "gdl_panel"; private final String CREATE_NEW_BUTTON_STYLE_NAME = "create_new_button"; + private final String HASH_OBJECT_PSI_CONTAINER_STYLE_NAME = "hash_object_psi_container"; private HashObjectPsiContainer hashObjectPsicontainer = null; @@ -96,7 +97,10 @@ public void setHashObjectPsiContainer(HashObjectPsiContainer psiContainer){ if(this.hashObjectPsicontainer != null) this.hashObjectPsicontainer.removeFromParent(); this.hashObjectPsicontainer = psiContainer; - if(this.hashObjectPsicontainer != null) this.contentPanel.insert(this.hashObjectPsicontainer, this.contentPanel.getWidgetCount()); + if(this.hashObjectPsicontainer != null){ + this.contentPanel.insert(this.hashObjectPsicontainer, this.contentPanel.getWidgetCount()); + this.hashObjectPsicontainer.addStyleName(this.HASH_OBJECT_PSI_CONTAINER_STYLE_NAME); + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 03:08:03 2011 (r949) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectPsiContainer.java Wed Sep 21 03:39:11 2011 (r950) @@ -6,6 +6,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; @@ -26,6 +27,8 @@ this.initWidget(this.containerPanel); this.containerPanel.add(this.commitButton); this.commitButton.addClickHandler(new HashObjectPsiContainerClickHandler()); + DOM.setStyleAttribute(this.commitButton.getElement(), "width", "100%"); + DOM.setStyleAttribute(this.commitButton.getElement(), "marginTop", "1em"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 03:08:03 2011 (r949) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Wed Sep 21 03:39:11 2011 (r950) @@ -62,6 +62,12 @@ } +.hash_object_psi_container { + border: rgb(134, 169, 203) 1px solid; + border-radius: 5px; +} + + .gdl_panel { margin-left:auto; margin-right:0;

1 0