Commit e1c4d1c0 authored by Boris Mühmer's avatar Boris Mühmer
Browse files

moved interfaces to top level

parent b0340e6d

pkg/stars/interfaces/actioner.go→pkg/stars/actioner.go

+1 −1
Original line number Diff line number Diff line 
package interfaces

package stars



// Actioner ...

type Actioner interface {

pkg/stars/actions/addavatar/addavatar.go

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import ( 
	"fmt"

	"os"



	"repositories.muehmer.net/bsmrgo/stars/pkg/stars/interfaces"

	"repositories.muehmer.net/bsmrgo/stars/pkg/stars"

)



const (
@@ -14,11 +14,11 @@ const ( 


// AddAvatar ...

type AddAvatar struct {

	avatar interfaces.Avatarer

	avatar stars.Avatarer

}



// New ...

func New(avatar interfaces.Avatarer) *AddAvatar {

func New(avatar stars.Avatarer) *AddAvatar {

	return &AddAvatar{

		avatar: avatar,

	}
@@ -30,7 +30,7 @@ func (a *AddAvatar) Name() string { 
}



// Do ...

func (a *AddAvatar) Do(s interfaces.Simulatorer) error {

func (a *AddAvatar) Do(s stars.Simulatorer) error {

	fmt.Fprintf(os.Stderr, "Action: AddAvatar: %s\n", a.avatar.Name())

	s.Avatars()[a.avatar.Name()] = a.avatar

	go func() {

pkg/stars/actions/listavatars/listavatars.go

+2 −2
Original line number Diff line number Diff line 
package listavatars



import "repositories.muehmer.net/bsmrgo/stars/pkg/stars/interfaces"

import "repositories.muehmer.net/bsmrgo/stars/pkg/stars"



const (

	// CommandName ...
@@ -27,7 +27,7 @@ func (a *ListAvatars) Name() string { 
}



// Do ...

func (a *ListAvatars) Do(s interfaces.Simulatorer) error {

func (a *ListAvatars) Do(s stars.Simulatorer) error {

	defer close(a.Done)

	for key := range s.Avatars() {

		a.Names = append(a.Names, key)

pkg/stars/interfaces/avatarer.go→pkg/stars/avatarer.go

+1 −1
Original line number Diff line number Diff line 
package interfaces

package stars



// Avatarer ...

type Avatarer interface {

pkg/stars/simulator/simulator.go

+8 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import ( 
	"sync"

	"time"



	"repositories.muehmer.net/bsmrgo/stars/pkg/stars/interfaces"

	"repositories.muehmer.net/bsmrgo/stars/pkg/stars"

)



// Simulator ...
@@ -15,8 +15,8 @@ type Simulator struct { 
	ready   chan bool

	stop    chan bool

	done    chan Done

	action  chan interfaces.Actioner

	avatars map[string]interfaces.Avatarer

	action  chan stars.Actioner

	avatars map[string]stars.Avatarer

}



// Config ...
@@ -41,12 +41,12 @@ func (d Done) String() string { 
func New(stop chan bool, tickDuration time.Duration) *Simulator {

	c := Config{Duration: tickDuration}

	return &Simulator{

		avatars: make(map[string]interfaces.Avatarer),

		avatars: make(map[string]stars.Avatarer),

		config:  c,

		stop:    stop,

		ready:   make(chan bool),

		done:    make(chan Done),

		action:  make(chan interfaces.Actioner),

		action:  make(chan stars.Actioner),

	}

}
@@ -61,12 +61,12 @@ func (s *Simulator) DoneChannel() chan Done { 
}



// ActionChannel ...

func (s *Simulator) ActionChannel() chan interfaces.Actioner {

func (s *Simulator) ActionChannel() chan stars.Actioner {

	return s.action

}



// Avatars ...

func (s *Simulator) Avatars() map[string]interfaces.Avatarer {

func (s *Simulator) Avatars() map[string]stars.Avatarer {

	return s.avatars

}
@@ -92,7 +92,7 @@ func (s *Simulator) Run() { 
			var wg sync.WaitGroup

			for name, avatar := range s.avatars {

				wg.Add(1)

				go func(n string, a interfaces.Avatarer) {

				go func(n string, a stars.Avatarer) {

					defer wg.Done()

					fmt.Fprintf(os.Stderr, "simulator(): avatar %s: stopping...\n", n)

					a.Stop()