Merge pull request #22 from onlyLYJ/master

Struts done

group12/382266293/.classpath

@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar" sourcepath="lib/dom4j-1.6.1.zip"/>
+	<classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

group12/382266293/coding/basic/Collection/AbstractList.java → group12/382266293/coding/basic/collection/AbstractList.java

@@ -1,4 +1,4 @@
-package Collection;
+package collection;
 
 public abstract class AbstractList<E> implements List<E> {
 

group12/382266293/coding/basic/Collection/Iterator.java → group12/382266293/coding/basic/collection/Iterator.java

@@ -1,4 +1,4 @@
-package Collection;
+package collection;
 
 public interface Iterator<E> {
 

group12/382266293/coding/basic/Collection/List.java → group12/382266293/coding/basic/collection/List.java

@@ -1,4 +1,4 @@
-package Collection;
+package collection;
 
 public interface List<E> {
 

group12/382266293/coding/basic/Collection/Concrete/ArrayList.java → group12/382266293/coding/basic/collection/concrete/ArrayList.java

@@ -1,10 +1,10 @@
-package Collection.Concrete;
+package collection.concrete;
 
 import java.util.Arrays;
 import java.util.NoSuchElementException;
 
-import Collection.AbstractList;
-import Collection.Iterator;
+import collection.AbstractList;
+import collection.Iterator;
 
 public class ArrayList<E> extends AbstractList<E> {
 

group12/382266293/coding/basic/Collection/Concrete/BinaryTreeNode.java → group12/382266293/coding/basic/collection/concrete/BinaryTreeNode.java

@@ -1,4 +1,4 @@
-package Collection.Concrete;
+package collection.concrete;
 
 public class BinaryTreeNode<E extends Comparable<E>> {
 

group12/382266293/coding/basic/Collection/Concrete/LinkedList.java → group12/382266293/coding/basic/collection/concrete/LinkedList.java

@@ -1,8 +1,9 @@
-package Collection.Concrete;
+package collection.concrete;
 
 import java.util.NoSuchElementException;
-import Collection.AbstractList;
-import Collection.Iterator;
+
+import collection.AbstractList;
+import collection.Iterator;
 
 
 public class LinkedList<E> extends AbstractList<E> {
@@ -87,18 +88,28 @@ public E removeLast(){
 		return remove(size-1);
 	}
 
+	@SuppressWarnings("unchecked")
 	public E remove(int index) {
 		checkIndex(index);
-		Node<E> pNode = getNode(index);
+		Node<E> pNode = null;
+		E data = null;
 		if (index == 0) {
+			data = (E) head.data;
 			head =  head.next;
-		} else if (index == size-1 ) {
-			getNode(index-1).next = null;
+		} else if (index == size-1) {
+			pNode = getNode(index - 1);
+			data = (E) pNode.next.data;
+			pNode.next = null;
 		} else {
-			getNode(index-1).next = getNode(index+1);
+			pNode = head;
+			for ( int i = 0; i < index - 1 ; i++) {
+				pNode = pNode.next;
+			}
+			data = (E) pNode.next.data;
+			pNode.next =pNode.next.next;
 		}
 		size--;
-		return pNode.data;
+		return data;
 	}
 
 	@Override

group12/382266293/coding/basic/Collection/Concrete/Queue.java → group12/382266293/coding/basic/collection/concrete/Queue.java

@@ -1,8 +1,8 @@
-package Collection.Concrete;
+package collection.concrete;
 import java.util.NoSuchElementException;
 
-import Collection.AbstractList;
-import Collection.Iterator;
+import collection.AbstractList;
+import collection.Iterator;
 
 public class Queue<E> extends AbstractList<E> {
 

group12/382266293/coding/basic/Collection/Concrete/Stack.java → group12/382266293/coding/basic/collection/concrete/Stack.java

@@ -1,10 +1,10 @@
-package Collection.Concrete;
+package collection.concrete;
 
 import java.util.EmptyStackException;
 import java.util.NoSuchElementException;
 
-import Collection.AbstractList;
-import Collection.Iterator;
+import collection.AbstractList;
+import collection.Iterator;
 
 public class Stack<E> extends AbstractList<E> {
 

group12/382266293/coding/basic/TestCollection/AllTests.java → group12/382266293/coding/basic/test/collection/AllTests.java

@@ -1,4 +1,4 @@
-package TestCollection;
+package test.collection;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

group12/382266293/coding/basic/TestCollection/ArrayListTest.java → group12/382266293/coding/basic/test/collection/ArrayListTest.java

@@ -1,4 +1,4 @@
-package TestCollection;
+package test.collection;
 
 import static util.Print.*;
 import static util.TestUtil.*;
@@ -10,10 +10,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-
-import Collection.Iterator;
-import Collection.List;
-import Collection.Concrete.ArrayList;
+import collection.Iterator;
+import collection.List;
+import collection.concrete.ArrayList;
 import junit.framework.TestCase;
 
 public class ArrayListTest extends TestCase {

group12/382266293/coding/basic/TestCollection/BinaryTreeNodeTest.java → group12/382266293/coding/basic/test/collection/BinaryTreeNodeTest.java

@@ -1,4 +1,4 @@
-package TestCollection;
+package test.collection;
 
 import static util.Print.*;
 import java.util.Random;
@@ -9,7 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import Collection.Concrete.BinaryTreeNode;
+import collection.concrete.BinaryTreeNode;
 import junit.framework.TestCase;
 
 public class BinaryTreeNodeTest extends TestCase {

group12/382266293/coding/basic/TestCollection/LinkedListTest.java → group12/382266293/coding/basic/test/collection/LinkedListTest.java

@@ -1,4 +1,4 @@
-package TestCollection;
+package test.collection;
 
 import static util.Print.*;
 import static util.TestUtil.*; 
@@ -8,9 +8,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import Collection.Iterator;
-import Collection.List;
-import Collection.Concrete.LinkedList;
+import collection.Iterator;
+import collection.List;
+import collection.concrete.LinkedList;
 import junit.framework.TestCase;
 
 
@@ -182,7 +182,9 @@ public void testRemove() {
 			assertEquals(i, myLL.size());
 			assertEquals(a,res);
 		}
+
 	}
+
 
 	@Test
 	public void testSize() {

group12/382266293/coding/basic/TestCollection/QueueTest.java → group12/382266293/coding/basic/test/collection/QueueTest.java

@@ -1,11 +1,14 @@
-package TestCollection;
+package test.collection;
 
 import static util.Print.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
+import collection.concrete.Queue;
+
 import static util.TestUtil.*;
-import Collection.Concrete.Queue;
+
 import junit.framework.TestCase;
 
 public class QueueTest extends TestCase {

group12/382266293/coding/basic/TestCollection/StackTest.java → group12/382266293/coding/basic/test/collection/StackTest.java

@@ -1,4 +1,4 @@
-package TestCollection;
+package test.collection;
 
 import static util.Print.*;
 
@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import Collection.Concrete.Stack;
+import collection.concrete.Stack;
 import junit.framework.TestCase;
 
 public class StackTest extends TestCase {

group12/382266293/coding/basic/util/ActionXMLreader.java

@@ -0,0 +1,53 @@
+package util;
+
+import java.util.List;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.Node;
+import org.dom4j.io.SAXReader;
+
+import static util.Print.*;
+
+public class ActionXMLreader {
+
+    public Node getRootNode(String add) {
+        SAXReader reader = new SAXReader();
+        Document document = null;
+        Node root = null;
+		try {
+			document = reader.read(add);
+			root = document.getRootElement();
+		} catch (DocumentException e) {
+			e.printStackTrace();
+		}
+		return root;
+    }
+
+    public String parseClass(Node root, String attr) {
+
+         @SuppressWarnings("rawtypes")
+		List list = root.selectNodes("action[@name='" + attr + "']");
+         String clazz = null;
+         for(Object o:list){
+             Element e = (Element) o;
+             clazz = e.attributeValue("class");
+         }
+		return clazz;
+    }
+
+    public String parseResult(Node root, String attr, String result) {
+
+         @SuppressWarnings("rawtypes")
+		List list = root.selectNodes("action[@name='" + attr + "']/result[@name='" + result + "']");
+
+         String jsp = null;
+         for(Object o:list){
+             Element e = (Element) o;
+             jsp = e.getTextTrim();
+         }
+		return jsp;
+    }
+
+
+}

group12/382266293/coding/basic/util/Print.java

@@ -12,7 +12,7 @@ public static void println(Object o){
 		System.out.println(o);
 	}
 
-	public static void printArr(int[] arr) {	
+	public static void printArr(Object[] arr) {	
 		println(Arrays.toString(arr));
 	}
 

group12/382266293/coding/basic/util/TestUtil.java

@@ -3,10 +3,10 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import Collection.List;
-import Collection.Concrete.ArrayList;
-import Collection.Concrete.LinkedList;
-import Collection.Concrete.Queue;
+import collection.List;
+import collection.concrete.ArrayList;
+import collection.concrete.LinkedList;
+import collection.concrete.Queue;
 import junit.framework.TestCase;
 
 

group12/382266293/lib/.gitignore

@@ -1 +1,3 @@
 /dom4j-1.6.1.zip
+/jaxen-1.1-beta-6.jar
+/dom4j-1.6.1.jar

group12/382266293/src/array/ArrayUtil.java

@@ -3,8 +3,9 @@
 import static util.Print.*;
 import java.util.Arrays;
 import java.util.BitSet;
-import Collection.Iterator;
-import Collection.Concrete.ArrayList;
+
+import collection.Iterator;
+import collection.concrete.ArrayList;
 
 
 

group12/382266293/src/litestruts/LoginAction.java → group12/382266293/src/com/coderising/action/LoginAction.java

@@ -1,4 +1,4 @@
-package litestruts;
+package com.coderising.action;
 
 /**
  * 这是一个用来展示登录的业务类， 其中的用户名和密码都是硬编码的。