lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge type comparison into a single function call

Browse Source
This commit is contained in:
James Shubin
2016-01-08 04:13:42 -05:00
parent d769309cc0
commit 45ff3b6aa4
3 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
file.go
View File

@@ -368,24 +368,21 @@ func (obj *FileType) ApplyDir() bool {
func (obj *FileType) Compare(typ Type) bool {
switch typ.(type) {
case *FileType:
return obj.compare(typ.(*FileType))
typ := typ.(*FileType)
if obj.Name != typ.Name {
return false
}
if obj.GetPath() != typ.Path {
return false
}
if obj.Content != typ.Content {
return false
}
if obj.State != typ.State {
return false
}
default:
return false
}
}
func (obj *FileType) compare(typ *FileType) bool {
if obj.Name != typ.Name {
return false
}
if obj.GetPath() != typ.Path {
return false
}
if obj.Content != typ.Content {
return false
}
if obj.State != typ.State {
return false
}
return true
}

23
service.go
View File

@@ -304,21 +304,18 @@ func (obj *ServiceType) Apply() bool {
func (obj *ServiceType) Compare(typ Type) bool {
switch typ.(type) {
case *ServiceType:
return obj.compare(typ.(*ServiceType))
typ := typ.(*ServiceType)
if obj.Name != typ.Name {
return false
}
if obj.State != typ.State {
return false
}
if obj.Startup != typ.Startup {
return false
}
default:
return false
}
}
func (obj *ServiceType) compare(typ *ServiceType) bool {
if obj.Name != typ.Name {
return false
}
if obj.State != typ.State {
return false
}
if obj.Startup != typ.Startup {
return false
}
return true
}

11
types.go
View File

@@ -294,15 +294,12 @@ func (obj *NoopType) Compare(typ Type) bool {
switch typ.(type) {
// we can only compare NoopType to others of the same type
case *NoopType:
return obj.compare(typ.(*NoopType))
typ := typ.(*NoopType)
if obj.Name != typ.Name {
return false
}
default:
return false
}
}
func (obj *NoopType) compare(typ *NoopType) bool {
if obj.Name != typ.Name {
return false
}
return true
}