Author: lgiessmann Date: Wed Sep 21 00:32:20 2011 New Revision: 944 Log: gdl-frontend: Widgets: fixed some error messages 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/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json 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 Tue Sep 20 06:06:20 2011 (r943) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Wed Sep 21 00:32:20 2011 (r944) @@ -1,6 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -13,10 +14,10 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_GDL_Create_HashObject.jtm"; - public final static String GET_HASH_OBJECT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; - //public final static String GET_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; - public final static String GET_ENVIRONMENT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; - //public final static String GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; + //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_full_TMCL_and_GDL_Schema.jtm"; + //public final static String GET_HASH_OBJECT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; + public final static String GET_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; + //public final static String GET_ENVIRONMENT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; + public final static String GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Tue Sep 20 06:06:20 2011 (r943) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Wed Sep 21 00:32:20 2011 (r944) @@ -42,11 +42,11 @@ ArrayList<String> options = new ArrayList<String>(); // get the explicitly set TM-Values and Literal-Values. - // if no values were set explecitly, get the values for the constraint + // if no values were set explicitly, get the values for the constraint ArrayList<String> exLiteralValues = this.getLiterals(); ArrayList<Topic> exTmValues = this.getTmValues(); if(exLiteralValues.size() != 0 && exTmValues.size() != 0){ - throw new InvalidGdlSchemaException("found literal values and tm values for the value group " + TmHelper.getAnyIdOfTopic(this.getValueGroup()) + ", but mixin literal and tm-values for a value group is not allowed!"); + throw new InvalidGdlSchemaException("found literal values and tm values for the value group " + TmHelper.getAnyIdOfTopic(this.getValueGroup()) + ", but mixing literal and tm-values for a value group is not allowed!"); } else if(exLiteralValues.size() != 0){ options = exLiteralValues; } else if(exTmValues.size() != 0){ @@ -65,7 +65,7 @@ if(tmValues.size() != 0){ for (Topic topic : tmValues) options.add(this.getTopicRepresentation(topic, this.getDisplayByOfValueGroup(), this.getPreferredScopeOfValueGroup())); } else { - throw new InvalidGdlSchemaException("found no value to display for the value-group" + TmHelper.getAnyIdOfTopic(this.getValueGroup())); + throw new InvalidGdlSchemaException("found no value to display for the value-group " + TmHelper.getAnyIdOfTopic(this.getValueGroup())); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json Tue Sep 20 06:06:20 2011 (r943) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/EnvironmentPsis.json Wed Sep 21 00:32:20 2011 (r944) @@ -1,23 +1 @@ -{ - "topics": - [ - "<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 +{"topics":["<http:\/\/textgrid.org\/serviceregistry\/environment\/env>","<http:\/\/textgrid.org\/serviceregistry\/environment\/new-env>","<http:\/\/textgrid.org\/serviceregistry\/environment\/old-env>","<http:\/\/textgrid.org\/serviceregistry\/environment\/test-env>"]} \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json Tue Sep 20 06:06:20 2011 (r943) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/HashObjectPsis.json Wed Sep 21 00:32:20 2011 (r944) @@ -1,101 +1 @@ -{ - "topics": - [ - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash1>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash2>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash3>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash4>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash5>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash6>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash7>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash8>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash9>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash10>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash11>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash12>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash13>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash14>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash15>", - "<http://textgrid.org/serviceregistry/test-hash-2>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash16>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash17>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash18>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash19>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash20>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash21>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash22>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash23>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash24>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash25>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash26>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash27>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash28>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash29>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash30>", - "<http://textgrid.org/serviceregistry/test-hash-31>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash32>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash33>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash34>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash35>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash36>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash37>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash38>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash39>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash40>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash41>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash42>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash43>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash44>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash45>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash46>", - "<http://textgrid.org/serviceregistry/test-hash-47>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash1>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash2>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash3>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash4>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash5>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash6>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash7>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash8>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash9>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash10>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash11>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash12>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash13>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash14>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash15>", - "<http://textgrid.org/serviceregistry/test-hash-2>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash16>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash17>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash18>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash19>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash20>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash21>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash22>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash23>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash24>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash25>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash26>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash27>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash28>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash29>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash30>", - "<http://textgrid.org/serviceregistry/test-hash-31>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash32>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash33>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash34>", - "<http://textgrid.org/serviceregistry/hash-object/environment-4/hash35>", - "<http://textgrid.org/serviceregistry/hash-object/environment-3/hash36>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash37>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash38>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash39>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash40>", - "<http://textgrid.org/serviceregistry/hash-object/environment-2/hash41>", - "<http://textgrid.org/serviceregistry/hash-object/environment-1/hash42>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash43>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash44>", - "<http://textgrid.org/serviceregistry/hash-object/environment-5/hash45>", - "<http://textgrid.org/serviceregistry/hash-object/environment-6/hash46>", - "<http://textgrid.org/serviceregistry/test-hash-47>" - ] -} \ No newline at end of file +{"topics":["<http:\/\/textgrid.org\/serviceregistry\/hash-object\/env\/new-key>","<http:\/\/textgrid.org\/serviceregistry\/hash-object\/old-env\/key-value>"]} \ No newline at end of file