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

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

15 Sep '11

Author: lgiessmann Date: Thu Sep 15 04:26:17 2011 New Revision: 907 Log: gdl-frontend: Widgets: implemented a click handler that creates a GdlPanel when clicking on a psi Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 01:58:58 2011 (r906) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 04:26:17 2011 (r907) @@ -1,7 +1,17 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; +import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; + import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.dom.client.Element; +import com.google.gwt.dom.client.TextAreaElement; +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; @@ -12,9 +22,11 @@ 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; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; @@ -23,12 +35,19 @@ private HorizontalPanel mainPanel = new HorizontalPanel(); private VerticalPanel navigationPanel = new VerticalPanel(); private Button createNewButton = new Button("create new"); - private PsiContainer psiContainer = new PsiContainer(); - //private Image textGridLogo = new Image(IsidorusConstants.TEXTGRID_LOGO_URL); + private PsiContainer psiContainer = null; + private GdlPanel gdlPanel = null; @Override public void onModuleLoad() { + try{ + this.psiContainer = new PsiContainer(new PsiClickHandler()); + }catch(ExecutionException e){ + Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); + this.resetPage(); + } + RootPanel.get("GWT_Content").add(this.mainPanel); mainPanel.add(this.navigationPanel); mainPanel.setBorderWidth(1); @@ -46,6 +65,7 @@ }catch(RequestException e){ e.printStackTrace(); Window.alert("could not request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + e.getClass() + "): " + e.getMessage()); + HashObjectUi.this.resetPage(); } } @@ -56,6 +76,42 @@ + private class PsiClickHandler implements ClickHandler { + @Override + public void onClick(ClickEvent event) { + Object obj = event.getSource(); + if(obj instanceof Label){ + Label source = (Label)obj; + try{ + GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler()); + if(HashObjectUi.this.gdlPanel != null) HashObjectUi.this.gdlPanel.removeFromParent(); + HashObjectUi.this.gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 400, 400); + HashObjectUi.this.mainPanel.add(gdlPanel); + gdlPanel.setTmEngine(new JtmsTmEngine()); + gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); + gdlPanel.setCommitCallback(new CommitCallback()); + gdlPanel.setDeleteCallback(new DeleteCallback()); + gdlPanel.loadSchema(); + }catch(Exception e){ + e.printStackTrace(); + Window.alert("could not instantiate the GdlPanel, because(" + e.getClass() + "): " + e.getMessage()); + HashObjectUi.this.resetPage(); + } + } + } + } + + + + private class ResetClickHandler implements ClickHandler { + @Override + public void onClick(ClickEvent event) { + Element elem = DOM.getElementById("hash_object_text_key_id__GDL_0"); + ((TextAreaElement)elem).setValue(""); + elem = DOM.getElementById("hash_object_text_value_id__GDL_0"); + ((TextAreaElement)elem).setValue(""); + } + } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Thu Sep 15 01:58:58 2011 (r906) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Thu Sep 15 04:26:17 2011 (r907) @@ -1,6 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; import java.util.ArrayList; + +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; + +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.json.client.JSONString; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; @@ -11,9 +15,13 @@ public class PsiContainer { private ArrayList<Label> psiLabels = new ArrayList<Label>(); private VerticalPanel containerPanel = new VerticalPanel(); + private ClickHandler lblClickHandler = null; - public PsiContainer(){} + public PsiContainer(ClickHandler labelClikcHandler) throws ExecutionException{ + if(labelClikcHandler == null) throw new ExecutionException("labelClickHandler must not be null"); + this.lblClickHandler = labelClikcHandler; + } public void addPsi(String psi){ @@ -31,6 +39,7 @@ } } if(widgetIdx == this.containerPanel.getWidgetCount()) this.containerPanel.add(lbl); + if(this.lblClickHandler != null)lbl.addClickHandler(this.lblClickHandler); }

1 0

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

15 Sep '11

