Stack & Queue Completed

张加涛 · 张加涛 · commit c6b11b7f869d · 2017-02-25T17:15:24.000+08:00
diff --git a/group08/108621969/com/coding/basic/ArrayList.java b/group08/108621969/com/coding/basic/ArrayList.java
@@ -63,7 +63,7 @@ private boolean isFull() {
         return false;
     }
 
-    private boolean isEmpty() {
+    public boolean isEmpty() {
         if(size == 0) {
             return true;
         }
diff --git a/group08/108621969/com/coding/basic/Queue.java b/group08/108621969/com/coding/basic/Queue.java
@@ -4,18 +4,30 @@
  * Created by zhangjiatao on 2017/2/25.
  */
 public class Queue {
+    private ArrayList elementData = new ArrayList();
+
     public void enQueue(Object o) {
+        elementData.add(0, o);
     }
 
     public Object deQueue() {
-        return null;
+        return elementData.remove(elementData.size() - 1);
     }
 
     public boolean isEmpty() {
-        return false;
+        return elementData.isEmpty();
     }
 
     public int size() {
-        return -1;
+        return elementData.size();
+    }
+
+    public static void main(String[] args) {
+        Queue queue = new Queue();
+        queue.enQueue(1);
+        queue.enQueue(2);
+        queue.enQueue(3);
+        System.out.println(queue.deQueue());
+        System.out.println(queue.toString());
     }
 }
diff --git a/group08/108621969/com/coding/basic/Stack.java b/group08/108621969/com/coding/basic/Stack.java
@@ -1,7 +1,40 @@
 package com.coding.basic;
 
+import java.util.ArrayList;
+
+
 /**
  * Created by zhangjiatao on 2017/2/25.
  */
 public class Stack {
+    private ArrayList elementData = new ArrayList();
+
+    public void push(Object o) {
+        elementData.add(elementData.size(), o);
+    }
+
+    public Object pop() {
+        return elementData.remove(elementData.size() - 1);
+    }
+
+    public Object peek() {
+        return elementData.get(elementData.size() - 1);
+    }
+
+    public boolean isEmpty() {
+        return elementData.isEmpty();
+    }
+
+    public int size() {
+        return elementData.size();
+    }
+
+    public static void main(String[] args) {
+        Stack stack = new Stack();
+        stack.push(1);
+        stack.push(2);
+        stack.push(3);
+        System.out.println(stack.pop());
+        System.out.println(stack.toString());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private boolean isFull() {`
`63`	`63`	`return false;`
`64`	`64`	`}`
`65`	`65`
`66`		`- private boolean isEmpty() {`
	`66`	`+ public boolean isEmpty() {`
`67`	`67`	`if(size == 0) {`
`68`	`68`	`return true;`
`69`	`69`	`}`