You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2006/11/10 10:15:40 UTC

svn commit: r473277 [38/45] - in /myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource: ./ src/ src/animation/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/ src/collections/ src/crypto/ src/data/ src/data/...

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Toolbar.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Toolbar.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Toolbar.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Toolbar.js Fri Nov 10 01:15:01 2006
@@ -8,41 +8,27 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.ToolbarContainer");
-dojo.provide("dojo.widget.html.ToolbarContainer");
 dojo.provide("dojo.widget.Toolbar");
-dojo.provide("dojo.widget.html.Toolbar");
-dojo.provide("dojo.widget.ToolbarItem");
-dojo.provide("dojo.widget.html.ToolbarButtonGroup");
-dojo.provide("dojo.widget.html.ToolbarButton");
-dojo.provide("dojo.widget.html.ToolbarDialog");
-dojo.provide("dojo.widget.html.ToolbarMenu");
-dojo.provide("dojo.widget.html.ToolbarSeparator");
-dojo.provide("dojo.widget.html.ToolbarSpace");
-dojo.provide("dojo.widget.Icon");
 
 dojo.require("dojo.widget.*");
-dojo.require("dojo.html");
+dojo.require("dojo.html.style");
 
 /* ToolbarContainer
  *******************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarContainer");
-dojo.widget.html.ToolbarContainer = function() {
-	dojo.widget.HtmlWidget.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarContainer, dojo.widget.HtmlWidget);
-dojo.lang.extend(dojo.widget.html.ToolbarContainer, {
-	widgetType: "ToolbarContainer",
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarContainer",
+	dojo.widget.HtmlWidget,
+{
 	isContainer: true,
 
 	templateString: '<div class="toolbarContainer" dojoAttachPoint="containerNode"></div>',
-	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlToolbar.css"),
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/Toolbar.css"),
 
 	getItem: function(name) {
 		if(name instanceof dojo.widget.ToolbarItem) { return name; }
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				var item = child.getItem(name);
 				if(item) { return item; }
 			}
@@ -54,7 +40,7 @@
 		var items = [];
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				items = items.concat(child.getItems());
 			}
 		}
@@ -64,7 +50,7 @@
 	enable: function() {
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				child.enable.apply(child, arguments);
 			}
 		}
@@ -73,7 +59,7 @@
 	disable: function() {
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				child.disable.apply(child, arguments);
 			}
 		}
@@ -82,7 +68,7 @@
 	select: function(name) {
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				child.select(arguments);
 			}
 		}
@@ -91,7 +77,7 @@
 	deselect: function(name) {
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				child.deselect(arguments);
 			}
 		}
@@ -101,7 +87,7 @@
 		var values = {};
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				dojo.lang.mixin(values, child.getItemsState());
 			}
 		}
@@ -112,7 +98,7 @@
 		var values = {};
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				dojo.lang.mixin(values, child.getItemsActiveState());
 			}
 		}
@@ -123,7 +109,7 @@
 		var values = {};
 		for(var i = 0; i < this.children.length; i++) {
 			var child = this.children[i];
-			if(child instanceof dojo.widget.html.Toolbar) {
+			if(child instanceof dojo.widget.Toolbar) {
 				dojo.lang.mixin(values, child.getItemsSelectedState());
 			}
 		}
@@ -133,17 +119,14 @@
 
 /* Toolbar
  **********/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbar");
