github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-09-06 10:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename LabelMajor to Label

Browse Source
This commit is contained in:
Paul Bellamy
2016-03-29 14:00:11 +01:00
parent 43547fae32
commit 80dc714c1e
17 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/renderable_node.go
+10 -10
View File
@@ -13,7 +13,7 @@ import (
// to rendering a node when there are many nodes visible at once.
type RenderableNode struct {
ID string `json:"id"` //
LabelMajor string `json:"label_major"` // e.g. "process", human-readable
Label string `json:"label"` // e.g. "process", human-readable
LabelMinor string `json:"label_minor,omitempty"` // e.g. "hostname", human-readable, optional
Rank string `json:"rank"` // to help the layout engine
Pseudo bool `json:"pseudo,omitempty"` // sort-of a placeholder node, for rendering purposes
@@ -39,7 +39,7 @@ const (
func NewRenderableNode(id string) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: "",
Label: "",
LabelMinor: "",
Rank: "",
Pseudo: false,
@@ -50,10 +50,10 @@ func NewRenderableNode(id string) RenderableNode {
}
// NewRenderableNodeWith makes a new RenderableNode with some fields filled in
func NewRenderableNodeWith(id, major, minor, rank string, node RenderableNode) RenderableNode {
func NewRenderableNodeWith(id, label, minor, rank string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: major,
Label: label,
LabelMinor: minor,
Rank: rank,
Pseudo: false,
@@ -68,7 +68,7 @@ func NewRenderableNodeWith(id, major, minor, rank string, node RenderableNode) R
func NewDerivedNode(id string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: "",
Label: "",
LabelMinor: "",
Rank: "",
Pseudo: node.Pseudo,
@@ -80,10 +80,10 @@ func NewDerivedNode(id string, node RenderableNode) RenderableNode {
}
}
func newDerivedPseudoNode(id, major string, node RenderableNode) RenderableNode {
func newDerivedPseudoNode(id, label string, node RenderableNode) RenderableNode {
return RenderableNode{
ID: id,
LabelMajor: major,
Label: label,
LabelMinor: "",
Rank: "",
Pseudo: true,
@@ -112,8 +112,8 @@ func (rn RenderableNode) WithParents(p report.Sets) RenderableNode {
func (rn RenderableNode) Merge(other RenderableNode) RenderableNode {
result := rn.Copy()
if result.LabelMajor == "" {
result.LabelMajor = other.LabelMajor
if result.Label == "" {
result.Label = other.Label
}
if result.LabelMinor == "" {
@@ -144,7 +144,7 @@ func (rn RenderableNode) Merge(other RenderableNode) RenderableNode {
func (rn RenderableNode) Copy() RenderableNode {
return RenderableNode{
ID: rn.ID,
LabelMajor: rn.LabelMajor,
Label: rn.Label,
LabelMinor: rn.LabelMinor,
Rank: rn.Rank,
Pseudo: rn.Pseudo,