dojo-pkg 1.111.0

data/data/dojo-release-1.1.1-src/dojox/rpc/tests/stores/JsonRestStore.js

@@ -0,0 +1,233 @@
+dojo.provide("dojox.data.tests.stores.JsonRestStore");
+dojo.require("dojox.data.JsonRestStore");
+dojo.require("dojo.data.api.Read");
+dojo.require("dojox.rpc.Service");
+
+dojox.data.tests.stores.JsonRestStore.error = function(t, d, errData){
+	//  summary:
+	//		The error callback function to be used for all of the tests.
+	d.errback(errData);	
+}
+var testServices = new dojox.rpc.Service(dojo.moduleUrl("dojox.rpc.tests.resources", "test.smd"));
+var jsonStore = new dojox.data.JsonRestStore({service:testServices.jsonRestStore});
+
+doh.register("dojox.data.tests.stores.JsonRestStore", 
+	[
+		{
+			name: "Fetch some items",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		Simple test of a basic fetch on JsonRestStore of a simple query.
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"query", 
+					onComplete: function(items, request){
+						t.is(4, items.length);
+						d.callback(true);
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "fetch by id",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		Simple test of a basic fetch on JsonRestStore of a single item.
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"obj1", 
+					onComplete: function(item, request){
+						t.is("Object 1", item.name);
+						t.t(jsonStore.hasAttribute(item,"name"));
+						t.is(jsonStore.getValues(item,"name").length,1);
+						t.t(jsonStore.isItem(item));
+						d.callback(true);
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "Modify,save, check by id",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		Fetch an item from a query, modify and save it, and check to see if it was modified correctly
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"query", 
+					onComplete: function(items, request){
+						var now = new Date().getTime();
+						jsonStore.setValue(items[0],"updated",now);
+						jsonStore.setValue(items[0],"obj",{foo:'bar'});
+						jsonStore.setValue(items[0],"obj dup",items[0].obj);
+						jsonStore.setValue(items[0],"testArray",[1,2,3,4]);
+						jsonStore.save();
+						jsonStore.fetch({query:"obj1",
+							onComplete: function(item, request){
+								t.is("Object 1", item.name);
+								t.is(now, item.updated);
+								t.is("bar", item.obj.foo);
+								t.is(item.obj, item['obj dup']);
+								d.callback(true);
+							},
+							onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "Post, delete, and put",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		append/post an item, delete it, sort the lists, resort the list, saving each time.
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"obj1", 
+					onComplete: function(item, request){
+						var now = new Date().getTime();
+						var testArray = item.testArray;
+						var newObject = {"name":"new object"};
+						testArray.push(newObject);
+						jsonStore.save();
+						jsonStore.deleteItem(newObject,{parent:testArray});
+						jsonStore.save();
+						testArray.sort(function(obj1,obj2) { return obj1 < obj2; });
+						jsonStore.save();
+						testArray.sort(function(obj1,obj2) { return obj1 > obj2; });
+						jsonStore.save();
+						d.callback(true);
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "Revert",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		append/post an item, delete it, sort the lists, resort the list, saving each time.
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"obj1", 
+					onComplete: function(item, request){
+						jsonStore.setValue(item,"name","new name");
+						jsonStore.setValue(item,"newProp","new value");
+						jsonStore.unsetAttribute(item,"updated");
+						t.is(jsonStore.getValue(item,"name"),"new name");
+						t.is(jsonStore.getValue(item,"newProp"),"new value");
+						t.is(jsonStore.getValue(item,"updated"),undefined);
+						jsonStore.revert();
+						t.is(jsonStore.getValue(item,"name"),"Object 1");
+						t.is(jsonStore.getValue(item,"newProp"),undefined);
+						t.t(typeof jsonStore.getValue(item,"updated") == 'number');
+						d.callback(true);
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "Lazy loading",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		test lazy loading
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"query", 
+					onComplete: function(items, request){
+						/*var item = jsonStore.getValue(items,2); // sync lazy loading
+						t.is(item.name == 'Object 3');*/
+						jsonStore.getValue(items,3,function(item) { // async lazy loading
+							t.is(item.name,'Object 4');
+							d.callback(true);
+						});
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		{
+			name: "Array manipulation",
+			timeout:	10000, //10 seconds.
+			runTest: function(t) {
+				//	summary: 
+				//		test array manipulation
+				var d = new doh.Deferred();
+				jsonStore.fetch({query:"obj1", 
+					onComplete: function(item, request){
+						var testArray = item.testArray;
+						testArray.reverse();
+						testArray.unshift(testArray.pop());
+						jsonStore.onSave = function(data) {
+							t.is(data.length,1);						
+							d.callback(true);
+							jsonStore.onSave = function(){};
+						};
+						jsonStore.save();
+					},
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)});
+				return d; //Object
+			}
+		},
+		
+		{
+			name: "ReadAPI:  Fetch_20_Streaming",
+			timeout:	10000, //10 seconds.  Json can sometimes be slow.
+			runTest: function(t) {
+				//	summary: 
+				//		fetching with paging
+
+				var d = new doh.Deferred();
+				var count = 0;
+
+				function onItem(item, requestObj){
+				  t.assertTrue(typeof item == 'number');
+				  count++;
+				}
+				function onComplete(items, request){
+					t.is(5, count);
+					
+					t.is(null, items);
+					d.callback(true);
+				}
+				//Get everything...
+				jsonStore.fetch({	
+					query: "bigQuery",
+					onBegin: null,
+					count: 5,
+					onItem: onItem,
+					onComplete: onComplete,
+					onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, t, d)
+				});
+				return d; //Object
+			}
+		},
+		function testReadAPI_functionConformance(t){
+			//	summary: 
+			//		Simple test read API conformance.  Checks to see all declared functions are actual functions on the instances.
+			//	description:
+			//		Simple test read API conformance.  Checks to see all declared functions are actual functions on the instances.
+
+			var readApi = new dojo.data.api.Read();
+			var passed = true;
+
+			for(i in readApi){
+				if(i.toString().charAt(0) !== '_')
+				{
+					var member = readApi[i];
+					//Check that all the 'Read' defined functions exist on the test store.
+					if(typeof member === "function"){
+						var testStoreMember = jsonStore	[i];
+						if(!(typeof testStoreMember === "function")){
+							passed = false;
+							break;
+						}
+					}
+				}
+			}
+		}
+	]
+);
+

data/data/dojo-release-1.1.1-src/dojox/rpc/tests/test_dojo_data_model_persevere.html

@@ -0,0 +1,146 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title>dojox.Grid with Dojo.Data via binding</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+	<style type="text/css">
+		@import "../../../dojo/resources/dojo.css";
+		@import "../_grid/tundraGrid.css";
+		
+		#grid, #grid2 {
+			width: 65em;
+			height: 25em;
+			padding: 1px;
+		}
+	</style>
+	<script type="text/javascript" src="../../../dojo/dojo.js" 
+		djConfig="isDebug: true, debugAtAllCosts: false, parseOnLoad: true"></script>
+	<script type="text/javascript">
+		dojo.require("dojox.grid.Grid");
+		dojo.require("dojox.grid._data.model");
+		dojo.require("dojox.rpc.Service");
+		dojo.require("dojox.data.PersevereRestStore");
+		dojo.require("dojo.parser");
+	</script>
+	<script type="text/javascript">
+		function getRow(inRowIndex){
+			return ' ' + inRowIndex;
+		}
+		
+		
+		var layout = [
+			// view 0
+			{ type: 'dojox.GridRowView', width: '20px' },
+			// view 2
+			{ 
+				defaultCell: { width: 8, editor: dojox.grid.editors.Input, styles: 'text-align: right;'  },
+				cells: [[
+				{editor:null },
+				{ }
+			]]}
+		];
+		var persevereServices = new dojox.rpc.Service("/persevere/SMD"); // just connect to the auto-generated SMD from persevere
+		dynaStore = new dojox.data.PersevereRestStore({service:persevereServices.dyna}); // and create a store for it
+		dataModel = new dojox.grid.data.DojoData(null,null,{rowsPerPage:12,store:dynaStore,query:"46.customers",clientSort:true});
+		
+		removeItem = function() {
+			// Removes the first item in the model from the store
+			// Grid should reflect removal of the first item and items should be re-indexed
+
+			// need to specify the parent because the dynaStore is hierarchical and the grid model will 
+			// call newItem without any info who the parent
+			dynaStore.parentId="46.customers";			
+			dynaStore.deleteItem(dataModel.data[0].__dojo_data_item);
+		}
+		
+		var i = 0;
+		addItem = function() {
+			// need to specify the parent because the dynaStore is hierarchical and the grid model will 
+			// call newItem without any info who the parent
+			dynaStore.parentId="46.customers";
+			grid.addRow({firstName: "firstName", lastName: "lastName",created:new Date});
+		}
+		addItemToStore = function() {
+			// Adds a new item to the store
+			// Grid should reflect the new item.
+			dynaStore.newItem({firstName: "firstName", lastName: "lastName",created:new Date});
+		}
+		removeProperty = function() {
+			var selected = grid.selection.getSelected();
+			for (var i = 0; i < selected.length;i++) {
+				dynaStore.unsetAttribute(dataModel.getRow(selected[i]).__dojo_data_item,columns[grid.focus.cell.fieldIndex].field);
+			}
+		}
+		addProperty = function() {
+			var selected = grid.selection.getSelected();
+			if (selected.length != 1)
+				return alert("You must select one item");
+			var item = dataModel.getRow(selected[0]).__dojo_data_item;
+			console.log('select index ' + selected[0]);
+			console.log('row ' , item);
+			var key = prompt("What would you like to name the new property?","property");
+			//var valueType = prompt("What type of value would you like?","string");
+			dynaStore.setValue(item,key,"new value");
+			dataModel.findAdditionFields([item],columns);
+		}
+		refresh = function() {
+			grid.refresh();
+		}
+		dataModel.findAdditionFields = function(items,columns) {
+			var m = this.fields._nameMaps || (this.fields._nameMaps = {}); 
+			var fields = this.fields._fields || (this.fields._fields = []);
+			for (var i = 0; i<items.length; i++) {
+				var item = items[i];
+				for (var j in item) {
+					if (j != 'id' && j != '_id' && typeof m[j] != 'number') { // if we have not accounted for this property yet
+						m[fields.length+".idx"] = j;
+						m[j] = fields.length;
+						fields.push({name: j, key: j});
+						columns.push({field:j});
+					}
+				}
+			}
+			// console.debug("new fields:", fields);
+			layout[1].cells[0] = columns;
+			grid.setStructure(layout);
+			this.fields.set(fields);
+			this.notify("FieldsChange");
+		}
+		dataModel.processRows = function(items,request) { 
+		// this overwrites the processRows function, so that the columns be can be 
+		// dynamically generated based on the data. Real applications will probably
+		// be content with a more static generation of columns (like actually
+		// manually typing them out in the layout).
+			columns = [];
+			this.findAdditionFields(items,columns);
+			// do the feault behavior now
+			return dojox.grid.data.DojoData.prototype.processRows.apply(this,arguments);
+		} 
+		dataModel._setupFields= function(dataItem){
+		// this is called by the super impl of processRows, but we don't want it to do anything
+		}
+		
+		
+	</script>
+</head>
+<body class="tundra">
+	<h5>dojox.Grid using interactive PersevereRestStore</h5>
+	<div id="controls">
+		<button onclick="dynaStore.save()">Save</button>
+		<button onclick="dynaStore.revert()">Revert</button>
+		<button onclick="refresh()">Refresh</button>&nbsp;&nbsp;&nbsp;
+		<button onclick="addItem()">Add</button>
+		<button onclick="grid.removeSelectedRows()">Remove</button>&nbsp;&nbsp;&nbsp;
+		<button onclick="addProperty()">Add Property</button>
+		<button onclick="removeProperty()">Remove Property</button>
+<!-- Testing buttons (not so good for demos) <button onclick="removeItem()">Remove (Store)</button>
+		<button onclick="addItemToStore()">Add (Store)</button>&nbsp;&nbsp;&nbsp;
+		<button onclick="grid.edit.apply()">Apply</button>
+		<button onclick="grid.edit.cancel()">Cancel</button>&nbsp;&nbsp;&nbsp; -->		
+	</div>
+
+	<div id="grid" jsId="grid" dojoType="dojox.Grid" elasticView="2" 
+		model="dataModel" structure="layout">
+	</div>
+</body>
+</html>

data/data/dojo-release-1.1.1-src/dojox/sketch/Anchor.js

@@ -0,0 +1,57 @@
+dojo.provide("dojox.sketch.Anchor");
+dojo.require("dojox.gfx");
+
+(function(){
+	var ta=dojox.sketch;
+	ta.Anchor=function(an, id, isControl){
+		var self=this;
+		var size=4;	//	.5 * size of anchor.
+		var rect=null;
+
+		this.type=function(){ return "Anchor"; };
+		this.annotation=an;
+
+		this.id=id;
+		this._key="anchor-" + ta.Anchor.count++;
+		this.shape=null;
+		this.isControl=(isControl!=null)?isControl:true;
+
+		this.beginEdit=function(){
+			this.annotation.beginEdit(ta.CommandTypes.Modify);
+		};
+		this.endEdit=function(){
+			this.annotation.endEdit();
+		};
+		this.doChange=function(pt){
+			if(this.isControl) this.shape.applyTransform(pt);
+			else{
+				an.transform.dx+=pt.dx;
+				an.transform.dy+=pt.dy;
+			}
+		};
+		this.setBinding=function(pt){
+			an[id]={ x: an[id].x+pt.dx, y:an[id].y+pt.dy };
+			an.draw();
+			an.drawBBox();
+		};
+		this.setUndo=function(){ an.setUndo(); };
+
+		this.enable=function(){
+			if(!an.shape) return;
+			an.figure._add(this);
+			rect={ x:an[id].x-size, y:an[id].y-size, width:size*2, height:size*2 };
+			this.shape=an.shape.createRect(rect)
+				.setStroke({ color:"black", width:1 })
+				.setFill([255,255,255,0.35]);
+			this.shape.getEventSource().setAttribute("id", self._key);
+			this.shape.getEventSource().setAttribute("shape-rendering", "crispEdges");
+		};
+		this.disable=function(){
+			an.figure._remove(this);
+			if(an.shape) an.shape.remove(this.shape);
+			this.shape=null;
+			rect=null;
+		};
+	};
+	ta.Anchor.count=0;
+})();

data/data/dojo-release-1.1.1-src/dojox/sketch/Annotation.js

@@ -0,0 +1,219 @@
+dojo.provide("dojox.sketch.Annotation");
+dojo.require("dojox.sketch.Anchor");
+dojo.require("dojox.sketch._Plugin");
+
+(function(){
+	var ta=dojox.sketch;
+	dojo.declare("dojox.sketch.AnnotationTool", ta._Plugin, {
+//		constructor: function(){
+////			console.log('this.shape',this.shape);
+////			this.annotation=ta.tools[this.shape];
+//		},
+		onMouseMove: function(e,rect){
+				if(this._cshape){ 
+					this._cshape.setShape(rect);
+				} else {
+					this._cshape=this.figure.surface.createRect(rect)
+						.setStroke({color:"#999", width:1, style:"ShortDot"})
+						.setFill([255,255,255,0.7]);
+					this._cshape.getEventSource().setAttribute("shape-rendering","crispEdges");
+				}
+		},
+		onMouseUp: function(e){
+			var f=this.figure;
+			if(!(f._startPoint.x==e.pageX&&f._startPoint.y==e.pageY)){
+				if(this._cshape){
+					//	The minimum number of pixels one has to travel before a shape
+					//		gets drawn.
+					var limit=40;
+					if(Math.max(
+						limit, 
+						Math.abs(f._absEnd.x-f._start.x), 
+						Math.abs(f._absEnd.y-f._start.y)
+					)>limit){
+						this._create(f._start, f._end);
+					}
+				}
+			}
+			if(this._cshape) f.surface.remove(this._cshape);
+		},
+		_create: function(start,end){
+			//	create a new shape, needs to be accessible from the
+			//		dragging functions.
+			var f=this.figure;
+			var _=f.nextKey();
+			var a=new (this.annotation)(f, "annotation-"+_);
+			a.transform={dx:start.x/f.zoomFactor, dy:start.y/f.zoomFactor};
+			a.end={ x:end.x/f.zoomFactor, y:end.y/f.zoomFactor };
+			if(a.control){
+				a.control={ x:Math.round((end.x/2)/f.zoomFactor),y:Math.round((end.y/2)/f.zoomFactor) };
+			}
+			f.onBeforeCreateShape(a);
+			a.initialize();
+			f.select(a);
+			f.onCreateShape(a);
+			f.history.add(ta.CommandTypes.Create,a);
+		}
+	});
+	ta.Annotation=function(figure, id){
+		//	for editing stuff.
+		this.id=this._key=id;
+		this.figure=figure;
+		this.mode=ta.Annotation.Modes.View;
+		this.shape=null;	// dojox.gfx.Group
+		this.boundingBox=null;	// rect for boundaries
+		this.hasAnchors=true;
+		this.anchors={};	//	ta.Anchor
+		this._properties={
+			'stroke':{ color:"blue", width:2 },
+			'fill': "blue",
+			'label': ""
+		};
+
+		if(this.figure) this.figure.add(this);
+	};
+	var p=ta.Annotation.prototype;
+	p.constructor=ta.Annotation;
+	p.type=function(){ return ''; };
+	p.getType=function(){ return ta.Annotation; };
+
+	p.remove=function(){
+		this.figure.history.add(ta.CommandTypes.Delete, this, this.serialize());
+	};
+	p.property=function(name,/*?*/value){
+		var r;
+		name=name.toLowerCase();
+		if(this._properties[name]!==undefined){
+			r=this._properties[name];
+		}
+		if(arguments.length>1){
+			this._properties[name]=value;
+		}
+		if(r!=value){
+			this.onPropertyChange(name,r);
+		}
+		return r;
+	};
+	p.onPropertyChange=function(name,oldvalue){};
+	p.onCreate=function(){
+		this.figure.history.add(ta.CommandTypes.Create,this);
+	}
+	p.onDblClick=function(event){
+		var l=prompt('Set new text:',this.property('label'));
+		if(l!==false){
+			this.beginEdit(ta.CommandTypes.Modify);
+			this.property('label',l);
+			this.draw();
+			this.endEdit();
+		}
+	}
+	p.initialize=function(){ };
+	p.destroy=function(){ };
+	p.draw=function(){ };
+	p.apply=function(obj){ };
+	p.serialize=function(){ };
+	p.getBBox=function(){ };
+	p.beginEdit=function(type){
+		this._type=type||ta.CommandTypes.Move;
+		this._prevState=this.serialize();
+	};
+	p.endEdit=function(){
+		var newstep=true;
+		if(this._type==ta.CommandTypes.Move){
+			var f=this.figure;
+			if(f._absEnd.x==f._start.x&&f._absEnd.y==f._start.y){
+				newstep=false;
+			}
+		}
+		if(newstep){
+			this.figure.history.add(this._type,this,this._prevState);
+		}
+		this._type=this._prevState='';
+	};
+	p.calculate={
+		slope:function(p1, p2){
+			if(!(p1.x-p2.x)) return 0;
+			return ((p1.y-p2.y)/(p1.x-p2.x));
+		},
+		dx:function(p1, p2, dy){
+			var s=this.slope(p1,p2);
+			if(s==0) return s;
+			return dy/s; 
+		},
+		dy:function(p1, p2, dx){ return this.slope(p1,p2)*dx; }
+	};
+	p.drawBBox=function(){
+		var r=this.getBBox();
+		if(!this.boundingBox){
+			this.boundingBox=this.shape.createRect(r)
+				.moveToBack()
+				.setStroke({color:"#999", width:1, style:"Dash"})
+				.setFill([238,238,238,0.3]);
+			this.boundingBox.getEventSource().setAttribute("id",this.id+"-boundingBox");
+			this.boundingBox.getEventSource().setAttribute("shape-rendering","crispEdges");
+			this.figure._add(this);
+		} else this.boundingBox.setShape(r);
+	};
+	p.setBinding=function(pt){
+		this.transform.dx+=pt.dx;
+		this.transform.dy+=pt.dy;
+		this.draw();
+	};
+	p.doChange=function(pt){ };
+	p.getTextBox=function(){
+		return dojox.gfx._base._getTextBox(this.property('label'),ta.Annotation.labelFont);
+	};
+	p.setMode=function(m){
+		if(this.mode==m) return;
+		this.mode=m;
+		var method="disable";
+		if(m==ta.Annotation.Modes.Edit) method="enable";
+		if(method=="enable"){
+			//	draw the bounding box
+			this.drawBBox();
+			this.figure._add(this);
+		} else {
+			if(this.boundingBox){
+				if(this.shape) this.shape.remove(this.boundingBox);
+				this.boundingBox=null;
+			}
+		}
+		for(var p in this.anchors){ this.anchors[p][method](); }
+	};
+//	p.writeProperties=function(){
+//		var ps=this._properties;
+//		return "<!CDATA[properties:"+dojo.toJson(ps)+"]]>";
+//	};
+	p.writeCommonAttrs=function(){
+		return 'id="' + this.id + '" dojoxsketch:type="' + this.type() + '"'
+			+ ' transform="translate('+ this.transform.dx + "," + this.transform.dy + ')"'
+			+ (this.data?(' ><![CDATA[data:'+dojo.toJson(this.data)+']]'):'');
+	};
+	p.readCommonAttrs=function(obj){
+		var i=0,cs=obj.childNodes,c;
+		while((c=cs[i++])){
+			if(c.nodeType==4){ //CDATA
+				if(c.nodeValue.substr(0,11)=='properties:'){
+					this._properties=dojo.fromJson(c.nodeValue.substr(11));
+				}else if(c.nodeValue.substr(0,5)=='data:'){
+					this.data=dojo.fromJson(c.nodeValue.substr(5));
+				}else{
+					console.error('unknown CDATA node in node ',obj);
+				}
+			}
+		}
+
+		if(obj.getAttribute('transform')){
+			var t=obj.getAttribute('transform').replace("translate(","");
+			var pt=t.split(",");
+			this.transform.dx=parseFloat(pt[0],10);
+			this.transform.dy=parseFloat(pt[1],10);
+		}
+	};
+	ta.Annotation.Modes={ View:0, Edit:1 };
+	ta.Annotation.labelFont={family:"Arial", size:"16px", weight:"bold"};
+	ta.Annotation.register=function(name){
+		var cls=ta[name+'Annotation'];
+		ta.registerTool(name, function(p){dojo.mixin(p,{shape: name,annotation:cls});return new ta.AnnotationTool(p)});
+	};
+})();