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

[isidorus-cvs] r639 - trunk/src/ajax/javascripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 07:08:08 2011 New Revision: 639 Log: fixed ticket #114 => added a delete button and functionality for associations to the UI Modified: trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js Mon Jul 18 05:08:51 2011 (r638) +++ trunk/src/ajax/javascripts/constants.js Mon Jul 18 07:08:08 2011 (r639) @@ -24,7 +24,7 @@ var SUMMARY_URL = HOST_PREF + "json/summary"; var MARK_AS_DELETED_URL = HOST_PREF + "mark-as-deleted"; var TM_OVERVIEW = HOST_PREF + "json/tmcl/overview/"; -var TIMEOUT = 30000; // const TIMEOUT = 10000 --> "const" doesn't work under IE +var TIMEOUT = 60000; // const TIMEOUT = 10000 --> "const" doesn't work under IE @@ -94,6 +94,7 @@ "topicPsis" : function(){ return "topicPsis"; }, "removeLink" : function(){ return "removeLink"; }, "removeNameRow" : function(){ return "removeOccurrenceRow"; }, + "removeAssociationRow" : function(){ return "removeAssociationRow"; }, "removeOccurrenceRow" : function(){ return "removeNameRow"; }, "removeTopicRow" : function(){ return "removeTopicRow"; } }; Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js Mon Jul 18 05:08:51 2011 (r638) +++ trunk/src/ajax/javascripts/datamodel.js Mon Jul 18 07:08:08 2011 (r639) @@ -433,6 +433,18 @@ for(var i = 0; i !== values.length; ++i)values[i] = encodeURI(values[i]); return values; }, + "reset" : function(){ + if(!this.__container__.__frames__) return; + + for(var i = 0; i != this.__container__.__frames__.length; ++i) + this.__container__.__frames__[i].remove(); + + while(this.__container__.__frames__.length != 0)this.__container__.__frames__.shift(); + + new TextrowC("", ".*", this.__container__, 1, -1, null); + this.__error__.insert({"before" : this.__container__.__frames__[0].getFrame()}); + + }, "toJSON" : function(unique, removeNull){ var content = this.getContent(unique, removeNull); return content.length === 0 ? "null" : content.toJSON(); @@ -3678,6 +3690,13 @@ }); } setDblClickHandler(this); + + // --- mark-as-deleted + if(contents){ + var myself = this; + this.__table__.insert({"bottom" : makeRemoveLink(function(event){ + makeRemoveObject("Association", myself); + }, "delete Association")});} } catch(err){ alert("From AssociationC(): " + err); @@ -4359,6 +4378,7 @@ case "delete Occurrence" : trClass = CLASSES.removeOccurrenceRow(); break; case "delete Topic" : trClass = CLASSES.removeTopicRow(); break; case "delete Name" : trClass = CLASSES.removeNameRow(); break; + case "delete Association" : trClass = CLASSES.removeAssociationRow(); break; } var tr = new Element("tr", {"class" : trClass}).insert(new Element("td", {"colspan" : 3}).insert(link)); @@ -4372,7 +4392,7 @@ if(type !== "Occurrence" && type !== "Name" && type !== "Variant" && type !== "Topic" && type !== "Association"){ throw "From makeRemoveObject(): type must be: \"Occurrence\" || \"Name\" " + - "|| \"Topic\" but is " + type; + "|| \"Topic\" || \"Association\" but is " + type; } if (!objectToDelete){ throw "From makeRemoveObject(): objectToDelete must be set"; @@ -4418,15 +4438,18 @@ var delMessage = "null"; switch(type){ - case "Topic": + case "Topic": delMessage = "{\"type\":\"Topic\",\"delete\":" + makeJsonTopicStub(objectToDelete.getFrame()) + "}"; break; - case "Name": - case "Occurrence": + case "Name": + case "Occurrence": delMessage = "{\"type\":\"" + type + "\",\"parent\":" + - makeJsonTopicStub(objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode) + - ",\"delete\":" + objectToDelete.toJSON() + "}"; + makeJsonTopicStub(objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode) + + ",\"delete\":" + objectToDelete.toJSON() + "}"; break; + case "Association": + delMessage = "{\"type\":\"Association\",\"delete\":" + objectToDelete.toJSON() + "}"; + break; } commitDeletedObject(delMessage, function(xhr){ @@ -4434,8 +4457,14 @@ $(CLASSES.subPage()).update(); setNaviClasses($(PAGES.home)); makePage(PAGES.home, ""); - } - else if (type === "Occurrence" || type === "Name"){ + }else if(type === "Association"){ + if(objectToDelete.__owner__.__frames__.length === 1){ + objectToDelete.__itemIdentity__.reset(); + objectToDelete.disable(); + }else { + objectToDelete.remove(); + } + }else if (type === "Occurrence" || type === "Name"){ if(objectToDelete.__owner__.__frames__.length >= 1 && objectToDelete.__owner__.__frames__.length > objectToDelete.__min__){ objectToDelete.remove(); @@ -4458,6 +4487,6 @@ ii.remove(); } } - alert("Objected deleted"); + alert("Object deleted"); }); } \ No newline at end of file

1 0

[isidorus-cvs] r638 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 05:08:51 2011 New Revision: 638 Log: trunk fixed ticket #116 => the admin interface accpets requests that initiate a backup as xtm file Added: trunk/src/shell_scripts/backup-isidorus.sh (contents, props changed) Modified: trunk/src/shell_scripts/shutdown-isidorus.sh Added: trunk/src/shell_scripts/backup-isidorus.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/backup-isidorus.sh Mon Jul 18 05:08:51 2011 (r638) @@ -0,0 +1,105 @@ +#!/bin/bash +##+----------------------------------------------------------------------------- +##+ Isidorus +##+ (c) 2008-2010 Marc Kuester, Christoph Ludwig, Lukas Georgieff +##+ +##+ Isidorus is freely distributable under the LLGPL license. +##+ You can find a detailed description in trunk/docs/LLGPL-LICENSE.txt and +##+ trunk/docs/LGPL-LICENSE.txt. +##+----------------------------------------------------------------------------- + + +## This script can be used to invoke hunchentoot's admin interface and backup +## the server date. The default ip address is set to 127.0.0.1 and can be changed via +## the switch -host <ip-address>. The default url that determines the server's +## callback binding is set to /admin/backup, but this behavior can also be +## changed by using the switch -url <url-fragment>. The path variable +## contains the name of the stored xtm backup file that is created, the default +## value is a date string of the form dd.mm.yyyy:hh:mm:ss.xtm" and can be +## changed by using the switch -path <any-string>. +## A sample call would be +## ./backup-isidorus.sh -host 12.34.56.78 -url /admin/shutdown -path=backup.xtm + +url="/admin/backup"; +host="127.0.0.1:11008"; +path=`date +"%d.%m.%y:%H:%M:%S"`".xtm" + +if [ $# -eq 0 ]; then + : +elif [ $# -eq 1 -a $1 = "?" ]; then + echo "you can pass the arguments -host <host-url>, -url </url-fragment> and -path <any-string>, if no arguments are passed the default values 127.0.0.1:11008, /admin/backup and <current-data>.xtm are used"; + exit; +elif [ $# -eq 2 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and -path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 4 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 6 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + if [ $5 = "-host" ]; then + host=$6; + elif [ $5 = "-url" ]; then + url=$6; + elif [ $5 = "-path" ]; then + path=$6; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; +fi + + + + +curl $host$url"?path="$path; \ No newline at end of file Modified: trunk/src/shell_scripts/shutdown-isidorus.sh ============================================================================== --- trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 04:07:59 2011 (r637) +++ trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 05:08:51 2011 (r638) @@ -22,7 +22,7 @@ if [ $# -eq 0 ]; then : elif [ $# -eq 1 -a $1 = "?" ]; then - echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1 and 11008 are used"; + echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1:11008 and /admin/shutdown are used"; exit; elif [ $# -eq 2 ]; then if [ $1 = "-host" ]; then

1 0

[isidorus-cvs] r637 - in trunk/src: . rest_interface shell_scripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 04:07:59 2011 New Revision: 637 Log: fixed ticket #113 => hunchentoot defines a new admin interface that allows to sut down the server from a predefined ip address; each time a shut down is initiated a backup file in the working directory and the name of the form backup_dd.mm.yyyy:hh:mm:ss is created. Added: trunk/src/rest_interface/admin-interface.lisp trunk/src/shell_scripts/ trunk/src/shell_scripts/shutdown-isidorus.sh (contents, props changed) Modified: trunk/src/isidorus.asd trunk/src/rest_interface/rest-interface.lisp Modified: trunk/src/isidorus.asd ============================================================================== --- trunk/src/isidorus.asd Sun Jul 17 13:50:32 2011 (r636) +++ trunk/src/isidorus.asd Mon Jul 18 04:07:59 2011 (r637) @@ -111,6 +111,8 @@ :depends-on ("rest-interface")) (:file "set-up-json-interface" :depends-on ("rest-interface")) + (:file "admin-interface" + :depends-on ("rest-interface")) (:file "read" :depends-on ("rest-interface"))) :depends-on ("model" "atom" "xml" "TM-SPARQL" Added: trunk/src/rest_interface/admin-interface.lisp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/rest_interface/admin-interface.lisp Mon Jul 18 04:07:59 2011 (r637) @@ -0,0 +1,77 @@ +;;+----------------------------------------------------------------------------- +;;+ Isidorus +;;+ (c) 2008-2010 Marc Kuester, Christoph Ludwig, Lukas Georgieff +;;+ +;;+ Isidorus is freely distributable under the LLGPL license. +;;+ You can find a detailed description in trunk/docs/LLGPL-LICENSE.txt and +;;+ trunk/docs/LGPL-LICENSE.txt. +;;+----------------------------------------------------------------------------- + +(in-package :rest-interface) + +;;TODO: add functions to export statement + +;the prefix to get a fragment by the psi -> localhost:8000/json/get/<fragment-psi> +(defparameter *admin-backup* "/admin/backup") +;the prefix to get a fragment by the psi -> localhost:8000/json/rdf/get/<fragment-psi> +(defparameter *admin-shutdown* "/admin/shutdown") + + +(defun set-up-admin-interface () + (push + (create-regex-dispatcher *admin-backup* #'admin-backup) + hunchentoot:*dispatch-table*) + (push + (create-regex-dispatcher *admin-shutdown* #'admin-shutdown) + hunchentoot:*dispatch-table*)) + + + +(defun admin-shutdown() + (handler-case + (if (string= *admin-remote-name* (hunchentoot:remote-addr*)) + (progn + (when elephant:*store-controller* + (xtm-exporter:export-as-xtm + (concat "backup_" (make-date-string (get-universal-time)) ".xtm") + :tm-id "http://isidor.us/backup-tm" + :revision 0)) + (shutdown-json-engine) + (shutdown-atom-engine) + (shutdown-admin-server) + (close-tm-store)) ;in case the json and atom services are not running + (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) + (condition (err) + (progn + (tools:close-tm-store) + (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "closed the tm store, but:~%condition: \"~a\"" err))))) + + + + +(defun admin-backup() + (handler-case + (if (string= "127.0.0.1" (hunchentoot:remote-addr*)) + (let ((destination-path + (hunchentoot:url-decode (hunchentoot:get-parameter "path")))) + (xtm-exporter:export-as-xtm destination-path + :tm-id "http://isidor.us/backup-tm" + :revision 0)) + (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) + (condition (err) + (progn + (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "Condition: \"~a\"" err))))) + + +(defun make-date-string (universal-time) + (tools:concat + (write-to-string (nth-value 3 (decode-universal-time universal-time))) "." + (write-to-string (nth-value 4 (decode-universal-time universal-time))) "." + (write-to-string (nth-value 5 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 2 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 1 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 0 (decode-universal-time universal-time))))) \ No newline at end of file Modified: trunk/src/rest_interface/rest-interface.lisp ============================================================================== --- trunk/src/rest_interface/rest-interface.lisp Sun Jul 17 13:50:32 2011 (r636) +++ trunk/src/rest_interface/rest-interface.lisp Mon Jul 18 04:07:59 2011 (r637) @@ -30,8 +30,13 @@ :read-fragment-feed :start-json-engine :start-atom-engine + :start-admin-server :shutdown-json-engine :shutdown-atom-engine + :shutdown-admin-server + :*admin-host-name* + :*admin-port* + :*admin-remote-name* :*json-get-prefix* :*get-rdf-prefix* :*json-commit-url* @@ -69,6 +74,31 @@ (defvar *json-server-acceptor* nil) (defvar *atom-server-acceptor* nil) +(defvar *admin-server-acceptor* nil) +(defvar *admin-host-name* "127.0.0.1") +(defvar *admin-port* 11008) +(defvar *admin-remote-name* "127.0.0.1") + + +(defun start-admin-server () + (when *admin-server-acceptor* + (error "The admin-server is already running")) + (set-up-admin-interface ) + (setf hunchentoot:*show-lisp-errors-p* t) + (setf hunchentoot:*hunchentoot-default-external-format* + (flex:make-external-format :utf-8 :eol-style :lf)) + (setf *admin-server-acceptor* + (make-instance 'hunchentoot:acceptor + :address *admin-host-name* + :port *admin-port*)) + (hunchentoot:start *admin-server-acceptor*)) + + +(defun shutdown-admin-server () + "Shut down the admin server." + (when *admin-server-acceptor* + (hunchentoot:stop *admin-server-acceptor*)) + (setf *admin-server-acceptor* nil)) (defun start-json-engine (repository-path &key @@ -93,7 +123,8 @@ (defun shutdown-json-engine () "Shut down the Topic Map Engine, only the json part." - (hunchentoot:stop *json-server-acceptor*) + (when *json-server-acceptor* + (hunchentoot:stop *json-server-acceptor*)) (setf *json-server-acceptor* nil) (close-tm-store)) @@ -122,6 +153,7 @@ (defun shutdown-atom-engine () "Shut down the Topic Map Engine, only the atom part." - (hunchentoot:stop *atom-server-acceptor*) + (when *atom-server-acceptor* + (hunchentoot:stop *atom-server-acceptor*)) (setf *atom-server-acceptor* nil) (close-tm-store)) \ No newline at end of file Added: trunk/src/shell_scripts/shutdown-isidorus.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 04:07:59 2011 (r637) @@ -0,0 +1,62 @@ +#!/bin/bash +##+----------------------------------------------------------------------------- +##+ Isidorus +##+ (c) 2008-2010 Marc Kuester, Christoph Ludwig, Lukas Georgieff +##+ +##+ Isidorus is freely distributable under the LLGPL license. +##+ You can find a detailed description in trunk/docs/LLGPL-LICENSE.txt and +##+ trunk/docs/LGPL-LICENSE.txt. +##+----------------------------------------------------------------------------- + + +## This script can be used to invoke hunchentoot's admin interface and shut down +## the server. The default ip address is set to 127.0.0.1 and can be changed via +## the switch -host <ip-address>. The default url that determines the server's +## callback binding is set to /admin/shutdown, but this behavior can also be +## changed by using the switch -url <url-fragment>. +## a sample call would be ./shutdown-isidorus.sh -host 12.34.56.78 -url /admin/shutdown + +url="/admin/shutdown"; +host="127.0.0.1:11008"; + +if [ $# -eq 0 ]; then + : +elif [ $# -eq 1 -a $1 = "?" ]; then + echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1 and 11008 are used"; + exit; +elif [ $# -eq 2 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 4 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi +else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; +fi + +curl $host$url + + +

1 0

[isidorus-cvs] r636 - trunk/src/ajax/javascripts
by lgiessmann＠common-lisp.net 17 Jul '11

17 Jul '11

