Author: markt
Date: Mon Sep 3 20:37:06 2012
New Revision: 1380347
URL: http://svn.apache.org/viewvc?rev=1380347&view=rev
Log:
Clean-up
- Java 7 <>
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1380347&r1=1380346&r2=1380347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Mon Sep
3 20:37:06 2012
@@ -89,7 +89,7 @@ public class JspCServletContext implemen
*/
public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL) {
- myAttributes = new Hashtable<String,Object>();
+ myAttributes = new Hashtable<>();
myLogWriter = aLogWriter;
myResourceBaseURL = aResourceBaseURL;
@@ -321,7 +321,7 @@ public class JspCServletContext implemen
@Override
public Set<String> getResourcePaths(String path) {
- Set<String> thePaths = new HashSet<String>();
+ Set<String> thePaths = new HashSet<>();
if (!path.endsWith("/"))
path += "/";
String basePath = getRealPath(path);
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1380347&r1=1380346&r2=1380347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Mon Sep
3 20:37:06 2012
@@ -72,7 +72,7 @@ import org.apache.tomcat.InstanceManager
public class JspServletWrapper {
private static final Map<String,Long> ALWAYS_OUTDATED_DEPENDENCIES =
- new HashMap<String,Long>();
+ new HashMap<>();
static {
// If this is missing,
Modified: tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java?rev=1380347&r1=1380346&r2=1380347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java Mon Sep
3 20:37:06 2012
@@ -33,7 +33,7 @@ public class UniqueAttributesImpl extend
private static final String PAGE_ENCODING = "pageEncoding";
private final boolean pageDirective;
- private final Set<String> qNames = new HashSet<String>();
+ private final Set<String> qNames = new HashSet<>();
public UniqueAttributesImpl() {
this.pageDirective = false;
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1380347&r1=1380346&r2=1380347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Mon Sep 3
20:37:06 2012
@@ -484,11 +484,11 @@ public class EncodingMap {
/** fIANA2JavaMap */
protected static final Hashtable<String,String> fIANA2JavaMap =
- new Hashtable<String,String>();
+ new Hashtable<>();
/** fJava2IANAMap */
protected static final Hashtable<String,String> fJava2IANAMap =
- new Hashtable<String,String>();
+ new Hashtable<>();
//
// Static initialization
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java?rev=1380347&r1=1380346&r2=1380347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java Mon Sep 3
20:37:06 2012
@@ -108,7 +108,7 @@ public class TreeNode {
public void addAttribute(String name, String value) {
if (attributes == null)
- attributes = new HashMap<String,String>();
+ attributes = new HashMap<>();
attributes.put(name, value);
}
@@ -122,7 +122,7 @@ public class TreeNode {
public void addChild(TreeNode node) {
if (children == null)
- children = new ArrayList<TreeNode>();
+ children = new ArrayList<>();
children.add(node);
}
@@ -209,7 +209,7 @@ public class TreeNode {
return empty.iterator();
}
- ArrayList<TreeNode> results = new ArrayList<TreeNode>();
+ ArrayList<TreeNode> results = new ArrayList<>();
Iterator<TreeNode> items = children.iterator();
while (items.hasNext()) {
TreeNode item = items.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
