Author: remy.maucherat(a)jboss.com
Date: 2008-02-18 07:27:06 -0500 (Mon, 18 Feb 2008)
New Revision: 440
Modified:
trunk/java/org/jboss/web/rewrite/RewriteCond.java
trunk/java/org/jboss/web/rewrite/RewriteRule.java
trunk/java/org/jboss/web/rewrite/RewriteValve.java
trunk/java/org/jboss/web/rewrite/Substitution.java
Log:
- Cleanups using generics (ok, it's not very useful ...).
Modified: trunk/java/org/jboss/web/rewrite/RewriteCond.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/RewriteCond.java 2008-02-15 23:04:17 UTC (rev 439)
+++ trunk/java/org/jboss/web/rewrite/RewriteCond.java 2008-02-18 12:27:06 UTC (rev 440)
@@ -112,7 +112,7 @@
this.testString = testString;
}
- public void parse(Map maps) {
+ public void parse(Map<String, RewriteMap> maps) {
test = new Substitution();
test.setSub(testString);
test.parse(maps);
@@ -172,7 +172,7 @@
protected Substitution test = null;
- protected ThreadLocal condition = new ThreadLocal();
+ protected ThreadLocal<Condition> condition = new
ThreadLocal<Condition>();
/**
* This makes the test case-insensitive, i.e., there is no difference between
@@ -199,7 +199,7 @@
if (nocase) {
value = value.toLowerCase();
}
- Condition condition = (Condition) this.condition.get();
+ Condition condition = this.condition.get();
if (condition == null) {
if (condPattern.startsWith("<")) {
LexicalCondition ncondition = new LexicalCondition();
Modified: trunk/java/org/jboss/web/rewrite/RewriteRule.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/RewriteRule.java 2008-02-15 23:04:17 UTC (rev 439)
+++ trunk/java/org/jboss/web/rewrite/RewriteRule.java 2008-02-18 12:27:06 UTC (rev 440)
@@ -31,13 +31,13 @@
protected RewriteCond[] conditions = new RewriteCond[0];
- protected ThreadLocal pattern = new ThreadLocal();
+ protected ThreadLocal<Pattern> pattern = new ThreadLocal<Pattern>();
protected Substitution substitution = null;
protected String patternString = null;
protected String substitutionString = null;
- public void parse(Map maps) {
+ public void parse(Map<String, RewriteMap> maps) {
// Parse the substitution
if (!"-".equals(substitutionString)) {
substitution = new Substitution();
@@ -71,7 +71,7 @@
* @return null if no rewrite took place
*/
public CharSequence evaluate(CharSequence url, Resolver resolver) {
- Pattern pattern = (Pattern) this.pattern.get();
+ Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
int flags = 0;
Modified: trunk/java/org/jboss/web/rewrite/RewriteValve.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/RewriteValve.java 2008-02-15 23:04:17 UTC (rev 439)
+++ trunk/java/org/jboss/web/rewrite/RewriteValve.java 2008-02-18 12:27:06 UTC (rev 440)
@@ -73,7 +73,7 @@
/**
* If rewriting occurs, the whole request will be processed again.
*/
- protected ThreadLocal invoked = new ThreadLocal();
+ protected ThreadLocal<Boolean> invoked = new ThreadLocal<Boolean>();
/**
@@ -93,7 +93,7 @@
/**
* Maps to be used by the rules.
*/
- protected Map maps = new Hashtable();
+ protected Map<String, RewriteMap> maps = new Hashtable<String,
RewriteMap>();
public void addLifecycleListener(LifecycleListener listener) {
@@ -249,9 +249,9 @@
}
public void stop() throws LifecycleException {
- Iterator values = maps.values().iterator();
+ Iterator<RewriteMap> values = maps.values().iterator();
while (values.hasNext()) {
- RewriteMap map = (RewriteMap) values.next();
+ RewriteMap map = values.next();
if (map instanceof Lifecycle) {
((Lifecycle) map).stop();
}
Modified: trunk/java/org/jboss/web/rewrite/Substitution.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/Substitution.java 2008-02-15 23:04:17 UTC (rev 439)
+++ trunk/java/org/jboss/web/rewrite/Substitution.java 2008-02-18 12:27:06 UTC (rev 440)
@@ -104,9 +104,9 @@
public String getSub() { return sub; }
public void setSub(String sub) { this.sub = sub; }
- public void parse(Map maps) {
+ public void parse(Map<String, RewriteMap> maps) {
- ArrayList elements = new ArrayList();
+ ArrayList<SubstitutionElement> elements = new
ArrayList<SubstitutionElement>();
int pos = 0;
int percentPos = 0;
int dollarPos = 0;
@@ -149,7 +149,7 @@
if (!(-1 < open && open < colon && colon <
close)) {
throw new IllegalArgumentException(sub);
}
- newElement.map = (RewriteMap) maps.get(sub.substring(open + 1,
colon));
+ newElement.map = maps.get(sub.substring(open + 1, colon));
if (newElement.map == null) {
throw new IllegalArgumentException(sub + ": No map: " +
sub.substring(open + 1, colon));
}
Show replies by date