finished and refactored :D

DuplicateDeleter.java

@@ -34,7 +34,7 @@ public abstract class DuplicateDeleter<T> {
      */
     abstract public T[] removeDuplicatesExactly(int exactNumberOfDuplications);
     
-    protected int numOfDupUnder(int num) {
+    protected int numOfArray(int num, String type) {
         
         int numToReturn = 0;
         int dup = 0;
@@ -46,9 +46,16 @@ public abstract class DuplicateDeleter<T> {
                 }
             }
             
-            if(dup < num){
-                numToReturn++;
+            if(type.equals("max")){
+                if(dup < num){
+                    numToReturn++;
+                }                
+            } else if(type.equals("exact")){
+               if(dup != num){
+                    numToReturn++;
+                }  
             }
+
             dup = 0;
         }
         
@@ -56,48 +63,37 @@ public abstract class DuplicateDeleter<T> {
         
     }
     
-    protected int numOfExactDup(int exact) {
+    protected T[] createArray(T[] array, int dupNum, String type){
         
-        int numToReturn = 0;
         int dup = 0;
-       
+        int indexOf = 0;
+        
+        
         for(int i = 0; i < this.array.length; i++) {    
             for(int j = 0; j < this.array.length; j++){
-                if(this.array[i].equals(this.array[j])){
+                if(this.array[i] == this.array[j]){
                     dup++;
                 }
             }
             
-            if(dup != exact){
-                numToReturn++;
+            
+            if(type.equals("exact")){
+                if(dup != dupNum){
+                    array[indexOf] = this.array[i];
+                    indexOf++;
+                }            
+            } else if(type.equals("max")) {
+                if(dup < dupNum){
+                    array[indexOf] = this.array[i];
+                    indexOf++;
+                }     
             }
+            
+
             dup = 0;
         }
-        
-        return numToReturn;
+        this.array = array;    
+        return array;
     }
     
-    // protected T[] createArray(int size, String type){
-        // T[] newArray = new Integer[size];
-        
-        // int dup = 0;
-        // int indexOf = 0;
-        
-        
-        // for(int i = 0; i < this.array.length; i++) {    
-            // for(int j = 0; j < this.array.length; j++){
-                // if(this.array[i] == this.array[j]){
-                    // dup++;
-                // }
-            // }
-            
-            // if(dup != exactNumberOfDuplications){
-                // newArray[indexOf] = this.array[i];
-                // indexOf++;
-            // }
-            // dup = 0;
-        // }
-        // this.array = newArray;    
-    // }
-    
 }

IntegerDuplicateDeleter.java

@@ -10,62 +10,22 @@ public class IntegerDuplicateDeleter extends DuplicateDeleter<Integer>{
     
     @Override
     public Integer[] removeDuplicates(int maxNumberOfDuplications){
-        //Arrays.sort(this.array);
-        
-        int sizeOfArray = this.numOfDupUnder(maxNumberOfDuplications);
-        Integer[] newArray = new Integer[sizeOfArray];
-        
-        
-        int dup = 0;
-        int indexOf = 0;        
-        
-        for(int i = 0; i < this.array.length; i++) {    
-            for(int j = 0; j < this.array.length; j++){
-                if(this.array[i] == this.array[j]){
-                    dup++;
-                }
-            }
-            
-            if(dup < maxNumberOfDuplications){
-                newArray[indexOf] = this.array[i];
-                indexOf++;
-            }
-            dup = 0;
-        }
-        this.array = newArray;
-        return this.array;        
+
+        int sizeOfArray = this.numOfArray(maxNumberOfDuplications, "max");
+        return this.createArray(new Integer[sizeOfArray],
+                                    maxNumberOfDuplications,
+                                    "max");     
+                                    
     };
     
     @Override
     public Integer[] removeDuplicatesExactly(int exactNumberOfDuplications){
         
-        //Arrays.sort(this.array);
-        
-        int sizeOfArray = this.numOfExactDup(exactNumberOfDuplications);
-        
-        
-        Integer[] newArray = new Integer[sizeOfArray];
-        
-        int dup = 0;
-        int indexOf = 0;
-        
-        
-        for(int i = 0; i < this.array.length; i++) {    
-            for(int j = 0; j < this.array.length; j++){
-                if(this.array[i] == this.array[j]){
-                    dup++;
-                }
-            }
-            
-            if(dup != exactNumberOfDuplications){
-                newArray[indexOf] = this.array[i];
-                indexOf++;
-            }
-            dup = 0;
-        }
-        this.array = newArray;
-        return this.array; 
-        
+        int sizeOfArray = this.numOfArray(exactNumberOfDuplications, "exact");
+        return this.createArray(new Integer[sizeOfArray],
+                                    exactNumberOfDuplications,
+                                    "exact");
+                                    
     };
     
     

StringDuplicateDeleter.java

@@ -9,57 +9,22 @@ public final class StringDuplicateDeleter extends DuplicateDeleter<String> {
     
     @Override
     public String[] removeDuplicates(int maxNumberOfDuplications){
-        //Arrays.sort(this.array);
-        
-        int sizeOfArray = this.numOfDupUnder(maxNumberOfDuplications);
-        String[] newArray = new String[sizeOfArray];
-        
-        int dup = 0;
-        int indexOf = 0;        
-        
-        for(int i = 0; i < this.array.length; i++) {    
-            for(int j = 0; j < this.array.length; j++){
-                if(this.array[i].equals(this.array[j])){
-                    dup++;
-                }
-            }
-            
-            if(dup < maxNumberOfDuplications){
-                newArray[indexOf] = this.array[i];
-                indexOf++;
-            }
-            dup = 0;
-        }
-        this.array = newArray;
-        return this.array;
+
+        int sizeOfArray = this.numOfArray(maxNumberOfDuplications, "max");
+        return this.createArray(new String[sizeOfArray],
+                                    maxNumberOfDuplications,
+                                    "max");  
+                                    
     };
     
     @Override
     public String[] removeDuplicatesExactly(int exactNumberOfDuplications){
-        //Arrays.sort(this.array);
-        
-        int sizeOfArray = this.numOfExactDup(exactNumberOfDuplications);
-        String[] newArray = new String[sizeOfArray];
-        
-        int dup = 0;
-        int indexOf = 0;
-        
-        
-        for(int i = 0; i < this.array.length; i++) {    
-            for(int j = 0; j < this.array.length; j++){
-                if(this.array[i].equals(this.array[j])){
-                    dup++;
-                }
-            }
-            
-            if(dup != exactNumberOfDuplications){
-                newArray[indexOf] = this.array[i];
-                indexOf++;
-            }
-            dup = 0;
-        }
-        this.array = newArray;
-        return this.array;         
+
+        int sizeOfArray = this.numOfArray(exactNumberOfDuplications, "exact");
+        return this.createArray(new String[sizeOfArray],
+                                    exactNumberOfDuplications,
+                                    "exact");   
+                                    
     };
     
     

package.bluej

@@ -11,18 +11,18 @@ dependency3.type=UsesDependency
 dependency4.from=StringDuplicateDeleterTest
 dependency4.to=StringDuplicateDeleter
 dependency4.type=UsesDependency
-editor.fx.0.height=671
-editor.fx.0.width=800
-editor.fx.0.x=240
-editor.fx.0.y=23
+editor.fx.0.height=642
+editor.fx.0.width=878
+editor.fx.0.x=170
+editor.fx.0.y=30
 objectbench.height=140
 objectbench.width=565
 package.divider.horizontal=0.59958071278826
 package.divider.vertical=0.7601957585644372
 package.editor.height=459
 package.editor.width=848
-package.editor.x=306
-package.editor.y=23
+package.editor.x=344
+package.editor.y=26
 package.frame.height=671
 package.frame.width=974
 package.numDependencies=4