made BinStore a static class
This commit is contained in:
@@ -30,8 +30,6 @@ class Init {
|
||||
WindowManager.init();
|
||||
MainTerm.instance = new MainTerm();
|
||||
|
||||
BinStore.instance = new BinStore();
|
||||
|
||||
if (Turtle.isTurtle()){
|
||||
Turtle.instance = new Turtle();
|
||||
}
|
||||
|
||||
@@ -22,9 +22,7 @@ import bin.Disk;
|
||||
import haxe.ds.ReadOnlyArray;
|
||||
|
||||
class BinStore {
|
||||
public static var instance: BinStore;
|
||||
|
||||
private final store:ReadOnlyArray<Bin> = [
|
||||
private static final store:ReadOnlyArray<Bin> = [
|
||||
{c: Disk, name: "Disk", aliases: ["disk"]},
|
||||
{c: GPS, name: "GPS", aliases: ["gps"]},
|
||||
{c: HelloWorld, name: "HelloWorld", aliases: ["hello"]},
|
||||
@@ -46,12 +44,7 @@ class BinStore {
|
||||
{c: PFClient, name: "PFClient", aliases: ["pfclient"]}
|
||||
];
|
||||
|
||||
@:allow(kernel.Init)
|
||||
private function new() {
|
||||
|
||||
}
|
||||
|
||||
public function getBinByName(name:String):Null<Bin> {
|
||||
public static function getBinByName(name:String):Null<Bin> {
|
||||
for (bin in store) {
|
||||
if (bin.name == name) {
|
||||
return bin;
|
||||
@@ -60,7 +53,7 @@ class BinStore {
|
||||
return null;
|
||||
}
|
||||
|
||||
public function getBinByAlias(alias:String):Null<Bin> {
|
||||
public static function getBinByAlias(alias:String):Null<Bin> {
|
||||
for (bin in store) {
|
||||
for (a in bin.aliases) {
|
||||
if (a == alias) {
|
||||
@@ -71,7 +64,7 @@ class BinStore {
|
||||
return null;
|
||||
}
|
||||
|
||||
public function getNameByAlias(alias: String): String {
|
||||
public static function getNameByAlias(alias: String): String {
|
||||
var bin = getBinByAlias(alias);
|
||||
if (bin == null) {
|
||||
return null;
|
||||
|
||||
@@ -21,7 +21,7 @@ class Service {
|
||||
}
|
||||
|
||||
public function start() {
|
||||
var bin = BinStore.instance.getBinByAlias(this.binName);
|
||||
var bin = BinStore.getBinByAlias(this.binName);
|
||||
|
||||
if (bin == null){
|
||||
throw new Error('Bin ${this.binName} not found');
|
||||
|
||||
@@ -67,7 +67,7 @@ class ServiceManager {
|
||||
}
|
||||
|
||||
public function register(name: String, binName: String,args: Array<String>): Outcome<Noise,String> {
|
||||
if (BinStore.instance.getBinByAlias(binName) == null){
|
||||
if (BinStore.getBinByAlias(binName) == null){
|
||||
return Failure("bin not found");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user