state/api/watcher: Refactor API watchers

state/apiserver/root.go

Index: state/apiserver/root.go
=== modified file 'state/apiserver/root.go'
--- state/apiserver/root.go	2013-07-04 07:47:38 +0000
+++ state/apiserver/root.go	2013-07-05 10:28:47 +0000
@@ -129,25 +129,6 @@
 	}, nil
 }
 
-// EnvironConfigWatcher returns an object that provides
-// API access to methods on a state.EnvironConfigWatcher.
-// Each client has its own current set of watchers, stored
-// in r.resources.
-func (r *srvRoot) EnvironConfigWatcher(id string) (*srvEnvironConfigWatcher, error) {
-	if err := r.requireAgent(); err != nil {
-		return nil, err
-	}
-	watcher, ok := r.resources.Get(id).(*state.EnvironConfigWatcher)
-	if !ok {
-		return nil, common.ErrUnknownWatcher
-	}
-	return &srvEnvironConfigWatcher{
-		watcher:   watcher,
-		id:        id,
-		resources: r.resources,
-	}, nil
-}
-
 // AllWatcher returns an object that provides API access to methods on
 // a state/multiwatcher.Watcher, which watches any changes to the
 // state. Each client has its own current set of watchers, stored in