Author: mcucchiara
Date: Tue Sep 20 16:25:07 2011
New Revision: 1173223
URL: http://svn.apache.org/viewvc?rev=1173223&view=rev
Log:
Partial upgrade to java 5
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
Tue Sep 20 16:25:07 2011
@@ -62,7 +62,7 @@ public class Main {
// check the JDK version
String version = System.getProperty("java.version");
- boolean jdk15 = version.indexOf("1.5") != -1;
+ boolean jdk15 = version.contains("1.5");
String javaHome = System.getProperty("java.home");
ArrayList<URL> urls = new ArrayList<URL>();
@@ -73,11 +73,10 @@ public class Main {
File wd = new File(".");
File[] jars = wd.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".jar") && name.indexOf("-src.") ==
-1;
+ return name.endsWith(".jar") && !name.contains("-src.");
}
});
- for (int i = 0; i < jars.length; i++) {
- File jar = jars[i];
+ for (File jar : jars) {
urls.add(jar.toURL());
}
@@ -181,8 +180,7 @@ public class Main {
return;
}
- for (int i = 0; i < files.length; i++) {
- File f = files[i];
+ for (File f : files) {
if (f.isDirectory()) {
findJars(f, urls);
} else if (f.getName().endsWith(".jar")) {
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
Tue Sep 20 16:25:07 2011
@@ -21,13 +21,12 @@
package org.apache.struts2.sitegraph;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.config.BeanSelectionProvider;
import org.apache.struts2.config.DefaultPropertiesProvider;
import org.apache.struts2.config.LegacyPropertiesConfigurationProvider;
@@ -37,12 +36,12 @@ import org.apache.struts2.sitegraph.enti
import org.apache.struts2.sitegraph.entities.VelocityView;
import org.apache.struts2.sitegraph.entities.View;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
/**
* Initializes and retrieves XWork config elements
@@ -53,7 +52,7 @@ public class StrutsConfigRetriever {
private static String configDir;
private static String[] views;
private static boolean isXWorkStarted = false;
- private static Map viewCache = new LinkedHashMap();
+ private static Map<String, View> viewCache = new LinkedHashMap<String,
View>();
private static ConfigurationManager cm;
/**
@@ -61,7 +60,7 @@ public class StrutsConfigRetriever {
*
* @return Map of all action names/configs
*/
- public static Map getActionConfigs() {
+ public static Map<String, Map<String,ActionConfig>> getActionConfigs() {
if (!isXWorkStarted)
initXWork();
return
cm.getConfiguration().getRuntimeConfiguration().getActionConfigs();
@@ -84,9 +83,9 @@ public class StrutsConfigRetriever {
}
}
- public static Set getNamespaces() {
- Set namespaces = Collections.EMPTY_SET;
- Map allActionConfigs = getActionConfigs();
+ public static Set<String> getNamespaces() {
+ Set<String> namespaces= Collections.emptySet();
+ Map<String, Map<String, ActionConfig>> allActionConfigs =
getActionConfigs();
if (allActionConfigs != null) {
namespaces = allActionConfigs.keySet();
}
@@ -99,11 +98,11 @@ public class StrutsConfigRetriever {
* @param namespace
* @return Set of the action names for this namespace.
*/
- public static Set getActionNames(String namespace) {
- Set actionNames = Collections.EMPTY_SET;
- Map allActionConfigs = getActionConfigs();
+ public static Set<String> getActionNames(String namespace) {
+ Set<String> actionNames = Collections.emptySet();
+ Map<String, Map<String, ActionConfig>> allActionConfigs =
getActionConfigs();
if (allActionConfigs != null) {
- Map actionMappings = (Map) allActionConfigs.get(namespace);
+ Map<String, ActionConfig> actionMappings =
allActionConfigs.get(namespace);
if (actionMappings != null) {
actionNames = actionMappings.keySet();
}
@@ -143,9 +142,8 @@ public class StrutsConfigRetriever {
public static File getViewFile(String namespace, String actionName, String
resultName) {
ResultConfig result = getResultConfig(namespace, actionName,
resultName);
- String location = (String) result.getParams().get("location");
- for (int i = 0; i < views.length; i++) {
- String viewRoot = views[i];
+ String location = result.getParams().get("location");
+ for (String viewRoot : views) {
File viewFile = getViewFileInternal(viewRoot, location, namespace);
if (viewFile != null) {
return viewFile;
@@ -156,9 +154,9 @@ public class StrutsConfigRetriever {
}
private static File getViewFileInternal(String root, String location,
String namespace) {
- StringBuffer filePath = new StringBuffer(root);
+ StringBuilder filePath = new StringBuilder(root);
if (!location.startsWith("/")) {
- filePath.append(namespace + "/");
+ filePath.append(namespace).append('/');
}
filePath.append(location);
File viewFile = new File(filePath.toString());
@@ -171,7 +169,7 @@ public class StrutsConfigRetriever {
public static View getView(String namespace, String actionName, String
resultName, int type) {
String viewId = namespace + "/" + actionName + "/" + resultName;
- View view = (View) viewCache.get(viewId);
+ View view = viewCache.get(viewId);
if (view == null) {
File viewFile = StrutsConfigRetriever.getViewFile(namespace,
actionName, resultName);
if (viewFile != null) {
@@ -199,6 +197,5 @@ public class StrutsConfigRetriever {
StrutsConfigRetriever.configDir = configDir;
StrutsConfigRetriever.views = views;
isXWorkStarted = false;
- viewCache = new LinkedHashMap();
}
}
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
Tue Sep 20 16:25:07 2011
@@ -21,21 +21,16 @@
package org.apache.struts2.sitegraph.entities;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.sitegraph.model.Link;
+
+import java.io.*;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.struts2.sitegraph.model.Link;
-
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
*/
public abstract class FileBasedView implements View {
@@ -54,8 +49,8 @@ public abstract class FileBasedView impl
return name;
}
- public Set getTargets() {
- TreeSet targets = new TreeSet();
+ public Set<Target> getTargets() {
+ TreeSet<Target> targets = new TreeSet<Target>();
// links
matchPatterns(getLinkPattern(), targets, Link.TYPE_HREF);
@@ -77,7 +72,7 @@ public abstract class FileBasedView impl
return Pattern.compile(actionRegex);
}
- private void matchPatterns(Pattern pattern, Set targets, int type) {
+ private void matchPatterns(Pattern pattern, Set<Target> targets, int type)
{
Matcher matcher = pattern.matcher(contents);
while (matcher.find()) {
String target = matcher.group(1);
@@ -93,11 +88,11 @@ public abstract class FileBasedView impl
try {
BufferedReader in = new BufferedReader(new FileReader(file));
- String s = new String();
- StringBuffer buffer = new StringBuffer();
+ String s;
+ StringBuilder buffer = new StringBuilder();
while ((s = in.readLine()) != null) {
- buffer.append(s + "\n");
+ buffer.append(s).append('\n');
}
in.close();
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
Tue Sep 20 16:25:07 2011
@@ -43,5 +43,5 @@ public interface View {
*
* @return a set of Targets
*/
- public Set getTargets();
+ public Set<Target> getTargets();
}
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
Tue Sep 20 16:25:07 2011
@@ -31,12 +31,12 @@ import java.util.TreeSet;
/**
*/
public class Graph extends SubGraph {
- private Set links;
+ private Set<Link> links;
public static Map nodeMap = new LinkedHashMap();
public Graph() {
super("");
- this.links = new TreeSet();
+ this.links = new TreeSet<Link>();
}
public void addLink(Link link) {
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java?rev=1173223&r1=1173222&r2=1173223&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
Tue Sep 20 16:25:07 2011
@@ -21,31 +21,17 @@
package org.apache.struts2.sitegraph.renderers;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.struts2.StrutsConstants;
+import com.opensymphony.xwork2.ActionChainResult;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
import org.apache.struts2.sitegraph.StrutsConfigRetriever;
import org.apache.struts2.sitegraph.entities.Target;
import org.apache.struts2.sitegraph.entities.View;
-import org.apache.struts2.sitegraph.model.ActionNode;
-import org.apache.struts2.sitegraph.model.Graph;
-import org.apache.struts2.sitegraph.model.IndentWriter;
-import org.apache.struts2.sitegraph.model.Link;
-import org.apache.struts2.sitegraph.model.SiteGraphNode;
-import org.apache.struts2.sitegraph.model.SubGraph;
-import org.apache.struts2.sitegraph.model.ViewNode;
+import org.apache.struts2.sitegraph.model.*;
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.*;
/**
* Renders flow diagram to the console at info level
@@ -53,7 +39,7 @@ import com.opensymphony.xwork2.config.en
public class DOTRenderer {
private Writer writer;
- private List links = new ArrayList();
+ private List<TempLink> links = new ArrayList<TempLink>();
public DOTRenderer(Writer writer) {
this.writer = writer;
@@ -62,50 +48,44 @@ public class DOTRenderer {
public void render(String ns) {
Graph graph = new Graph();
- TreeMap viewMap = new TreeMap(new Comparator() {
- public int compare(Object o1, Object o2) {
- ViewNode v1 = (ViewNode) o1;
- ViewNode v2 = (ViewNode) o2;
+ TreeMap<ViewNode, View> viewMap = new TreeMap<ViewNode, View>(new
Comparator<ViewNode>() {
+ public int compare(ViewNode v1, ViewNode v2) {
return v1.getFullName().compareTo(v2.getFullName());
}
});
- Set namespaces = StrutsConfigRetriever.getNamespaces();
- for (Iterator iter = namespaces.iterator(); iter.hasNext();) {
- String namespace = (String) iter.next();
-
+ Set<String> namespaces = StrutsConfigRetriever.getNamespaces();
+ for (String namespace : namespaces) {
if (!namespace.startsWith(ns)) {
continue;
}
SubGraph subGraph = graph.create(namespace);
- Set actionNames = StrutsConfigRetriever.getActionNames(namespace);
- for (Iterator iterator = actionNames.iterator();
iterator.hasNext();) {
- String actionName = (String) iterator.next();
+ Set<String> actionNames =
StrutsConfigRetriever.getActionNames(namespace);
+ for (String actionName : actionNames) {
ActionConfig actionConfig =
StrutsConfigRetriever.getActionConfig(namespace,
actionName);
ActionNode action = new ActionNode(actionName);
subGraph.addNode(action);
- Set resultNames = actionConfig.getResults().keySet();
- for (Iterator iterator2 = resultNames.iterator();
iterator2.hasNext();) {
- String resultName = (String) iterator2.next();
- ResultConfig resultConfig = ((ResultConfig)
actionConfig.getResults().get(resultName));
+ Set<String> resultNames = actionConfig.getResults().keySet();
+ for (String resultName : resultNames) {
+ ResultConfig resultConfig =
actionConfig.getResults().get(resultName);
String resultClassName = resultConfig.getClassName();
if
(resultClassName.equals(ActionChainResult.class.getName())) {
- } else if (resultClassName.indexOf("Dispatcher") != -1
- || resultClassName.indexOf("Velocity") != -1
- || resultClassName.indexOf("Freemarker") != -1) {
+ } else if (resultClassName.contains("Dispatcher")
+ || resultClassName.contains("Velocity")
+ || resultClassName.contains("Freemarker")) {
if (resultConfig.getParams().get("location") == null) {
continue;
}
- String location = getViewLocation((String)
resultConfig.getParams().get("location"), namespace);
+ String location =
getViewLocation(resultConfig.getParams().get("location"), namespace);
// FIXME: work with new configuration style
if (location.endsWith("action")) {
addTempLink(action, location, Link.TYPE_RESULT,
resultConfig.getName());
@@ -120,15 +100,15 @@ public class DOTRenderer {
viewMap.put(view, viewFile);
}
}
- } else if (resultClassName.indexOf("Jasper") != -1) {
+ } else if (resultClassName.contains("Jasper")) {
- } else if (resultClassName.indexOf("XSLT") != -1) {
+ } else if (resultClassName.contains("XSLT")) {
- } else if (resultClassName.indexOf("Redirect") != -1) {
+ } else if (resultClassName.contains("Redirect")) {
// check if the redirect is to an action -- if so,
link it
- String locationConfig = (String)
resultConfig.getParams().get("location");
+ String locationConfig =
resultConfig.getParams().get("location");
if (locationConfig == null) {
- locationConfig = (String)
resultConfig.getParams().get("actionName");
+ locationConfig =
resultConfig.getParams().get("actionName");
}
String location = getViewLocation(locationConfig,
namespace);
// FIXME: work with new configuration style
@@ -151,23 +131,20 @@ public class DOTRenderer {
}
// now look for links in the view
- for (Iterator iterator = viewMap.entrySet().iterator();
iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- ViewNode view = (ViewNode) entry.getKey();
- View viewFile = (View) entry.getValue();
- Set targets = viewFile.getTargets();
- for (Iterator iterator1 = targets.iterator();
iterator1.hasNext();) {
- Target target = (Target) iterator1.next();
+ for (Map.Entry<ViewNode, View> viewNodeViewEntry : viewMap.entrySet())
{
+ ViewNode view = viewNodeViewEntry.getKey();
+ View viewFile = viewNodeViewEntry.getValue();
+ Set<Target> targets = viewFile.getTargets();
+ for (Target target : targets) {
String viewTarget = target.getTarget();
addTempLink(view, viewTarget, target.getType(), "");
}
}
// finally, let's match up these links as real Link objects
- for (Iterator iterator = links.iterator(); iterator.hasNext();) {
- TempLink temp = (TempLink) iterator.next();
+ for (TempLink temp : links) {
String location = temp.location;
-
+
// FIXME: work with new configuration style
if (location.endsWith("action")) {
location = location.substring(0, location.indexOf("action") -
1);
@@ -212,7 +189,7 @@ public class DOTRenderer {
}
private String getViewLocation(String location, String namespace) {
- String view = null;
+ String view;
if (!location.startsWith("/")) {
view = namespace + "/" + location;
} else {
