gofmt all project files
This commit is contained in:
parent
e0b9309cfc
commit
009a3074fe
11 changed files with 58 additions and 28 deletions
29
.idea/watcherTasks.xml
Normal file
29
.idea/watcherTasks.xml
Normal file
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectTasksOptions">
|
||||
<TaskOptions isEnabled="true">
|
||||
<option name="arguments" value="fmt $FilePath$" />
|
||||
<option name="checkSyntaxErrors" value="true" />
|
||||
<option name="description" />
|
||||
<option name="exitCodeBehavior" value="ERROR" />
|
||||
<option name="fileExtension" value="go" />
|
||||
<option name="immediateSync" value="false" />
|
||||
<option name="name" value="go fmt" />
|
||||
<option name="output" value="$FilePath$" />
|
||||
<option name="outputFilters">
|
||||
<array />
|
||||
</option>
|
||||
<option name="outputFromStdout" value="false" />
|
||||
<option name="program" value="$GoExecPath$" />
|
||||
<option name="runOnExternalChanges" value="false" />
|
||||
<option name="scopeName" value="Project Files" />
|
||||
<option name="trackOnlyRoot" value="true" />
|
||||
<option name="workingDir" value="$ProjectFileDir$" />
|
||||
<envs>
|
||||
<env name="GOROOT" value="$GOROOT$" />
|
||||
<env name="GOPATH" value="$GOPATH$" />
|
||||
<env name="PATH" value="$GoBinDirs$" />
|
||||
</envs>
|
||||
</TaskOptions>
|
||||
</component>
|
||||
</project>
|
27
ferag.go
27
ferag.go
|
@ -2,26 +2,26 @@ package feragstring
|
|||
|
||||
const (
|
||||
dateInputFormatISO = "2006-01-02"
|
||||
dateOutputFormat = "060102"
|
||||
linebreak = "\r\n"
|
||||
dateOutputFormat = "060102"
|
||||
linebreak = "\r\n"
|
||||
)
|
||||
|
||||
type FeragString struct {
|
||||
TitleInfo *TitleInfo
|
||||
TitleEnd *TitleEnd
|
||||
ProductReferences []*ProductReference
|
||||
ProductReferencesNr int
|
||||
RouteListEntries []*RouteListEntry
|
||||
RouteListEntryCount int
|
||||
RouteInfoEntries []*RouteInfo
|
||||
TitleInfo *TitleInfo
|
||||
TitleEnd *TitleEnd
|
||||
ProductReferences []*ProductReference
|
||||
ProductReferencesNr int
|
||||
RouteListEntries []*RouteListEntry
|
||||
RouteListEntryCount int
|
||||
RouteInfoEntries []*RouteInfo
|
||||
ProductionDropEntries []*ProductionDrop
|
||||
RouteEndEntries []*RouteEnd
|
||||
RouteEndEntries []*RouteEnd
|
||||
}
|
||||
|
||||
func NewFeragString() *FeragString {
|
||||
fs := FeragString{
|
||||
TitleInfo: NewTitleInfo(),
|
||||
TitleEnd: NewTitleEnd(),
|
||||
TitleEnd: NewTitleEnd(),
|
||||
}
|
||||
return &fs
|
||||
}
|
||||
|
@ -32,8 +32,10 @@ func (fs *FeragString) SetTitleName(titleName string) {
|
|||
}
|
||||
|
||||
func (fs *FeragString) PrintOut() string {
|
||||
// +2440 | first message is the title info
|
||||
info := fs.TitleInfo.Message()
|
||||
|
||||
// +2450 | list of product references
|
||||
for _, pr := range fs.ProductReferences {
|
||||
info += pr.Message()
|
||||
}
|
||||
|
@ -54,6 +56,7 @@ func (fs *FeragString) PrintOut() string {
|
|||
info += re.Message()
|
||||
}
|
||||
|
||||
// +2441 | last message is the corresponding title end
|
||||
info += fs.TitleEnd.Message()
|
||||
return info
|
||||
}
|
||||
|
@ -94,4 +97,4 @@ func (fs *FeragString) AddProductionDrop(pd *ProductionDrop) error {
|
|||
func (fs *FeragString) AddRouteEnd(re *RouteEnd) error {
|
||||
fs.RouteEndEntries = append(fs.RouteEndEntries, re)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
|
||||
type FeragMessage struct {
|
||||
messageStart string
|
||||
messageEnd string
|
||||
messageEnd string
|
||||
}
|
||||
|
||||
func (fm *FeragMessage) getMessageStart() string {
|
||||
|
|
|
@ -128,7 +128,7 @@ func (pr *ProductReference) SetProductReferenceNumber(productReferenceNumber int
|
|||
|
||||
func NewProductReference() *ProductReference {
|
||||
pr := ProductReference{
|
||||
FeragMessage: FeragMessage{"2450", "!"},
|
||||
FeragMessage: FeragMessage{"2450", "!"},
|
||||
missingParameter: MissingParameter{
|
||||
missingRate: 0,
|
||||
missingSize: 1,
|
||||
|
@ -155,4 +155,4 @@ func (pr *ProductReference) Payload() string {
|
|||
func (pr *ProductReference) Message() string {
|
||||
message := pr.FeragMessage.MessageTemplate()
|
||||
return message(&pr.FeragMessage, pr.Payload())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ import "fmt"
|
|||
|
||||
type ProductionDrop struct {
|
||||
FeragMessage
|
||||
agentName string
|
||||
agentName string
|
||||
numberOfCopies int
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ func (re *RouteEnd) SetRouteName(routeName string) {
|
|||
|
||||
func NewRouteEnd() *RouteEnd {
|
||||
re := RouteEnd{
|
||||
FeragMessage: FeragMessage{
|
||||
FeragMessage: FeragMessage{
|
||||
messageStart: "2406",
|
||||
messageEnd: "!",
|
||||
},
|
||||
|
|
|
@ -4,10 +4,10 @@ import "fmt"
|
|||
|
||||
type RouteInfo struct {
|
||||
FeragMessage
|
||||
routeName string
|
||||
topsheetMarker int
|
||||
routeName string
|
||||
topsheetMarker int
|
||||
eaAddressDefinition int
|
||||
editionName string
|
||||
editionName string
|
||||
}
|
||||
|
||||
func (ri *RouteInfo) EditionName() string {
|
||||
|
@ -44,7 +44,7 @@ func (ri *RouteInfo) RouteName() string {
|
|||
|
||||
func NewRouteInfo() *RouteInfo {
|
||||
ri := RouteInfo{
|
||||
FeragMessage: FeragMessage{
|
||||
FeragMessage: FeragMessage{
|
||||
messageStart: "2402",
|
||||
messageEnd: "!",
|
||||
},
|
||||
|
|
|
@ -4,9 +4,9 @@ import "fmt"
|
|||
|
||||
type RouteListEntry struct {
|
||||
FeragMessage
|
||||
routeName string
|
||||
routeCode int
|
||||
rampNumber int
|
||||
routeName string
|
||||
routeCode int
|
||||
rampNumber int
|
||||
copiesInRoute int
|
||||
}
|
||||
|
||||
|
|
|
@ -74,4 +74,4 @@ func TestNewFeragString(t *testing.T) {
|
|||
if testcontent != producedContent {
|
||||
t.Errorf("Files don't match!")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,4 +29,4 @@ func (ti *TitleEnd) Message() string {
|
|||
message := ti.FeragMessage.MessageTemplate()
|
||||
payload := fmt.Sprintf("+40%-8s", ti.titleName)
|
||||
return message(&ti.FeragMessage, payload)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,7 +72,6 @@ func (ti *TitleInfo) PublicationDate() string {
|
|||
return fmt.Sprintf("+95%-6s", ti.publicationDate.Format(dateOutputFormat))
|
||||
}
|
||||
|
||||
|
||||
func (ti *TitleInfo) Message() string {
|
||||
message := ti.FeragMessage.MessageTemplate()
|
||||
return message(&ti.FeragMessage, ti.Payload())
|
||||
|
@ -110,4 +109,3 @@ func NewTitleInfo() *TitleInfo {
|
|||
}
|
||||
return &t
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue