isidorus-cvs

isidorus-cvs@common-lisp.net

1037 discussions

[isidorus-cvs] r919 - branches/gdl-frontend/src/TM-SPARQL
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 01:56:58 2011 New Revision: 919 Log: tm-sparql: fixed a bug when handling carriage returns of http in the rest-handler Modified: branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Modified: branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp ============================================================================== --- branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Mon Sep 19 01:06:33 2011 (r918) +++ branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Mon Sep 19 01:56:58 2011 (r919) @@ -427,7 +427,7 @@ (progn (add-variable construct "*") (parse-variables construct (string-after trimmed-str "*"))) (let ((result (parse-variable-name construct trimmed-str))) - (add-variable construct (getf result :value)) + (add-variable construct (trim-whitespace-right (getf result :value))) (parse-variables construct (getf result :next-query))))))))

1 0

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

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 01:06:33 2011 New Revision: 918 Log: gdl-backend: added the tm-sparql interface to the gdl-interface Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 00:29:32 2011 (r917) +++ branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 01:06:33 2011 (r918) @@ -59,7 +59,8 @@ :*gdl-host-address* :*gdl-base-path* :*gdl-host-file* - :*gdl-tm-id*)) + :*gdl-tm-id* + :*gdl-sparql*)) (in-package :rest-interface) 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 19 00:29:32 2011 (r917) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 19 01:06:33 2011 (r918) @@ -17,12 +17,14 @@ (defparameter *gdl-base-path* "anaToMia/hosted_files/") (defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) (defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") +(defparameter *gdl-sparql* "/gdl/tm-sparql/?$") (defun set-up-gdl-interface (&key (get-fragment *gdl-get-fragment*) (get-schema *gdl-get-schema*) (commit-fragment *gdl-commit-fragment*) (delete-fragment *gdl-delete-fragment*) + (gdl-sparql *gdl-sparql*) (base-path *gdl-base-path*) (host-address *gdl-host-address*) (host-file *gdl-host-file*)) @@ -56,6 +58,10 @@ (push (create-regex-dispatcher delete-fragment #'delete-handler) + hunchentoot:*dispatch-table*) + + (push + (create-regex-dispatcher gdl-sparql #'gdl-tm-sparql) hunchentoot:*dispatch-table*)) @@ -212,4 +218,19 @@ (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) (setf (hunchentoot:content-type*) "text") (format nil "Topic \"~a\" not found" psi))))) - (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) \ No newline at end of file + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) + + +(defun gdl-tm-sparql (&optional param) + "Returns a JSON object representing a SPARQL response." + (declare (Ignorable param)) + (if (eql (hunchentoot:request-method*) :POST) + (let ((external-format (flexi-streams:make-external-format + :UTF-8 :eol-style :LF))) + (let ((sparql-request (hunchentoot:raw-post-data + :external-format external-format + :force-text t))) + (export-construct-as-isidorus-json-string + (make-instance 'SPARQL-Query :query sparql-request + :revision 0)))) + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))) \ No newline at end of file

1 0

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

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 00:29:32 2011 New Revision: 917 Log: 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 Mon Sep 19 00:11:51 2011 (r916) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Mon Sep 19 00:29:32 2011 (r917) @@ -63,7 +63,7 @@ this.mainPanel.setPixelSize(1024, 700); this.navigationPanel.add(this.createNewButton); try{ - this.requestHashObjectPsis(); + this.requestPsis(); } catch(ExecutionException e){ Window.alert("could not create web page, because: (" + e.getClass() + ") " + e.getMessage()); this.resetPage(); @@ -78,7 +78,7 @@ try{ this.psiContainer = new PsiContainer(new PsiClickHandler()); - this.requestHashObjectPsis(); + this.requestPsis(); this.navigationPanel.add(this.createNewButton); }catch(Exception e){ Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); @@ -86,12 +86,13 @@ } - private void requestHashObjectPsis() throws ExecutionException { + private void requestPsis() throws ExecutionException { String url = null; if(IsidorusConstants.HASH_OBJECT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_HASH_OBJECT_PSIS_URL); else if(IsidorusConstants.ENVIRONMENT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_ENVIRONMENT_PSIS_URL); else throw new ExecutionException("the topic type PSI " + GdlWebPage.this.topicTypePsi + " is not supported!"); RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + try{ builder.sendRequest(null, new PsiRequest()); }catch(RequestException e){ @@ -185,8 +186,7 @@ GdlWebPage.this.psiContainer.addPsi(psiString); } - GdlWebPage.this.psiContainer.insertIn(GdlWebPage.this.navigationPanel); - } else { + GdlWebPage.this.psiContainer.insertIn(GdlWebPage.this.navigationPanel); } else { Window.alert("could not request existing instances of " + GdlWebPage.this.topicTypePsi + ", because(" + response.getStatusCode() + "): " + response.getStatusText()); GdlWebPage.this.resetPage(); }

1 0

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

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 00:11:51 2011 New Revision: 916 Log: gdl-frontend: Widgets: fixed a bug in the reset method of the class GdlWebPage 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/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/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Sep 16 01:00:13 2011 (r915) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Mon Sep 19 00:11:51 2011 (r916) @@ -19,8 +19,8 @@   -  - <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.EnvironmentUi"/> + <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.HashObjectUi"/> +   <source path="base"/> Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Fri Sep 16 01:00:13 2011 (r915) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 19 00:11:51 2011 (r916) @@ -38,6 +38,9 @@ public final String GET_REQUEST_URL = IsidorusConstants.GET_FRAGMENT_REQUEST_URL; + public CommitCallback(){} + + @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) { try{ @@ -205,7 +208,6 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { 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()); } @@ -267,11 +269,9 @@ builder.sendRequest(delObj.toString(), new HashObjectDeleteRequest(delObj.toString(), this.objectToBeSend)); }catch(RequestException e){ Window.alert("could not update the topic " + delObj); - //TODO: reset page } } else { Window.alert("could not commit the topic with the psi " + psi + " since it already exists"); - //TODO: reset page } } else if(404 == response.getStatusCode() && !edited) { try{ @@ -281,11 +281,9 @@ commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); }catch(RequestException e){ Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); - // TODO: reset page } } else { Window.alert("could not commit the topic with the psi " + psi + ", because: " + response.getStatusCode() + ": " + response.getStatusText()); - // TODO: reset page } } @@ -409,13 +407,10 @@ @Override public void onError(Request request, Throwable exception) { Window.alert("could not commit the data: " + this.objectToBeSend); - // TODO: reset page } } - - - + private class HashObjectDeleteRequest implements RequestCallback{ private String objectToBeDeleted = null; private String objectToBeSend = null; @@ -441,7 +436,6 @@ commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); }catch(RequestException e){ Window.alert("could not commit the data: " + this.objectToBeSend); - // TODO: reset web page } } else { Window.alert("update operation of the object " + this.objectToBeDeleted + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); @@ -452,7 +446,6 @@ @Override public void onError(Request request, Throwable exception) { Window.alert("could not update the data: " + this.objectToBeDeleted); - // TODO: reset web page } } @@ -474,7 +467,6 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { 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()); } @@ -484,7 +476,6 @@ @Override public void onError(Request request, Throwable exception) { Window.alert("could not commit the data: " + this.objectToBeSend); - // TODO: reset page } } } 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 Fri Sep 16 01:00:13 2011 (r915) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Mon Sep 19 00:11:51 2011 (r916) @@ -59,9 +59,9 @@ } RootPanel.get("GWT_Content").add(this.mainPanel); - mainPanel.add(this.navigationPanel); - mainPanel.setPixelSize(1024, 700); - navigationPanel.add(createNewButton); + this.mainPanel.add(this.navigationPanel); + this.mainPanel.setPixelSize(1024, 700); + this.navigationPanel.add(this.createNewButton); try{ this.requestHashObjectPsis(); } catch(ExecutionException e){ @@ -79,6 +79,7 @@ try{ this.psiContainer = new PsiContainer(new PsiClickHandler()); this.requestHashObjectPsis(); + this.navigationPanel.add(this.createNewButton); }catch(Exception e){ Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); }

1 0

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

16 Sep '11

Author: lgiessmann Date: Fri Sep 16 01:00:13 2011 New Revision: 915 Log: gdl-frontend: Widgets: finalised the page for http://textgrid.org/serviceregistry/model/types/Environment Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/EnvironmentUi.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json 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/GdlWebPage.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Sep 16 00:45:21 2011 (r914) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Sep 16 01:00:13 2011 (r915) @@ -19,7 +19,8 @@   - <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.HashObjectUi"/> +  + <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.EnvironmentUi"/>  <source path="base"/> Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/EnvironmentUi.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/EnvironmentUi.java Fri Sep 16 01:00:13 2011 (r915) @@ -0,0 +1,17 @@ +package us.isidor.gdl.anaToMia.Widgets.isidorus; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.Window; + + +public class EnvironmentUi implements EntryPoint { + @Override + public void onModuleLoad() { + try{ + GdlWebPage page = new GdlWebPage(IsidorusConstants.ENVIRONMENT_PSI); + page.createWebPage(); + }catch(Exception e){ + Window.alert("could not create a web page, because: (" + e.getClass() + ") " + e.getMessage()); + } + } +} 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 Fri Sep 16 00:45:21 2011 (r914) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Fri Sep 16 01:00:13 2011 (r915) @@ -95,7 +95,7 @@ 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()); + Window.alert("could not request existing instances of " + GdlWebPage.this.topicTypePsi + ", because(" + e.getClass() + "): " + e.getMessage()); GdlWebPage.this.resetPage(); } } @@ -107,7 +107,7 @@ try{ if(GdlWebPage.this.gdlPanel != null) GdlWebPage.this.gdlPanel.removeFromParent(); ArrayList<Pair<String, TopicIdentifierTypes>> topicsToCreate = new ArrayList<Pair<String, TopicIdentifierTypes>>(); - topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(IsidorusConstants.HASH_OBJECT_PSI, TopicIdentifierTypes.SubjectIdentifier)); + topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(GdlWebPage.this.topicTypePsi, TopicIdentifierTypes.SubjectIdentifier)); GdlWebPage.this.gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160); GdlWebPage.this.mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); @@ -186,7 +186,7 @@ GdlWebPage.this.psiContainer.insertIn(GdlWebPage.this.navigationPanel); } else { - Window.alert("could not request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + response.getStatusCode() + "): " + response.getStatusText()); + Window.alert("could not request existing instances of " + GdlWebPage.this.topicTypePsi + ", because(" + response.getStatusCode() + "): " + response.getStatusText()); GdlWebPage.this.resetPage(); } } @@ -200,7 +200,7 @@ 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); + Window.alert("could not request existing instances of " + GdlWebPage.this.topicTypePsi + ", because(" + eClass + "): " + message); GdlWebPage.this.resetPage(); } } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json Fri Sep 16 01:00:13 2011 (r915) @@ -0,0 +1,20 @@ +[ + "http://textgrid.org/serviceregistry/environment/env-1", + "http://textgrid.org/serviceregistry/environment/env-2", + "http://textgrid.org/serviceregistry/environment/env-3", + "http://textgrid.org/serviceregistry/environment/env-4", + "http://textgrid.org/serviceregistry/environment/env-5", + "http://textgrid.org/serviceregistry/environment/env-6", + "http://textgrid.org/serviceregistry/environment/env-7", + "http://textgrid.org/serviceregistry/test-env-1", + "http://textgrid.org/serviceregistry/environment/env-8", + "http://textgrid.org/serviceregistry/environment/env-9", + "http://textgrid.org/serviceregistry/environment/env-10", + "http://textgrid.org/serviceregistry/environment/env-11", + "http://textgrid.org/serviceregistry/environment/env-12", + "http://textgrid.org/serviceregistry/environment/env-13", + "http://textgrid.org/serviceregistry/environment/env-14", + "http://textgrid.org/serviceregistry/environment/env-15", + "http://textgrid.org/serviceregistry/environment/env-16", + "http://textgrid.org/serviceregistry/environment/env-17" +] \ No newline at end of file

1 0

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

16 Sep '11

Author: lgiessmann Date: Fri Sep 16 00:45:21 2011 New Revision: 914 Log: gdl-frontend: Widgets: excluded the implementation that creates the gdl web page to the class GdlWebPage, so theat this instace create HashObjectUI and EnvironmentUi pages Added: 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/HashObjectUi.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.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/GdlWebPage.java Fri Sep 16 00:45:21 2011 (r914) @@ -0,0 +1,207 @@ +package us.isidor.gdl.anaToMia.Widgets.isidorus; + +import java.util.ArrayList; +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; +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.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; +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; + + +public class GdlWebPage { + private String topicTypePsi = null; + private HorizontalPanel mainPanel = new HorizontalPanel(); + private VerticalPanel navigationPanel = new VerticalPanel(); + private Button createNewButton = new Button("create new"); + private PsiContainer psiContainer = null; + private GdlPanel gdlPanel = null; + private final String GDL_PANEL_STYLE_NAME = "gdl_panel"; + private final String CREATE_NEW_BUTTON_STYLE_NAME = "create_new_button"; + + + public GdlWebPage(String topicTypePsi) throws ExecutionException{ + if(topicTypePsi == null) throw new ExecutionException("topicTypePsi must not be null"); + this.topicTypePsi = topicTypePsi; + } + + + public void createWebPage(){ + this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); + DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em"); + try{ + GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler()); + this.psiContainer = new PsiContainer(new PsiClickHandler()); + this.createNewButton.addClickHandler(new CreateNewClickHandler()); + }catch(Exception e){ + Window.alert("could not create web page, because: (" + e.getClass() + ") " + e.getMessage()); + this.resetPage(); + } + + RootPanel.get("GWT_Content").add(this.mainPanel); + mainPanel.add(this.navigationPanel); + mainPanel.setPixelSize(1024, 700); + navigationPanel.add(createNewButton); + try{ + this.requestHashObjectPsis(); + } catch(ExecutionException e){ + Window.alert("could not create web page, because: (" + e.getClass() + ") " + e.getMessage()); + this.resetPage(); + } + } + + + public void resetPage() { + if(gdlPanel != null) this.gdlPanel.removeFromParent(); + if(this.psiContainer != null) this.psiContainer.removeFromParent(); + if(this.createNewButton != null) this.createNewButton.removeFromParent(); + + try{ + this.psiContainer = new PsiContainer(new PsiClickHandler()); + this.requestHashObjectPsis(); + }catch(Exception e){ + Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); + } + } + + + private void requestHashObjectPsis() throws ExecutionException { + String url = null; + if(IsidorusConstants.HASH_OBJECT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_HASH_OBJECT_PSIS_URL); + else if(IsidorusConstants.ENVIRONMENT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_ENVIRONMENT_PSIS_URL); + else throw new ExecutionException("the topic type PSI " + GdlWebPage.this.topicTypePsi + " is not supported!"); + 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()); + GdlWebPage.this.resetPage(); + } + } + + + private class CreateNewClickHandler implements ClickHandler { + @Override + public void onClick(ClickEvent event) { + try{ + if(GdlWebPage.this.gdlPanel != null) GdlWebPage.this.gdlPanel.removeFromParent(); + ArrayList<Pair<String, TopicIdentifierTypes>> topicsToCreate = new ArrayList<Pair<String, TopicIdentifierTypes>>(); + topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(IsidorusConstants.HASH_OBJECT_PSI, TopicIdentifierTypes.SubjectIdentifier)); + GdlWebPage.this.gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160); + GdlWebPage.this.mainPanel.add(gdlPanel); + gdlPanel.setTmEngine(new JtmsTmEngine()); + gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); + gdlPanel.setCommitCallback(new CommitCallback()); + gdlPanel.setDeleteCallback(new DeleteCallback()); + gdlPanel.addStyleName(GdlWebPage.this.GDL_PANEL_STYLE_NAME); + gdlPanel.loadSchema(); + }catch(Exception e){ + e.printStackTrace(); + Window.alert("could not instantiate the GdlPanel, because(" + e.getClass() + "): " + e.getMessage()); + GdlWebPage.this.resetPage(); + } + } + } + + + private class PsiClickHandler implements ClickHandler { + @Override + public void onClick(ClickEvent event) { + Object obj = event.getSource(); + if(obj instanceof Label){ + Label source = (Label)obj; + try{ + if(GdlWebPage.this.gdlPanel != null) GdlWebPage.this.gdlPanel.removeFromParent(); + GdlWebPage.this.gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 362, 160); + GdlWebPage.this.mainPanel.add(gdlPanel); + gdlPanel.setTmEngine(new JtmsTmEngine()); + gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); + gdlPanel.setCommitCallback(new CommitCallback()); + gdlPanel.setDeleteCallback(new DeleteCallback()); + gdlPanel.loadSchema(); + gdlPanel.addStyleName(GdlWebPage.this.GDL_PANEL_STYLE_NAME); + Window.scrollTo(0, 0); + }catch(Exception e){ + e.printStackTrace(); + Window.alert("could not instantiate the GdlPanel, because(" + e.getClass() + "): " + e.getMessage()); + GdlWebPage.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(""); + } + } + + + 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()); + GdlWebPage.this.resetPage(); + } + for(int psisIdx = 0; psisIdx != psis.size(); ++psisIdx){ + JSONValue psiVal = psis.get(psisIdx); + JSONString psiString = null; + if(psiVal != null) psiString = psiVal.isString(); + GdlWebPage.this.psiContainer.addPsi(psiString); + } + + GdlWebPage.this.psiContainer.insertIn(GdlWebPage.this.navigationPanel); + } else { + Window.alert("could not request existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object, because(" + response.getStatusCode() + "): " + response.getStatusText()); + GdlWebPage.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); + GdlWebPage.this.resetPage(); + } + } +} 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 Fri Sep 16 00:21:15 2011 (r913) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Fri Sep 16 00:45:21 2011 (r914) @@ -1,196 +1,17 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; - -import java.util.ArrayList; - -import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; -import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; -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; -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.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; 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 = null; - private GdlPanel gdlPanel = null; - private final String GDL_PANEL_STYLE_NAME = "gdl_panel"; - private final String CREATE_NEW_BUTTON_STYLE_NAME = "create_new_button"; - - @Override public void onModuleLoad() { - this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); - DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em"); - try{ - GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler()); - this.psiContainer = new PsiContainer(new PsiClickHandler()); - this.createNewButton.addClickHandler(new CreateNewClickHandler()); - }catch(Exception 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.setPixelSize(1024, 700); - navigationPanel.add(createNewButton); - this.requestHashObjectPsis(); - } - - - public void resetPage(){ - if(gdlPanel != null) this.gdlPanel.removeFromParent(); - if(this.psiContainer != null) this.psiContainer.removeFromParent(); - if(this.createNewButton != null) this.createNewButton.removeFromParent(); - try{ - this.psiContainer = new PsiContainer(new PsiClickHandler()); + GdlWebPage page = new GdlWebPage(IsidorusConstants.HASH_OBJECT_PSI); + page.createWebPage(); }catch(Exception e){ - Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); - this.resetPage(); - } - 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()); - HashObjectUi.this.resetPage(); - } - } - - - private class CreateNewClickHandler implements ClickHandler { - @Override - public void onClick(ClickEvent event) { - try{ - if(HashObjectUi.this.gdlPanel != null) HashObjectUi.this.gdlPanel.removeFromParent(); - ArrayList<Pair<String, TopicIdentifierTypes>> topicsToCreate = new ArrayList<Pair<String, TopicIdentifierTypes>>(); - topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(IsidorusConstants.HASH_OBJECT_PSI, TopicIdentifierTypes.SubjectIdentifier)); - HashObjectUi.this.gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160); - HashObjectUi.this.mainPanel.add(gdlPanel); - gdlPanel.setTmEngine(new JtmsTmEngine()); - gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); - gdlPanel.setCommitCallback(new CommitCallback()); - gdlPanel.setDeleteCallback(new DeleteCallback()); - gdlPanel.addStyleName(HashObjectUi.this.GDL_PANEL_STYLE_NAME); - gdlPanel.loadSchema(); - }catch(Exception e){ - e.printStackTrace(); - Window.alert("could not instantiate the GdlPanel, because(" + e.getClass() + "): " + e.getMessage()); - HashObjectUi.this.resetPage(); - } - } - } - - - private class PsiClickHandler implements ClickHandler { - @Override - public void onClick(ClickEvent event) { - Object obj = event.getSource(); - if(obj instanceof Label){ - Label source = (Label)obj; - try{ - if(HashObjectUi.this.gdlPanel != null) HashObjectUi.this.gdlPanel.removeFromParent(); - HashObjectUi.this.gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 362, 160); - HashObjectUi.this.mainPanel.add(gdlPanel); - gdlPanel.setTmEngine(new JtmsTmEngine()); - gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); - gdlPanel.setCommitCallback(new CommitCallback()); - gdlPanel.setDeleteCallback(new DeleteCallback()); - gdlPanel.loadSchema(); - gdlPanel.addStyleName(HashObjectUi.this.GDL_PANEL_STYLE_NAME); - Window.scrollTo(0, 0); - }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(""); - } - } - - - 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(); + Window.alert("could not create a web page, because: (" + e.getClass() + ") " + 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 Fri Sep 16 00:21:15 2011 (r913) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Fri Sep 16 00:45:21 2011 (r914) @@ -18,5 +18,6 @@ //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 GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; public final static String TEXTGRID_LOGO_URL = GWT.getModuleBaseURL() + "textgrid_small.png"; }

1 0

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

16 Sep '11

Author: lgiessmann Date: Fri Sep 16 00:21:15 2011 New Revision: 913 Log: gdl-frontend: Widgets: finalised the page for http://textgrid.org/serviceregistry/model/types/Hash-Object 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 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/HashObjectUi.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 06:20:12 2011 (r912) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Fri Sep 16 00:21:15 2011 (r913) @@ -44,6 +44,7 @@ @Override public void onModuleLoad() { this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); + DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em"); try{ GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler()); this.psiContainer = new PsiContainer(new PsiClickHandler()); @@ -62,7 +63,17 @@ public void resetPage(){ - // TODO: implement + if(gdlPanel != null) this.gdlPanel.removeFromParent(); + if(this.psiContainer != null) this.psiContainer.removeFromParent(); + if(this.createNewButton != null) this.createNewButton.removeFromParent(); + + try{ + this.psiContainer = new PsiContainer(new PsiClickHandler()); + }catch(Exception e){ + Window.alert("could not create web page, becuase: (" + e.getClass() + ") " + e.getMessage()); + this.resetPage(); + } + this.requestHashObjectPsis(); } 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 06:20:12 2011 (r912) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Fri Sep 16 00:21:15 2011 (r913) @@ -19,6 +19,11 @@ private final String PSI_LABEL_STYLE_CLASS = "psi_label"; + public void removeFromParent(){ + this.containerPanel.removeFromParent(); + } + + public PsiContainer(ClickHandler labelClikcHandler) throws ExecutionException{ if(labelClikcHandler == null) throw new ExecutionException("labelClickHandler must not be null"); this.lblClickHandler = labelClikcHandler; @@ -40,6 +45,7 @@ break; } } + if(widgetIdx == this.containerPanel.getWidgetCount()) this.containerPanel.add(lbl); if(this.lblClickHandler != null)lbl.addClickHandler(this.lblClickHandler); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Thu Sep 15 06:20:12 2011 (r912) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Fri Sep 16 00:21:15 2011 (r913) @@ -10,6 +10,7 @@ text-align: center; } + .sendButton { display: block; font-size: 16pt; @@ -60,6 +61,12 @@ background-color: rgb(134, 169, 203); } + +image { + border-style: none; +} + + .gdl_panel { margin-left:auto; margin-right:0;

1 0

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

15 Sep '11

Author: lgiessmann Date: Thu Sep 15 06:20:12 2011 New Revision: 912 Log: gdl-frontend: Widgets: added the style for the create new button Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.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/HashObjectUi.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 06:01:45 2011 (r911) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 06:20:12 2011 (r912) @@ -37,10 +37,13 @@ private Button createNewButton = new Button("create new"); private PsiContainer psiContainer = null; private GdlPanel gdlPanel = null; + private final String GDL_PANEL_STYLE_NAME = "gdl_panel"; + private final String CREATE_NEW_BUTTON_STYLE_NAME = "create_new_button"; @Override public void onModuleLoad() { + this.createNewButton.addStyleName(this.CREATE_NEW_BUTTON_STYLE_NAME); try{ GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler()); this.psiContainer = new PsiContainer(new PsiClickHandler()); @@ -52,7 +55,6 @@ RootPanel.get("GWT_Content").add(this.mainPanel); mainPanel.add(this.navigationPanel); - mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1024, 700); navigationPanel.add(createNewButton); this.requestHashObjectPsis(); @@ -84,12 +86,13 @@ if(HashObjectUi.this.gdlPanel != null) HashObjectUi.this.gdlPanel.removeFromParent(); ArrayList<Pair<String, TopicIdentifierTypes>> topicsToCreate = new ArrayList<Pair<String, TopicIdentifierTypes>>(); topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(IsidorusConstants.HASH_OBJECT_PSI, TopicIdentifierTypes.SubjectIdentifier)); - HashObjectUi.this.gdlPanel = new GdlPanel(null, topicsToCreate, 400, 400); + HashObjectUi.this.gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160); HashObjectUi.this.mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); gdlPanel.setCommitCallback(new CommitCallback()); gdlPanel.setDeleteCallback(new DeleteCallback()); + gdlPanel.addStyleName(HashObjectUi.this.GDL_PANEL_STYLE_NAME); gdlPanel.loadSchema(); }catch(Exception e){ e.printStackTrace(); @@ -108,13 +111,14 @@ Label source = (Label)obj; try{ 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.gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 362, 160); HashObjectUi.this.mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); gdlPanel.setCommitCallback(new CommitCallback()); gdlPanel.setDeleteCallback(new DeleteCallback()); gdlPanel.loadSchema(); + gdlPanel.addStyleName(HashObjectUi.this.GDL_PANEL_STYLE_NAME); Window.scrollTo(0, 0); }catch(Exception e){ e.printStackTrace(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Thu Sep 15 06:01:45 2011 (r911) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Thu Sep 15 06:20:12 2011 (r912) @@ -58,4 +58,14 @@ margin-top: 5px; margin-bottom: 5px; background-color: rgb(134, 169, 203); +} + +.gdl_panel { + margin-left:auto; + margin-right:0; + margin-top: 2em; +} + +.create_new_button { + margin-bottom: 2em; } \ No newline at end of file

1 0

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

15 Sep '11

Author: lgiessmann Date: Thu Sep 15 06:01:45 2011 New Revision: 911 Log: gdl-frontend: Widgets: added the style for the navigation-psi list 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 Thu Sep 15 05:49:55 2011 (r910) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.css Thu Sep 15 06:01:45 2011 (r911) @@ -32,3 +32,30 @@ #closeButton { margin: 15px 6px 6px; } + +.psi_label { + cursor: pointer; +} + + +.psi_label:hover { + font-size: larger; + border: rgb(134, 169, 203) 1px solid; + border-radius: 5px; + padding-left: 2px; + padding-right: 2px; + margin-top: 5px; + margin-bottom: 5px; +} + + +.psi_label:active { + font-size: larger; + border: rgb(134, 169, 203) 1px solid; + border-radius: 5px; + padding-left: 2px; + padding-right: 2px; + margin-top: 5px; + margin-bottom: 5px; + background-color: rgb(134, 169, 203); +} \ No newline at end of file

1 0

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

15 Sep '11

Author: lgiessmann Date: Thu Sep 15 05:49:55 2011 New Revision: 910 Log: gdl-frontend: Widgets: replaced some hard coded strings (psis/urls) by constants 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/HashObjectUi.java 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/PsiContainer.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/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Thu Sep 15 05:15:35 2011 (r909) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Thu Sep 15 05:49:55 2011 (r910) @@ -36,7 +36,6 @@ 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; - public final String HASH_VALUE_OCCURRENCE_TYPE = "http://textgrid.org/serviceregistry/model/value"; @Override @@ -238,7 +237,7 @@ 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(IsidorusConstants.HASH_VALUE_OCCURRENCE_TYPE); String[] xsdString = Utils.splitUriByLastFragment(IsidorusConstants.XSD_STRING); JSONObject delObj = new JSONObject(); @@ -361,7 +360,7 @@ if(typeReference == null) continue; Pair<String, TopicIdentifierTypes> typeRef = this.computeReferenceUri(typeReference, prefixes); - if(typeRef != null && typeRef.getSecond().equals(TopicIdentifierTypes.SubjectIdentifier) && typeRef.getFirst().equals(CommitCallback.this.HASH_VALUE_OCCURRENCE_TYPE)) return occurrence; + if(typeRef != null && typeRef.getSecond().equals(TopicIdentifierTypes.SubjectIdentifier) && typeRef.getFirst().equals(IsidorusConstants.HASH_VALUE_OCCURRENCE_TYPE)) return occurrence; } return null; 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 05:15:35 2011 (r909) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/HashObjectUi.java Thu Sep 15 05:49:55 2011 (r910) @@ -5,10 +5,8 @@ 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; 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 Thu Sep 15 05:15:35 2011 (r909) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Thu Sep 15 05:49:55 2011 (r910) @@ -11,6 +11,7 @@ public final static String TOPIC_MAP_IDENTIFIER = "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm"; public final static String HASH_OBJECT_PSI = "http://textgrid.org/serviceregistry/model/types/Hash-Object"; public final static String ENVIRONMENT_PSI = "http://textgrid.org/serviceregistry/model/types/Environment"; + public final static String HASH_VALUE_OCCURRENCE_TYPE = "http://textgrid.org/serviceregistry/model/value"; 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/"; 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 05:15:35 2011 (r909) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/PsiContainer.java Thu Sep 15 05:49:55 2011 (r910) @@ -16,6 +16,7 @@ private ArrayList<Label> psiLabels = new ArrayList<Label>(); private VerticalPanel containerPanel = new VerticalPanel(); private ClickHandler lblClickHandler = null; + private final String PSI_LABEL_STYLE_CLASS = "psi_label"; public PsiContainer(ClickHandler labelClikcHandler) throws ExecutionException{ @@ -28,6 +29,7 @@ if(psi == null) return; Label lbl = new Label(psi); + lbl.addStyleName(this.PSI_LABEL_STYLE_CLASS); this.psiLabels.add(lbl); int widgetIdx = 0; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html Thu Sep 15 05:15:35 2011 (r909) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/GDL_Widgets.html Thu Sep 15 05:49:55 2011 (r910) @@ -47,7 +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"/> + <a href="http://www.textgrid.org/"><image style="position:fixed; bottom:0px; right:0px" src="http://127.0.0.1:8888/gdl_widgets/textgrid_small.png"/></a> </center> </body> </html>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

isidorus-cvs