Author: lgiessmann Date: Sun Jul 17 13:50:32 2011 New Revision: 636 Log: trunk: fixed ticket #117 => the topic id is set in the background with a UUID if a new topic is created, otherwise the existent topic id is used Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js Sun Jul 17 09:04:35 2011 (r635) +++ trunk/src/ajax/javascripts/datamodel.js Sun Jul 17 13:50:32 2011 (r636) @@ -2218,19 +2218,21 @@ this.__instanceOfs__ = (!instanceOfs || instanceOfs.length === 0 ? null : instanceOfs); try{ - var topicidContent = null; + //var topicidContent = null; var itemIdentityContent = null; var subjectLocatorContent = null; var subjectIdentifierContent = null; var namesContent = null; var occurrencesContent = null; if(content){ - topicidContent = content.id + this.__topicidContent__ = content.id itemIdentityContent = content.itemIdentities subjectLocatorContent = content.subjectLocators; subjectIdentifierContent = content.subjectIdentifiers; namesContent = content.names; occurrencesContent = content.occurrences; + }else{ + this.__topicidContent__ = new UUID().toString(); } this.__frame__ .writeAttribute({"class" : CLASSES.topicFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.topicFrame()}); @@ -2246,9 +2248,9 @@ setMinimizeHandler(this); // --- topic id - this.__topicid__ = new Object(); - new TextrowC(topicidContent, ".*", this.__topicid__, 1, 1, null); - this.__table__.insert({"bottom" : newRow(CLASSES.topicIdFrame(), "Topic ID", this.__topicid__.__frames__[0].getFrame())}); + //this.__topicid__ = new Object(); + //new TextrowC(topicidContent, ".*", this.__topicid__, 1, 1, null); + //this.__table__.insert({"bottom" : newRow(CLASSES.topicIdFrame(), "Topic ID", this.__topicid__.__frames__[0].getFrame())}); // --- itemIdentity this.__itemIdentity__ = new ItemIdentityC(itemIdentityContent, this); @@ -2286,7 +2288,7 @@ }, "getContent" : function(){ try{ - return {"id" : this.__topicid__.__frames__[0].getContent().strip(), + return {"id" : this.__topicidContent__, "itemIdentities" : this.__itemIdentity__.getContent(true, true), "subjectLocators" : this.__subjectLocator__.getContent(true, true), "subjectIdentifiers" : this.__subjectIdentifier__.getContent(true, true), @@ -2300,7 +2302,7 @@ }, "toJSON" : function(){ try{ - return "{\"id\":" + this.__topicid__.__frames__[0].getContent().strip().toJSON() + + return "{\"id\":" + this.__topicidContent__.toJSON() + ",\"itemIdentities\":" + this.__itemIdentity__.toJSON(true, true) + ",\"subjectLocators\":" + this.__subjectLocator__.toJSON(true, true) + ",\"subjectIdentifiers\":" + this.__subjectIdentifier__.toJSON(true, true) + @@ -2314,7 +2316,7 @@ }, "minimize" : function(){ var rows = new Array(); - rows.push(this.getFrame().select("tr." + CLASSES.topicIdFrame())[0], + rows.push(//this.getFrame().select("tr." + CLASSES.topicIdFrame())[0], this.getFrame().select("tr." + CLASSES.itemIdentityFrame())[0], this.getFrame().select("tr." + CLASSES.subjectLocatorFrame())[0], this.getFrame().select("tr." + CLASSES.subjectIdentifierFrame())[0], @@ -2334,13 +2336,13 @@ }, "isValid" : function(){ var ret = true; - if(this.__topicid__.__frames__[0].getContent().strip().length === 0){ - ret = false; - this.__topicid__.__frames__[0].showError("The topic must contain a topic ID!"); - } - else { - this.__topicid__.__frames__[0].hideError(); - } + //if(this.__topicid__.__frames__[0].getContent().strip().length === 0){ + // ret = false; + // this.__topicid__.__frames__[0].showError("The topic must contain a topic ID!"); + //} + //else { + // this.__topicid__.__frames__[0].hideError(); + //} if(this.__subjectIdentifier__.getContent().length === 0){ ret = false; this.showError("The topic must contain at least one SubjectIdentifier!<br/>If it is not possible to insert one - please create a subjectidentifier-constraint for this topic (-type)!");

1 0

[isidorus-cvs] r635 - in trunk/src/ajax: . javascripts/external
by lgiessmann＠common-lisp.net 17 Jul '11

17 Jul '11

Author: lgiessmann Date: Sun Jul 17 09:04:35 2011 New Revision: 635 Log: trunk: added the files textgrid_15.07.2011.xtm that contains the lates dump and test data of the TextGrid ServiceRegistry, and UUID.js, which contains a class definition for UUID => referenced it via the isidorus.html file Added: trunk/src/ajax/javascripts/external/UUID.js Modified: trunk/src/ajax/isidorus.html Modified: trunk/src/ajax/isidorus.html ============================================================================== --- trunk/src/ajax/isidorus.html Sat Jul 16 02:30:29 2011 (r634) +++ trunk/src/ajax/isidorus.html Sun Jul 17 09:04:35 2011 (r635) @@ -44,6 +44,9 @@ <script language="JavaScript" type="text/javascript" src="javascripts/external/prototype/prototype.js"></script> <script language="JavaScript" type="text/javascript" src="javascripts/external/scriptaculous/scriptaculous.js"></script> +  + <script language="JavaScript" type="text/javascript" src="javascripts/external/UUID.js"></script> +  <script language="JavaScript" type="text/javascript" src="javascripts/constants.js"></script> <script language="JavaScript" type="text/javascript" src="javascripts/tmcl_tools.js"></script> Added: trunk/src/ajax/javascripts/external/UUID.js ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/ajax/javascripts/external/UUID.js Sun Jul 17 09:04:35 2011 (r635) @@ -0,0 +1,117 @@ +/* +uuid.js - Version 0.3 +JavaScript Class to create a UUID like identifier + +Copyright (C) 2006-2008, Erik Giberti (AF-Design), All rights reserved. + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA + +The latest version of this file can be downloaded from +http://www.af-design.com/resources/javascript_uuid.php + +HISTORY: +6/5/06 - Initial Release +5/22/08 - Updated code to run faster, removed randrange(min,max) in favor of + a simpler rand(max) function. Reduced overhead by using getTime() + method of date class (suggestion by James Hall). +9/5/08 - Fixed a bug with rand(max) and additional efficiencies pointed out + by Robert Kieffer http://broofa.com/ + +KNOWN ISSUES: +- Still no way to get MAC address in JavaScript +- Research into other versions of UUID show promising possibilities + (more research needed) +- Documentation needs improvement + +*/ + +// On creation of a UUID object, set it's initial value +function UUID(){ + this.id = this.createUUID(); +} + +// When asked what this Object is, lie and return it's value +UUID.prototype.valueOf = function(){ return this.id; } +UUID.prototype.toString = function(){ return this.id; } + +// +// INSTANCE SPECIFIC METHODS +// + +UUID.prototype.createUUID = function(){ + // + // Loose interpretation of the specification DCE 1.1: Remote Procedure Call + // described at http://www.opengroup.org/onlinepubs/009629399/apdxa.htm#tagtcjh_37 + // since JavaScript doesn't allow access to internal systems, the last 48 bits + // of the node section is made up using a series of random numbers (6 octets long). + // + var dg = new Date(1582, 10, 15, 0, 0, 0, 0); + var dc = new Date(); + var t = dc.getTime() - dg.getTime(); + var h = '-'; + var tl = UUID.getIntegerBits(t,0,31); + var tm = UUID.getIntegerBits(t,32,47); + var thv = UUID.getIntegerBits(t,48,59) + '1'; // version 1, security version is 2 + var csar = UUID.getIntegerBits(UUID.rand(4095),0,7); + var csl = UUID.getIntegerBits(UUID.rand(4095),0,7); + + // since detection of anything about the machine/browser is far to buggy, + // include some more random numbers here + // if NIC or an IP can be obtained reliably, that should be put in + // here instead. + var n = UUID.getIntegerBits(UUID.rand(8191),0,7) + + UUID.getIntegerBits(UUID.rand(8191),8,15) + + UUID.getIntegerBits(UUID.rand(8191),0,7) + + UUID.getIntegerBits(UUID.rand(8191),8,15) + + UUID.getIntegerBits(UUID.rand(8191),0,15); // this last number is two octets long + return tl + h + tm + h + thv + h + csar + csl + h + n; +} + + +// +// GENERAL METHODS (Not instance specific) +// + + +// Pull out only certain bits from a very large integer, used to get the time +// code information for the first part of a UUID. Will return zero's if there +// aren't enough bits to shift where it needs to. +UUID.getIntegerBits = function(val,start,end){ + var base16 = UUID.returnBase(val,16); + var quadArray = new Array(); + var quadString = ''; + var i = 0; + for(i=0;i<base16.length;i++){ + quadArray.push(base16.substring(i,i+1)); + } + for(i=Math.floor(start/4);i<=Math.floor(end/4);i++){ + if(!quadArray[i] || quadArray[i] == '') quadString += '0'; + else quadString += quadArray[i]; + } + return quadString; +} + +// Replaced from the original function to leverage the built in methods in +// JavaScript. Thanks to Robert Kieffer for pointing this one out +UUID.returnBase = function(number, base){ + return (number).toString(base).toUpperCase(); +} + +// pick a random number within a range of numbers +// int b rand(int a); where 0 <= b <= a +UUID.rand = function(max){ + return Math.floor(Math.random() * (max + 1)); +} + +// end of UUID class file \ No newline at end of file

