resolve conflict after merge development into this branch

Author: neacao

.gitignore

@@ -23,4 +23,3 @@
 /logging
 /json
 /native.iml
-

java/lang/String/String.hpp

@@ -55,6 +55,7 @@ namespace Java {
 			String(Array<byte> &bytes);
 			String(const String &target);
 			~String();
+
 		public:
 			char charAt(int index);
 

java/util/ArrayList/ArrayList.hpp

@@ -83,9 +83,18 @@ namespace Java {
 					 public virtual RandomAccess {
 		private:
 			std::vector<E> original;
+            typedef E* _iterator;
+            typedef const E* _const_iterator;
+
 
 		public:
-			/**
+
+            _iterator begin() { return &this->original[0]; };
+            _const_iterator begin() const { return &this->original[0]; };
+            _iterator end() { return &this->original[this->original.size()]; };
+            _const_iterator end() const { return &this->original[this->original.size()]; };
+
+            /**
 			 * Constructs an empty list
 			 */
 			ArrayList() {
@@ -115,22 +124,6 @@ namespace Java {
 
 			}
 
-		public:
-			/**
-			 * @return
-			 */
-			ArrayListIterator<E> begin() const {
-				return ArrayListIterator<E>(this, 0);
-			}
-
-			/**
-			 *
-			 * @return
-			 */
-			ArrayListIterator<E> end() const {
-				return original.end();
-			}
-
 		public:
 
 			/**

java/util/ArrayList/ArrayListTest.cpp

@@ -95,3 +95,19 @@ TEST(Javalang, ArrayListFunction) {
     ASSERT_EQUAL(0 ,intArray.get(-1));
     ASSERT_EQUAL(5 ,intArray.get(intArray.size()));
 }
+
+TEST(JavaLang, ArrayListForEach) {
+    //
+    ArrayList<int> validArrayList;
+
+    int index;
+    for (index = 0; index < 100; ++index) {
+        validArrayList.add(index);
+    }
+
+    int expect = 0;
+    for (int element : validArrayList) {
+        ASSERT_EQUAL(expect, element);
+        expect++;
+    }
+}