Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/selectors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2537/components/http/impl/src/java/org/jicarilla/http/selectors
Modified Files:
HTTPFieldSelector.java PatternMatchingHTTPFieldSelector.java
Log Message:
Ran some code analysis tools on the code and changed approximately 200 small things based on that. Nothing shocking (I hope!)
Index: HTTPFieldSelector.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/selectors/HTTPFieldSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTTPFieldSelector.java 25 Jan 2004 22:12:36 -0000 1.1
+++ HTTPFieldSelector.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -43,7 +43,7 @@
{
protected HTTPField m_field;
- public HTTPFieldSelector( HTTPField field )
+ public HTTPFieldSelector( final HTTPField field )
{
Assert.assertNotNull( "field argument may not be null", field );
m_field = field;
@@ -54,54 +54,51 @@
return m_field;
}
- public boolean select( Object object )
+ public boolean select( final Object object )
{
if( object == null )
return false;
if( object instanceof HTTPField )
{
- HTTPField field = (HTTPField)object;
+ final HTTPField field = (HTTPField)object;
return selectField( field );
}
if( object instanceof HTTPMessage )
{
- HTTPMessage message = (HTTPMessage)object;
+ final HTTPMessage message = (HTTPMessage)object;
return selectHTTPMessage( message );
}
if( object instanceof HTTPEvent )
{
- HTTPEvent event = (HTTPEvent)object;
- HTTPMessage message = event.getHTTPRequest();
+ final HTTPEvent event = (HTTPEvent)object;
+ final HTTPMessage message = event.getHTTPRequest();
return selectHTTPMessage( message );
}
return false;
}
- protected boolean selectField( HTTPField field )
+ protected boolean selectField( final HTTPField field )
{
- if( m_field.equals( field ) )
- return true;
- else
- return false;
+ return m_field.equals( field );
}
- protected boolean selectHTTPMessage( HTTPMessage message )
+ protected boolean selectHTTPMessage( final HTTPMessage message )
{
- Iterator it = message.getHeaders().iterator();
+ final Iterator it = message.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
if( selectField( field ) )
return true;
}
return false;
}
- public boolean equals( Object o )
+ public boolean equals( final Object o )
{
if( this == o )
return true;
@@ -116,8 +113,9 @@
return true;
}
+ private final static int HASHCODE_ADD = 130;
public int hashCode()
{
- return getCriterion().hashCode() + 130;
+ return getCriterion().hashCode() + HASHCODE_ADD;
}
}
Index: PatternMatchingHTTPFieldSelector.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/selectors/PatternMatchingHTTPFieldSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PatternMatchingHTTPFieldSelector.java 25 Jan 2004 22:12:49 -0000 1.1
+++ PatternMatchingHTTPFieldSelector.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -74,13 +74,13 @@
protected Pattern m_namePattern;
protected Pattern m_valuePattern;
- public PatternMatchingHTTPFieldSelector( Pattern fieldNamePattern )
+ public PatternMatchingHTTPFieldSelector( final Pattern fieldNamePattern )
{
this( fieldNamePattern, null );
}
- public PatternMatchingHTTPFieldSelector( Pattern fieldNamePattern,
- Pattern fieldValuePattern )
+ public PatternMatchingHTTPFieldSelector( final Pattern fieldNamePattern,
+ final Pattern fieldValuePattern )
{
Assert.assertNotNull( "fieldNamePattern argument may not be null",
fieldNamePattern );
@@ -96,34 +96,34 @@
return new Pattern[] { m_namePattern, m_valuePattern };
}
- public boolean select( Object object )
+ public boolean select( final Object object )
{
if( object == null )
return false;
if( object instanceof HTTPField )
{
- HTTPField field = (HTTPField)object;
+ final HTTPField field = (HTTPField)object;
return selectField( field );
}
if( object instanceof HTTPMessage )
{
- HTTPMessage message = (HTTPMessage)object;
+ final HTTPMessage message = (HTTPMessage)object;
return selectHTTPMessage( message );
}
if( object instanceof HTTPEvent )
{
- HTTPEvent event = (HTTPEvent)object;
- HTTPMessage message = event.getHTTPRequest();
+ final HTTPEvent event = (HTTPEvent)object;
+ final HTTPMessage message = event.getHTTPRequest();
return selectHTTPMessage( message );
}
return false;
}
- protected boolean selectField( HTTPField field )
+ protected boolean selectField( final HTTPField field )
{
final String fieldName = field.getNameString();
if( !m_namePattern.matcher( fieldName ).matches() )
@@ -144,19 +144,19 @@
}
}
- protected boolean selectHTTPMessage( HTTPMessage message )
+ protected boolean selectHTTPMessage( final HTTPMessage message )
{
- Iterator it = message.getHeaders().iterator();
+ final Iterator it = message.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
if( selectField( field ) )
return true;
}
return false;
}
- public boolean equals( Object o )
+ public boolean equals( final Object o )
{
if( this == o )
return true;
@@ -171,8 +171,9 @@
return true;
}
+ private final static int HASHCODE_ADD = 135;
public int hashCode()
{
- return getCriterion().hashCode() + 130;
+ return getCriterion().hashCode() + HASHCODE_ADD;
}
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.