1 0

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

16 Jul '11

Author: lgiessmann Date: Sat Jul 16 02:30:29 2011 New Revision: 634 Log: gdl-frontend: Widgets: added an href memeber to the class Reference Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Sat Jul 16 01:01:39 2011 (r633) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Sat Jul 16 02:30:29 2011 (r634) @@ -10,25 +10,9 @@ import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.HasBlurHandlers; import com.google.gwt.event.dom.client.HasFocusHandlers; -import com.google.gwt.event.dom.client.HasMouseDownHandlers; -import com.google.gwt.event.dom.client.HasMouseOutHandlers; -import com.google.gwt.event.dom.client.HasMouseOverHandlers; -import com.google.gwt.event.dom.client.HasMouseUpHandlers; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseDownHandler; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOutHandler; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseOverHandler; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.event.dom.client.MouseUpHandler; -import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; @@ -56,8 +40,9 @@ public GdlReference(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a Reference element for each TM-elem - this.createReference().setText("Reference"); // TODO: remove - + Reference ref = this.createReference(); // TODO: remove + ref.setText("Reference"); // TODO: remove + ref.setHref("http://www.google.de"); // TODO: remove } @@ -185,6 +170,8 @@ protected class ReferenceClickHandler implements ClickHandler { @Override public void onClick(ClickEvent event) { + Reference ref = (Reference)event.getSource(); + Window.open(ref.getHref(), "new window", null); /* TODO: implement @@ -285,13 +272,27 @@ // this class wraps a Label that is used as protected class Reference extends Label implements HasFocusHandlers, HasBlurHandlers { + private String href = ""; + public Reference(){ super(); } - public Reference(String text) { + public Reference(String text, String href) { super(text); + if(href != null) this.href = href; + } + + + public String getHref(){ + return this.href; + } + + + public void setHref(String href){ + if(href != null) this.href = href; + else this.href = ""; }

1 0

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

16 Jul '11

Author: lgiessmann Date: Sat Jul 16 01:01:39 2011 New Revision: 633 Log: gdl-frontend: Widgets: chnged the inner class Reference Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 15 09:59:54 2011 (r632) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Sat Jul 16 01:01:39 2011 (r633) @@ -10,8 +10,25 @@ import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.HasBlurHandlers; import com.google.gwt.event.dom.client.HasFocusHandlers; +import com.google.gwt.event.dom.client.HasMouseDownHandlers; +import com.google.gwt.event.dom.client.HasMouseOutHandlers; +import com.google.gwt.event.dom.client.HasMouseOverHandlers; +import com.google.gwt.event.dom.client.HasMouseUpHandlers; +import com.google.gwt.event.dom.client.MouseDownEvent; +import com.google.gwt.event.dom.client.MouseDownHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.event.dom.client.MouseUpEvent; +import com.google.gwt.event.dom.client.MouseUpHandler; +import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; @@ -39,7 +56,8 @@ public GdlReference(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a Reference element for each TM-elem - this.createReference().setText("Reference"); + this.createReference().setText("Reference"); // TODO: remove + } @@ -185,6 +203,85 @@ } + /* + protected class Reference extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseDownHandlers, HasMouseUpHandlers, HasMouseOutHandlers, HasMouseOverHandlers { + Hyperlink link = new Hyperlink(); + + + public Reference(){ + initWidget(link); + } + + + public Reference(String text){ + this(); + this.link.setText(text); + } + + + public Reference(String text, String href){ + this(text); + this.link.setTargetHistoryToken(href); + } + + + public String getText(){ + return this.link.getText(); + } + + + public void setText(String text){ + this.link.setText(text); + } + + + public String getHref(){ + return this.link.getTargetHistoryToken(); + } + + + public void setHref(String text){ + this.link.setTargetHistoryToken(text); + } + + + @Override + public HandlerRegistration addBlurHandler(BlurHandler handler) { + return this.addDomHandler(handler, BlurEvent.getType()); + } + + + @Override + public HandlerRegistration addFocusHandler(FocusHandler handler) { + return this.addDomHandler(handler, FocusEvent.getType()); + } + + + @Override + public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { + return this.addDomHandler(handler, MouseOverEvent.getType()); + } + + + @Override + public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { + return this.addDomHandler(handler, MouseOutEvent.getType()); + } + + + @Override + public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { + return this.addDomHandler(handler, MouseUpEvent.getType()); + } + + + @Override + public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { + return this.addDomHandler(handler, MouseDownEvent.getType()); + } + } + */ + // this class wraps a Label that is used as protected class Reference extends Label implements HasFocusHandlers, HasBlurHandlers { @@ -192,9 +289,11 @@ super(); } - public Reference(String text){ + + public Reference(String text) { super(text); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Jul 15 09:59:54 2011 (r632) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Sat Jul 16 01:01:39 2011 (r633) @@ -20,7 +20,6 @@ import us.isidor.gdl.anaToMia.Widgets.value.PositiveNumUnitValue; import us.isidor.gdl.anaToMia.Widgets.value.TextAlignValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; - import com.google.gwt.dom.client.Style.FontStyle; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 15 09:59:54 2011 (r632) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Sat Jul 16 01:01:39 2011 (r633) @@ -39,6 +39,7 @@ {"subject_identifiers":["[gdl:background-color]"], "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:font-weight]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, {"subject_identifiers":["[gdl:View]"]}, {"subject_identifiers":["[gdl:Text]"]}, @@ -50,8 +51,8 @@ {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, - {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:text-decoration]", "value":"underline"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, - {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, + {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:text-decoration]", "value":"underline"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:font-weight]", "value":"bold"}]}, + {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[gdl:Value]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[doc:pos-of-title-1]"], "instance_of":["si:[gdl:Position]"]},

1 0

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

15 Jul '11

Author: lgiessmann Date: Fri Jul 15 09:59:54 2011 New Revision: 632 Log: gdl-frontend: Widgets: added TODO.txt Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt ============================================================================== --- /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/TODO.txt Fri Jul 15 09:59:54 2011 (r632) @@ -0,0 +1,8 @@ +1. Use a Hyperlink element in GdlReference instead of the inner class Reference +2. Implement GdlLineBreak +3. Implement TopicMaps data consumption +4. Implement TopicMaps data generation +3. Implement GdlButton(s) +4. Implement GdlButton(s) positioning +6. ImplementGdlVisibleObject => (de)registerButtonCallback +7. Fix css-handlers \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Jul 15 09:50:21 2011 (r631) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Jul 15 09:59:54 2011 (r632) @@ -9,7 +9,5 @@ public GdlTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); - // TODO Auto-generated constructor stub } - // TODO: implement }

1 0

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

15 Jul '11

Author: lgiessmann Date: Fri Jul 15 09:50:21 2011 New Revision: 631 Log: gdl-frontend: Widgets: fixed a bug when setting a GdlView's padding property Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java 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/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 15 08:12:14 2011 (r630) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 15 09:50:21 2011 (r631) @@ -1455,6 +1455,12 @@ this.setMarginBottom(widget, this.getMarginBottom(styleClass), styleClass); this.setMarginLeft(widget, this.getMarginLeft(styleClass), styleClass); + this.setPadding(widget, this.getPadding(styleClass), styleClass); + this.setPaddingTop(widget, this.getPaddingTop(styleClass), styleClass); + this.setPaddingRight(widget, this.getPaddingRight(styleClass), styleClass); + this.setPaddingBottom(widget, this.getPaddingBottom(styleClass), styleClass); + this.setPaddingLeft(widget, this.getPaddingLeft(styleClass), styleClass); + this.setBorderColor(widget, this.getBorderColor(styleClass), styleClass); this.setBorderTopColor(widget, this.getBorderTopColor(styleClass), styleClass); this.setBorderRightColor(widget, this.getBorderRightColor(styleClass), styleClass); 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 Fri Jul 15 08:12:14 2011 (r630) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Jul 15 09:50:21 2011 (r631) @@ -3,7 +3,6 @@ import java.util.ArrayList; import com.google.gwt.event.shared.EventHandler; -import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 15 08:12:14 2011 (r630) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 15 09:50:21 2011 (r631) @@ -185,6 +185,7 @@ } + // this class wraps a Label that is used as protected class Reference extends Label implements HasFocusHandlers, HasBlurHandlers { public Reference(){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Jul 15 08:12:14 2011 (r630) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Jul 15 09:50:21 2011 (r631) @@ -48,6 +48,12 @@ super(tmRepresentative); // TODO: create a text element for each TM-elem this.createNewTextArea().setText("Text"); // TODO: remove only for debugging + //NumUnitValue val = this.getPaddingBottom(null); // TODO: remove + //String str = "null"; + //if(val != null) str = val.getCssValue(); + //if(val != null) DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", str); + //DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", "20px"); + //Window.alert(">> " + str); } @@ -652,6 +658,12 @@ this.setMarginRight(source, this.getMarginRight(null), null); this.setMarginBottom(source, this.getMarginBottom(null), null); this.setMarginLeft(source, this.getMarginLeft(null), null); + + this.setPadding(source, this.getPadding(null), null); + this.setPaddingTop(source, this.getPaddingTop(null), null); + this.setPaddingRight(source, this.getPaddingRight(null), null); + this.setPaddingBottom(source, this.getPaddingBottom(null), null); + this.setPaddingLeft(source, this.getPaddingLeft(null), null); this.setBorderColor(source, this.getBorderColor(null), null); this.setBorderTopColor(source, this.getBorderTopColor(null), null); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 15 08:12:14 2011 (r630) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 15 09:50:21 2011 (r631) @@ -27,23 +27,31 @@ {"subject_identifiers":["[gdl:Text-Object]"]}, {"subject_identifiers":["[gdl:Position]"]}, {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:margin-left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:margin-top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:margin-bottom]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:padding]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:padding-bottom]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:margin]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:text-decoration]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:nth-element]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:background-color]"], "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":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"blue"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, + {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, {"subject_identifiers":["[gdl:View]"]}, {"subject_identifiers":["[gdl:Text]"]}, {"subject_identifiers":["[gdl:Title]"]}, {"subject_identifiers":["[gdl:Reference]"]}, {"subject_identifiers":["[gdl:List]"]}, - {"subject_identifiers":["[doc:list-item-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_1_id", "datatype":"[xsd:ID]"}]}, - {"subject_identifiers":["[doc:list-item-3]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_3_id", "datatype":"[xsd:ID]"}]}, - {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}]}, + {"subject_identifiers":["[doc:list-item-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}, {"type":"si:[gdl:margin-bottom]", "value":"5px"}]}, + {"subject_identifiers":["[doc:list-item-3]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_3_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding-bottom]", "value":"5px"}]}, + {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, - {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}]}, - {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}]}, - {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}]}, + {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, + {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:text-decoration]", "value":"underline"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, + {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[gdl:Value]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[doc:pos-of-title-1]"], "instance_of":["si:[gdl:Position]"]}, @@ -64,7 +72,7 @@ {"subject_identifiers":["[doc:nth-elem-3]"], "instance_of":["si:[gdl:Nth-Element]"], "occurrences":[{"type":"si:[gdl:nth-value]", "value":"8"}]}, {"subject_identifiers":["[gdl:TM-Instance-Value]"]}, {"subject_identifiers":["[gdl:TM-Multiple-Type-Value]"]}, - {"subject_identifiers":["[doc:person-list]"], "instance_of":["si:[gdl:List]"], "occurrences":[{"type":"si:[gdl:id]", "value":"person_list_1_id", "datatype":"[xsd:ID]"}]}, + {"subject_identifiers":["[doc:person-list]"], "instance_of":["si:[gdl:List]"], "occurrences":[{"type":"si:[gdl:id]", "value":"person_list_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin]", "value":"50px"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}]}, {"subject_identifiers":["[gdl:tm-binding]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]},

1 0

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

15 Jul '11

Author: lgiessmann Date: Fri Jul 15 08:12:14 2011 New Revision: 630 Log: gdl-frontend: Widgets: fixed a bug when setting a GdlView's style properties Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 15 08:12:14 2011 (r630) @@ -1397,7 +1397,7 @@ // sets the background-color style property of this element by using the GWT DOM class - public void setBackgroundColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { + public void setBackgroundColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null) this.setCssProperty(widget, styleClass, "backgroundColor", value.getCssValue()); } @@ -1425,7 +1425,7 @@ // sets a given css property and css value of this element's sub element protected void setCssProperty(Widget elem, String styleClass, String cssProperty, String cssValue)throws InvalidGdlSchemaException, ExecutionException{ if(cssValue == null || cssProperty == null) return; - + if(styleClass == null){ DOM.setStyleAttribute(elem.getElement(), cssProperty, cssValue); } else if(styleClass.equals(GdlPsis.Scope.gdlActive)){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Jul 15 08:12:14 2011 (r630) @@ -2,7 +2,6 @@ import java.util.ArrayList; - import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; @@ -10,9 +9,7 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.RootPanel; @@ -34,8 +31,6 @@ requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); gdlPanel = new GdlPanel(null, requestedTopicsToCreate); - gdlPanel.setPixelSize(450, 450); - DOM.setStyleAttribute(gdlPanel.getElement(), "backgroundColor", "yellow"); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Jul 15 08:12:14 2011 (r630) @@ -30,7 +30,7 @@ public GdlListBox(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a ListBox element for each TM-elem - this.createNewListBox(); + this.createNewListBox().addItem("List-Box"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 15 08:12:14 2011 (r630) @@ -39,7 +39,7 @@ public GdlReference(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a Reference element for each TM-elem - this.createReference(); + this.createReference().setText("Reference"); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Jul 15 08:12:14 2011 (r630) @@ -47,7 +47,7 @@ public GdlText(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a text element for each TM-elem - this.createNewTextArea(); // TODO: remove only for debugging + this.createNewTextArea().setText("Text"); // TODO: remove only for debugging } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Jul 15 08:12:14 2011 (r630) @@ -61,12 +61,12 @@ public GdlTitle(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a Title element for each TM-elem - this.createTitle(); + this.createTitle().setText("Title"); } // sets the list Element to either ol or ul depending on the gdl:ordered property - public void createTitle() throws InvalidGdlSchemaException, ExecutionException { + public TitleWidget createTitle() throws InvalidGdlSchemaException, ExecutionException { // this object is able to own only one sub-element TitleWidget title = new TitleWidget(this.getTitleOrder()); ActiveStyleHandler asHandler = new ActiveStyleHandler(this); @@ -83,6 +83,7 @@ title.addBlurHandler(fsHandler); super.addToContainerPanel(title); this.setGdlStyle(title); + return title; } // returns a PositiveNumUnitValue instance that represents the text font-size of this element. Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,39 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.dom.client.Style.Float; -import com.google.gwt.dom.client.Style.Overflow; -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.DomEvent; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.user.client.ui.Widget; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; -import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; -import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; -import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; -import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlCreatorAssociationView extends GdlAssociationView { @@ -43,19 +16,6 @@ // TODO Auto-generated constructor stub } - @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Topic getTmRepresentative() { - // TODO Auto-generated method stub - return null; - } - // TODO: implement - @Override public boolean validate() { @@ -70,355 +30,6 @@ } @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void setMargin(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMarginTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMarginRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMarginBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMarginLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderTopColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderRightColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderBottomColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderLeftColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderTopStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderRightStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderBottomStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderLeftStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderTopWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderRightWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderBottomWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderLeftWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderTopRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderBottomRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderBottomLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBorderTopLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setPadding(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setPaddingTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setPaddingRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setPaddingBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setPaddingLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMinWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMaxWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMinHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setMaxHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setCursor(Widget widget, CursorValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void setBackgroundColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override - public void onHoverEnd(MouseOutEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override - public void onFocusEnd(BlurEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override - public void onActiveEnd(MouseUpEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - @Override public ArrayList<String> getStringValue() { // TODO Auto-generated method stub return null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,34 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.DomEvent; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; -import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; -import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; -import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; -import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlDefaultCreatorTopicView extends GdlDefaultTopicView{ @@ -39,438 +17,31 @@ // TODO Auto-generated constructor stub } - + @Override - public String getViewName() { + public ArrayList<String> getStringValue() { // TODO Auto-generated method stub return null; } @Override - public Topic getTmRepresentative() { + public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { // TODO Auto-generated method stub return null; } - - + + @Override public boolean validate() { // TODO Auto-generated method stub return false; } + @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - - - @Override - public void setMargin(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPadding(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setCursor(Widget widget, CursorValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBackgroundColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverEnd(MouseOutEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusEnd(BlurEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveEnd(MouseUpEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,14 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.event.dom.client.ClickHandler; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; @@ -23,20 +18,6 @@ @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public Topic getTmRepresentative() { - // TODO Auto-generated method stub - return null; - } - - - @Override public boolean validate() { // TODO Auto-generated method stub return false; @@ -48,12 +29,6 @@ return null; } - @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - @Override public ArrayList<String> getStringValue() { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,38 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.dom.client.Style.Float; -import com.google.gwt.dom.client.Style.Overflow; -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.DomEvent; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.user.client.ui.Widget; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; -import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; -import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; -import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlEditorAssociationView extends GdlAssociationView { @@ -51,13 +25,6 @@ @Override - public Topic getTmRepresentative() { - // TODO Auto-generated method stub - return null; - } - - - @Override public boolean validate() { // TODO Auto-generated method stub return false; @@ -68,399 +35,7 @@ // TODO Auto-generated method stub return null; } - - @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void setMargin(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPadding(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setCursor(Widget widget, CursorValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBackgroundColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverEnd(MouseOutEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusEnd(BlurEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveEnd(MouseUpEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - + @Override public ArrayList<String> getStringValue() { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,37 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.dom.client.Style.Float; -import com.google.gwt.dom.client.Style.Overflow; -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.DomEvent; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.user.client.ui.Widget; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; -import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; -import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; -import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlSpecialCreatorTopicView extends GdlSpecialTopicView{ // TODO: implement @@ -43,21 +18,6 @@ @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public Topic getTmRepresentative() { - // TODO Auto-generated method stub - return null; - } - - - - @Override public boolean validate() { // TODO Auto-generated method stub return false; @@ -69,401 +29,6 @@ return null; } - @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - - - - @Override - public void setMargin(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPadding(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setCursor(Widget widget, CursorValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBackgroundColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverEnd(MouseOutEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusEnd(BlurEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveEnd(MouseUpEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - @Override public ArrayList<String> getStringValue() { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Fri Jul 15 08:12:14 2011 (r630) @@ -1,37 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - -import com.google.gwt.dom.client.Style.Float; -import com.google.gwt.dom.client.Style.Overflow; -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.DomEvent; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.MouseDownEvent; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseUpEvent; -import com.google.gwt.user.client.ui.Widget; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; -import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; -import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; -import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlSpecialEditorTopicView extends GdlSpecialTopicView{ @@ -44,20 +19,6 @@ } - @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public Topic getTmRepresentative() { - // TODO Auto-generated method stub - return null; - } - - @Override public boolean validate() { @@ -71,400 +32,6 @@ return null; } - @Override - public void registerButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterButtonCallback(ClickHandler handler, String id) { - // TODO Auto-generated method stub - - } - - - - - @Override - public void setMargin(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMarginLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftStyle(Widget widget, BorderStyleValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRightWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderLeftWidth(Widget widget, AbsoluteNumValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomRightRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderBottomLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBorderTopLeftRadius(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPadding(Widget widget, NumUnitValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingTop(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingRight(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingBottom(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setPaddingLeft(Widget widget, NumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxWidth(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMinHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setMaxHeight(Widget widget, AutoNumUnitValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setCursor(Widget widget, CursorValue value, String styleClass) - throws InvalidGdlSchemaException, ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void setBackgroundColor(Widget widget, ColorValue value, - String styleClass) throws InvalidGdlSchemaException, - ExecutionException { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onHoverEnd(MouseOutEvent event, HoverStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onFocusEnd(BlurEvent event, FocusStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } - - - @Override - public void onActiveEnd(MouseUpEvent event, ActiveStyleHandler handler) { - // TODO Auto-generated method stub - - } @Override Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Fri Jul 15 08:12:14 2011 (r630) @@ -94,7 +94,7 @@ this.setZindex(this.getZindex()); this.setFloat(this.getFloat()); this.setClear(this.getClear()); - super.setGdlStyle(this); + this.setGdlStyle(this.mainPanel); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 15 04:29:35 2011 (r629) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 15 08:12:14 2011 (r630) @@ -28,6 +28,10 @@ {"subject_identifiers":["[gdl:Position]"]}, {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[gdl:nth-element]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:background-color]"], "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":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"blue"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, {"subject_identifiers":["[gdl:View]"]}, {"subject_identifiers":["[gdl:Text]"]}, {"subject_identifiers":["[gdl:Title]"]}, @@ -78,7 +82,6 @@ {"subject_identifiers":["[gdl:Default-Creator-Topic-View]"]}, {"subject_identifiers":["[gdl:Default-Editor-Topic-View]"]}, {"subject_identifiers":["[gdl:Special-Creator-Topic-View]"]}, - {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[doc:default-creator-topic-view-2]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 2", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_2_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[doc:default-editor-topic-view]"], "instance_of":["si:[gdl:Default-Editor-Topic-View]"], "names":[{"value": "Def. Editor View", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_editor_topic_view_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[doc:special-creator-topic-view]"], "instance_of":["si:[gdl:Special-Creator-Topic-View]"], "names":[{"value": "Spec. Creator View", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"special_creator_topic_view_id", "datatype":"[xsd:ID]"}]},

1 0