twsxyrdcf"vgeurhtkùlm

GuusDb · Mar 18, 2022 · c89b832 · c89b832
1 parent ad7cad3
commit c89b832
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/DesignPatterns/Adapter/ASDII_AdapterIteratorStarter/src/domein/EnumerationIterator.java b/DesignPatterns/Adapter/ASDII_AdapterIteratorStarter/src/domein/EnumerationIterator.java
@@ -4,7 +4,22 @@
 import java.util.Iterator;
 
 
-public class EnumerationIterator {
+public class EnumerationIterator<E> implements Iterator<E>{
+
+	private Enumeration<E> enumeration;
 
-
+	public EnumerationIterator(Enumeration<E> enumeration) {
+		this.enumeration = enumeration;
+	}
+
+	@Override
+	public boolean hasNext() {
+		return enumeration.hasMoreElements();
+	}
+
+	@Override
+	public E next() {
+		return enumeration.nextElement();
+	}
+
 }
diff --git a/DesignPatterns/Adapter/ASDII_AdapterIteratorStarter/src/domein/IteratorEnumeration.java b/DesignPatterns/Adapter/ASDII_AdapterIteratorStarter/src/domein/IteratorEnumeration.java
@@ -4,7 +4,19 @@
 import java.util.Iterator;
 
 
-public class IteratorEnumeration {
+public class IteratorEnumeration<E> implements Enumeration<E>{
+
+	@Override
+	public boolean hasMoreElements() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public E nextElement() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
 
 

diff --git a/...Patterns/Adapter/ASDII_AdapterIteratorStarter/src/persistentie/PersistentieBeheerder.java b/...Patterns/Adapter/ASDII_AdapterIteratorStarter/src/persistentie/PersistentieBeheerder.java
@@ -10,6 +10,7 @@
 
 import domein.ApplicatieFout;
 import domein.EnumerationIterator;
+import domein.IteratorEnumeration;
 import domein.MenuActie;
 import javax.swing.tree.TreeNode;
 
@@ -66,13 +67,13 @@ private void voegToeAanOuder(DefaultMutableTreeNode root,
                 = root.depthFirstEnumeration();
 
         //TODO Instantieer adaptor
-
+        Iterator<TreeNode> iterator =  new EnumerationIterator<>(enumeration); 
         int ouder = ((MenuActie) kind.getUserObject()).getOuder();
         //while (enumeration.hasMoreElements() && !gevonden) 
-        while ( && !gevonden) {   //TODO gebruik adaptor  
+        while ( iterator.hasNext() && !gevonden) {   //TODO gebruik adaptor  
 
             //DefaultMutableTreeNode node = enumeration.nextElement();
-            DefaultMutableTreeNode node = ; //TODO gebruik adaptor
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) iterator.next(); //TODO gebruik adaptor
 
             MenuActie menuActie = (MenuActie) node.getUserObject();