11:19 p.m.
Author: shane.bryzak(a)jboss.com
Date: 2008-01-22 00:19:02 -0500 (Tue, 22 Jan 2008)
New Revision: 7173
Modified:
trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
trunk/src/main/org/jboss/seam/core/Init.java
trunk/src/main/org/jboss/seam/framework/Query.java
trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
trunk/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
trunk/src/main/org/jboss/seam/navigation/ConversationControl.java
trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java
trunk/src/main/org/jboss/seam/util/Base64.java
trunk/src/pdf/org/jboss/seam/pdf/DocumentStore.java
trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java
trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
trunk/src/test/unit/org/jboss/seam/test/unit/web/MultipartRequestTest.java
Log:
compiler warnings, imports
Modified: trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
===================================================================
--- trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-01-22 01:53:26 UTC
(rev 7172)
+++ trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-01-22 05:19:02 UTC
(rev 7173)
@@ -22,12 +22,8 @@
import org.jboss.seam.log.Logging;
import org.jboss.seam.transaction.AbstractUserTransaction;
import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.transaction.HeuristicCompletionException;
import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.UnexpectedRollbackException;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;
Modified: trunk/src/main/org/jboss/seam/core/Init.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Init.java 2008-01-22 01:53:26 UTC (rev 7172)
+++ trunk/src/main/org/jboss/seam/core/Init.java 2008-01-22 05:19:02 UTC (rev 7173)
@@ -8,7 +8,6 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Modified: trunk/src/main/org/jboss/seam/framework/Query.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/Query.java 2008-01-22 01:53:26 UTC (rev 7172)
+++ trunk/src/main/org/jboss/seam/framework/Query.java 2008-01-22 05:19:02 UTC (rev 7173)
@@ -257,7 +257,7 @@
/**
* Return the ejbql to used in a count query (for calculating number of
* results)
- * @return
+ * @return String The ejbql query
*/
protected String getCountEjbql()
{
Modified: trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-01-22 01:53:26 UTC (rev
7172)
+++ trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-01-22 05:19:02 UTC (rev
7173)
@@ -26,9 +26,7 @@
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.FacesLifecycle;
-import org.jboss.seam.core.ConversationList;
import org.jboss.seam.core.ConversationPropagation;
-import org.jboss.seam.core.ConversationStack;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Manager;
Modified: trunk/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2008-01-22 01:53:26 UTC (rev
7172)
+++ trunk/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2008-01-22 05:19:02 UTC (rev
7173)
@@ -190,6 +190,7 @@
}
}
+ @Override
public String toString() {
// TODO: This is not pretty because DBUnit's DatabaseOperation
doesn't implement toString() properly
return operation.getClass() + " with dataset: " + dataSetLocation;
@@ -268,6 +269,7 @@
// TODO: DBUnit/HSQL bugfix
// http://www.carbonfive.com/community/archives/2005/07/dbunit_hsql_and.html
config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new
DefaultDataTypeFactory() {
+ @Override
public DataType createDataType(int sqlType, String sqlTypeName)
throws DataTypeException {
if (sqlType == Types.BOOLEAN) {
Modified: trunk/src/main/org/jboss/seam/navigation/ConversationControl.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/ConversationControl.java 2008-01-22 01:53:26
UTC (rev 7172)
+++ trunk/src/main/org/jboss/seam/navigation/ConversationControl.java 2008-01-22 05:19:02
UTC (rev 7173)
@@ -3,7 +3,6 @@
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.ConversationEntry;
-import org.jboss.seam.core.Manager;
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.pageflow.Pageflow;
/**
Modified: trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-01-22 01:53:26 UTC
(rev 7172)
+++ trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-01-22 05:19:02 UTC
(rev 7173)
@@ -11,8 +11,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.security.auth.Subject;
-
import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.StatefulSession;
@@ -240,7 +238,6 @@
Role r = iter.next();
if (r.getName().equals(role.getName()))
{
- FactHandle fh = getSecurityContext().getFactHandle(r);
found = true;
break;
}
Modified: trunk/src/main/org/jboss/seam/util/Base64.java
===================================================================
--- trunk/src/main/org/jboss/seam/util/Base64.java 2008-01-22 01:53:26 UTC (rev 7172)
+++ trunk/src/main/org/jboss/seam/util/Base64.java 2008-01-22 05:19:02 UTC (rev 7173)
@@ -551,7 +551,7 @@
// Isolate options
int gzip = (options & GZIP);
- int dontBreakLines = (options & DONT_BREAK_LINES);
+ //int dontBreakLines = (options & DONT_BREAK_LINES);
try
{
@@ -975,7 +975,7 @@
if( bytes != null && bytes.length >= 4 )
{
- int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+ int head = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head )
{
java.io.ByteArrayInputStream bais = null;
@@ -1310,7 +1310,7 @@
private int lineLength;
private boolean breakLines; // Break lines at less than 80 characters
private int options; // Record options used to create the stream.
- private byte[] alphabet; // Local copies to avoid extra method calls
+ //private byte[] alphabet; // Local copies to avoid extra method calls
private byte[] decodabet; // Local copies to avoid extra method calls
@@ -1357,7 +1357,7 @@
this.position = -1;
this.lineLength = 0;
this.options = options; // Record for later, mostly to determine which
alphabet to use
- this.alphabet = getAlphabet(options);
+ //this.alphabet = getAlphabet(options);
this.decodabet = getDecodabet(options);
} // end constructor
@@ -1368,6 +1368,7 @@
* @return next byte
* @since 1.3
*/
+ @Override
public int read() throws java.io.IOException
{
// Do we need to get data?
@@ -1496,6 +1497,7 @@
* @return bytes read into array or -1 if end of stream is encountered.
* @since 1.3
*/
+ @Override
public int read( byte[] dest, int off, int len ) throws java.io.IOException
{
int i;
@@ -1547,7 +1549,7 @@
private byte[] b4; // Scratch used in a few places
private boolean suspendEncoding;
private int options; // Record for later
- private byte[] alphabet; // Local copies to avoid extra method calls
+ //private byte[] alphabet; // Local copies to avoid extra method calls
private byte[] decodabet; // Local copies to avoid extra method calls
/**
@@ -1594,7 +1596,7 @@
this.suspendEncoding = false;
this.b4 = new byte[4];
this.options = options;
- this.alphabet = getAlphabet(options);
+ //this.alphabet = getAlphabet(options);
this.decodabet = getDecodabet(options);
} // end constructor
@@ -1611,6 +1613,7 @@
* @param theByte the byte to write
* @since 1.3
*/
+ @Override
public void write(int theByte) throws java.io.IOException
{
// Encoding suspended?
@@ -1672,6 +1675,7 @@
* @param len max number of bytes to read into array
* @since 1.3
*/
+ @Override
public void write( byte[] theBytes, int off, int len ) throws
java.io.IOException
{
// Encoding suspended?
Modified: trunk/src/pdf/org/jboss/seam/pdf/DocumentStore.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/DocumentStore.java 2008-01-22 01:53:26 UTC (rev
7172)
+++ trunk/src/pdf/org/jboss/seam/pdf/DocumentStore.java 2008-01-22 05:19:02 UTC (rev
7173)
@@ -12,7 +12,6 @@
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.pdf.DocumentData.DocumentType;
import org.jboss.seam.ui.util.Faces;
@Name("org.jboss.seam.pdf.documentStore")
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java 2008-01-22 01:53:26 UTC (rev
7172)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIHtmlText.java 2008-01-22 05:19:02 UTC (rev
7173)
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.List;
import javax.faces.FacesException;
import javax.faces.component.ValueHolder;
@@ -13,7 +12,6 @@
import org.jboss.seam.ui.util.JSF;
-import com.lowagie.text.Element;
import com.lowagie.text.Paragraph;
import com.lowagie.text.html.simpleparser.HTMLWorker;
import com.lowagie.text.html.simpleparser.StyleSheet;
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-01-22 01:53:26
UTC (rev 7172)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-01-22 05:19:02
UTC (rev 7173)
@@ -1,7 +1,6 @@
package org.jboss.seam.test.unit;
import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
import org.jboss.seam.core.Interpolator;
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/web/MultipartRequestTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/web/MultipartRequestTest.java 2008-01-22
01:53:26 UTC (rev 7172)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/web/MultipartRequestTest.java 2008-01-22
05:19:02 UTC (rev 7173)
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.Enumeration;
import java.util.HashSet;
import javax.servlet.FilterChain;