From 96bc701ba7a01b940ad5910d85c7b6958ac4a141 Mon Sep 17 00:00:00 2001
From: Joe Zhao <ztuowen@gmail.com>
Date: Sat, 6 Dec 2014 19:48:28 +0800
Subject: Restructuring & workflow construction

---
 aux/set/Aside.java | 45 ---------------------------------------------
 aux/set/Hand.java  | 10 +++++-----
 aux/set/Meld.java  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 aux/set/Aside.java
 create mode 100644 aux/set/Meld.java

(limited to 'aux/set')

diff --git a/aux/set/Aside.java b/aux/set/Aside.java
deleted file mode 100644
index 2a3b530..0000000
--- a/aux/set/Aside.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package mahjong.aux.set;
-
-import mahjong.aux.Card;
-import mahjong.player.GenericPlayer;
-
-/**
- * Created by joe on 12/2/14.
- */
-public class Aside {
-    public enum Type {Chi,Peng,aGang,mGang,jGang};
-
-    private Type type;
-    private Card[] rep;
-    private int from;
-
-    public Aside(Card[] rep,Type type,int from)
-    {
-        this.rep=rep;
-        this.type=type;
-        this.from=from;
-    }
-
-    public Aside(Card[] rep,Type type)
-    {
-        this.rep=rep;
-        this.type=type;
-        this.from= 0;
-    }
-
-    public Card[] getRep() {
-        return rep;
-    }
-
-    public int getFrom() {
-        return from;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setFrom(int from) {
-        this.from = from;
-    }
-}
diff --git a/aux/set/Hand.java b/aux/set/Hand.java
index a66944f..a865a90 100644
--- a/aux/set/Hand.java
+++ b/aux/set/Hand.java
@@ -23,19 +23,19 @@ public class Hand extends Set {
         super(cards);
     }
 
-    public Vector<Aside> asides = new Vector<Aside>();
+    public Vector<Meld> melds = new Vector<Meld>();
 
     public void init()
     {
         cards.clear();
-        asides.clear();
+        melds.clear();
     }
 
     public boolean huAble(Card card)
     {
         boolean hu=false;
         accountant.add(card,1);
-        if (accountant.calTing(asides.size())==0)
+        if (accountant.calTing(melds.size())==0)
             hu=true;
         accountant.add(card,-1);
         return hu;
@@ -69,8 +69,8 @@ public class Hand extends Set {
 
     public boolean jiaGangAble(Card card)
     {
-        for (Aside i:asides)
-        if (i.getType()== Aside.Type.Peng && card.getStdId() == i.getRep()[0].getStdId())
+        for (Meld i:melds)
+        if (i.getType()== Meld.Type.Peng && card.getStdId() == i.getRep()[0].getStdId())
             return true;
         return false;
     }
diff --git a/aux/set/Meld.java b/aux/set/Meld.java
new file mode 100644
index 0000000..8da091b
--- /dev/null
+++ b/aux/set/Meld.java
@@ -0,0 +1,45 @@
+package mahjong.aux.set;
+
+import mahjong.aux.Card;
+import mahjong.player.GenericPlayer;
+
+/**
+ * Created by joe on 12/2/14.
+ */
+public class Meld {
+    public enum Type {Chi,Peng,aGang,mGang,jGang};
+
+    private Type type;
+    private Card[] rep;
+    private int from;
+
+    public Meld(Card[] rep,Type type,int from)
+    {
+        this.rep=rep;
+        this.type=type;
+        this.from=from;
+    }
+
+    public Meld(Card[] rep,Type type)
+    {
+        this.rep=rep;
+        this.type=type;
+        this.from= 0;
+    }
+
+    public Card[] getRep() {
+        return rep;
+    }
+
+    public int getFrom() {
+        return from;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setFrom(int from) {
+        this.from = from;
+    }
+}
-- 
cgit v1.2.3-70-g09d2