[isidorus-cvs] r1002 - in trunk/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base war/gdl_widgets
lgiessmann at common-lisp.net
lgiessmann at common-lisp.net
Mon Oct 17 15:14:13 UTC 2011
Author: lgiessmann
Date: Mon Oct 17 08:14:12 2011
New Revision: 1002
Log:
gdl-frontend: Widgets: fixed some bugs in the TMCL-definition for the new (test-)GDL-Schema; implemented a new test-class
Added:
trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java
Modified:
trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm
trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm.txt
Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java
==============================================================================
--- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Oct 17 03:28:30 2011 (r1001)
+++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Oct 17 08:14:12 2011 (r1002)
@@ -1,33 +1,89 @@
package us.isidor.gdl.anaToMia.Widgets.base;
-
-import us.isidor.gdl.anaToMia.Widgets.isidorus.LoadScreenPanel;
-
+import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine;
+import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
+import us.isidor.gdl.anaToMia.Widgets.isidorus.CommitCallback;
+import us.isidor.gdl.anaToMia.Widgets.isidorus.DeleteCallback;
+import us.isidor.gdl.anaToMia.Widgets.isidorus.LoadSchemaCallback;
+import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback;
+import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback;
+import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback;
+import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
+import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes;
import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.user.client.Timer;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.http.client.RequestException;
+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.RootPanel;
+import com.google.gwt.dom.client.TextAreaElement;
+import java.util.ArrayList;
public class TestClass implements EntryPoint{
+ public final String MODEL_PREF = "http://services.org/serviceregistry/model/types/";
+ public final String SERVICE_PSI = MODEL_PREF + "Service";
+ public final String SORT_SERVICE = "http://service.org/serviceregistry/psis/service/sort-service";
+ HorizontalPanel mainPanel = new HorizontalPanel();
+ GdlPanel gdlPanel = null;
+
@Override
public void onModuleLoad() {
- RootPanel.get().setHeight("1500px");
- RootPanel.get().setWidth("2500px");
- Window.enableScrolling(false);
- final LoadScreenPanel lsp = new LoadScreenPanel("Title", "message");
- RootPanel.get().add(lsp);
-
- Timer t = new Timer() {
- @Override
- public void run() {
- lsp.removeFromParent();
- Window.enableScrolling(true);
- }
- };
-
- t.schedule(5000);
-
-
+ try{
+ RootPanel.get("GWT_Content").add(mainPanel);
+ mainPanel.setBorderWidth(1);
+ mainPanel.setPixelSize(1000, 600);
+
+ ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
+ requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>(SERVICE_PSI, TopicIdentifierTypes.SubjectIdentifier));
+
+ Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>(SORT_SERVICE, TopicIdentifierTypes.SubjectIdentifier);
+ gdlPanel = new GdlPanel(requestedTopicToEdit, null);
+
+ GdlPanel.addClickHandler("hash_object_reset_button_id", new 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("");
+ }
+ });
+
+ mainPanel.add(gdlPanel);
+ gdlPanel.setTmEngine(new JtmsTmEngine());
+ gdlPanel.setLoadSchemaCallback(new TestLoadSchemaCallback());
+ gdlPanel.setCommitCallback(new ICommitCallback() {
+ @Override
+ public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) {
+ Window.alert("not implemented yet :-(");
+ }
+ });
+ gdlPanel.setDeleteCallback(new IDeleteCallback() {
+ @Override
+ public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) {
+ Window.alert("not implemented yet :-(");
+ }
+ });
+
+ Button requestButton = new Button("load schema");
+ requestButton.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ gdlPanel.loadSchema();
+ }
+ });
+
+ mainPanel.add(requestButton);
+ }catch(Exception e){
+ e.printStackTrace();
+ Window.alert(">> e >> " + e.getClass() + " >> " + e.getMessage());
+ }
}
}
Added: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestLoadSchemaCallback.java Mon Oct 17 08:14:12 2011 (r1002)
@@ -0,0 +1,122 @@
+package us.isidor.gdl.anaToMia.Widgets.base;
+
+
+import java.util.ArrayList;
+import com.google.gwt.core.client.GWT;
+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.user.client.Window;
+import us.isidor.gdl.anaToMia.Widgets.base.ButtonDialog;
+import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel;
+import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;
+import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback;
+import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
+import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes;
+
+
+// this class can be used as a callback that requests the Topic Map data
+// addressable by the URI requestUrl
+public class TestLoadSchemaCallback implements ILoadSchemaCallback{
+ private final String requestUrl = URL.encode(GWT.getModuleBaseURL() + "Service_GDL_Schema.jtm");
+ private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>();
+ private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null;
+ private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, requestUrl);
+
+
+ public TestLoadSchemaCallback(){}
+
+
+ // this method is invoked as a callback method
+ @Override
+ public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> requestedTopicToEdit , ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException {
+ this.requestedTopicsToCreate = requestedTopicsToCreate;
+ this.requestedTopicToEdit = requestedTopicToEdit;
+ requestBuilder.sendRequest(null, new RequestCallbackImpl(panel));
+ }
+
+
+ // this method implements the actual request and a simple error handling
+ private class RequestCallbackImpl implements RequestCallback{
+ private GdlPanel panel = null;
+
+
+ @SuppressWarnings("unused")
+ private RequestCallbackImpl() {}
+
+
+ public RequestCallbackImpl(GdlPanel panel){
+ this.panel = panel;
+ }
+
+
+ @Override
+ public void onResponseReceived(Request request, Response response) {
+ if(Response.SC_OK == response.getStatusCode()){
+ try{
+ if(panel.getTmEngine() == null || panel.getSchemaTm() == null) throw new ExecutionException("no Topic Maps engine was set yet");
+ panel.getTmEngine().importTopicMap(response.getText(), panel.getSchemaTm());
+ panel.createView();
+ }catch(ExecutionException e){
+ Window.alert("Execution Error: " + e.getMessage());
+ }catch(Exception e){
+ Window.alert("panel: " + panel + ", tm: " + panel.getSchemaTm() + "\ncaught error: " + e.getLocalizedMessage()); // TODO: implement smarter error handling
+ e.printStackTrace();
+ }
+ } else {
+ final ButtonDialog dialog = new ButtonDialog("Connection Error", "The request to " + requestUrl + " failed\n" + response.getStatusCode() + ": " + response.getStatusText(), "retry", "cancel", null, null);
+ dialog.setLeftButtonClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ dialog.hide();
+ try{
+ loadSchema(panel, TestLoadSchemaCallback.this.requestedTopicToEdit, TestLoadSchemaCallback.this.requestedTopicsToCreate);
+ }catch(Exception e){
+ Window.alert("connection to : " + requestUrl + " failed: " + e.getMessage());
+ }
+ }
+ });
+
+ dialog.setRightButtonClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ dialog.hide();
+ }
+ });
+
+ dialog.center();
+ }
+ }
+
+
+ @Override
+ public void onError(Request request, Throwable exception) {
+ final ButtonDialog dialog = new ButtonDialog("Connection Error", "The request to " + requestUrl + " failed\n" + exception.getMessage(), "retry", "cancel", null, null);
+ dialog.setLeftButtonClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ dialog.hide();
+ try{
+ loadSchema(panel, TestLoadSchemaCallback.this.requestedTopicToEdit, TestLoadSchemaCallback.this.requestedTopicsToCreate);
+ }catch(Exception e){
+ Window.alert("connection to : " + requestUrl + " failed: " + e.getMessage());
+ }
+ }
+ });
+
+ dialog.setRightButtonClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ dialog.hide();
+ }
+ });
+
+ dialog.center();
+ }
+ }
+}
Modified: trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm
==============================================================================
--- trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm Mon Oct 17 03:28:30 2011 (r1001)
+++ trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm Mon Oct 17 08:14:12 2011 (r1002)
@@ -3,7 +3,10 @@
"prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/",
"tmdm":"http://psi.topicmaps.org/iso13250/model/",
"model":"http://services.org/serviceregistry/model/",
- "types":"http://services.org/serviceregistry/model/types",
+ "gdl":"http://psi.isidor.us/gdl/",
+ "gdlt":"http://psi.isidor.us/gdl/types/",
+ "gdlsrv":"http://service.org/serviceregistry/gdl/",
+ "types":"http://services.org/serviceregistry/model/types/",
"srv":"http://service.org/serviceregistry/"},
"item_type":"topicmap",
@@ -12,6 +15,7 @@
{"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:occurrence-type]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:association-type]"], "instance_of":["si:[tmcl:topic-type]"]},
@@ -19,6 +23,11 @@
{"subject_identifiers":["[tmcl:card-max]"], "instance_of":["si:[tmcl:occurrence-type]"]},
{"subject_identifiers":["[tmcl:regexp]"], "instance_of":["si:[tmcl:occurrence-type]"]},
{"subject_identifiers":["[tmcl:datatype]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[tmcl:allowed-reifier]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[tmcl:allowed]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[tmcl:allows]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[tmcl:constrained-scope]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[tmcl:constrained-scope-topic]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]", "si:[tmcl:role-type]"]},
{"subject_identifiers":["[tmcl:subject-identifier-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:subject-locator-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
@@ -26,9 +35,13 @@
{"subject_identifiers":["[tmcl:topic-name-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:topic-occurrence-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:regular-expression-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:variant-name-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:occurrence-datatype-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:topic-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:association-role-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:reifier-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:scope-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[tmcl:scope-required-constraint]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]},
{"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:association-type]"]},
{"subject_identifiers":["[tmcl:constrained-topic-type]"], "instance_of":["si:[tmcl:association-type]"]},
@@ -48,7 +61,7 @@
{"subject_identifiers":["[model:endpoint]"], "instance_of":["si:[tmcl:role-type]"]},
{"subject_identifiers":["[model:service]"], "instance_of":["si:[tmcl:role-type]"]},
{"subject_identifiers":["[types:Scope-Type]"], "instance_of":["si:[tmcl:topic-type]"]},
- {"subject_identifiers":["[model:symbolic-name]"], "instance_of":["si:[types:Scope-Topic]"]},
+ {"subject_identifiers":["[model:symbolic-name]"], "instance_of":["si:[types:Scope-Type]"]},
{"subject_identifiers":["[types:Language]"], "instance_of":["si:[tmcl:topic-type]"]},
{"subject_identifiers":["[model:german]"], "instance_of":["si:[types:Language]"]},
{"subject_identifiers":["[model:english]"], "instance_of":["si:[types:Language]"]},
@@ -90,7 +103,70 @@
{"subject_identifiers":["[model:endpoint-role-ii-constraint]"], "instance_of":["si:[tmcl:item-identifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:regexp]", "value":"^.+$"}]},
{"subject_identifiers":["[model:endpoint-role-reifier-constraint]"], "instance_of":["si:[tmcl:reifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-max]", "value":"1"}]},
{"subject_identifiers":["[model:service-role-ii-constraint]"], "instance_of":["si:[tmcl:item-identifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:regexp]", "value":"^.+$"}]},
- {"subject_identifiers":["[model:service-role-reifier-constraint]"], "instance_of":["si:[tmcl:reifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-max]", "value":"1"}]}
+ {"subject_identifiers":["[model:service-role-reifier-constraint]"], "instance_of":["si:[tmcl:reifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-max]", "value":"1"}]},
+
+
+ {"subject_identifiers":["[gdlt:Schema]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]},
+ {"subject_identifiers":["[gdlt:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]},
+ {"subject_identifiers":["[gdlt:Visible-Object]"]},
+ {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:padding-left]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:cursor]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:color]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:View]"]},
+ {"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:tm-binding]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:container]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:descriptor]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:tm-construct]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:value-group]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:tm-value]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:value-binding]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:view-binding]"], "instance_of":["si:[tmcl:association-type]"]},
+ {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]},
+ {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]},
+ {"subject_identifiers":["[gdlt:Topic-View]"]},
+ {"subject_identifiers":["[gdlt:Default-Topic-View]"]},
+ {"subject_identifiers":["[gdlt:Default-Editor-Topic-View]"]},
+ {"subject_identifiers":["[gdlt:Value]"]},
+ {"subject_identifiers":["[gdlt:TM-Value]"]},
+ {"subject_identifiers":["[gdlt:TM-Single-Type-Value]"]},
+ {"subject_identifiers":["[gdlt:Literal-Value]"]},
+ {"subject_identifiers":["[gdl:literal-value]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:Default-Value]"]},
+ {"subject_identifiers":["[gdl:fixed]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:Default-Literal-Value]"]},
+ {"subject_identifiers":["[gdlt:Text-Object]"]},
+ {"subject_identifiers":["[gdl:font-size]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:Text]"]},
+ {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:Position]"]},
+ {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]},
+ {"subject_identifiers":["[gdlt:Value-Group]"]},
+ {"subject_identifiers":["[gdlt:Button]"]},
+ {"subject_identifiers":["[gdlt:Action-Button]"]},
+ {"subject_identifiers":["[gdlt:Delete-Button]"]},
+
+ {"subject_identifiers":["[gdlsrv:service-schema]"], "instance_of":["si:[gdlt:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for a Service UI"}]},
+ {"subject_identifiers":["[gdlsrv:service-default-editor-topic-view]"], "instance_of":["si:[gdlt:Default-Editor-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Editor Topic View for instances of http://services.org/serviceregistry/model/types/Service"}], "occurrences":[{"type":"si:[gdl:id]", "value":"service_default_editor_topic_view_id"}, {"type":"si:[gdl:width]", "value":"552px"}, {"type":"si:[gdl:height]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}]},
+ {"subject_identifiers":["[gdlsrv:service-editor-view-binding]"], "instance_of":["si:[gdlt:TM-Single-Type-Value]"]},
+
+ {"subject_identifiers":["[gdlsrv:service-psis-text]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"service_psis_text_id"}, {"type":"si:[gdl:readonly]", "value":"false"}, {"type":"si:[gdl:width]", "value":"470px"},{"type":"si:[gdl:cursor]", "value":"text"}]},
+ {"subject_identifiers":["[gdlsrv:service-psis-text-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]},
+ {"subject_identifiers":["[gdlsrv:service-psis-text-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}
],
"associations": [{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-name-constraint]"}]},
@@ -101,9 +177,13 @@
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:regular-expression-constraint]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-role-constraint]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:association-role-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:scope-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:scope-required-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:reifier-constraint]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:variant-name-constraint]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[types:Scope-Type]"},{"type":"si:[tmdm:subtype]", "player":"si:[types:Language]"}]},
{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[types:Scope-Type]"},{"type":"si:[tmdm:subtype]", "player":"si:[types:Priority]"}]},
-
+
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-psi-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[types:Service]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-sl-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[types:Service]"}]},
@@ -126,20 +206,20 @@
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-rex-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-dt-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
- {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-constraint-ii-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
+ {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-ii-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
{"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allows]", "player":"si:[model:endpoint-address-reifier-constraint]"}, {"type":"si:[tmcl:allowed]", "player":"si:[types:Reifier-Type]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-address-reifier-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint-address]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:Service]"}]},
- {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:has-endpoint]"}]},
+ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
{"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:service]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:Endpoint]"}]},
- {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:has-endpoint]"}]},
+ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
{"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint]"}]},
- {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:has-endpoint]"}]},
- {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:service]"}]},
- {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:has-endpoint]"}]},
- {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:endpoint]"}]},
+ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
+ {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:service]"}]},
+ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-endpoint-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
+ {"type":"si:[tmcl:constrained-role]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-service-role-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-ii-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
{"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allows]", "player":"si:[model:has-endpoint-reifier-constraint]"}, {"type":"si:[tmcl:allowed]", "player":"si:[types:Reifier-Type]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-reifier-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
@@ -148,16 +228,48 @@
{"type":"si:[tmcl:constrained-scope]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:has-endpoint-scope-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:Priority]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:Service]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
- {"type":"si:[tmcl:constrained-scope-topic]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:first]"}]},
+ {"type":"si:[tmcl:constrained-scope-topic]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:first]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:Endpoint]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:has-endpoint]"}]},
- {"type":"si:[tmcl:constrained-scope-topic]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[types:first]"}]},
+ {"type":"si:[tmcl:constrained-scope-topic]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-has-endpoint-scope-required-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:first]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-role-ii-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:service]"}]},
{"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allows]", "player":"si:[model:service-role-reifier-constraint]"}, {"type":"si:[tmcl:allowed]", "player":"si:[types:Reifier-Type]"}]},
{"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:service-role-reifier-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:service]"}]},
{"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-role-ii-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint]"}]},
{"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allows]", "player":"si:[model:endpoint-role-reifier-constraint]"}, {"type":"si:[tmcl:allowed]", "player":"si:[types:Reifier-Type]"}]},
- {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-role-reifier-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint]"}]}
+ {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[model:endpoint-role-reifier-constraint]"}, {"type":"si:[tmcl:constrained]", "player":"si:[model:endpoint]"}]},
+
+
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Visible-Object]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:View]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Topic-View]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Default-Topic-View]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Default-Editor-Topic-View]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Descriptor]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:TM-Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Literal-Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Default-Value]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Text-Object]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Text]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Position]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value-Group]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Button]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Action-Button]"}]},
+ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Action-Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Delete-Button]"}]},
+
+
+ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[gdlsrv:service-schema]"},{"type":"si:[gdl:containee]", "player":"si:[gdlsrv:service-default-editor-topic-view]"}]},
+ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[gdlsrv:service-editor-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[types:Service]"}]},
+ {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[gdlsrv:service-default-editor-topic-view]"},{"type":"si:[gdl:tm-value]", "player":"si:[gdlsrv:service-editor-view-binding]"}]},
+
+ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[gdlsrv:service-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[gdlsrv:service-psis-text]"}]},
+ {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[gdlsrv:service-psis-text-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[gdlsrv:service-default-editor-topic-view]"},{"type":"si:[gdl:descendant]", "player":"si:[gdlsrv:service-psis-text]"}]},
+ {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[gdlsrv:service-psis-text-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[gdlsrv:service-psis-text]"}]},
+ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[gdlsrv:service-psis-text-value-group]"},{"type":"si:[gdl:tm-construct]", "player":"si:[model:service-psi-constraint]"}]}
+
]
}
\ No newline at end of file
Modified: trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm.txt
==============================================================================
--- trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm.txt Mon Oct 17 03:28:30 2011 (r1001)
+++ trunk/src/anaToMia/GDL_Widgets/war/gdl_widgets/Service_GDL_Schema.jtm.txt Mon Oct 17 08:14:12 2011 (r1002)
@@ -1,5 +1,5 @@
-==> Service *
- ==> subject-identifier-constraint *
+==> Service **
+ ==> subject-identifier-constraint **
==> subject-locator-constraint *
==> item-identifier-constraint *
==> topic-name-constraint *
@@ -36,7 +36,7 @@
==> scope-constraint *
==> scope-required-constraint *
==> Roles
- ==> item-identifier-constraint
- ==> reifier-constraint
+ ==> item-identifier-constraint *
+ ==> reifier-constraint *
==> Type
==> Role-Player
\ No newline at end of file
More information about the Isidorus-cvs
mailing list