-dojo.widget.html.Toolbar = function() {
-	dojo.widget.HtmlWidget.call(this);
-}
-dojo.inherits(dojo.widget.html.Toolbar, dojo.widget.HtmlWidget);
-dojo.lang.extend(dojo.widget.html.Toolbar, {
-	widgetType: "Toolbar",
+
+dojo.widget.defineWidget(
+	"dojo.widget.Toolbar",
+	dojo.widget.HtmlWidget,
+{
 	isContainer: true,
 
 	templateString: '<div class="toolbar" dojoAttachPoint="containerNode" unselectable="on" dojoOnMouseover="_onmouseover" dojoOnMouseout="_onmouseout" dojoOnClick="_onclick" dojoOnMousedown="_onmousedown" dojoOnMouseup="_onmouseup"></div>',
-	//templateString: '<div class="toolbar" dojoAttachPoint="containerNode" unselectable="on"></div>',
 
 	// given a node, tries to find it's toolbar item
 	_getItem: function(node) {
@@ -176,7 +159,7 @@
 
 	_onclick: function(e) {
 		var widget = this._getItem(e.target);
-		if(widget && widget._onclick){ 
+		if(widget && widget._onclick){
 			widget._onclick(e);
 		}
 	},
@@ -193,7 +176,7 @@
 
 	addChild: function(item, pos, props) {
 		var widget = dojo.widget.ToolbarItem.make(item, null, props);
-		var ret = dojo.widget.html.Toolbar.superclass.addChild.call(this, widget, null, pos, null);
+		var ret = dojo.widget.Toolbar.superclass.addChild.call(this, widget, null, pos, null);
 		return ret;
 	},
 
@@ -316,16 +299,15 @@
 
 /* ToolbarItem
  **************/
-dojo.widget.ToolbarItem = function() {
-	dojo.widget.HtmlWidget.call(this);
-}
-dojo.inherits(dojo.widget.ToolbarItem, dojo.widget.HtmlWidget);
-dojo.lang.extend(dojo.widget.ToolbarItem, {
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarItem",
+	dojo.widget.HtmlWidget,
+{
 	templateString: '<span unselectable="on" class="toolbarItem"></span>',
 
 	_name: null,
 	getName: function() { return this._name; },
-	setName: function(value) { return this._name = value; },
+	setName: function(value) { return (this._name = value); },
 	getValue: function() { return this.getName(); },
 	setValue: function(value) { return this.setName(value); },
 
@@ -406,7 +388,7 @@
 	_label: "",
 	getLabel: function() { return this._label; },
 	setLabel: function(value) {
-		var ret = this._label = value;
+		var ret = (this._label = value);
 		if(!this.labelNode) {
 			this.labelNode = document.createElement("span");
 			this.domNode.appendChild(this.labelNode);
@@ -462,8 +444,9 @@
 	},
 
 	_onmouseover: function(e) {
-		if(!this._enabled) { return };
+		if(!this._enabled) { return; }
 		dojo.html.addClass(this.domNode, "hover");
+		this._fireEvent("onMouseOver");
 	},
 
 	_onmouseout: function(e) {
@@ -472,6 +455,7 @@
 		if(!this._selected) {
 			dojo.html.removeClass(this.domNode, "selected");
 		}
+		this._fireEvent("onMouseOut");
 	},
 
 	_onclick: function(e) {
@@ -484,7 +468,7 @@
 
 	_onmousedown: function(e) {
 		if(e.preventDefault) { e.preventDefault(); }
-		if(!this._enabled) { return };
+		if(!this._enabled) { return; }
 		dojo.html.addClass(this.domNode, "down");
 		if(this._toggleItem) {
 			if(this.parent.preventDeselect && this._selected) {
@@ -492,12 +476,20 @@
 			}
 			this.toggleSelected();
 		}
+		this._fireEvent("onMouseDown");
 	},
 
 	_onmouseup: function(e) {
 		dojo.html.removeClass(this.domNode, "down");
+		this._fireEvent("onMouseUp");
 	},
 
+	onClick: function() { },
+	onMouseOver: function() { },
+	onMouseOut: function() { },
+	onMouseDown: function() { },
+	onMouseUp: function() { },
+
 	fillInTemplate: function(args, frag) {
 		if(args.name) { this._name = args.name; }
 		if(args.selected) { this.select(); }
@@ -523,7 +515,7 @@
 		item = dojo.widget.createWidget("ToolbarButton",
 			dojo.lang.mixin(props||{}, {icon: new dojo.widget.Icon(wh.toString())}));
 	} else if(whIsType) {
-		item = dojo.widget.createWidget(wh, props)
+		item = dojo.widget.createWidget(wh, props);
 	} else if(typeof wh == "string" || wh instanceof String) {
 		switch(wh.charAt(0)) {
 			case "|":
@@ -559,13 +551,10 @@
 
 /* ToolbarButtonGroup
  *********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarButtonGroup");
-dojo.widget.html.ToolbarButtonGroup = function() {
-	dojo.widget.ToolbarItem.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarButtonGroup, dojo.widget.ToolbarItem);
-dojo.lang.extend(dojo.widget.html.ToolbarButtonGroup, {
-	widgetType: "ToolbarButtonGroup",
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarButtonGroup",
+	dojo.widget.ToolbarItem,
+{
 	isContainer: true,
 
 	templateString: '<span unselectable="on" class="toolbarButtonGroup" dojoAttachPoint="containerNode"></span>',
@@ -582,7 +571,7 @@
 
 	addChild: function(item, pos, props) {
 		var widget = dojo.widget.ToolbarItem.make(item, null, dojo.lang.mixin(props||{}, {toggleItem:true}));
-		var ret = dojo.widget.html.ToolbarButtonGroup.superclass.addChild.call(this, widget, null, pos, null);
+		var ret = dojo.widget.ToolbarButtonGroup.superclass.addChild.call(this, widget, null, pos, null);
         this._injectChild(widget);
         return ret;
     },
@@ -674,16 +663,12 @@
 
 /* ToolbarButton
  ***********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarButton");
-dojo.widget.html.ToolbarButton = function() {
-	dojo.widget.ToolbarItem.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarButton, dojo.widget.ToolbarItem);
-dojo.lang.extend(dojo.widget.html.ToolbarButton, {
-	widgetType: "ToolbarButton",
-
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarButton",
+	dojo.widget.ToolbarItem,
+{
 	fillInTemplate: function(args, frag) {
-		dojo.widget.html.ToolbarButton.superclass.fillInTemplate.call(this, args, frag);
+		dojo.widget.ToolbarButton.superclass.fillInTemplate.call(this, args, frag);
 		dojo.html.addClass(this.domNode, "toolbarButton");
 		if(this._icon) {
 			this.setIcon(this._icon);
@@ -707,24 +692,20 @@
 
 /* ToolbarDialog
  **********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarDialog");
-dojo.widget.html.ToolbarDialog = function() {
-	dojo.widget.html.ToolbarButton.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarDialog, dojo.widget.html.ToolbarButton);
-dojo.lang.extend(dojo.widget.html.ToolbarDialog, {
-	widgetType: "ToolbarDialog",
-	
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarDialog",
+	dojo.widget.ToolbarButton,
+{
 	fillInTemplate: function (args, frag) {
-		dojo.widget.html.ToolbarDialog.superclass.fillInTemplate.call(this, args, frag);
+		dojo.widget.ToolbarDialog.superclass.fillInTemplate.call(this, args, frag);
 		dojo.event.connect(this, "onSelect", this, "showDialog");
 		dojo.event.connect(this, "onDeselect", this, "hideDialog");
 	},
-	
+
 	showDialog: function (e) {
 		dojo.lang.setTimeout(dojo.event.connect, 1, document, "onmousedown", this, "deselect");
 	},
-	
+
 	hideDialog: function (e) {
 		dojo.event.disconnect(document, "onmousedown", this, "deselect");
 	}
@@ -733,13 +714,11 @@
 
 /* ToolbarMenu
  **********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarMenu");
-dojo.widget.html.ToolbarMenu = function() {
-	dojo.widget.html.ToolbarDialog.call(this);
-
-	this.widgetType = "ToolbarMenu";
-}
-dojo.inherits(dojo.widget.html.ToolbarMenu, dojo.widget.html.ToolbarDialog);
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarMenu",
+	dojo.widget.ToolbarDialog,
+	{}
+);
 
 /* ToolbarMenuItem
  ******************/
@@ -748,19 +727,16 @@
 
 /* ToolbarSeparator
  **********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarSeparator");
-dojo.widget.html.ToolbarSeparator = function() {
-    dojo.widget.ToolbarItem.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarSeparator, dojo.widget.ToolbarItem);
-dojo.lang.extend(dojo.widget.html.ToolbarSeparator, {
-	widgetType: "ToolbarSeparator",
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarSeparator",
+	dojo.widget.ToolbarItem,
+{
 	templateString: '<span unselectable="on" class="toolbarItem toolbarSeparator"></span>',
 
-	defaultIconPath: new dojo.uri.dojoUri("src/widget/templates/buttons/-.gif"),
+	defaultIconPath: new dojo.uri.dojoUri("src/widget/templates/buttons/sep.gif"),
 
 	fillInTemplate: function(args, frag, skip) {
-		dojo.widget.html.ToolbarSeparator.superclass.fillInTemplate.call(this, args, frag);
+		dojo.widget.ToolbarSeparator.superclass.fillInTemplate.call(this, args, frag);
 		this._name = this.widgetId;
 		if(!skip) {
 			if(!this._icon) {
@@ -771,25 +747,21 @@
 	},
 
 	// don't want events!
-	_onmouseover: null, 
-    _onmouseout: null, 
-    _onclick: null, 
-    _onmousedown: null, 
-    _onmouseup: null 
+	_onmouseover: null,
+    _onmouseout: null,
+    _onclick: null,
+    _onmousedown: null,
+    _onmouseup: null
 });
 
 /* ToolbarSpace
  **********************/
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarSpace");
-dojo.widget.html.ToolbarSpace = function() {
-	dojo.widget.html.ToolbarSeparator.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarSpace, dojo.widget.html.ToolbarSeparator);
-dojo.lang.extend(dojo.widget.html.ToolbarSpace, {
-    widgetType: "ToolbarSpace",
-
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarSpace",
+	dojo.widget.ToolbarSeparator,
+{
 	fillInTemplate: function(args, frag, skip) {
-		dojo.widget.html.ToolbarSpace.superclass.fillInTemplate.call(this, args, frag, true);
+		dojo.widget.ToolbarSpace.superclass.fillInTemplate.call(this, args, frag, true);
 		if(!skip) {
 			dojo.html.addClass(this.domNode, "toolbarSpace");
 		}
@@ -797,19 +769,16 @@
 });
 
 /* ToolbarSelect
- ******************/ 
+ ******************/
 
-dojo.widget.tags.addParseTreeHandler("dojo:toolbarSelect");
-dojo.widget.html.ToolbarSelect = function() {
-	dojo.widget.ToolbarItem.call(this);
-}
-dojo.inherits(dojo.widget.html.ToolbarSelect, dojo.widget.ToolbarItem);
-dojo.lang.extend(dojo.widget.html.ToolbarSelect, {
-    widgetType: "ToolbarSelect",
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarSelect",
+	dojo.widget.ToolbarItem,
+{
 	templateString: '<span class="toolbarItem toolbarSelect" unselectable="on"><select dojoAttachPoint="selectBox" dojoOnChange="changed"></select></span>',
 
 	fillInTemplate: function(args, frag) {
-		dojo.widget.html.ToolbarSelect.superclass.fillInTemplate.call(this, args, frag, true);
+		dojo.widget.ToolbarSelect.superclass.fillInTemplate.call(this, args, frag, true);
 		var keys = args.values;
 		var i = 0;
 		for(var val in keys) {
@@ -825,7 +794,7 @@
 	},
 
 	setEnabled: function(is, force, preventEvent) {
-		var ret = dojo.widget.html.ToolbarSelect.superclass.setEnabled.call(this, is, force, preventEvent);
+		var ret = dojo.widget.ToolbarSelect.superclass.setEnabled.call(this, is, force, preventEvent);
 		this.selectBox.disabled = !this._enabled;
 		return ret;
 	},
@@ -841,21 +810,29 @@
 /* Icon
  *********/
 // arguments can be IMG nodes, Image() instances or URLs -- enabled is the only one required
-dojo.widget.Icon = function(enabled, disabled, hover, selected){
+dojo.widget.Icon = function(enabled, disabled, hovered, selected){
 	if(!arguments.length){
 		// FIXME: should this be dojo.raise?
 		throw new Error("Icon must have at least an enabled state");
 	}
-	var states = ["enabled", "disabled", "hover", "selected"];
+	var states = ["enabled", "disabled", "hovered", "selected"];
 	var currentState = "enabled";
 	var domNode = document.createElement("img");
 
 	this.getState = function(){ return currentState; }
 	this.setState = function(value){
-		if(dojo.lang.inArray(value, states)){
+		if(dojo.lang.inArray(states, value)){
 			if(this[value]){
 				currentState = value;
-				domNode.setAttribute("src", this[currentState].src);
+				var img = this[currentState];
+				if ((dojo.render.html.ie55 || dojo.render.html.ie60) && img.src && img.src.match(/[.]png$/i) ) {
+					domNode.width = img.width||img.offsetWidth;
+					domNode.height = img.height||img.offsetHeight;
+					domNode.setAttribute("src", dojo.uri.dojoUri("src/widget/templates/images/blank.gif").uri);
+					domNode.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+img.src+"',sizingMethod='image')";
+				} else {
+					domNode.setAttribute("src", img.src);
+				}
 			}
 		}else{
 			throw new Error("Invalid state set on Icon (state: " + value + ")");
@@ -884,7 +861,7 @@
 
 	this.enable = function(){ this.setState("enabled"); }
 	this.disable = function(){ this.setState("disabled"); }
-	this.hover = function(){ this.setState("hover"); }
+	this.hover = function(){ this.setState("hovered"); }
 	this.select = function(){ this.setState("selected"); }
 
 	this.getSize = function(){
@@ -933,3 +910,37 @@
 
 	return new dojo.widget.Icon(a,b,c,d);
 }
+
+/* ToolbarColorDialog
+ ******************/
+dojo.widget.defineWidget(
+	"dojo.widget.ToolbarColorDialog",
+	dojo.widget.ToolbarDialog,
+{
+ 	palette: "7x10",
+
+	fillInTemplate: function (args, frag) {
+		dojo.widget.ToolbarColorDialog.superclass.fillInTemplate.call(this, args, frag);
+		this.dialog = dojo.widget.createWidget("ColorPalette", {palette: this.palette});
+		this.dialog.domNode.style.position = "absolute";
+
+		dojo.event.connect(this.dialog, "onColorSelect", this, "_setValue");
+	},
+
+	_setValue: function(color) {
+		this._value = color;
+		this._fireEvent("onSetValue", color);
+	},
+
+	showDialog: function (e) {
+		dojo.widget.ToolbarColorDialog.superclass.showDialog.call(this, e);
+		var abs = dojo.html.getAbsolutePosition(this.domNode, true);
+		var y = abs.y + dojo.html.getBorderBox(this.domNode).height;
+		this.dialog.showAt(abs.x, y);
+	},
+
+	hideDialog: function (e) {
+		dojo.widget.ToolbarColorDialog.superclass.hideDialog.call(this, e);
+		this.dialog.hide();
+	}
+});
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tooltip.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tooltip.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tooltip.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tooltip.js Fri Nov 10 01:15:01 2006
@@ -8,7 +8,158 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.Tooltip");
-dojo.require("dojo.widget.Widget");
-
-dojo.requireAfterIf("html", "dojo.widget.html.Tooltip");
+dojo.provide("dojo.widget.Tooltip");
+dojo.require("dojo.widget.ContentPane");
+dojo.require("dojo.widget.PopupContainer");
+dojo.require("dojo.uri.Uri");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.event.*");
+dojo.require("dojo.html.style");
+dojo.require("dojo.html.util");
+dojo.require("dojo.html.iframe");
+
+dojo.widget.defineWidget(
+	"dojo.widget.Tooltip",
+	[dojo.widget.ContentPane, dojo.widget.PopupContainerBase],
+	{
+		isContainer: true,
+
+		// Constructor arguments
+		caption: "",
+		showDelay: 500,
+		hideDelay: 100,
+		connectId: "",
+
+		templateCssPath: dojo.uri.dojoUri("src/widget/templates/TooltipTemplate.css"),
+
+		fillInTemplate: function(args, frag){
+			if(this.caption != ""){
+				this.domNode.appendChild(document.createTextNode(this.caption));
+			}
+			this._connectNode = dojo.byId(this.connectId);
+			dojo.widget.Tooltip.superclass.fillInTemplate.call(this, args, frag);
+
+			this.addOnLoad(this, "_loadedContent");
+			dojo.html.addClass(this.domNode, "dojoTooltip");
+
+			//copy style from input node to output node
+			var source = this.getFragNodeRef(frag);
+			dojo.html.copyStyle(this.domNode, source);
+
+			//apply the necessary css rules to the node so that it can popup
+			this.applyPopupBasicStyle();
+		},
+
+		postCreate: function(args, frag){
+			dojo.event.connect(this._connectNode, "onmouseover", this, "onMouseOver");
+			dojo.widget.Tooltip.superclass.postCreate.call(this, args, frag);
+		},
+
+		onMouseOver: function(e){
+			this._mouse = {x: e.pageX, y: e.pageY};
+
+			// Start tracking mouse movements, so we know when to cancel timers or erase the tooltip
+			if(!this._tracking){
+				dojo.event.connect(document.documentElement, "onmousemove", this, "onMouseMove");
+				this.tracking=true;
+			}
+
+			this._onHover(e);			
+		},
+
+		onMouseMove: function(e) {
+			this._mouse = {x: e.pageX, y: e.pageY};
+
+			if(dojo.html.overElement(this._connectNode, e) || dojo.html.overElement(this.domNode, e)){
+				this._onHover(e);
+			} else {
+				// mouse has been moved off the element/tooltip
+				// note: can't use onMouseOut to detect this because the "explode" effect causes
+				// spurious onMouseOut events (due to interference from outline), w/out corresponding onMouseOver
+				this._onUnHover(e);
+			}
+		},
+
+		_onHover: function(e) {
+			if(this._hover){ return; }
+			this._hover=true;
+
+			// If the tooltip has been scheduled to be erased, cancel that timer
+			// since we are hovering over element/tooltip again
+			if(this._hideTimer) {
+				clearTimeout(this._hideTimer);
+				delete this._hideTimer;
+			}
+			
+			// If tooltip not showing yet then set a timer to show it shortly
+			if(!this.isShowingNow && !this._showTimer){
+				this._showTimer = setTimeout(dojo.lang.hitch(this, "open"), this.showDelay);
+			}
+		},
+
+		_onUnHover: function(e){
+			if(!this._hover){ return; }
+			this._hover=false;
+
+			if(this._showTimer){
+				clearTimeout(this._showTimer);
+				delete this._showTimer;
+			}
+			if(this.isShowingNow && !this._hideTimer){
+				this._hideTimer = setTimeout(dojo.lang.hitch(this, "close"), this.hideDelay);
+			}
+			
+			// If we aren't showing the tooltip, then we can stop tracking the mouse now;
+			// otherwise must track the mouse until tooltip disappears
+			if(!this.isShowingNow){
+				dojo.event.disconnect(document.documentElement, "onmousemove", this, "onMouseMove");
+				this._tracking=false;
+			}
+		},
+
+		open: function() {
+			if (this.isShowingNow) { return; }
+
+			dojo.widget.PopupContainerBase.prototype.open.call(this, this._mouse.x, this._mouse.y, null, [this._mouse.x, this._mouse.y], "TL,TR,BL,BR", [10,15]);
+		},
+
+		close: function() {
+			if (this.isShowingNow) {
+				if ( this._showTimer ) {
+					clearTimeout(this._showTimer);
+					delete this._showTimer;
+				}
+				if ( this._hideTimer ) {
+					clearTimeout(this._hideTimer);
+					delete this._hideTimer;
+				}
+				dojo.event.disconnect(document.documentElement, "onmousemove", this, "onMouseMove");
+				this._tracking=false;
+				dojo.widget.PopupContainerBase.prototype.close.call(this);
+			}
+		},
+
+		_position: function(){
+			this.move(this._mouse.x, this._mouse.y, [10,15], "TL,TR,BL,BR");
+		},
+
+		_loadedContent: function(){
+			if(this.isShowingNow){
+				// the tooltip has changed size due to downloaded contents, so reposition it
+				this._position();
+			}
+		},
+
+		checkSize: function(){
+			// checkSize() is called when the user has resized the browser window,
+			// but that doesn't affect this widget (or this widget's children)
+			// so it can be safely ignored
+		},
+
+		uninitialize: function(){
+			this.close();
+			dojo.event.disconnect(this._connectNode, "onmouseover", this, "onMouseOver");
+		}
+
+	}
+);

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tree.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tree.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tree.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/Tree.js Fri Nov 10 01:15:01 2006
@@ -20,30 +20,24 @@
  */
 dojo.provide("dojo.widget.Tree");
 
+dojo.require("dojo.widget.*");
 dojo.require("dojo.event.*");
 dojo.require("dojo.io.*");
 dojo.require("dojo.widget.HtmlWidget");
 dojo.require("dojo.widget.TreeNode");
+dojo.require("dojo.html.common");
+dojo.require("dojo.html.selection");
 
 
-
-// make it a tag
-dojo.widget.tags.addParseTreeHandler("dojo:Tree");
-
-
-dojo.widget.Tree = function() {
-	dojo.widget.HtmlWidget.call(this);
-
+dojo.widget.defineWidget("dojo.widget.Tree", dojo.widget.HtmlWidget, function() {
 	this.eventNames = {};
 
 	this.tree = this;
 	this.DNDAcceptTypes = [];
 	this.actionsDisabled = [];
 
-}
-dojo.inherits(dojo.widget.Tree, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.Tree, {
+},
+{
 	widgetType: "Tree",
 
 	eventNamesDefault: {
@@ -338,7 +332,7 @@
 		// add new child into DOM after it was added into children
 		if (index < this.children.length) { // children[] already has child
 			//dojo.debug("Inserting before "+this.children[index].title);
-			dojo.dom.insertBefore(child.domNode, this.children[index].domNode);
+			dojo.html.insertBefore(child.domNode, this.children[index].domNode);
 		} else {
 			this.containerNode.appendChild(child.domNode);
 			if (this.isExpanded && this.isTreeNode) {
@@ -378,7 +372,7 @@
 		// Use-case:
 		// a child was moved down under the last node so last node should be updated
 		var prevSibling = child.getPreviousSibling();
-		if (child.isLastNode() && prevSibling) {
+		if (child.isLastChild() && prevSibling) {
 			prevSibling.updateExpandGridColumn();
 		}
 
@@ -500,9 +494,9 @@
 
 
 		children.splice(index,1);
-		dojo.dom.removeNode(child.domNode);
+		dojo.html.removeNode(child.domNode);
 
-		if (parent.children.length == 0) {
+		if (parent.children.length == 0 && !parent.isTree) {
 			parent.containerNode.style.display = "none";
 		}
 

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicController.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicController.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicController.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicController.js Fri Nov 10 01:15:01 2006
@@ -16,17 +16,7 @@
 dojo.require("dojo.io.*");
 
 
-dojo.widget.tags.addParseTreeHandler("dojo:TreeBasicController");
-
-
-dojo.widget.TreeBasicController = function() {
-	dojo.widget.HtmlWidget.call(this);
-}
-
-dojo.inherits(dojo.widget.TreeBasicController, dojo.widget.HtmlWidget);
-
-
-dojo.lang.extend(dojo.widget.TreeBasicController, {
+dojo.widget.defineWidget("dojo.widget.TreeBasicController", dojo.widget.HtmlWidget, {
 	widgetType: "TreeBasicController",
 
 	DNDController: "",

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,825 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeBasicControllerV3");
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.json")
+dojo.require("dojo.io.*");
+dojo.require("dojo.widget.TreeCommon");
+dojo.require("dojo.widget.TreeNodeV3");
+dojo.require("dojo.widget.TreeV3");
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeBasicControllerV3",
+	[dojo.widget.HtmlWidget, dojo.widget.TreeCommon],
+	function(){
+		this.listenedTrees = {};
+	},
+{
+	// TODO: do something with addChild / setChild, so that RpcController become able
+	// to hook on this and report to server
+	
+	// TODO: make sure keyboard control stuff works when node is moved between trees
+	// node should be unfocus()'ed when it its ancestor is moved and tree,lastFocus - cleared
+
+	/**
+	 * TreeCommon.listenTree will attach listeners to these events
+	 *
+	 * The logic behind the naming:
+	 * 1. (after|before)
+	 * 2. if an event refers to tree, then add "Tree"
+	 * 3. add action
+	 */
+	listenTreeEvents: ["afterSetFolder", "afterTreeCreate", "beforeTreeDestroy"],
+	listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget},	
+		
+		
+	editor: null,
+
+	
+	initialize: function(args) {
+		if (args.editor) {
+			this.editor = dojo.widget.byId(args.editor);
+			this.editor.controller = this;
+		}
+		
+	},
+		
+	
+	getInfo: function(elem) {
+		return elem.getInfo();
+	},
+
+	onBeforeTreeDestroy: function(message) {
+                this.unlistenTree(message.source);
+	},
+
+	onAfterSetFolder: function(message) {
+		
+		//dojo.profile.start("onTreeChange");
+        
+		if (message.source.expandLevel > 0) {
+			this.expandToLevel(message.source, message.source.expandLevel);				
+		}
+		if (message.source.loadLevel > 0) {
+			this.loadToLevel(message.source, message.source.loadLevel);				
+		}
+			
+		
+		//dojo.profile.end("onTreeChange");
+	},
+	
+
+	// down arrow
+	_focusNextVisible: function(nodeWidget) {
+		
+		// if this is an expanded folder, get the first child
+		if (nodeWidget.isFolder && nodeWidget.isExpanded && nodeWidget.children.length > 0) {
+			returnWidget = nodeWidget.children[0];			
+		} else {
+			// find a parent node with a sibling
+			while (nodeWidget.isTreeNode && nodeWidget.isLastChild()) {
+				nodeWidget = nodeWidget.parent;
+			}
+			
+			if (nodeWidget.isTreeNode) {
+				var returnWidget = nodeWidget.parent.children[nodeWidget.getParentIndex()+1];				
+			}
+			
+		}
+				
+		if (returnWidget && returnWidget.isTreeNode) {
+			this._focusLabel(returnWidget);
+			return returnWidget;
+		}
+		
+	},
+	
+	// up arrow
+	_focusPreviousVisible: function(nodeWidget) {
+		var returnWidget = nodeWidget;
+		
+		// if younger siblings		
+		if (!nodeWidget.isFirstChild()) {
+			var previousSibling = nodeWidget.parent.children[nodeWidget.getParentIndex()-1]
+
+			nodeWidget = previousSibling;
+			// if the previous nodeWidget is expanded, dive in deep
+			while (nodeWidget.isFolder && nodeWidget.isExpanded && nodeWidget.children.length > 0) {
+				returnWidget = nodeWidget;
+				// move to the last child
+				nodeWidget = nodeWidget.children[nodeWidget.children.length-1];
+			}
+		} else {
+			// if this is the first child, return the parent
+			nodeWidget = nodeWidget.parent;
+		}
+		
+		if (nodeWidget && nodeWidget.isTreeNode) {
+			returnWidget = nodeWidget;
+		}
+		
+		if (returnWidget && returnWidget.isTreeNode) {
+			this._focusLabel(returnWidget);
+			return returnWidget;
+		}
+		
+	},
+	
+	// right arrow
+	_focusZoomIn: function(nodeWidget) {
+		var returnWidget = nodeWidget;
+		
+		// if not expanded, expand, else move to 1st child
+		if (nodeWidget.isFolder && !nodeWidget.isExpanded) {
+			this.expand(nodeWidget);
+		}else if (nodeWidget.children.length > 0) {
+			nodeWidget = nodeWidget.children[0];
+		}
+		
+		if (nodeWidget && nodeWidget.isTreeNode) {
+			returnWidget = nodeWidget;
+		}
+		
+		if (returnWidget && returnWidget.isTreeNode) {
+			this._focusLabel(returnWidget);
+			return returnWidget;
+		}
+		
+	},
+	
+	// left arrow
+	_focusZoomOut: function(node) {
+		
+		var returnWidget = node;
+		
+		// if not expanded, expand, else move to 1st child
+		if (node.isFolder && node.isExpanded) {
+			this.collapse(node);
+		} else {
+			node = node.parent;
+		}
+		if (node && node.isTreeNode) {
+			returnWidget = node;
+		}
+		
+		if (returnWidget && returnWidget.isTreeNode) {
+			this._focusLabel(returnWidget);
+			return returnWidget;
+		}
+		
+	},
+	
+	onFocusNode: function(e) {
+		var node = this.domElement2TreeNode(e.target);
+		
+		if (node) {
+			node.viewFocus();			
+			dojo.event.browser.stopEvent(e);
+		}
+	},
+	
+	onBlurNode: function(e) {
+		var node = this.domElement2TreeNode(e.target);
+		
+		if (!node) {
+			return;
+		}
+		
+		var labelNode = node.labelNode;
+		
+		labelNode.setAttribute("tabIndex", "-1");
+		node.viewUnfocus();		
+		dojo.event.browser.stopEvent(e);
+		
+		// this could have been set to -1 by the shift+TAB processing
+		node.tree.domNode.setAttribute("tabIndex", "0");
+		
+	},
+	
+	
+	_focusLabel: function(node) {
+		//dojo.debug((new Error()).stack)		
+		var lastFocused = node.tree.lastFocused;
+		var labelNode;
+		
+		if (lastFocused && lastFocused.labelNode) {
+			labelNode = lastFocused.labelNode;
+			// help Opera out with blur events
+			dojo.event.disconnect(labelNode, "onblur", this, "onBlurNode");
+			labelNode.setAttribute("tabIndex", "-1");
+			dojo.html.removeClass(labelNode, "TreeLabelFocused");
+		}
+		
+		// set tabIndex so that the tab key can find this node
+		labelNode = node.labelNode;
+		labelNode.setAttribute("tabIndex", "0");
+		node.tree.lastFocused = node;
+		
+		// add an outline - this helps opera a lot
+		dojo.html.addClass(labelNode, "TreeLabelFocused");
+		dojo.event.connectOnce(labelNode, "onblur", this, "onBlurNode");
+		// prevent the domNode from seeing the focus event
+		dojo.event.connectOnce(labelNode, "onfocus", this, "onFocusNode");
+		// set focus so that the label wil be voiced using screen readers
+		labelNode.focus();
+			
+	},
+	
+	onKey: function(e) {
+		if (!e.key || e.ctrkKey || e.altKey) { return; }
+		// pretend the key was directed toward the current focused node (helps opera out)
+		
+		var nodeWidget = this.domElement2TreeNode(e.target);
+		if (!nodeWidget) {
+			return;
+		}
+		
+		var treeWidget = nodeWidget.tree;
+		
+		if (treeWidget.lastFocused && treeWidget.lastFocused.labelNode) {
+			nodeWidget = treeWidget.lastFocused;
+		}
+		
+		switch(e.key) {
+			case e.KEY_TAB:
+				if (e.shiftKey) {
+					// we're moving backwards so don't tab to the domNode
+					// it'll be added back in onBlurNode
+					treeWidget.domNode.setAttribute("tabIndex", "-1");
+				}
+				break;
+			case e.KEY_RIGHT_ARROW:
+				this._focusZoomIn(nodeWidget);
+				dojo.event.browser.stopEvent(e);
+				break;
+			case e.KEY_LEFT_ARROW:
+				this._focusZoomOut(nodeWidget);
+				dojo.event.browser.stopEvent(e);
+				break;
+			case e.KEY_UP_ARROW:
+				this._focusPreviousVisible(nodeWidget);
+				dojo.event.browser.stopEvent(e);
+				break;
+			case e.KEY_DOWN_ARROW:
+				this._focusNextVisible(nodeWidget);
+				dojo.event.browser.stopEvent(e);
+				break;
+		}
+	},
+	
+	
+	onFocusTree: function(e) {
+		if (!e.currentTarget) { return; }
+		try {
+			var treeWidget = this.getWidgetByNode(e.currentTarget);
+			if (!treeWidget || !treeWidget.isTree) { return; }
+			// on first focus, choose the root node
+			var nodeWidget = this.getWidgetByNode(treeWidget.domNode.firstChild);
+			if (nodeWidget && nodeWidget.isTreeNode) {
+				if (treeWidget.lastFocused && treeWidget.lastFocused.isTreeNode) { // onClick could have chosen a non-root node
+					nodeWidget = treeWidget.lastFocused;
+				}
+				this._focusLabel(nodeWidget);
+			}
+		}
+		catch(e) {}
+	},
+
+	// perform actions-initializers for tree
+	onAfterTreeCreate: function(message) {
+		var tree = message.source;
+		dojo.event.browser.addListener(tree.domNode, "onKey", dojo.lang.hitch(this, this.onKey));
+		dojo.event.browser.addListener(tree.domNode, "onmousedown", dojo.lang.hitch(this, this.onTreeMouseDown));
+		dojo.event.browser.addListener(tree.domNode, "onclick", dojo.lang.hitch(this, this.onTreeClick));
+		dojo.event.browser.addListener(tree.domNode, "onfocus", dojo.lang.hitch(this, this.onFocusTree));
+		tree.domNode.setAttribute("tabIndex", "0");
+		
+		if (tree.expandLevel) {								
+			this.expandToLevel(tree, tree.expandLevel)
+		}
+		if (tree.loadLevel) {
+			this.loadToLevel(tree, tree.loadLevel);
+		}
+	},
+
+    onTreeMouseDown: function(e) {
+    },
+
+	onTreeClick: function(e){
+		//dojo.profile.start("onTreeClick");
+		
+		var domElement = e.target;
+		//dojo.debug('click')
+		// find node
+        var node = this.domElement2TreeNode(domElement);		
+		if (!node || !node.isTreeNode) {
+			return;
+		}
+		
+		
+		var checkExpandClick = function(el) {
+			return el === node.expandNode;
+		}
+		
+		if (this.checkPathCondition(domElement, checkExpandClick)) {
+			this.processExpandClick(node);			
+		}
+		
+		this._focusLabel(node);
+		
+		//dojo.profile.end("onTreeClick");
+		
+	},
+	
+	processExpandClick: function(node){
+		
+		//dojo.profile.start("processExpandClick");
+		
+		if (node.isExpanded){
+			this.collapse(node);
+		} else {
+			this.expand(node);
+		}
+		
+		//dojo.profile.end("processExpandClick");
+	},
+		
+	
+	
+	/**
+	 * time between expand calls for batch operations
+	 * @see expandToLevel
+	 */
+	batchExpandTimeout: 20,
+	
+	
+	expandAll: function(nodeOrTree) {		
+		return this.expandToLevel(nodeOrTree, Number.POSITIVE_INFINITY);
+		
+	},
+	
+	
+	collapseAll: function(nodeOrTree) {
+		var _this = this;
+		
+		var filter = function(elem) {
+			return (elem instanceof dojo.widget.Widget) && elem.isFolder && elem.isExpanded;
+		}
+		
+		if (nodeOrTree.isTreeNode) {		
+			this.processDescendants(nodeOrTree, filter, this.collapse);
+		} else if (nodeOrTree.isTree) {
+			dojo.lang.forEach(nodeOrTree.children,function(c) { _this.processDescendants(c, filter, _this.collapse) });
+		}
+	},
+	
+	/**
+	 * expand tree to specific node
+	 */
+	expandToNode: function(node) {
+		n = node.parent
+		s = []
+		while (!n.isExpanded) {
+			s.push(n)
+			n = n.parent
+		}
+				
+		dojo.lang.forEach(s, function(n) { n.expand() })
+	},
+		
+	/**
+	 * walk a node in time, forward order, with pauses between expansions
+	 */
+	expandToLevel: function(nodeOrTree, level) {
+		dojo.require("dojo.widget.TreeTimeoutIterator");
+		
+		var _this = this;
+		var filterFunc = function(elem) {
+			var res = elem.isFolder || elem.children && elem.children.length;
+			//dojo.debug("Filter "+elem+ " result:"+res);
+			return res;
+		};
+		var callFunc = function(node, iterator) {			
+			 _this.expand(node, true);
+			 iterator.forward();
+		}
+			
+		var iterator = new dojo.widget.TreeTimeoutIterator(nodeOrTree, callFunc, this);
+		iterator.setFilter(filterFunc);
+		
+		
+		iterator.timeout = this.batchExpandTimeout;
+		
+		//dojo.debug("here "+nodeOrTree+" level "+level);
+		
+		iterator.setMaxLevel(nodeOrTree.isTreeNode ? level-1 : level);
+		
+		
+		return iterator.start(nodeOrTree.isTreeNode);
+	},
+	
+
+	getWidgetByNode: function(node) {
+		var widgetId;
+		var newNode = node;
+		while (! (widgetId = newNode.widgetId) ) {
+			newNode = newNode.parentNode;
+			if (newNode == null) { break; }
+		}
+		if (widgetId) { return dojo.widget.byId(widgetId); }
+		else if (node == null) { return null; }
+		else{ return dojo.widget.manager.byNode(node); }
+	},
+
+
+
+	/**
+	 * callout activated even if node is expanded already
+	 */
+	expand: function(node) {
+		
+		//dojo.profile.start("expand");
+		
+		//dojo.debug("Expand "+node.isFolder);
+		
+		if (node.isFolder) {			
+			node.expand(); // skip trees or non-folders
+		}		
+		
+		//dojo.profile.end("expand");
+				
+	},
+
+	/**
+	 * safe to call on tree and non-folder
+	 */
+	collapse: function(node) {
+		if (node.isFolder) {
+			node.collapse();
+		}
+	},
+	
+	
+	// -------------------------- TODO: Inline edit node ---------------------
+	canEditLabel: function(node) {
+		if (node.actionIsDisabledNow(node.actions.EDIT)) return false;
+
+		return true;
+	},
+	
+		
+	editLabelStart: function(node) {		
+		if (!this.canEditLabel(node)) {
+			return false;
+		}
+		
+		if (!this.editor.isClosed()) {
+			//dojo.debug("editLabelStart editor open");
+			this.editLabelFinish(this.editor.saveOnBlur);			
+		}
+				
+		this.doEditLabelStart(node);
+		
+	
+	},
+	
+	
+	editLabelFinish: function(save) {
+		this.doEditLabelFinish(save);		
+	},
+	
+	
+	doEditLabelStart: function(node) {
+		if (!this.editor) {
+			dojo.raise(this.widgetType+": no editor specified");
+		}
+		
+		//dojo.debug("editLabelStart editor open "+node);
+		
+		this.editor.open(node);		
+	},
+	
+	doEditLabelFinish: function(save, server_data) {
+		//dojo.debug("Finish "+save);
+		//dojo.debug((new Error()).stack)
+		if (!this.editor) {
+			dojo.raise(this.widgetType+": no editor specified");
+		}
+
+		var node = this.editor.node;	
+		var editorTitle = this.editor.getContents();
+		
+		this.editor.close(save);
+
+		if (save) {
+			var data = {title:editorTitle};
+			
+			if (server_data) { // may be undefined
+				dojo.lang.mixin(data, server_data);
+			}
+			
+			
+			if (node.isPhantom) {			
+				// I can't just set node phantom's title, because widgetId/objectId/widgetName...
+				// may be provided by server
+				var parent = node.parent;
+				var index = node.getParentIndex();				
+				node.destroy();
+				// new node was added!
+				dojo.widget.TreeBasicControllerV3.prototype.doCreateChild.call(this, parent, index, data);
+			} else {
+				var title = server_data && server_data.title ? server_data.title : editorTitle;
+				// use special method to make sure everything updated and event sent
+				node.setTitle(title); 
+			}
+		} else {
+			//dojo.debug("Kill phantom on cancel");
+			if (node.isPhantom) {
+				node.destroy();
+			}
+		}
+	},
+	
+	
+		
+	makeDefaultNode: function(parent, index) {
+		var data = {title:parent.tree.defaultChildTitle};
+		return dojo.widget.TreeBasicControllerV3.prototype.doCreateChild.call(this,parent,index,data);
+	},
+	
+	/**
+	 * check that something is possible
+	 * run maker to do it
+	 * run exposer to expose result to visitor immediatelly
+	 *   exposer does not affect result
+	 */
+	runStages: function(check, prepare, make, finalize, expose, args) {
+		
+		if (check && !check.apply(this, args)) {
+			return false;
+		}
+		
+		if (prepare && !prepare.apply(this, args)) {
+			return false;
+		}
+		
+		var result = make.apply(this, args);
+		
+		
+		if (finalize) {
+			finalize.apply(this,args);			
+		}
+			
+		if (!result) {
+			return result;
+		}
+		
+			
+		if (expose) {
+			expose.apply(this, args);
+		}
+		
+		return result;
+	}
+});
+
+
+// create and edit
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+		
+	createAndEdit: function(parent, index) {
+		var data = {title:parent.tree.defaultChildTitle};
+		
+		if (!this.canCreateChild(parent, index, data)) {
+			return false;
+		}
+		
+		var child = this.doCreateChild(parent, index, data);
+		if (!child) return false;
+		this.exposeCreateChild(parent, index, data);
+		
+		child.isPhantom = true;
+		
+		if (!this.editor.isClosed()) {
+			//dojo.debug("editLabelStart editor open");
+			this.editLabelFinish(this.editor.saveOnBlur);			
+		}
+		
+		
+				
+		this.doEditLabelStart(child);		
+	
+	}
+	
+});
+
+
+// =============================== clone ============================
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+	
+	canClone: function(child, newParent, index, deep){
+		return true;
+	},
+	
+	
+	clone: function(child, newParent, index, deep) {
+		return this.runStages(
+			this.canClone, this.prepareClone, this.doClone, this.finalizeClone, this.exposeClone, arguments
+		);			
+	},
+
+	exposeClone: function(child, newParent) {
+		if (newParent.isTreeNode) {
+			this.expand(newParent);
+		}
+	},
+
+	doClone: function(child, newParent, index, deep) {
+		//dojo.debug("Clone "+child);
+		var cloned = child.clone(deep);
+		newParent.addChild(cloned, index);
+				
+		return cloned;
+	}
+	
+
+});
+
+// =============================== detach ============================
+
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+	canDetach: function(child) {
+		if (child.actionIsDisabledNow(child.actions.DETACH)) {
+			return false;
+		}
+
+		return true;
+	},
+
+
+	detach: function(node) {
+		return this.runStages(
+			this.canDetach, this.prepareDetach, this.doDetach, this.finalizeDetach, this.exposeDetach, arguments
+		);			
+	},
+
+
+	doDetach: function(node, callObj, callFunc) {
+		node.detach();
+	}
+	
+});
+
+
+// =============================== destroy ============================
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+
+	canDestroyChild: function(child) {
+		
+		if (child.parent && !this.canDetach(child)) {
+			return false;
+		}
+		return true;
+	},
+
+
+	destroyChild: function(node) {
+		return this.runStages(
+			this.canDestroyChild, this.prepareDestroyChild, this.doDestroyChild, this.finalizeDestroyChild, this.exposeDestroyChild, arguments
+		);			
+	},
+
+
+	doDestroyChild: function(node) {
+		node.destroy();
+	}
+	
+});
+
+
+
+// =============================== move ============================
+
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+
+	/**
+	 * check for non-treenodes
+	 */
+	canMoveNotANode: function(child, parent) {
+		if (child.treeCanMove) {
+			return child.treeCanMove(parent);
+		}
+		
+		return true;
+	},
+
+	/**
+	 * Checks whether it is ok to change parent of child to newParent
+	 * May incur type checks etc
+	 *
+	 * It should check only hierarchical possibility w/o index, etc
+	 * because in onDragOver event for Between Dnd mode we can't calculate index at once on onDragOVer.
+	 * index changes as client moves mouse up-down over the node
+	 */
+	canMove: function(child, newParent){
+		if (!child.isTreeNode) {
+			return this.canMoveNotANode(child, newParent);
+		}
+						
+		if (child.actionIsDisabledNow(child.actions.MOVE)) {
+			return false;
+		}
+
+		// if we move under same parent then no matter if ADDCHILD disabled for him
+		// but if we move to NEW parent then check if action is disabled for him
+		// also covers case for newParent being a non-folder in strict mode etc
+		if (child.parent !== newParent && newParent.actionIsDisabledNow(newParent.actions.ADDCHILD)) {
+			return false;
+		}
+
+		// Can't move parent under child. check whether new parent is child of "child".
+		var node = newParent;
+		while(node.isTreeNode) {
+			//dojo.debugShallow(node.title)
+			if (node === child) {
+				// parent of newParent is child
+				return false;
+			}
+			node = node.parent;
+		}
+
+		return true;
+	},
+
+
+	move: function(child, newParent, index/*,...*/) {
+		return this.runStages(this.canMove, this.prepareMove, this.doMove, this.finalizeMove, this.exposeMove, arguments);			
+	},
+
+	doMove: function(child, newParent, index) {
+		//dojo.debug("MOVE "+child);
+		child.tree.move(child, newParent, index);
+
+		return true;
+	},
+	
+	exposeMove: function(child, newParent) {		
+		if (newParent.isTreeNode) {
+			this.expand(newParent);
+		}
+	}
+		
+
+});
+
+dojo.lang.extend(dojo.widget.TreeBasicControllerV3, {
+
+	// -----------------------------------------------------------------------------
+	//                             Create node stuff
+	// -----------------------------------------------------------------------------
+
+
+	canCreateChild: function(parent, index, data) {
+		if (parent.actionIsDisabledNow(parent.actions.ADDCHILD)) {
+			return false;
+		}
+
+		return true;
+	},
+
+
+	/* send data to server and add child from server */
+	/* data may contain an almost ready child, or anything else, suggested to server */
+	/*in Rpc controllers server responds with child data to be inserted */
+	createChild: function(parent, index, data) {
+		return this.runStages(this.canCreateChild, this.prepareCreateChild, this.doCreateChild, this.finalizeCreateChild, this.exposeCreateChild, arguments);		
+	},
+
+
+	doCreateChild: function(parent, index, data) {
+		//dojo.debug("doCreateChild parent "+parent+" index "+index+" data "+data);
+		
+		var newChild = parent.tree.createNode(data); 
+		//var newChild = dojo.widget.createWidget(widgetType, data);
+
+		parent.addChild(newChild, index);
+
+		return newChild;
+	},
+	
+	exposeCreateChild: function(parent) {
+		return this.expand(parent);
+	}
+
+
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeBasicControllerV3.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,150 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeCommon");
+dojo.require("dojo.widget.*"); // for dojo.widget.manager
+
+dojo.declare(
+	"dojo.widget.TreeCommon",
+	null,
+{
+	listenTreeEvents: [],
+	listenedTrees: {},
+	
+	/**
+	 * evaluates to false => skip unlistening nodes
+	 * provided => use it
+	 */	
+	listenNodeFilter: null,
+	
+	listenTree: function(tree) {
+		
+		//dojo.debug("listenTree in "+this+" tree "+tree);
+		
+		var _this = this;
+		
+		if (this.listenedTrees[tree.widgetId]) {
+			return; // already listening
+		}
+		
+		dojo.lang.forEach(this.listenTreeEvents, function(event) {
+			var eventHandler =  "on" + event.charAt(0).toUpperCase() + event.substr(1);
+			//dojo.debug("subscribe: event "+tree.eventNames[event]+" widget "+_this+" handler "+eventHandler);
+			dojo.event.topic.subscribe(tree.eventNames[event], _this, eventHandler);
+		});
+		
+		
+		var filter;
+		
+		if (this.listenNodeFilter) {			
+			this.processDescendants(tree, this.listenNodeFilter, this.listenNode, true);
+		}
+		
+		/**
+		 * remember that I listen to this tree. No unbinding/binding/deselection
+		 * needed when transfer between listened trees
+		 */
+		this.listenedTrees[tree.widgetId] = true;
+		
+	},			
+	
+	// interface functions
+	listenNode: function() {},	
+	unlistenNode: function() {},
+			
+	unlistenTree: function(tree, nodeFilter) {
+		
+		var _this = this;
+	
+		if (!this.listenedTrees[tree.widgetId]) {
+			return; 
+		}
+		
+		dojo.lang.forEach(this.listenTreeEvents, function(event) {
+			var eventHandler =  "on" + event.charAt(0).toUpperCase() + event.substr(1);
+			dojo.event.topic.unsubscribe(tree.eventNames[event], _this, eventHandler);
+		});
+		
+		
+		if (this.listenNodeFilter) {
+			this.processDescendants(tree, this.listenNodeFilter, this.unlistenNode, true);
+		}
+		
+		delete this.listenedTrees[tree.widgetId];
+		
+	},
+	
+	
+	/**
+	 * check condition for node.domNode -> .. -> any node chain
+	 */
+	checkPathCondition: function(domElement, condition) {
+		
+		while (domElement && !domElement.widgetId) {
+			if (condition.call(null, domElement)) {
+				return true;
+			}
+			
+			domElement = domElement.parentNode;
+		}
+		
+		return false;
+	},
+		
+	
+	/**
+	 * get node widget id by its descendant dom node
+	 */
+	domElement2TreeNode: function(domElement) {
+		
+		while (domElement && !domElement.widgetId) {
+			domElement = domElement.parentNode;
+		}
+		
+		if (!domElement) {
+			return null;
+		}
+		
+		var widget = dojo.widget.byId(domElement.widgetId);
+		
+		if (!widget.isTreeNode) {
+			return null;
+		}
+		
+		return widget;
+	},
+	
+	/**
+	 * it is here, not in Widget, because mostly tree needs it
+	 */
+	processDescendants: function(elem, filter, func, skipFirst) {
+		
+		var _this = this;
+		
+		if (!skipFirst) {
+			if (!filter.call(_this,elem)) {
+				return;
+			}
+			func.call(_this,elem);	        
+		}
+		
+		
+		var stack = [elem];
+		while (elem = stack.pop()) {
+			dojo.lang.forEach(elem.children, function(elem) {
+				if (filter.call(_this, elem)) {		
+					func.call(_this, elem);
+					stack.push(elem);
+				}
+			});
+		}
+    }
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeCommon.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenu.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenu.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenu.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenu.js Fri Nov 10 01:15:01 2006
@@ -11,32 +11,16 @@
 
 
 dojo.provide("dojo.widget.TreeContextMenu");
-dojo.provide("dojo.widget.TreeMenuItem");
 
 dojo.require("dojo.event.*");
 dojo.require("dojo.io.*");
 dojo.require("dojo.widget.Menu2");
 
 
-dojo.widget.tags.addParseTreeHandler("dojo:TreeContextMenu");
-dojo.widget.tags.addParseTreeHandler("dojo:TreeMenuItem");
-
-
-
-dojo.widget.TreeContextMenu = function() {
-	dojo.widget.PopupMenu2.call(this);
-
+dojo.widget.defineWidget("dojo.widget.TreeContextMenu", dojo.widget.PopupMenu2, function() {
 	this.listenedTrees = [];
-
-}
-
-
-dojo.inherits(dojo.widget.TreeContextMenu, dojo.widget.PopupMenu2);
-
-dojo.lang.extend(dojo.widget.TreeContextMenu, {
-
-	widgetType: "TreeContextMenu",
-
+},
+{
 	open: function(x, y, parentMenu, explodeSrc){
 
 		var result = dojo.widget.PopupMenu2.prototype.open.apply(this, arguments);
@@ -140,24 +124,7 @@
 
 });
 
-
-
-
-
-
-dojo.widget.TreeMenuItem = function() {
-	dojo.widget.MenuItem2.call(this);
-
-}
-
-
-dojo.inherits(dojo.widget.TreeMenuItem, dojo.widget.MenuItem2);
-
-
-dojo.lang.extend(dojo.widget.TreeMenuItem, {
-
-	widgetType: "TreeMenuItem",
-
+dojo.widget.defineWidget("dojo.widget.TreeMenuItem", dojo.widget.MenuItem2, {
 	// treeActions menu item performs following actions (to be checked for permissions)
 	treeActions: "",
 

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,132 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.widget.TreeContextMenuV3");
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.io.*");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.Menu2");
+dojo.require("dojo.widget.TreeCommon");
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeContextMenuV3",
+	[dojo.widget.PopupMenu2, dojo.widget.TreeCommon],
+	function() {
+		this.listenedTrees = {};
+		
+	},
+{
+
+	listenTreeEvents: ["afterTreeCreate","beforeTreeDestroy"],
+	listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget},
+	
+	onAfterTreeCreate: function(message) {
+		var tree = message.source;
+		this.bindDomNode(tree.domNode);
+	},
+	
+	onBeforeTreeDestroy: function(message) {
+		this.unBindDomNode(message.source.domNode);
+	},
+	
+	
+	getTreeNode: function() {
+		
+		var source = this.getTopOpenEvent().target;
+		var treeNode = this.domElement2TreeNode(source);
+		return treeNode;
+	
+	},
+		
+	open: function() {
+		var result = dojo.widget.PopupMenu2.prototype.open.apply(this, arguments);
+
+		for(var i=0; i< this.children.length; i++) {
+			/* notify children */
+			if (this.children[i].menuOpen) {
+				this.children[i].menuOpen(this.getTreeNode());
+			}
+		}
+		return result;
+	},
+	
+	close: function(){
+		
+		for(var i=0; i< this.children.length; i++) {
+			/* notify menu entries */
+			if (this.children[i].menuClose) {
+				this.children[i].menuClose(this.getTreeNode());
+			}
+		}
+		
+
+		var result = dojo.widget.PopupMenu2.prototype.close.apply(this, arguments);
+		
+		return result
+	}
+	
+});
+
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeMenuItemV3",
+	[dojo.widget.MenuItem2, dojo.widget.TreeCommon],
+	function() {
+		this.treeActions = [];
+	},
+{
+	// treeActions menu item performs following actions (to be checked for permissions)
+	treeActions: "",
+
+	initialize: function(args, frag) {
+		for(var i=0; i<this.treeActions.length; i++) {
+			this.treeActions[i] = this.treeActions[i].toUpperCase();
+		}
+	},
+
+		
+	getTreeNode: function() {
+		var menu = this;
+
+		// FIXME: change to dojo.widget[this.widgetType]
+		while (! (menu instanceof dojo.widget.TreeContextMenuV3) ) {
+				menu = menu.parent;
+		}
+
+		var treeNode = menu.getTreeNode()
+
+		return treeNode;
+	},
+
+
+	menuOpen: function(treeNode) {
+
+		treeNode.viewEmphase()
+		this.setDisabled(false); // enable by default
+
+		var _this = this;
+		dojo.lang.forEach(_this.treeActions,
+			function(action) {
+				_this.setDisabled( treeNode.actionIsDisabledNow(action) );
+			}
+		);
+
+	},
+	
+	menuClose: function(treeNode) {
+
+		treeNode.viewUnemphase()
+	},
+
+	toString: function() {
+		return "["+this.widgetType+" node "+this.getTreeNode()+"]";
+	}
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeContextMenuV3.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeControllerExtension.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeControllerExtension.js?view=diff&rev=473277&r1=473276&r2=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeControllerExtension.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeControllerExtension.js Fri Nov 10 01:15:01 2006
@@ -14,11 +14,10 @@
  */
 dojo.provide("dojo.widget.TreeControllerExtension");
 
-
-dojo.widget.TreeControllerExtension = function() { }
-
-dojo.lang.extend(dojo.widget.TreeControllerExtension, {
-
+dojo.declare(
+	"dojo.widget.TreeControllerExtension",
+	null,
+{
 	saveExpandedIndices: function(node, field) {
 		var obj = {};
 

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,130 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeDemo");
+dojo.require("dojo.Deferred");
+
+dojo.widget.TreeDemo = {
+	
+	reportIfDefered: function(res) {
+		if (res instanceof dojo.Deferred) {			
+			res.addCallbacks(
+				function(res) { /* dojo.debug("OK " + (res ? res: '')); */ return res },
+				function(err) { dojo.debug("Error"); dojo.debugShallow(err); }
+			);
+		}		
+	},
+	
+	resetRandomChildren: function(maxCount) {
+		this.randomChildrenMaxCount = maxCount;
+		this.randomChildrenCount = 0;
+		this.randomChildrenDepth = 0;
+	},
+	
+	
+	makeRandomChildren: function(title) {		
+
+		this.randomChildrenDepth++;
+			
+		var children = [];
+		for (var i=1; i<=5; i++) {				
+
+			var t = title+(this.randomChildrenDepth==1 ? '' : '.')+i;
+			var node = {title: t};
+				
+			children.push(node);		
+			this.randomChildrenCount++	
+			if (this.randomChildrenCount >= this.randomChildrenMaxCount) {
+				break;			
+			}
+		}
+
+		var i=1;
+		var _this = this;
+		dojo.lang.forEach(children, function(child) {
+			var t = title+(_this.randomChildrenDepth==1 ? '' : '.')+i;
+			i++;
+		
+			// first node is always folder for tests
+			if (_this.randomChildrenCount<_this.randomChildrenMaxCount && (
+				_this.randomChildrenDepth==1 && child === children[0] || _this.randomChildrenDepth<5 && Math.random()>0.3 )
+			  ) {
+				//dojo.debug("add child "+t);
+				child.children = _this.makeRandomChildren(t);	
+			}
+		});
+				
+
+			//dojo.debug("out "+nodeOrTree);
+			
+		this.randomChildrenDepth--;
+			
+		return children;			
+	},
+	
+	bindDemoMenu: function(controller) {
+		var _t = this;
+		
+		dojo.event.topic.subscribe('treeContextMenuDestroy/engage',
+			function (menuItem) { 
+				var node = menuItem.getTreeNode();
+				//if (confirm("Delete node with descendants: "+node.title.replace(/(<([^>]+)>)/ig," ") +" ?")) {
+				_t.reportIfDefered(controller.destroyChild(node)); 
+				
+			}
+		);
+
+		dojo.event.topic.subscribe('treeContextMenuRefresh/engage',
+			function (menuItem) {
+                var node = menuItem.getTreeNode();
+                _t.reportIfDefered(controller.refreshChildren(node));
+			}
+		);
+
+		dojo.event.topic.subscribe('treeContextMenuCreate/engage',
+			function (menuItem) {
+				var node = menuItem.getTreeNode();
+				var d = controller.createAndEdit(node, 0);
+				_t.reportIfDefered(d);
+            }
+		);
+
+
+		dojo.event.topic.subscribe('treeContextMenuUp/engage',
+			function (menuItem) {
+                var node = menuItem.getTreeNode();
+                if (node.isFirstChild()) return;
+                _t.reportIfDefered(controller.move(node, node.parent, node.getParentIndex()-1));
+            }
+		);
+
+
+		dojo.event.topic.subscribe('treeContextMenuDown/engage',
+			function (menuItem) {
+                var node = menuItem.getTreeNode();
+                if (node.isLastChild()) return;
+                _t.reportIfDefered(controller.move(node, node.parent, node.getParentIndex()+1));
+            }
+		);
+
+		dojo.event.topic.subscribe('treeContextMenuEdit/engage',
+			function (menuItem) {
+                var node = menuItem.getTreeNode();
+                _t.reportIfDefered(controller.editLabelStart(node));
+			}
+		);
+
+
+	}
+	
+	
+	
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDemo.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,36 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeDeselectOnDblselect");
+
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.TreeSelectorV3");
+
+// selector extension to emphase node
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeDeselectOnDblselect",
+	[dojo.widget.HtmlWidget],
+{
+	selector: "",
+	
+	initialize: function() {
+		this.selector = dojo.widget.byId(this.selector);
+		//dojo.debug("OK "+this.selector);
+		dojo.event.topic.subscribe(this.selector.eventNames.dblselect, this, "onDblselect");		
+	},
+
+	onDblselect: function(message) {
+		//dojo.debug("happen "+this.selector);
+		//dojo.debug(message.node);
+		this.selector.deselect(message.node);
+	}
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDeselectOnDblselect.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,55 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide( "dojo.widget.TreeDisableWrapExtension" );
+
+dojo.require( "dojo.widget.HtmlWidget" );
+dojo.require( "dojo.widget.TreeExtension" );
+
+// selector extension to emphase node
+dojo.widget.defineWidget(
+	"dojo.widget.TreeDisableWrapExtension",
+	dojo.widget.TreeExtension,
+{
+	/**
+	 * can't unlisten
+	 */
+	templateCssPath: dojo.uri.dojoUri( "src/widget/templates/TreeDisableWrap.css" ),
+		
+	listenTree: function(tree) {
+		
+		var wrappingDiv = document.createElement( "div" );
+		var clazz = tree.classPrefix+"DisableWrap";
+		if (dojo.render.html.ie) {
+			clazz = clazz+' '+ tree.classPrefix+"IEDisableWrap";
+		}
+		dojo.html.setClass(wrappingDiv, clazz);
+		
+		var table = document.createElement( "table" );
+		wrappingDiv.appendChild( table );
+		
+		var tbody = document.createElement( "tbody" );
+		table.appendChild( tbody );
+		
+		var tr = document.createElement( "tr" );
+		tbody.appendChild( tr );
+		
+		var td = document.createElement( "td" );
+		tr.appendChild( td );
+		
+		if( tree.domNode.parentNode ) {
+			tree.domNode.parentNode.replaceChild( wrappingDiv, tree.domNode );
+		}
+		
+		td.appendChild( tree.domNode );
+		tree.domNode = wrappingDiv;
+	}
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDisableWrapExtension.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,137 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeDndControllerV3");
+
+dojo.require("dojo.dnd.TreeDragAndDropV3");
+	
+dojo.widget.defineWidget(
+	"dojo.widget.TreeDndControllerV3",
+	[dojo.widget.HtmlWidget, dojo.widget.TreeCommon],
+	function() {
+		this.dragSources = {};
+		this.dropTargets = {};
+		this.listenedTrees = {};
+	},
+{
+	listenTreeEvents: ["afterChangeTree","beforeTreeDestroy", "afterAddChild"],
+	listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget}, 
+	
+	initialize: function(args) {
+		this.treeController = dojo.lang.isString(args.controller) ? dojo.widget.byId(args.controller) : args.controller;
+		
+		if (!this.treeController) {
+			dojo.raise("treeController must be declared");
+		}
+		
+	},
+
+	onBeforeTreeDestroy: function(message) {
+		this.unlistenTree(message.source);
+	},
+	
+	// first Dnd registration happens in addChild
+	// because I have information about parent on this stage and can use it
+	// to check locking or other things
+	onAfterAddChild: function(message) {
+		//dojo.debug("Dnd addChild "+message.child);
+		this.listenNode(message.child);		
+	},
+
+
+	onAfterChangeTree: function(message) {
+		/* catch new nodes on afterAddChild, because I need parent */		
+		if (!message.oldTree) return;
+		
+		//dojo.debug("HERE");
+		
+		if (!message.newTree || !this.listenedTrees[message.newTree.widgetId]) {			
+			this.processDescendants(message.node, this.listenNodeFilter, this.unlistenNode);
+		}		
+		
+		if (!this.listenedTrees[message.oldTree.widgetId]) {
+			// we have new node
+			this.processDescendants(message.node, this.listenNodeFilter, this.listenNode);	
+		}
+		//dojo.profile.end("onTreeChange");
+	},
+	
+	
+	/**
+	 * Controller(node model) creates DndNodes because it passes itself to node for synchroneous drops processing
+	 * I can't process DnD with events cause an event can't return result success/false
+	*/
+	listenNode: function(node) {
+
+		//dojo.debug("listen dnd "+node);
+		//dojo.debug((new Error()).stack)
+		//dojo.profile.start("Dnd listenNode "+node);		
+		if (!node.tree.DndMode) return;
+		if (this.dragSources[node.widgetId] || this.dropTargets[node.widgetId]) return;
+
+	
+		/* I drag label, not domNode, because large domNodes are very slow to copy and large to drag */
+
+		var source = null;
+		var target = null;
+
+	
+		if (!node.actionIsDisabled(node.actions.MOVE)) {
+			//dojo.debug("reg source")
+			
+			//dojo.profile.start("Dnd source "+node);		
+			var source = this.makeDragSource(node);
+			//dojo.profile.end("Dnd source "+node);		
+
+			this.dragSources[node.widgetId] = source;
+		}
+
+		//dojo.profile.start("Dnd target "+node);		
+		//dojo.debug("reg target");
+		var target = this.makeDropTarget(node);
+		//dojo.profile.end("Dnd target "+node);		
+
+		this.dropTargets[node.widgetId] = target;
+
+		//dojo.profile.end("Dnd listenNode "+node);		
+
+
+	},
+	
+	/**
+	 * Factory method, override it to create special source
+	 */
+	makeDragSource: function(node) {
+		return new dojo.dnd.TreeDragSourceV3(node.contentNode, this, node.tree.widgetId, node);
+	},
+
+
+	/**
+	 * Factory method, override it to create special target
+	 */
+	makeDropTarget: function(node) {
+		 return new dojo.dnd.TreeDropTargetV3(node.contentNode, this.treeController, node.tree.DndAcceptTypes, node);
+	},
+
+	unlistenNode: function(node) {
+
+		if (this.dragSources[node.widgetId]) {
+			dojo.dnd.dragManager.unregisterDragSource(this.dragSources[node.widgetId]);
+			delete this.dragSources[node.widgetId];
+		}
+
+		if (this.dropTargets[node.widgetId]) {
+			dojo.dnd.dragManager.unregisterDropTarget(this.dropTargets[node.widgetId]);
+			delete this.dropTargets[node.widgetId];
+		}
+	}
+
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDndControllerV3.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,117 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeDocIconExtension");
+
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.TreeExtension");
+
+// selector extension to emphase node
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeDocIconExtension",
+	[dojo.widget.TreeExtension],
+{
+	/**
+	 * can't unlisten
+	 */
+	
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/TreeDocIcon.css"),
+
+	
+	listenTreeEvents: ["afterChangeTree","afterSetFolder","afterUnsetFolder"],
+	
+	listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget },
+	
+	getnodeDocType: function(node) {
+		var nodeDocType = node.getnodeDocType();
+		if (!nodeDocType) { // set default type
+			nodeDocType = node.isFolder ? "Folder" : "Document";
+		}
+		return nodeDocType;
+	},
+	
+	setnodeDocTypeClass: function(node) {
+		
+		var reg = new RegExp("(^|\\s)"+node.tree.classPrefix+"Icon\\w+",'g');			
+				
+		var clazz = dojo.html.getClass(node.iconNode).replace(reg,'') + ' ' + node.tree.classPrefix+'Icon'+this.getnodeDocType(node);
+		dojo.html.setClass(node.iconNode, clazz);		
+	},
+		
+		
+	onAfterSetFolder: function(message) {
+		//dojo.debug("FOLDER");
+		if (message.source.iconNode) {
+			// on node-initialize time when folder is set there is no iconNode
+			// this case will be processed in treeChange anyway			
+			this.setnodeDocTypeClass(message.source);
+		}
+	},
+	
+	
+	onAfterUnsetFolder: function(message) {
+		this.setnodeDocTypeClass(message.source);
+	},
+		
+	
+	listenNode: function(node) {
+		/**
+		 * add node with document type icon to node template and Tree.iconNodeTemplate
+		 * it will be set to TreeNode.iconNode on node creation
+		 * we do not assign document type yet, its node specific
+		 */
+		//dojo.debug("listenNode in "+node);
+			
+		node.contentIconNode = document.createElement("div");
+		var clazz = node.tree.classPrefix+"IconContent";
+		if (dojo.render.html.ie) {
+			clazz = clazz+' '+ node.tree.classPrefix+"IEIconContent";
+		}
+		dojo.html.setClass(node.contentIconNode, clazz);
+		
+		node.contentNode.parentNode.replaceChild(node.contentIconNode, node.expandNode);
+									  
+	  	node.iconNode = document.createElement("div");
+		dojo.html.setClass(node.iconNode, node.tree.classPrefix+"Icon"+' '+node.tree.classPrefix+'Icon'+this.getnodeDocType(node));
+		
+		node.contentIconNode.appendChild(node.expandNode);
+		node.contentIconNode.appendChild(node.iconNode);
+		
+		dojo.dom.removeNode(node.contentNode);
+		node.contentIconNode.appendChild(node.contentNode);
+		
+	
+		
+		//dojo.html.insertAfter(node.iconNode, node.expandNode);
+		
+		//dojo.debug("listenNode out "+node);
+		
+	},
+			
+	
+	onAfterChangeTree: function(message) {
+		var _this = this;
+		
+		//dojo.debug(message.node)
+		
+		if (!message.oldTree || !this.listenedTrees[message.oldTree.widgetId]) {			
+			// moving from old tree to our tree
+			this.processDescendants(message.node,
+				this.listenNodeFilter,
+				this.listenNode
+			);
+		}
+		
+	}
+	
+
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeDocIconExtension.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,115 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.RichText");
+
+dojo.provide("dojo.widget.TreeEditor");
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeEditor",
+	dojo.widget.HtmlWidget,
+{
+		
+		
+	singleLineMode: false, // enter saves
+	saveOnBlur: true, // blur or new edit saves current
+	sync: false,  // finish editing in sync/async mode
+	selectOnOpen: true,
+	
+	controller: null,
+		
+	node: null,
+	
+	richTextParams: {},
+	
+	
+	
+	getContents: function() {
+		return this.richText.getEditorContent();
+	},
+	
+	open: function(node) {
+		
+		if (!this.richText) {
+			this.richText = dojo.widget.createWidget("RichText", this.richTextParams, node.labelNode);
+		
+			dojo.event.connect("around", this.richText, "onKeyDown", this, "richText_onKeyDown" );
+			dojo.event.connect(this.richText, "onBlur", this, "richText_onBlur" );
+			
+			var self = this;
+			dojo.event.connect(this.richText, "onLoad", function(){
+				if (self.selectOnOpen) {
+					self.richText.execCommand("selectall");
+				}
+			});
+		} else {
+			this.richText.open(node.labelNode);
+		}
+		
+		this.node = node;		
+	},
+	
+	close: function(save) {
+		
+		this.richText.close(save);
+		
+		
+		this.node = null;	
+	},
+	
+	isClosed: function() {
+		return !this.richText || this.richText.isClosed;
+	},
+	
+	execCommand: function() {
+		this.richText.execCommand.apply(this.richText, arguments);
+	},
+	
+	richText_onKeyDown: function(invocation) {
+		var e = invocation.args[0];
+		if((!e)&&(this.object)) {
+			e = dojo.event.browser.fixEvent(this.editor.window.event);
+		}
+		
+		switch (e.keyCode) {
+			case e.KEY_ESCAPE:
+				this.finish(false);
+				dojo.event.browser.stopEvent(e);		
+				break;
+			case e.KEY_ENTER:
+				if( e.ctrlKey && !this.singleLineMode ) {
+					this.execCommand( "inserthtml", "<br/>" );
+							
+				}
+				else {
+					this.finish(true);					
+					//dojo.debug("finish");
+				}
+				dojo.event.browser.stopEvent(e);
+				break;
+			default:
+				return invocation.proceed();
+		}
+	},
+	
+	richText_onBlur: function() {
+		this.finish(this.saveOnBlur);
+	},
+	
+	
+	finish: function(save) {
+		return this.controller.editLabelFinish(save, this.sync);
+	}
+		
+		
+	
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEditor.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js?view=auto&rev=473277
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js (added)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js Fri Nov 10 01:15:01 2006
@@ -0,0 +1,43 @@
+/*
+	Copyright (c) 2004-2006, The Dojo Foundation
+	All Rights Reserved.
+
+	Licensed under the Academic Free License version 2.1 or above OR the
+	modified BSD license. For more information on Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+*/
+
+
+dojo.provide("dojo.widget.TreeEmphaseOnSelect");
+
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.TreeSelectorV3");
+dojo.require("dojo.html.selection");
+
+// selector extension to emphase node
+
+dojo.widget.defineWidget(
+	"dojo.widget.TreeEmphaseOnSelect",
+	dojo.widget.HtmlWidget,
+{
+	selector: "",
+	
+	initialize: function() {
+		this.selector = dojo.widget.byId(this.selector);
+		
+		dojo.event.topic.subscribe(this.selector.eventNames.select, this, "onSelect");
+		dojo.event.topic.subscribe(this.selector.eventNames.deselect, this, "onDeselect");	
+	},
+
+	
+	onSelect: function(message) {
+		message.node.viewEmphase()		
+	},
+	
+	onDeselect: function(message) {
+		message.node.viewUnemphase()
+	}
+	
+
+});

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js
------------------------------------------------------------------------------
    svn:keywords = "Id Author LastChangedDate LastChangedBy LastChangedRevision"

Propchange: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/resource/src/widget/TreeEmphaseOnSelect.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain