diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
index 2e2474ba8..a14c48bda 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
@@ -21,17 +21,12 @@
 
 package org.apache.struts2.sitegraph;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.sitegraph.renderers.DOTRenderer;
 
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import java.io.*;
 
 /**
  * // START SNIPPET: javadocs-intro
@@ -122,7 +117,7 @@ public class SiteGraph {
             }
         }
 
-        StrutsConfigRetriever.setConfiguration(configDir, views.split("[, ]+"));
+        StrutsConfigRetriever.setConfiguration(configDir, views.split("[,]+"));
         DOTRenderer renderer = new DOTRenderer(writer);
         renderer.render(namespace);
     }
diff --git a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
index 0716db1c5..587f321ba 100644
--- a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
+++ b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
@@ -21,16 +21,14 @@
 
 package org.apache.struts2.sitegraph;
 
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.StrutsTestCase;
+
 import java.io.File;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.net.URL;
 
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.Dispatcher;
-
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-
 /**
  */
 public class SiteGraphTest extends StrutsTestCase {
@@ -39,7 +37,7 @@ public class SiteGraphTest extends StrutsTestCase {
         // working directory being an assumed value when
         // running the test:  so let's get this class's parent dir
         URL url = ClassLoaderUtil.getResource("org/apache/struts2/sitegraph/struts.xml", SiteGraphTest.class);
-        File file = new File(url.toString().substring(5));
+        File file = new File(url.toURI());
         String dir = file.getParent();
 
         SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");