From 54ba307f7fa1e956723dd00b2c4fcc2994759d9f Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 5 Nov 2014 22:40:31 +0800 Subject: [PATCH] change this to short name --- example/beeapi/controllers/default.go | 40 +++++++++++++-------------- example/chat/controllers/default.go | 6 ++-- example/chat/controllers/ws.go | 6 ++-- flash_test.go | 6 ++-- router_test.go | 30 ++++++++++---------- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/example/beeapi/controllers/default.go b/example/beeapi/controllers/default.go index c6e53e74..a2184075 100644 --- a/example/beeapi/controllers/default.go +++ b/example/beeapi/controllers/default.go @@ -17,47 +17,47 @@ type ObjectController struct { beego.Controller } -func (this *ObjectController) Post() { +func (o *ObjectController) Post() { var ob models.Object - json.Unmarshal(this.Ctx.Input.RequestBody, &ob) + json.Unmarshal(o.Ctx.Input.RequestBody, &ob) objectid := models.AddOne(ob) - this.Data["json"] = map[string]string{"ObjectId": objectid} - this.ServeJson() + o.Data["json"] = map[string]string{"ObjectId": objectid} + o.ServeJson() } -func (this *ObjectController) Get() { - objectId := this.Ctx.Input.Params[":objectId"] +func (o *ObjectController) Get() { + objectId := o.Ctx.Input.Params[":objectId"] if objectId != "" { ob, err := models.GetOne(objectId) if err != nil { - this.Data["json"] = err + o.Data["json"] = err } else { - this.Data["json"] = ob + o.Data["json"] = ob } } else { obs := models.GetAll() - this.Data["json"] = obs + o.Data["json"] = obs } - this.ServeJson() + o.ServeJson() } -func (this *ObjectController) Put() { - objectId := this.Ctx.Input.Params[":objectId"] +func (o *ObjectController) Put() { + objectId := o.Ctx.Input.Params[":objectId"] var ob models.Object - json.Unmarshal(this.Ctx.Input.RequestBody, &ob) + json.Unmarshal(o.Ctx.Input.RequestBody, &ob) err := models.Update(objectId, ob.Score) if err != nil { - this.Data["json"] = err + o.Data["json"] = err } else { - this.Data["json"] = "update success!" + o.Data["json"] = "update success!" } - this.ServeJson() + o.ServeJson() } -func (this *ObjectController) Delete() { - objectId := this.Ctx.Input.Params[":objectId"] +func (o *ObjectController) Delete() { + objectId := o.Ctx.Input.Params[":objectId"] models.Delete(objectId) - this.Data["json"] = "delete success!" - this.ServeJson() + o.Data["json"] = "delete success!" + o.ServeJson() } diff --git a/example/chat/controllers/default.go b/example/chat/controllers/default.go index 370e6db1..95ef8a9b 100644 --- a/example/chat/controllers/default.go +++ b/example/chat/controllers/default.go @@ -14,7 +14,7 @@ type MainController struct { beego.Controller } -func (this *MainController) Get() { - this.Data["host"] = this.Ctx.Request.Host - this.TplNames = "index.tpl" +func (m *MainController) Get() { + m.Data["host"] = m.Ctx.Request.Host + m.TplNames = "index.tpl" } diff --git a/example/chat/controllers/ws.go b/example/chat/controllers/ws.go index 9ec5b418..fc3917b3 100644 --- a/example/chat/controllers/ws.go +++ b/example/chat/controllers/ws.go @@ -154,10 +154,10 @@ var upgrader = websocket.Upgrader{ WriteBufferSize: 1024, } -func (this *WSController) Get() { - ws, err := upgrader.Upgrade(this.Ctx.ResponseWriter, this.Ctx.Request, nil) +func (w *WSController) Get() { + ws, err := upgrader.Upgrade(w.Ctx.ResponseWriter, w.Ctx.Request, nil) if _, ok := err.(websocket.HandshakeError); ok { - http.Error(this.Ctx.ResponseWriter, "Not a websocket handshake", 400) + http.Error(w.Ctx.ResponseWriter, "Not a websocket handshake", 400) return } else if err != nil { return diff --git a/flash_test.go b/flash_test.go index 7c581e6a..b655f552 100644 --- a/flash_test.go +++ b/flash_test.go @@ -25,12 +25,12 @@ type TestFlashController struct { Controller } -func (this *TestFlashController) TestWriteFlash() { +func (t *TestFlashController) TestWriteFlash() { flash := NewFlash() flash.Notice("TestFlashString") - flash.Store(&this.Controller) + flash.Store(&t.Controller) // we choose to serve json because we don't want to load a template html file - this.ServeJson(true) + t.ServeJson(true) } func TestFlashHeader(t *testing.T) { diff --git a/router_test.go b/router_test.go index c64bb191..ee712167 100644 --- a/router_test.go +++ b/router_test.go @@ -27,33 +27,33 @@ type TestController struct { Controller } -func (this *TestController) Get() { - this.Data["Username"] = "astaxie" - this.Ctx.Output.Body([]byte("ok")) +func (tc *TestController) Get() { + tc.Data["Username"] = "astaxie" + tc.Ctx.Output.Body([]byte("ok")) } -func (this *TestController) Post() { - this.Ctx.Output.Body([]byte(this.Ctx.Input.Query(":name"))) +func (tc *TestController) Post() { + tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Query(":name"))) } -func (this *TestController) Param() { - this.Ctx.Output.Body([]byte(this.Ctx.Input.Query(":name"))) +func (tc *TestController) Param() { + tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Query(":name"))) } -func (this *TestController) List() { - this.Ctx.Output.Body([]byte("i am list")) +func (tc *TestController) List() { + tc.Ctx.Output.Body([]byte("i am list")) } -func (this *TestController) Params() { - this.Ctx.Output.Body([]byte(this.Ctx.Input.Params["0"] + this.Ctx.Input.Params["1"] + this.Ctx.Input.Params["2"])) +func (tc *TestController) Params() { + tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Params["0"] + tc.Ctx.Input.Params["1"] + tc.Ctx.Input.Params["2"])) } -func (this *TestController) Myext() { - this.Ctx.Output.Body([]byte(this.Ctx.Input.Param(":ext"))) +func (tc *TestController) Myext() { + tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Param(":ext"))) } -func (this *TestController) GetUrl() { - this.Ctx.Output.Body([]byte(this.UrlFor(".Myext"))) +func (tc *TestController) GetUrl() { + tc.Ctx.Output.Body([]byte(tc.UrlFor(".Myext"))) } func (t *TestController) GetParams() {