Move code to ES2015

- Adapter
- Chaining
- Command
- Composite
- CompositeIterator/1
- CompositeIterator/2

Author: tcorral

CompositeIterator/1/scripts/ConvertToIterator.js

@@ -1,46 +1,46 @@
-function getIndexArray(instance) {
-  return instance.lastIndex;
+function getIndexArray() {
+  return this.lastIndex;
 }
-function getIndexObject(instance) {
-  return instance.keys[instance.lastIndex];
+function getIndexObject() {
+  return this.keys[this.lastIndex];
 }
 
-function getCurrentArray(instance) {
-  return instance.array[this.lastIndex];
+function getCurrentArray() {
+  return this.array[this.lastIndex];
 }
 
-function getCurrentObject(instance) {
-  return instance.array[instance.keys[instance.lastIndex]];
+function getCurrentObject() {
+  return this.array[this.keys[this.lastIndex]];
 }
 
-function nextArray(instance) {
+function nextArray() {
   var result = null;
-  if (instance.hasNext()) {
-    result = instance.array[++instance.lastIndex];
+  if (this.hasNext()) {
+    result = this.array[++this.lastIndex];
   }
   return result;
 }
 
-function nextObject(instance) {
+function nextObject() {
   var result = null;
-  if (instance.hasNext()) {
-    result = instance.array[instance.keys[++instance.lastIndex]];
+  if (this.hasNext()) {
+    result = this.array[this.keys[++this.lastIndex]];
   }
   return result;
 }
 
-function prevArray(instance) {
+function prevArray() {
   var result = null;
-  if (instance.hasPrev()) {
-    result = instance.array[--instance.lastIndex];
+  if (this.hasPrev()) {
+    result = this.array[--this.lastIndex];
   }
   return result;
 }
 
-function prevObject(instance) {
+function prevObject() {
   var result = null;
-  if (instance.hasPrev()) {
-    result = instance.array[instance.keys[--instance.lastIndex]];
+  if (this.hasPrev()) {
+    result = this.array[this.keys[--this.lastIndex]];
   }
   return result;
 }

CompositeIterator/1/scripts/Menu.js

@@ -31,6 +31,7 @@ class Menu extends MenuComponent {
 		return this.description;
 	}
 	print() {
+		debugger;
 		console.log(this.getName() + ": " + this.getDescription());
 		console.log("--------------------------------------------");
 

CompositeIterator/1/scripts/MenuItem.js

@@ -10,16 +10,16 @@ class MenuItem extends MenuComponent {
     this.price = price;
   }
   getName() {
-    return this.sName;
+    return this.name;
   }
   getDescription() {
-    return this.sDescription;
+    return this.description;
   }
   getPrice() {
-    return this.nPrice;
+    return this.price;
   }
   isVegetarian() {
-    return this.bVegetarian;
+    return this._isVegetarian;
   }
   print() {
     console.log(this.getName() + ": " + this.getDescription() + ", " + this.getPrice() + "euros");