a simpler time

1 files changed, 1 insertions, 67 deletions

diff --git a/init.go b/init.go
index 0a94b3e..1896031 100644
--- a/init.go
+++ b/init.go
@@ -16,72 +16,6 @@ import (
 
 var muAction sync.Mutex
 
-// TODO: add checks for nil function pointers
-func (me *TreeInfo) newAction(a widget.Action) {
-	n := treeRoot.FindWidgetId(a.WidgetId)
-	switch a.ActionType {
-	case widget.Add:
-		if n == nil {
-			n := me.AddNode(&a)
-			me.Add(n)
-			return
-		}
-		log.Log(TREEWARN, "attempting to re-add widget", a.WidgetId, a.WidgetType, a.ActionType)
-		return
-	}
-	if n == nil {
-		// log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.WidgetId, a.WidgetType, a.ActionType)
-		// log.Log(TREEWARN, "tree.FindWidgetId() n == nil", a.State.CurrentS)
-		// log.Log(TREEWARN, "tree.FindWidgetId() n == nil. This should not happen. Bug in gui or tree package?")
-		// log.Log(TREEWARN, "tree.FindWidgetId() n == nil. A bug in your application?")
-		return
-	}
-
-	switch a.ActionType {
-	case widget.SetText:
-		log.Log(TREE, "tree.SetText() a.State.CurrentS =", a.State.CurrentS)
-		log.Log(TREE, "tree.SetText() a.State.DefaultS =", a.State.DefaultS)
-		log.Log(TREE, "tree.SetText() a.State.NewString =", a.State.NewString)
-		switch n.WidgetType {
-		case widget.Dropdown:
-			me.SetText(n, a.State.NewString)
-		case widget.Combobox:
-			me.SetText(n, a.State.NewString)
-		case widget.Textbox:
-			me.SetText(n, a.State.NewString)
-		case widget.Window:
-			me.SetTitle(n, a.State.Label)
-		default:
-			// buttons, checkboxes, groups, etc
-			me.SetLabel(n, a.State.Label)
-		}
-	case widget.AddText:
-		switch n.WidgetType {
-		case widget.Dropdown:
-			n.ddStrings = append(n.ddStrings, a.State.NewString)
-			me.AddText(n, a.State.NewString)
-		case widget.Combobox:
-			n.ddStrings = append(n.ddStrings, a.State.NewString)
-			me.AddText(n, a.State.NewString)
-		default:
-			log.Log(TREEWARN, "AddText() not supported on widget", n.WidgetType, n.String())
-		}
-	case widget.Checked:
-		switch n.WidgetType {
-		case widget.Checkbox:
-			if me.SetChecked == nil {
-				log.Log(TREEWARN, "SetChecked() == nil in toolkit", me.PluginName)
-			} else {
-				me.SetChecked(n, a.State.Checked)
-			}
-		default:
-			log.Log(TREEWARN, "SetChecked() not supported on widget", n.WidgetType, n.String())
-		}
-	default:
-		me.NodeAction(n, a.ActionType)
-	}
-}
-
 func (me *TreeInfo) catchActionChannel() {
 	defer func() {
 		if r := recover(); r != nil {
@@ -102,7 +36,7 @@ func (me *TreeInfo) catchActionChannel() {
 		case a := <-me.pluginChan:
 			log.Verbose("catchActionChannel() on ", a.WidgetId, a.WidgetType, a.ProgName)
 			muAction.Lock()
-			me.newAction(a)
+			me.doAction(a)
 			muAction.Unlock()
 		}
 	}