diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index 81e4ebe..88c147f 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
index 81e4ebe..88c147f 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index 81e4ebe..88c147f 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
index 81e4ebe..88c147f 100644
--- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java
+++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index 81e4ebe..88c147f 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index 81e4ebe..88c147f 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java
index 81e4ebe..88c147f 100644
--- a/src/org/umlgraph/doclet/ClassInfo.java
+++ b/src/org/umlgraph/doclet/ClassInfo.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index 81e4ebe..88c147f 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java
index 81e4ebe..88c147f 100644
--- a/src/org/umlgraph/doclet/StringUtil.java
+++ b/src/org/umlgraph/doclet/StringUtil.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index 81e4ebe..88c147f 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -21,7 +21,6 @@
 import com.sun.javadoc.*;
 import java.io.*;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -265,7 +264,7 @@ class StringUtil {
 				r.set(n, "");
 			n++;
 		}
-		return ((String[])(r.toArray(new String[0])));
+		return r.toArray(new String[0]);
 	}
 
 }