Author: lgiessmann Date: Thu Sep 15 01:58:58 2011 New Revision: 906 Log: gdl-frontend: Widgets: started to implement the acutl frontend for hash-objects Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/textgrid_large.jpg (contents, props changed) branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/textgrid_small.png (contents, props changed) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Wed Sep 14 05:49:14 2011 (r905) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Thu Sep 15 01:58:58 2011 (r906) @@ -18,8 +18,8 @@ <inherits name="com.google.gwt.http.HTTP" />  - <entry-point class='us.isidor.gdl.anaToMia.Widgets.base.TestClass'/> - +  + <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.HashObjectUi"/>  <source path="base"/> Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 01:58:58 2011 (r906) @@ -0,0 +1,103 @@ +package us.isidor.gdl.anaToMia.Widgets.isidorus; + + +import com.google.gwt.core.client.EntryPoint; +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.JSONParser; +import com.google.gwt.json.client.JSONString; +import com.google.gwt.json.client.JSONValue; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.VerticalPanel; + + +public class HashObjectUi implements EntryPoint { + private HorizontalPanel mainPanel = new HorizontalPanel(); + private VerticalPanel navigationPanel = new VerticalPanel(); + private Button createNewButton = new Button("create new"); + private PsiContainer psiContainer = new PsiContainer(); + //private Image textGridLogo = new Image(IsidorusConstants.TEXTGRID_LOGO_URL); + + + @Override + public void onModuleLoad() { + RootPanel.get("GWT_Content").add(this.mainPanel); + mainPanel.add(this.navigationPanel); + mainPanel.setBorderWidth(1); + mainPanel.setPixelSize(1024, 700); + navigationPanel.add(createNewButton); + this.requestHashObjectPsis(); + } + + + private void requestHashObjectPsis(){ + String url = URL.encode(IsidorusConstants.GET_HASH_OBJECT_PSIS_URL); + RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + try{ + builder.sendRequest(null, new PsiRequest()); + }catch(RequestException e){ + e.printStackTrace(); + Window.alert("could not request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + e.getClass() + "): " + e.getMessage()); + } + } + + + public void resetPage(){ + // TODO: implement + } + + + + + + + private class PsiRequest implements RequestCallback { + public PsiRequest(){} + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + JSONValue psiVals = JSONParser.parseStrict(response.getText()); + JSONArray psis = null; + if(psiVals != null) psis = psiVals.isArray(); + if(psis == null){ + Window.alert("got bad json, an array of strings was expected, but got: " + response.getText()); + HashObjectUi.this.resetPage(); + } + for(int psisIdx = 0; psisIdx != psis.size(); ++psisIdx){ + JSONValue psiVal = psis.get(psisIdx); + JSONString psiString = null; + if(psiVal != null) psiString = psiVal.isString(); + HashObjectUi.this.psiContainer.addPsi(psiString); + } + + HashObjectUi.this.psiContainer.insertIn(HashObjectUi.this.navigationPanel); + } else { + Window.alert("could not request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + response.getStatusCode() + "): " + response.getStatusText()); + HashObjectUi.this.resetPage(); + } + } + + + @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 request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + eClass + "): " + message); + HashObjectUi.this.resetPage(); + } + } +} 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 Wed Sep 14 05:49:14 2011 (r905) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Thu Sep 15 01:58:58 2011 (r906) @@ -14,4 +14,6 @@ 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_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; + public final static String TEXTGRID_LOGO_URL = GWT.getModuleBaseURL() + "textgrid_small.png"; } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Thu Sep 15 01:58:58 2011 (r906) @@ -0,0 +1,54 @@ +package us.isidor.gdl.anaToMia.Widgets.isidorus; + +import java.util.ArrayList; +import com.google.gwt.json.client.JSONString; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + + +public class PsiContainer { + private ArrayList<Label> psiLabels = new ArrayList<Label>(); + private VerticalPanel containerPanel = new VerticalPanel(); + + + public PsiContainer(){} + + + public void addPsi(String psi){ + if(psi == null) return; + + Label lbl = new Label(psi); + this.psiLabels.add(lbl); + + int widgetIdx = 0; + for( ; widgetIdx != this.containerPanel.getWidgetCount(); ++widgetIdx){ + Widget wdgt = this.containerPanel.getWidget(widgetIdx); + if((wdgt instanceof Label) && ((Label)wdgt).getText().compareTo(psi) >= 0){ + this.containerPanel.insert(lbl, widgetIdx); + break; + } + } + if(widgetIdx == this.containerPanel.getWidgetCount()) this.containerPanel.add(lbl); + } + + + public void addPsi(JSONString psi){ + if(psi != null) this.addPsi(psi.stringValue()); + } + + + public ArrayList<String> getPsis(){ + ArrayList<String> result = new ArrayList<String>(); + for (Label lbl : this.psiLabels) result.add(lbl.getText()); + + return result; + } + + + public void insertIn(Panel panel){ + if(panel == null) return; + panel.add(this.containerPanel); + } +} Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html Wed Sep 14 05:49:14 2011 (r905) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html Thu Sep 15 01:58:58 2011 (r906) @@ -47,6 +47,7 @@ <center> <div id="GWT_Content"/> + <image style="position:fixed; bottom:0px; right:0px" src="http://127.0.0.1:8888/gdl_widgets/textgrid_small.png"/> </center> </body> </html> Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json Thu Sep 15 01:58:58 2011 (r906) @@ -0,0 +1,103 @@ +[ + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash1", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash2", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash3", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash4", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash5", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash6", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash7", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash8", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash9", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash10", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash11", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash12", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash13", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash14", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash15", + "http://textgrid.org/serviceregistry/test-hash-2", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash16", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash17", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash18", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash19", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash20", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash21", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash22", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash23", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash24", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash25", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash26", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash27", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash28", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash29", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash30", + "http://textgrid.org/serviceregistry/test-hash-31", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash32", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash33", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash34", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash35", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash36", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash37", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash38", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash39", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash40", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash41", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash42", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash43", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash44", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash45", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash46", + "http://textgrid.org/serviceregistry/test-hash-47", + + + + + + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash1", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash2", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash3", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash4", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash5", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash6", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash7", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash8", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash9", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash10", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash11", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash12", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash13", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash14", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash15", + "http://textgrid.org/serviceregistry/test-hash-2", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash16", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash17", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash18", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash19", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash20", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash21", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash22", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash23", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash24", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash25", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash26", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash27", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash28", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash29", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash30", + "http://textgrid.org/serviceregistry/test-hash-31", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash32", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash33", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash34", + "http://textgrid.org/serviceregistry/hash-object/environment-4/hash35", + "http://textgrid.org/serviceregistry/hash-object/environment-3/hash36", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash37", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash38", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash39", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash40", + "http://textgrid.org/serviceregistry/hash-object/environment-2/hash41", + "http://textgrid.org/serviceregistry/hash-object/environment-1/hash42", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash43", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash44", + "http://textgrid.org/serviceregistry/hash-object/environment-5/hash45", + "http://textgrid.org/serviceregistry/hash-object/environment-6/hash46", + "http://textgrid.org/serviceregistry/test-hash-47" +] \ No newline at end of file Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/textgrid_large.jpg ============================================================================== Binary file. No diff available. Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/textgrid_small.png ============================================================================== Binary file. No diff available.

1 0

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

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 05:49:14 2011 New Revision: 905 Log: gdl-frontend: Widgets: fixed a bug in the click-handler of the reset-button that appears when the webpage is executed by firefox Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Sep 14 05:16:58 2011 (r904) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Sep 14 05:49:14 2011 (r905) @@ -16,6 +16,8 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.dom.client.Element; +import com.google.gwt.dom.client.TextAreaElement; public class TestClass implements EntryPoint{ @@ -37,16 +39,18 @@ //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/hash-object/Test Environment 1/test1", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/hash-object/Test Environment 1/test1", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { - DOM.getElementById("hash_object_text_key_id__GDL_0").setInnerText(""); - DOM.getElementById("hash_object_text_value_id__GDL_0").setInnerText(""); + Element elem = DOM.getElementById("hash_object_text_key_id__GDL_0"); + ((TextAreaElement)elem).setValue(""); + elem = DOM.getElementById("hash_object_text_value_id__GDL_0"); + ((TextAreaElement)elem).setValue(""); } }); - gdlPanel = new GdlPanel(requestedTopicToEdit, null); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Wed Sep 14 05:16:58 2011 (r904) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Wed Sep 14 05:49:14 2011 (r905) @@ -2,6 +2,7 @@ +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -11,6 +12,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] r904 - in branches/gdl-frontend/src: json/JTM rest_interface
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 05:16:58 2011 New Revision: 904 Log: gdl-interface: fixed a bug when updated fragments after commit/delete operations Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 05:05:42 2011 (r903) +++ branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 05:16:58 2011 (r904) @@ -364,7 +364,6 @@ "Searches for a topic corresponding to the given identifiers. Returns t if there was deleted an item otherweise it returns nil." (declare (list jtm-decoded-list) (integer revision)) - (let* ((prefs (jtm::make-prefix-list-from-jtm-list (jtm::get-item :PREFIXES jtm-decoded-list))) Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 05:05:42 2011 (r903) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 05:16:58 2011 (r904) @@ -156,10 +156,12 @@ (elephant:get-instances-by-value 'd:FragmentC 'd:topic top))) (map nil #'elephant:drop-instance frags)) (create-latest-fragment-of-topic top)) - tops)) - (unless result - (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) - (format nil "object not found")))))) + (if (typep result 'd:TopicC) + (delete result tops) + tops))) + (unless result + (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) + (format nil "object not found")))))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))

1 0

[isidorus-cvs] r903 - in branches/gdl-frontend/src: json/JTM rest_interface
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 05:05:42 2011 New Revision: 903 Log: gdl-interface: fixed a bug when updated fragments after commit/delete operations Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 04:33:04 2011 (r902) +++ branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 05:05:42 2011 (r903) @@ -268,8 +268,6 @@ (reifier (reified-construct reifier :revision revision)) (parent - (format t "parent: ~a, charvalue: ~a, datatype: ~a, type: ~a, scope: ~a~%" - parent value datatype type scope) (let ((found-occs (tools:remove-null (map 'list (lambda(occ) Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 04:33:04 2011 (r902) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 05:05:42 2011 (r903) @@ -142,8 +142,11 @@ (player role :revision (1- rev))) (roles result :revision (1- rev)))) ((typep result 'TopicC) + (elephant:drop-instance result) (let ((assocs - (player-in-roles result :revision (1- rev)))) + (map 'list (lambda(role) + (parent role :revision (1- rev))) + (player-in-roles result :revision (1- rev))))) (loop for assoc in assocs append (map 'list (lambda(role) (player role :revision (1- rev)))

1 0

[isidorus-cvs] r902 - in branches/gdl-frontend/src: json/JTM rest_interface
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 04:33:04 2011 New Revision: 902 Log: added additional fragment-updates when a construct is deleted, or when a new construct is committed Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Wed Sep 14 04:11:14 2011 (r901) +++ branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Wed Sep 14 04:33:04 2011 (r902) @@ -407,9 +407,23 @@ (add-name top name :revision revision)) (dolist (occ top-occs) (add-occurrence top occ :revision revision)) - (format t "t") (when create-fragment - (create-latest-fragment-of-topic top)) + (let ((all-assocs + (remove-null (map 'list (lambda(role) + (parent role :revision revision)) + (player-in-roles top :revision revision))))) + (let ((all-tops + (remove-null + (loop for assoc in all-assocs + append (map 'list (lambda(role) + (d:player role :revision revision)) + (roles assoc :revision revision)))))) + (map nil (lambda(top) + (map nil #'elephant:drop-instance + (elephant:get-instances-by-value 'FragmentC 'topic top)) + (create-latest-fragment-of-topic top)) + (append all-tops (list top)))))) + (format t "t") top)) Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 04:11:14 2011 (r901) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Wed Sep 14 04:33:04 2011 (r902) @@ -123,8 +123,37 @@ (hunchentoot:raw-post-data :external-format external-format :force-text t))) (with-writer-lock - (let ((result (jtm-delete-interface:mark-as-deleted-from-jtm - json-data :revision (get-revision)))) + (let* ((rev (d:get-revision)) + (result (jtm-delete-interface:mark-as-deleted-from-jtm + json-data :revision rev))) + (let ((tops + (remove-null + (cond ((or (typep result 'OccurrenceC) + (typep result 'NameC)) + (let ((top (parent result :revision (1- rev)))) + (when top (list top)))) + ((typep result 'VariantC) + (let ((name (parent result :revision (1- rev)))) + (when name + (let ((top (parent name :revision (1- rev)))) + (when top (list top)))))) + ((typep result 'AssociationC) + (map 'list (lambda(role) + (player role :revision (1- rev))) + (roles result :revision (1- rev)))) + ((typep result 'TopicC) + (let ((assocs + (player-in-roles result :revision (1- rev)))) + (loop for assoc in assocs + append (map 'list (lambda(role) + (player role :revision (1- rev))) + (roles assoc :revision (1- rev)))))))))) + (map nil (lambda(top) + (let ((frags + (elephant:get-instances-by-value 'd:FragmentC 'd:topic top))) + (map nil #'elephant:drop-instance frags)) + (create-latest-fragment-of-topic top)) + tops)) (unless result (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) (format nil "object not found"))))))

1 0

[isidorus-cvs] r901 - branches/gdl-frontend/src/json/JTM
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 04:11:14 2011 New Revision: 901 Log: jtm-delete-interface: fixed a bug when deleting occurrences Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 04:09:43 2011 (r900) +++ branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 04:11:14 2011 (r901) @@ -284,8 +284,8 @@ (t (error "when deleting an occurrence, there must be an item-identifier, reifier or parent set!"))))) (when occ-to-delete - ;(delete-occurrence (parent occ-to-delete :revision revision) - ;occ-to-delete :revision revision) + (delete-occurrence (parent occ-to-delete :revision revision) + occ-to-delete :revision revision) occ-to-delete))))

1 0

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

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 04:09:43 2011 New Revision: 900 Log: gdl-frontend: Widgets: removed some debug messages 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 Wed Sep 14 03:44:24 2011 (r899) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Wed Sep 14 04:09:43 2011 (r900) @@ -260,8 +260,6 @@ delOcc.put("datatype", new JSONString("[pref_3:" + xsdString[1] + "]")); delOcc.put("type", new JSONString("si:[pref_2:" + hashValuePsi[1] + "]")); - Window.alert(">>\n" + delObj.toString()); - try{ String url = URL.encode(CommitCallback.this.DELETE_REUQEST_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url);

1 0

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

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 03:44:24 2011 New Revision: 899 Log: gdl-frontend: Widgets: added the xsd string uri to IsidorusConstants Modified: 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/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Wed Sep 14 03:40:50 2011 (r898) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Wed Sep 14 03:44:24 2011 (r899) @@ -6,6 +6,7 @@ public class IsidorusConstants { + public final static String XSD_STRING = "http://www.w3.org/2001/XMLSchema#string"; 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";

1 0

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

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 03:40:50 2011 New Revision: 898 Log: gdl-frontend: Widgets: fixed a bug when creating delete requests to update http://textgrid.org/serivceregistry/model/types/Hash-Object 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 Wed Sep 14 03:35:08 2011 (r897) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Wed Sep 14 03:40:50 2011 (r898) @@ -6,7 +6,6 @@ import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; - import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.Request; import com.google.gwt.http.client.RequestBuilder; @@ -239,7 +238,8 @@ if (200 == response.getStatusCode()) { if(edited){ String[] topPsi = Utils.splitUriByLastFragment(psi); - String[] hashValuePsi = Utils.splitUriByLastFragment(CommitCallback.this.HASH_VALUE_OCCURRENCE_TYPE); + String[] hashValuePsi = Utils.splitUriByLastFragment(CommitCallback.this.HASH_VALUE_OCCURRENCE_TYPE); + String[] xsdString = Utils.splitUriByLastFragment(IsidorusConstants.XSD_STRING); JSONObject delObj = new JSONObject(); delObj.put("type", new JSONString("Occurrence")); @@ -250,12 +250,14 @@ JSONObject prefixes = new JSONObject(); prefixes.put("pref_1", new JSONString(topPsi[0])); prefixes.put("pref_2", new JSONString(hashValuePsi[0])); + prefixes.put("pref_3", new JSONString(xsdString[0])); delOcc.put("prefixes", prefixes); JSONArray jParents = new JSONArray(); jParents.set(0, new JSONString("si:[pref_1:" + topPsi[1] + "]")); delOcc.put("parent", jParents); delOcc.put("value", this.getOldHashValue(response.getText(), this.psi)); + delOcc.put("datatype", new JSONString("[pref_3:" + xsdString[1] + "]")); delOcc.put("type", new JSONString("si:[pref_2:" + hashValuePsi[1] + "]")); Window.alert(">>\n" + delObj.toString()); @@ -315,7 +317,7 @@ JSONObject hashTopic = hashTopicVal.isObject(); if(hashTopic == null) continue; - JSONValue psisVal = topics.get(topicIdx); + JSONValue psisVal = hashTopic.get("subject_identifiers"); if(psisVal == null) continue; JSONArray psis = psisVal.isArray(); @@ -325,7 +327,8 @@ if(psiVal == null) continue; JSONString psi = psiVal.isString(); - if(psi != null && this.computeUri(psi.stringValue(), prefixes).equals(psi)){ + + if(psi != null && this.computeUri(psi.stringValue(), prefixes).equals(topicPsiToBeUpdated)){ JSONObject occ = this.gethashValueOccurrence(hashTopic, prefixes); if(occ == null) continue; @@ -338,7 +341,6 @@ } } - return result; } @@ -400,7 +402,7 @@ JSONString prefString = prefVal.isString(); if(prefString == null) return ""; - return prefString + parts[1]; + return prefString.stringValue() + parts[1]; } else { return curie; }

1 0