[jboss-svn-commits] JBoss Common SVN: r2787 - in common-core/trunk/src: main/java/org/jboss/net/protocol/file and 31 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 31 13:55:31 EDT 2008
Author: adrian at jboss.org
Date: 2008-03-31 13:55:30 -0400 (Mon, 31 Mar 2008)
New Revision: 2787
Modified:
common-core/trunk/src/main/java/org/jboss/net/protocol/DelegatingURLConnection.java
common-core/trunk/src/main/java/org/jboss/net/protocol/URLLister.java
common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerBase.java
common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerFactory.java
common-core/trunk/src/main/java/org/jboss/net/protocol/URLStreamHandlerFactory.java
common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLConnection.java
common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLLister.java
common-core/trunk/src/main/java/org/jboss/net/protocol/http/DavURLLister.java
common-core/trunk/src/main/java/org/jboss/net/protocol/njar/Handler.java
common-core/trunk/src/main/java/org/jboss/net/sockets/DefaultSocketFactory.java
common-core/trunk/src/main/java/org/jboss/net/sockets/MethodHash.java
common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketClient.java
common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketHandler.java
common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketServer.java
common-core/trunk/src/main/java/org/jboss/net/sockets/TimeoutServerSocketFactory.java
common-core/trunk/src/main/java/org/jboss/util/Base64.java
common-core/trunk/src/main/java/org/jboss/util/CachePolicy.java
common-core/trunk/src/main/java/org/jboss/util/Classes.java
common-core/trunk/src/main/java/org/jboss/util/Counter.java
common-core/trunk/src/main/java/org/jboss/util/EmptyStringException.java
common-core/trunk/src/main/java/org/jboss/util/Executable.java
common-core/trunk/src/main/java/org/jboss/util/HashCode.java
common-core/trunk/src/main/java/org/jboss/util/Heap.java
common-core/trunk/src/main/java/org/jboss/util/JBossObject.java
common-core/trunk/src/main/java/org/jboss/util/LRUCachePolicy.java
common-core/trunk/src/main/java/org/jboss/util/LongCounter.java
common-core/trunk/src/main/java/org/jboss/util/MethodHashing.java
common-core/trunk/src/main/java/org/jboss/util/NestedError.java
common-core/trunk/src/main/java/org/jboss/util/NestedException.java
common-core/trunk/src/main/java/org/jboss/util/NestedRuntimeException.java
common-core/trunk/src/main/java/org/jboss/util/NestedSQLException.java
common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java
common-core/trunk/src/main/java/org/jboss/util/NoSuchMethodException.java
common-core/trunk/src/main/java/org/jboss/util/NotImplementedException.java
common-core/trunk/src/main/java/org/jboss/util/Null.java
common-core/trunk/src/main/java/org/jboss/util/NullArgumentException.java
common-core/trunk/src/main/java/org/jboss/util/Objects.java
common-core/trunk/src/main/java/org/jboss/util/Semaphore.java
common-core/trunk/src/main/java/org/jboss/util/SoftObject.java
common-core/trunk/src/main/java/org/jboss/util/StopWatch.java
common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java
common-core/trunk/src/main/java/org/jboss/util/Strings.java
common-core/trunk/src/main/java/org/jboss/util/Sync.java
common-core/trunk/src/main/java/org/jboss/util/SysPropertyActions.java
common-core/trunk/src/main/java/org/jboss/util/ThrowableHandler.java
common-core/trunk/src/main/java/org/jboss/util/TimedCachePolicy.java
common-core/trunk/src/main/java/org/jboss/util/TimerQueue.java
common-core/trunk/src/main/java/org/jboss/util/TimerTask.java
common-core/trunk/src/main/java/org/jboss/util/UnexpectedThrowable.java
common-core/trunk/src/main/java/org/jboss/util/UnreachableStatementException.java
common-core/trunk/src/main/java/org/jboss/util/WaitSync.java
common-core/trunk/src/main/java/org/jboss/util/WeakObject.java
common-core/trunk/src/main/java/org/jboss/util/WorkerQueue.java
common-core/trunk/src/main/java/org/jboss/util/collection/AbstractQueue.java
common-core/trunk/src/main/java/org/jboss/util/collection/ArrayIterator.java
common-core/trunk/src/main/java/org/jboss/util/collection/CachedCollection.java
common-core/trunk/src/main/java/org/jboss/util/collection/CachedList.java
common-core/trunk/src/main/java/org/jboss/util/collection/CollectionException.java
common-core/trunk/src/main/java/org/jboss/util/collection/CollectionsUtil.java
common-core/trunk/src/main/java/org/jboss/util/collection/CompoundIterator.java
common-core/trunk/src/main/java/org/jboss/util/collection/CompoundKey.java
common-core/trunk/src/main/java/org/jboss/util/collection/EmptyCollectionException.java
common-core/trunk/src/main/java/org/jboss/util/collection/FullCollectionException.java
common-core/trunk/src/main/java/org/jboss/util/collection/Iterators.java
common-core/trunk/src/main/java/org/jboss/util/collection/LazyList.java
common-core/trunk/src/main/java/org/jboss/util/collection/LazyMap.java
common-core/trunk/src/main/java/org/jboss/util/collection/LazySet.java
common-core/trunk/src/main/java/org/jboss/util/collection/ListQueue.java
common-core/trunk/src/main/java/org/jboss/util/collection/ListSet.java
common-core/trunk/src/main/java/org/jboss/util/collection/Queue.java
common-core/trunk/src/main/java/org/jboss/util/collection/ReverseListIterator.java
common-core/trunk/src/main/java/org/jboss/util/collection/SerializableEnumeration.java
common-core/trunk/src/main/java/org/jboss/util/collection/SoftSet.java
common-core/trunk/src/main/java/org/jboss/util/collection/SoftValueHashMap.java
common-core/trunk/src/main/java/org/jboss/util/collection/WeakClassCache.java
common-core/trunk/src/main/java/org/jboss/util/collection/WeakIdentityHashMap.java
common-core/trunk/src/main/java/org/jboss/util/collection/WeakSet.java
common-core/trunk/src/main/java/org/jboss/util/deadlock/ApplicationDeadlockException.java
common-core/trunk/src/main/java/org/jboss/util/deadlock/DeadlockDetector.java
common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowser.java
common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowserFactory.java
common-core/trunk/src/main/java/org/jboss/util/file/ClassFileFilter.java
common-core/trunk/src/main/java/org/jboss/util/file/DirectoryArchiveBrowser.java
common-core/trunk/src/main/java/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java
common-core/trunk/src/main/java/org/jboss/util/file/JarArchiveBrowser.java
common-core/trunk/src/main/java/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java
common-core/trunk/src/main/java/org/jboss/util/file/JarStreamBrowser.java
common-core/trunk/src/main/java/org/jboss/util/file/JarUtils.java
common-core/trunk/src/main/java/org/jboss/util/graph/DFSVisitor.java
common-core/trunk/src/main/java/org/jboss/util/graph/Edge.java
common-core/trunk/src/main/java/org/jboss/util/graph/Graph.java
common-core/trunk/src/main/java/org/jboss/util/graph/Vertex.java
common-core/trunk/src/main/java/org/jboss/util/graph/Visitor.java
common-core/trunk/src/main/java/org/jboss/util/graph/VisitorEX.java
common-core/trunk/src/main/java/org/jboss/util/id/GUID.java
common-core/trunk/src/main/java/org/jboss/util/id/SerialVersion.java
common-core/trunk/src/main/java/org/jboss/util/id/UID.java
common-core/trunk/src/main/java/org/jboss/util/id/VMID.java
common-core/trunk/src/main/java/org/jboss/util/loading/ConstructorTCCLClassLoaderSource.java
common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoader.java
common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoaderSwitcher.java
common-core/trunk/src/main/java/org/jboss/util/loading/DelegatingClassLoader.java
common-core/trunk/src/main/java/org/jboss/util/loading/Translator.java
common-core/trunk/src/main/java/org/jboss/util/naming/ENCThreadLocalKey.java
common-core/trunk/src/main/java/org/jboss/util/naming/NonSerializableFactory.java
common-core/trunk/src/main/java/org/jboss/util/naming/ReadOnlyContext.java
common-core/trunk/src/main/java/org/jboss/util/naming/Util.java
common-core/trunk/src/main/java/org/jboss/util/platform/PID.java
common-core/trunk/src/main/java/org/jboss/util/property/DefaultPropertyReader.java
common-core/trunk/src/main/java/org/jboss/util/property/FieldBoundPropertyListener.java
common-core/trunk/src/main/java/org/jboss/util/property/FilePropertyReader.java
common-core/trunk/src/main/java/org/jboss/util/property/MethodBoundPropertyListener.java
common-core/trunk/src/main/java/org/jboss/util/property/Property.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyContainer.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyError.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyEvent.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyException.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyGroup.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyManager.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyMap.java
common-core/trunk/src/main/java/org/jboss/util/property/PropertyReader.java
common-core/trunk/src/main/java/org/jboss/util/property/jmx/SystemPropertyClassValueMBean.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassArrayEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/DateEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ElementEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertiesEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertyEditors.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/StringArrayEditor.java
common-core/trunk/src/main/java/org/jboss/util/propertyeditor/URIEditor.java
common-core/trunk/src/main/java/org/jboss/util/state/IllegalTransitionException.java
common-core/trunk/src/main/java/org/jboss/util/state/State.java
common-core/trunk/src/main/java/org/jboss/util/state/StateMachine.java
common-core/trunk/src/main/java/org/jboss/util/state/xml/StateMachineParser.java
common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java
common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueOutputStream.java
common-core/trunk/src/main/java/org/jboss/util/stream/NotifyingBufferedOutputStream.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/BasicThreadPool.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/MinPooledExecutor.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/StartTimeoutException.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/Task.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/TaskStoppedException.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolFullException.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolMBean.java
common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolStoppedException.java
common-core/trunk/src/main/java/org/jboss/util/timeout/HashedTimeoutPriorityQueueImpl.java
common-core/trunk/src/main/java/org/jboss/util/timeout/Timeout.java
common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutExt.java
common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutFactory.java
common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueue.java
common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueueImpl.java
common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutTarget.java
common-core/trunk/src/main/java/org/jboss/util/xml/DOMUtils.java
common-core/trunk/src/main/java/org/jboss/util/xml/DOMWriter.java
common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
common-core/trunk/src/main/java/org/jboss/util/xml/XmlHelper.java
common-core/trunk/src/main/java/org/jboss/util/xml/XmlLoadable.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Catalog.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogEntry.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogException.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogManager.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Resolver.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/BootstrapResolver.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/Debug.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/PublicId.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/CatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/DOMCatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/ExtendedXMLCatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/OASISXMLCatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogParser.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TR9401CatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TextCatalogReader.java
common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/XCatalogReader.java
common-core/trunk/src/test/java/org/jboss/test/util/test/ClassesUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/collection/WeakSetUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolRunnableUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolTaskUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ConstructorTCCLClassLoaderSourceUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/propertyeditor/PropertyEditorsUnitTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java
Log:
Source code and javadoc 'tidyup' - noise begone.
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/DelegatingURLConnection.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/DelegatingURLConnection.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/DelegatingURLConnection.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,6 +39,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class DelegatingURLConnection
extends URLConnection
{
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/URLLister.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/URLLister.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/URLLister.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,7 @@
* Interface defining methods that can be used to list the contents of a URL
* collection irrespective of the protocol.
*/
+ at SuppressWarnings("unchecked")
public interface URLLister {
/**
* List the members of the given collection URL that match the patterns
@@ -81,7 +82,7 @@
* Determine whether the supplied memberName should be accepted
* @param baseURL the URL of the collection
* @param memberName the member of the collection
- * @return
+ * @return true to accept
*/
boolean accept(URL baseURL, String memberName);
}
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerBase.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerBase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerBase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,6 +34,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public abstract class URLListerBase implements URLLister
{
public Collection listMembers (URL baseUrl, String patterns,
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/URLListerFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -25,6 +25,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
+ at SuppressWarnings("unchecked")
public class URLListerFactory {
private static HashMap defaultClasses = new HashMap();
static {
@@ -66,7 +67,7 @@
throw new MalformedURLException("No lister class defined for protocol "+protocol);
}
- Class clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
+ Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
return (URLLister) clazz.newInstance();
} catch (ClassNotFoundException e) {
throw new MalformedURLException(e.getMessage());
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/URLStreamHandlerFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/URLStreamHandlerFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/URLStreamHandlerFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -45,13 +45,11 @@
* Class.forName method.
* </p>
*
- * <p>Use {@link preload} to force the URL handler map to load the
- * handlers for each protocol listed in {@link #PROTOCOLS}.
- *
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
* @author Scott.Stark at jboss.org
*/
+ at SuppressWarnings("unchecked")
public class URLStreamHandlerFactory
implements java.net.URLStreamHandlerFactory
{
@@ -117,6 +115,7 @@
* Preload the JBoss specific protocol handlers, so that URL knows about
* them even if the handler factory is changed.
*/
+ @SuppressWarnings("unused")
public static void preload()
{
for (int i = 0; i < PROTOCOLS.length; i ++)
@@ -144,7 +143,6 @@
/** Search the handlerPkgs for URLStreamHandler classes matching the
* pkg + protocol + ".Handler" naming convention.
*
- * @see #checkHandlerPkgs()
* @param protocol The protocol to create a stream handler for
* @return The protocol handler or null if not found
*/
@@ -172,7 +170,7 @@
{
// Form the standard protocol handler class name
String classname = handlerPkgs[p] + "." + protocol + ".Handler";
- Class type = null;
+ Class<?> type = null;
try
{
@@ -210,7 +208,7 @@
{
// Update the handlerPkgs[] from the handlerPkgsProp
StringTokenizer tokeninzer = new StringTokenizer(handlerPkgsProp, "|");
- ArrayList tmp = new ArrayList();
+ ArrayList<String> tmp = new ArrayList<String>();
while( tokeninzer.hasMoreTokens() )
{
String pkg = tokeninzer.nextToken().intern();
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLConnection.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLConnection.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLConnection.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -73,6 +73,7 @@
/**
* Returns the underlying file for this connection.
+ * @return the file
*/
public File getFile()
{
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLLister.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLLister.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/file/FileURLLister.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -40,6 +40,7 @@
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class FileURLLister extends URLListerBase
{
/** The Logger */
@@ -52,7 +53,7 @@
return listMembers(baseUrl, filter, false);
}
- public Collection listMembers(URL baseUrl, URLFilter filter, boolean scanNonDottedSubDirs) throws IOException
+ public Collection<URL> listMembers(URL baseUrl, URLFilter filter, boolean scanNonDottedSubDirs) throws IOException
{
// Make sure this is a directory URL
String baseUrlString = baseUrl.toString();
@@ -69,7 +70,7 @@
}
// The list of URLs to return
- ArrayList resultList = new ArrayList();
+ ArrayList<URL> resultList = new ArrayList<URL>();
// Do the actual job
listFiles(baseUrl, filter, scanNonDottedSubDirs, resultList);
@@ -85,7 +86,7 @@
* resultList with the contents that pass the filter (in the form of URLs)
* and possibly recurse into subdris not containing a '.' in their name.
*/
- private void listFiles(final URL baseUrl, final URLFilter filter, boolean scanNonDottedSubDirs, ArrayList resultList)
+ private void listFiles(final URL baseUrl, final URLFilter filter, boolean scanNonDottedSubDirs, ArrayList<URL> resultList)
throws IOException
{
// List the files at the current dir level, using the provided filter
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/http/DavURLLister.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/http/DavURLLister.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/http/DavURLLister.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -33,6 +33,7 @@
import org.apache.webdav.lib.WebdavResource;
import org.jboss.net.protocol.URLListerBase;
+ at SuppressWarnings("unchecked")
public class DavURLLister extends URLListerBase
{
public Collection listMembers (URL baseUrl, URLFilter filter) throws IOException
@@ -40,14 +41,14 @@
return listMembers (baseUrl, filter, false);
}
- public Collection listMembers (URL baseUrl, URLFilter filter, boolean scanNonDottedSubDirs) throws IOException
+ public Collection<URL> listMembers (URL baseUrl, URLFilter filter, boolean scanNonDottedSubDirs) throws IOException
{
WebdavResource resource = null;
try
{
resource = new WebdavResource (baseUrl.toString ());
WebdavResource[] resources = resource.listWebdavResources ();
- List urls = new ArrayList (resources.length);
+ List<URL> urls = new ArrayList<URL>(resources.length);
for (int i = 0; i < resources.length; i++)
{
WebdavResource member = resources[i];
Modified: common-core/trunk/src/main/java/org/jboss/net/protocol/njar/Handler.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/protocol/njar/Handler.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/protocol/njar/Handler.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -66,6 +66,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:cojonudo14 at hotmail.com">Hiram Chirino</a>
*/
+ at SuppressWarnings("unchecked")
public class Handler
extends URLStreamHandler
{
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/DefaultSocketFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/DefaultSocketFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/DefaultSocketFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -50,18 +50,22 @@
this(null, 200);
}
/** Create a socket factory with the given bind address
+ * @param bindAddress
*/
public DefaultSocketFactory(InetAddress bindAddress)
{
this(bindAddress, 200);
}
/** Create a socket factory with the given backlog
+ * @param backlog
*/
public DefaultSocketFactory(int backlog)
{
this(null, backlog);
}
/** Create a socket factory with the given bind address and backlog
+ * @param bindAddress
+ * @param backlog
*/
public DefaultSocketFactory(InetAddress bindAddress, int backlog)
{
@@ -111,7 +115,7 @@
* @param port - the port to listen to
* @param backlog - how many connections are queued
* @param inetAddress - the network interface address to use
- * @return
+ * @return the server socket
* @throws IOException
*/
public ServerSocket createServerSocket(int port, int backlog,
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/MethodHash.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/MethodHash.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/MethodHash.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,7 @@
import java.security.DigestOutputStream;
import java.security.MessageDigest;
+ at SuppressWarnings("unchecked")
public class MethodHash
{
@@ -39,7 +40,7 @@
* Calculate method hashes. This algo is taken from RMI.
*
* @param intf
- * @return
+ * @return the map
*/
public static Map getInterfaceHashes(Class intf)
{
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketClient.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketClient.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketClient.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,8 @@
*/
public class RMIMultiSocketClient implements InvocationHandler, Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
protected Remote[] stubs;
protected Random random;
public RMIMultiSocketClient(Remote[] stubs)
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketHandler.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketHandler.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketHandler.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -28,6 +28,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class RMIMultiSocketHandler implements RMIMultiSocket
{
Object target;
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketServer.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketServer.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/RMIMultiSocketServer.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,7 @@
* @author bill at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class RMIMultiSocketServer
{
private static HashMap handlermap = new HashMap();
Modified: common-core/trunk/src/main/java/org/jboss/net/sockets/TimeoutServerSocketFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/net/sockets/TimeoutServerSocketFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/net/sockets/TimeoutServerSocketFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -54,6 +54,7 @@
/**
* Create a socket factory with the given bind address
+ * @param bindAddress
*/
public TimeoutServerSocketFactory(InetAddress bindAddress)
{
@@ -62,6 +63,7 @@
/**
* Create a socket factory with the given backlog
+ * @param backlog
*/
public TimeoutServerSocketFactory(int backlog)
{
@@ -70,6 +72,8 @@
/**
* Create a socket factory with the given bind address and backlog
+ * @param bindAddress
+ * @param backlog
*/
public TimeoutServerSocketFactory(InetAddress bindAddress, int backlog)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/Base64.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Base64.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Base64.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -21,6 +21,8 @@
*/
package org.jboss.util;
+import java.io.IOException;
+
import org.jboss.logging.Logger;
/**
@@ -386,6 +388,7 @@
* Does not GZip-compress data.
*
* @param source The data to convert
+ * @return the encode bytes
* @since 1.4
*/
public static String encodeBytes(byte[] source)
@@ -409,6 +412,7 @@
*
* @param source The data to convert
* @param options Specified options
+ * @return the encoded bytes
* @see Base64#GZIP
* @see Base64#DONT_BREAK_LINES
* @since 2.0
@@ -425,6 +429,7 @@
* @param source The data to convert
* @param off Offset in array where conversion should begin
* @param len Length of data to convert
+ * @return the text node
* @since 1.4
*/
public static String encodeBytes(byte[] source, int off, int len)
@@ -452,6 +457,7 @@
* @param options Specified options
* @see Base64#GZIP
* @see Base64#DONT_BREAK_LINES
+ * @return the text node
* @since 2.0
*/
public static String encodeBytes(byte[] source, int off, int len, int options)
@@ -733,7 +739,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;
@@ -1408,6 +1414,7 @@
/**
* Method added by PHIL. [Thanks, PHIL. -Rob]
* This pads the buffer without closing the stream.
+ * @throws IOException
*/
public void flushBase64() throws java.io.IOException
{
@@ -1450,6 +1457,7 @@
* base640-encoded data in a stream.
*
* @since 1.5.1
+ * @throws IOException
*/
public void suspendEncoding() throws java.io.IOException
{
Modified: common-core/trunk/src/main/java/org/jboss/util/CachePolicy.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/CachePolicy.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/CachePolicy.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -42,6 +42,7 @@
* was really requested.
*
* @param key the key paired with the object
+ * @return the object
* @see #peek
*/
Object get(Object key);
@@ -57,6 +58,7 @@
*
* @param key the key paired with the object
* @see #get
+ * @return the object
*/
Object peek(Object key);
@@ -86,29 +88,17 @@
void flush();
/**
- * Get the size of the cache.
+ * @return the size of the cache
*/
int size();
- /**
- * create the service, do expensive operations etc
- */
void create() throws Exception;
- /**
- * start the service, create is already called
- */
void start() throws Exception;
- /**
- * stop the service
- */
void stop();
- /**
- * destroy the service, tear down
- */
void destroy();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/Classes.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Classes.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Classes.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -41,6 +41,7 @@
* @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis<a/>
*/
+ at SuppressWarnings("unchecked")
public final class Classes
{
/** The string used to separator packages */
@@ -120,6 +121,8 @@
/** Use reflection to access a URL[] getURLs or URL[] getClasspath method so
that non-URLClassLoader class loaders, or class loaders that override
getURLs to return null or empty, can provide the true classpath info.
+ * @param cl
+ * @return the urls
*/
public static URL[] getClassLoaderURLs(ClassLoader cl)
{
@@ -313,7 +316,7 @@
if (method != null)
{
- method.invoke(null, null);
+ method.invoke(null, (Object[]) null);
}
else
{
@@ -427,6 +430,7 @@
* appear multiple times through inheritence are only accounted for once.
*
* @param c - the class to start scanning for interfaces
+ * @return the interfaces
*/
public static Class[] getAllUniqueInterfaces(Class c)
{
@@ -686,16 +690,16 @@
* @throws ClassNotFoundException When a class could not be loaded from
* the specified ClassLoader
*/
- public final static Class[] convertToJavaClasses(Iterator it,
+ public final static Class<?>[] convertToJavaClasses(Iterator<String> it,
ClassLoader cl)
throws ClassNotFoundException
{
- ArrayList classes = new ArrayList();
+ ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
while (it.hasNext())
{
- classes.add(convertToJavaClass((String) it.next(), cl));
+ classes.add(convertToJavaClass(it.next(), cl));
}
- return (Class[]) classes.toArray(new Class[classes.size()]);
+ return classes.toArray(new Class[classes.size()]);
}
/**
@@ -721,12 +725,12 @@
try
{
- return cls.getMethod(buf.toString(), null);
+ return cls.getMethod(buf.toString(), (Class[]) null);
}
catch (NoSuchMethodException e)
{
buf.replace(0, 3, "is");
- return cls.getMethod(buf.toString(), null);
+ return cls.getMethod(buf.toString(), (Class[]) null);
}
}
Modified: common-core/trunk/src/main/java/org/jboss/util/Counter.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Counter.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Counter.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class Counter
implements Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The current count */
private int count;
@@ -133,6 +135,8 @@
private static class Wrapper
extends Counter
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The wrapped counter */
protected final Counter counter;
@@ -177,6 +181,9 @@
*/
public static Counter makeSynchronized(final Counter counter) {
return new Wrapper(counter) {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public synchronized int increment() {
return this.counter.increment();
}
@@ -225,6 +232,9 @@
Counter temp;
if (increasing) {
temp = new Wrapper(counter) {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public int decrement() {
throw new UnsupportedOperationException();
}
@@ -236,6 +246,8 @@
}
else {
temp = new Wrapper(counter) {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
public int increment() {
throw new UnsupportedOperationException();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/EmptyStringException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/EmptyStringException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/EmptyStringException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,8 @@
public class EmptyStringException
extends IllegalArgumentException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>EmptyStringException</tt>.
*
Modified: common-core/trunk/src/main/java/org/jboss/util/Executable.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Executable.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Executable.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,8 +31,5 @@
*/
public interface Executable
{
- /**
- * Executes the implemented task.
- */
void execute() throws Exception;
}
Modified: common-core/trunk/src/main/java/org/jboss/util/HashCode.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/HashCode.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/HashCode.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -30,9 +30,12 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public final class HashCode
implements Serializable, Cloneable, Comparable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** Hashcode for a 'null' value. */
private static final int NULL_HASHCODE = 0;
@@ -167,7 +170,7 @@
* @return Hash-code.
*/
public int hashCode() {
- return (int)value;
+ return value;
}
/**
@@ -185,7 +188,7 @@
/**
* Compares this object with the specified object for order.
*
- * @param other Value to compare with.
+ * @param obj Value to compare with.
* @return A negative integer, zero, or a positive integer as
* this object is less than, equal to, or greater than
* the specified object.
Modified: common-core/trunk/src/main/java/org/jboss/util/Heap.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Heap.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Heap.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
* @author <a href="mailto:simone.bordet at compaq.com">Simone Bordet</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class Heap
{
private Comparator m_comparator;
@@ -50,6 +51,7 @@
/**
* Creates a new Heap whose elements are compared using the given
* {@link Comparator}.
+ * @param comparator
*/
public Heap(Comparator comparator)
{
@@ -59,6 +61,7 @@
/**
* Inserts the given element in this heap.
+ * @param obj
*
* @see #extract
*/
@@ -96,6 +99,7 @@
/**
* Removes and returns the least element of this heap.
+ * @return the extracted object
*
* @see #insert
* @see #peek
@@ -141,7 +145,7 @@
}
/**
- * Returns, without removing it, the least element of this heap.
+ * @return without removing it, the least element of this heap.
*
* @see #extract
*/
@@ -160,13 +164,6 @@
m_nodes = new Object[10];
}
- /**
- * Compares the given objects using the comparator, if available,
- * or considering them Comparable objects.
- *
- * @throws ClassCastException if nor the comparator is given
- * and nor both objects implements the Comparable interface
- */
protected int compare(Object o1, Object o2)
{
if (m_comparator != null)
@@ -185,7 +182,8 @@
}
/**
- * Returns the parent index of <code>index</code>.
+ * @return the parent index of <code>index</code>.
+ * @param index
*/
protected int parent(int index)
{
@@ -193,7 +191,8 @@
}
/**
- * Returns the left child index of <code>index</code>.
+ * @param index
+ * @return the left child index of <code>index</code>.
*/
protected int left(int index)
{
@@ -201,7 +200,8 @@
}
/**
- * Returns the right child index of <code>index</code>.
+ * @param index
+ * @return the right child index of <code>index</code>.
*/
protected int right(int index)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/JBossObject.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/JBossObject.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/JBossObject.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,6 +56,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class JBossObject implements JBossInterface
{
/** The log */
@@ -72,6 +73,7 @@
*
* @param one an object
* @param two another object
+ * @return true when they are equal
*/
public static boolean equals(Object one, Object two)
{
@@ -87,6 +89,7 @@
*
* @param one an object
* @param two another object
+ * @return true when they are not equal
*/
public static boolean notEqual(Object one, Object two)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/LRUCachePolicy.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/LRUCachePolicy.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/LRUCachePolicy.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,7 @@
* @author <a href="mailto:simone.bordet at compaq.com">Simone Bordet</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class LRUCachePolicy
implements CachePolicy
{
@@ -66,6 +67,8 @@
/**
* Creates a LRU cache policy object with the specified minimum
* and maximum capacity.
+ * @param min
+ * @param max
*
* @see #create
*/
@@ -209,12 +212,14 @@
// Protected -----------------------------------------------------
/**
* Factory method for the linked list used by this cache implementation.
+ * @return the lru list
*/
protected LRUList createList() {return new LRUList();}
/**
* Callback method called when the cache algorithm ages out of the cache
* the given entry. <br>
* The implementation here is removing the given entry from the cache.
+ * @param entry
*/
protected void ageOut(LRUCacheEntry entry)
{
@@ -228,6 +233,9 @@
}
/**
* Factory method for cache entries
+ * @param key
+ * @param value
+ * @return the entry
*/
protected LRUCacheEntry createCacheEntry(Object key, Object value)
{
@@ -243,8 +251,10 @@
public class LRUList
{
/** The maximum capacity of the cache list */
+ @SuppressWarnings("hiding")
public int m_maxCapacity;
/** The minimum capacity of the cache list */
+ @SuppressWarnings("hiding")
public int m_minCapacity;
/** The current capacity of the cache list */
public int m_capacity;
@@ -363,6 +373,7 @@
}
/**
* Removes from the cache list the specified entry.
+ * @param entry
*/
protected void remove(LRUCacheEntry entry)
{
@@ -401,14 +412,17 @@
}
/**
* Callback that signals that the given entry is just about to be added.
+ * @param entry
*/
protected void entryPromotion(LRUCacheEntry entry) {}
/**
* Callback that signals that the given entry has been added to the cache.
+ * @param entry
*/
protected void entryAdded(LRUCacheEntry entry) {}
/**
* Callback that signals that the given entry has been removed from the cache.
+ * @param entry
*/
protected void entryRemoved(LRUCacheEntry entry) {}
/**
@@ -457,6 +471,8 @@
/**
* Creates a new double linked cell, storing the object we
* want to cache and the key that is used to retrieve it.
+ * @param key
+ * @param object
*/
protected LRUCacheEntry(Object key, Object object)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/LongCounter.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/LongCounter.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/LongCounter.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class LongCounter
implements Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The current count */
private long count;
@@ -133,6 +135,8 @@
private static class Wrapper
extends LongCounter
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The wrapped counter */
protected final LongCounter counter;
@@ -178,6 +182,8 @@
public static LongCounter makeSynchronized(final LongCounter counter)
{
return new Wrapper(counter) {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
public synchronized long increment() {
return this.counter.increment();
}
@@ -226,7 +232,9 @@
LongCounter temp;
if (increasing) {
temp = new Wrapper(counter) {
- public long decrement() {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ public long decrement() {
throw new UnsupportedOperationException();
}
@@ -237,6 +245,8 @@
}
else {
temp = new Wrapper(counter) {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
public long increment() {
throw new UnsupportedOperationException();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/MethodHashing.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/MethodHashing.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/MethodHashing.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,7 @@
* @author <a href="mailto:marc at jboss.org">Marc Fleury</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class MethodHashing
{
// Constants -----------------------------------------------------
@@ -122,7 +123,7 @@
* Calculate method hashes. This algo is taken from RMI.
*
* @param intf
- * @return
+ * @return the map
*/
public static Map getInterfaceHashes(Class intf)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/NestedError.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedError.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedError.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,8 @@
extends Error
implements NestedThrowable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The nested throwable */
protected final Throwable nested;
Modified: common-core/trunk/src/main/java/org/jboss/util/NestedException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,8 @@
extends Exception
implements NestedThrowable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The nested throwable */
protected final Throwable nested;
Modified: common-core/trunk/src/main/java/org/jboss/util/NestedRuntimeException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedRuntimeException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedRuntimeException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,8 @@
extends RuntimeException
implements NestedThrowable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The nested throwable */
protected final Throwable nested;
Modified: common-core/trunk/src/main/java/org/jboss/util/NestedSQLException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedSQLException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedSQLException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,8 @@
extends SQLException
implements NestedThrowable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The nested throwable */
protected final Throwable nested;
Modified: common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -128,7 +128,6 @@
return log;
}
- /** A helper to get a boolean property. */
protected static boolean getBoolean(String name, boolean defaultValue)
{
name = NestedThrowable.class.getName() + "." + name;
@@ -142,17 +141,13 @@
return new Boolean(value).booleanValue();
}
- /**
- * Check and possibly warn if the nested exception type is the same
- * as the parent type (duplicate nesting).
- */
public static void checkNested(final NestedThrowable parent,
final Throwable child)
{
if (!DETECT_DUPLICATE_NESTING || parent == null || child == null) return;
- Class parentType = parent.getClass();
- Class childType = child.getClass();
+ Class<?> parentType = parent.getClass();
+ Class<?> childType = child.getClass();
//
// This might be backwards... I always get this confused
Modified: common-core/trunk/src/main/java/org/jboss/util/NoSuchMethodException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NoSuchMethodException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NoSuchMethodException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -33,6 +33,8 @@
public class NoSuchMethodException
extends java.lang.NoSuchMethodException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>NoSuchMethodException</tt> with the specified detail
* message.
@@ -71,14 +73,11 @@
super();
}
- /**
- * Return a string representation of the given method object.
- */
public static String format(Method method)
{
StringBuffer buffer = new StringBuffer();
buffer.append(method.getName()).append("(");
- Class[] paramTypes = method.getParameterTypes();
+ Class<?>[] paramTypes = method.getParameterTypes();
for (int count = 0; count < paramTypes.length; count++) {
if (count > 0) {
buffer.append(",");
Modified: common-core/trunk/src/main/java/org/jboss/util/NotImplementedException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NotImplementedException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NotImplementedException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class NotImplementedException
extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>NotImplementedException</tt> with a detail message.
*
Modified: common-core/trunk/src/main/java/org/jboss/util/Null.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Null.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Null.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,8 @@
public final class Null
implements Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The primary instance of Null. */
public static final Null VALUE = new Null();
Modified: common-core/trunk/src/main/java/org/jboss/util/NullArgumentException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NullArgumentException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/NullArgumentException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,8 @@
public class NullArgumentException
extends IllegalArgumentException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The name of the argument that was <tt>null</tt>. */
protected final String name;
Modified: common-core/trunk/src/main/java/org/jboss/util/Objects.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Objects.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Objects.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -41,6 +41,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public final class Objects
{
/////////////////////////////////////////////////////////////////////////
@@ -91,7 +92,7 @@
* @return Copied object.
*
* @throws IOException
- * @throws ClassCastException
+ * @throws ClassNotFoundException
*/
public static Object copy(final Serializable obj)
throws IOException, ClassNotFoundException
@@ -135,6 +136,7 @@
* @param obj Object to dereference.
* @return Dereferenced object.
*/
+ @SuppressWarnings("unchecked")
public static Object deref(final Object obj) {
if (obj != null && obj instanceof Reference) {
Reference ref = (Reference)obj;
@@ -143,8 +145,24 @@
return obj;
}
-
+
/**
+ * Dereference an object
+ *
+ * @param <T> the expected type
+ * @param obj the object or reference
+ * @param expected the expected type
+ * @return the object or null
+ */
+ public static <T> T deref(final Object obj, Class<T> expected)
+ {
+ Object result = deref(obj);
+ if (result == null)
+ return null;
+ return expected.cast(result);
+ }
+
+ /**
* Check if the given object is an array (primitve or native).
*
* @param obj Object to test.
@@ -157,7 +175,7 @@
}
/**
- * Return an Object array for the given object.
+ * @return an Object array for the given object.
*
* @param obj Object to convert to an array. Converts primitive
* arrays to Object arrays consisting of their wrapper
Modified: common-core/trunk/src/main/java/org/jboss/util/Semaphore.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Semaphore.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Semaphore.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* @author <a href="mailto:simone.bordet at compaq.com">Simone Bordet</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class Semaphore
implements Sync
{
Modified: common-core/trunk/src/main/java/org/jboss/util/SoftObject.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/SoftObject.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/SoftObject.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public final class SoftObject
extends SoftReference
{
Modified: common-core/trunk/src/main/java/org/jboss/util/StopWatch.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/StopWatch.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/StopWatch.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class StopWatch
implements Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** Total time */
protected long total = 0;
@@ -258,6 +260,8 @@
private static class Wrapper
extends StopWatch
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
protected StopWatch watch;
public Wrapper(final StopWatch watch) {
@@ -315,6 +319,8 @@
{
return new Wrapper(watch)
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
public synchronized void start(final boolean reset) {
this.watch.start(reset);
}
Modified: common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -99,7 +99,6 @@
* @param props - the source for ${x} property ref values, null means use System.getProperty()
* @return the input string with all property references replaced if any.
* If there are no valid references the input string will be returned.
- * @throws java.lang.AccessControlException when not authorised to retrieved system properties
*/
public static String replaceProperties(final String string, final Properties props)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/Strings.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Strings.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Strings.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -42,6 +42,7 @@
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
* @version <tt>$Revision$</tt>
*/
+ at SuppressWarnings("unchecked")
public final class Strings
{
/** An empty string constant */
@@ -681,6 +682,8 @@
* <p>Compare two strings.
*
* <p>Both or one of them may be null.
+ * @param me
+ * @param you
*
* @return true if object equals or intern ==, else false.
*/
@@ -888,8 +891,8 @@
/**
*
* @param urispec
- * @return
- * @throws MalformedURLException
+ * @return the uri
+ * @throws URISyntaxException for any error
*/
public static URI toURI(final String urispec)
throws URISyntaxException
@@ -1034,7 +1037,6 @@
*
* @param object the object
* @param buffer the string builder
- * @return a string in the form className at hexHashCode
*/
public static final void defaultToString(JBossStringBuilder buffer, Object object)
{
@@ -1053,7 +1055,6 @@
*
* @param object the object
* @param buffer the string buffer
- * @return a string in the form className at hexHashCode
*/
public static final void defaultToString(StringBuffer buffer, Object object)
{
@@ -1167,7 +1168,7 @@
return null;
}
StringTokenizer st = new StringTokenizer(str, delimiters);
- List tokens = new ArrayList();
+ List<String> tokens = new ArrayList<String>();
while (st.hasMoreTokens())
{
String token = st.nextToken();
@@ -1180,7 +1181,7 @@
tokens.add(token);
}
}
- return (String[])tokens.toArray(new String[tokens.size()]);
+ return tokens.toArray(new String[tokens.size()]);
}
/**
@@ -1188,7 +1189,7 @@
*
* @param str the string to check
* @return the trimmed String
- * @see java.lang.Character#isWhitespace
+ * @see java.lang.Character#isWhitespace(char)
*/
public static String trimLeadingWhitespace(String str)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/Sync.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/Sync.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/Sync.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -35,6 +35,7 @@
* Acquires this sync
*
* @see #release
+ * @throws InterruptedException
*/
void acquire() throws InterruptedException;
Modified: common-core/trunk/src/main/java/org/jboss/util/SysPropertyActions.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/SysPropertyActions.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/SysPropertyActions.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
class SysPropertyActions
{
interface SysProps
Modified: common-core/trunk/src/main/java/org/jboss/util/ThrowableHandler.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/ThrowableHandler.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/ThrowableHandler.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -55,7 +55,7 @@
/////////////////////////////////////////////////////////////////////////
/** The list of listeners */
- protected static List listeners = Collections.synchronizedList(new ArrayList());
+ protected static List<ThrowableListener> listeners = Collections.synchronizedList(new ArrayList<ThrowableListener>());
/**
* Add a ThrowableListener to the listener list. Listener is added only
Modified: common-core/trunk/src/main/java/org/jboss/util/TimedCachePolicy.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/TimedCachePolicy.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/TimedCachePolicy.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -43,6 +43,7 @@
@author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>.
@version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class TimedCachePolicy
extends TimerTask /* A legacy base class that is no longer used as this level */
implements CachePolicy
@@ -54,10 +55,12 @@
/** Initializes an entry with the current cache time. This is called when
the entry is first inserted into the cache so that entries do not
have to know the absolute system time.
+ * @param now
*/
public void init(long now);
/** Is the entry still valid basis the current time
+ * @param now
@return true if the entry is within its lifetime, false if it is expired.
*/
public boolean isCurrent(long now);
@@ -71,7 +74,7 @@
*/
public void destroy();
- /** Get the value component of the TimedEntry. This may or may not
+ /** @return the value component of the TimedEntry. This may or may not
be the TimedEntry implementation.
*/
public Object getValue();
@@ -104,6 +107,7 @@
/** Creates a new TimedCachePolicy with the given default entry lifetime
that does not synchronized access to its policy store and uses a 60
second resolution.
+ * @param defaultLifetime
*/
public TimedCachePolicy(int defaultLifetime)
{
@@ -345,6 +349,7 @@
}
/** Get the raw TimedEntry for key without performing any expiration check.
+ * @param key
@return the TimedEntry value associated with key if one exists, null otherwise.
*/
public TimedEntry peekEntry(Object key)
Modified: common-core/trunk/src/main/java/org/jboss/util/TimerQueue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/TimerQueue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/TimerQueue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -53,6 +53,7 @@
}
/**
* Creates a new timer queue with the specified thread name
+ * @param threadName
*/
public TimerQueue(String threadName)
{
@@ -63,6 +64,7 @@
// Public --------------------------------------------------------
/**
* Schedules the given TimerTask for immediate execution.
+ * @param t
*/
public void schedule(TimerTask t)
{
@@ -71,6 +73,8 @@
/**
* Schedule the given TimerTask to be executed after <code>delay</code>
* milliseconds.
+ * @param t
+ * @param delay
*/
public void schedule(TimerTask t, long delay)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/TimerTask.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/TimerTask.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/TimerTask.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
* @author <a href="mailto:simone.bordet at compaq.com">Simone Bordet</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public abstract class TimerTask
implements Executable, Comparable
{
@@ -75,7 +76,7 @@
/**
* Cancels the next execution of this TimerTask (if any). <br>
* If the TimerTask is executing it will prevent the next execution (if any).
- * @returns true if one or more scheduled execution will not take place,
+ * @return true if one or more scheduled execution will not take place,
* false otherwise.
*/
public boolean cancel()
@@ -157,7 +158,7 @@
}
}
- /** Returns the period of this TimerTask */
+ /** @return the period of this TimerTask */
protected long getPeriod()
{
return m_period;
Modified: common-core/trunk/src/main/java/org/jboss/util/UnexpectedThrowable.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/UnexpectedThrowable.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/UnexpectedThrowable.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class UnexpectedThrowable
extends NestedError
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>UnexpectedThrowable</tt> with the specified
* detail message.
Modified: common-core/trunk/src/main/java/org/jboss/util/UnreachableStatementException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/UnreachableStatementException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/UnreachableStatementException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,8 @@
public class UnreachableStatementException
extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>UnreachableStatementException</tt> with a detail message.
*
Modified: common-core/trunk/src/main/java/org/jboss/util/WaitSync.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/WaitSync.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/WaitSync.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* Pone in wait status this sync, until {@link #doNotify} is called to wake it up.
*
* @see #doNotify
+ * @throws InterruptedException
*/
void doWait() throws InterruptedException;
@@ -43,6 +44,7 @@
* Wakes up this sync that has been posed in wait status by a {@link #doWait} call.
* If this sync is not waiting, invoking this method should have no effect.
* @see #doWait
+ * @throws InterruptedException
*/
void doNotify() throws InterruptedException;
}
Modified: common-core/trunk/src/main/java/org/jboss/util/WeakObject.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/WeakObject.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/WeakObject.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public final class WeakObject
extends WeakReference
{
Modified: common-core/trunk/src/main/java/org/jboss/util/WorkerQueue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/WorkerQueue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/WorkerQueue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -48,6 +48,7 @@
/**
* Creates a new worker queue with the specified thread name
+ * @param threadName
*/
public WorkerQueue(String threadName)
{
@@ -57,6 +58,8 @@
/**
* Creates a new worker queue with the specified thread name
* and daemon mode flag
+ * @param threadName
+ * @param isDaemon
*/
public WorkerQueue(String threadName, boolean isDaemon)
{
@@ -92,6 +95,7 @@
* Called by a thread that is not the WorkerQueue thread, this method
* queues the job and, if necessary, wakes up this worker queue that is
* waiting in {@link #getJob}.
+ * @param job
*/
public synchronized void putJob(Executable job)
{
@@ -108,7 +112,7 @@
}
/**
- * Returns whether the worker thread has been interrupted. <br>
+ * @return whether the worker thread has been interrupted. <br>
* When this method returns true, it is not possible to put new jobs in the
* queue and the already present jobs are executed and removed from the
* queue, then the thread exits.
@@ -125,6 +129,8 @@
* if it is, then waits, else returns the current job.
*
* @see #putJob
+ * @return the executable
+ * @throws InterruptedException
*/
protected synchronized Executable getJob() throws InterruptedException
{
@@ -140,6 +146,8 @@
* Never call this method, only override in subclasses to perform
* job getting in a specific way, normally tied to the data structure
* holding the jobs.
+ * @return the exectuable
+ * @throws InterruptedException
*/
protected Executable getJobImpl() throws InterruptedException
{
@@ -157,6 +165,7 @@
* Never call this method, only override in subclasses to perform
* job adding in a specific way, normally tied to the data structure
* holding the jobs.
+ * @param job
*/
protected void putJobImpl(Executable job)
{
@@ -191,6 +200,7 @@
/**
* Creates the loop that will get the next job and process it. <br>
* Override in subclasses to create a custom loop.
+ * @return the runnable
*/
protected Runnable createQueueLoop() {
return new QueueLoop();
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/AbstractQueue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/AbstractQueue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/AbstractQueue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -27,12 +27,13 @@
* An abstract implementation of a Queue. Sub-classes must provide methods
* for <code>addLast(Object)</code> and <code>removeFirst()</code>.
*
+ * @param <E> the element type
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
-public abstract class AbstractQueue
- extends AbstractCollection
- implements Queue
+public abstract class AbstractQueue<E>
+ extends AbstractCollection<E>
+ implements Queue<E>
{
/** Default maximum queue size */
public static int DEFAULT_MAXIMUM_SIZE = UNLIMITED_MAXIMUM_SIZE;
@@ -111,7 +112,7 @@
*
* @exception FullCollectionException The queue is full.
*/
- public boolean add(Object obj) throws FullCollectionException {
+ public boolean add(E obj) throws FullCollectionException {
if (isFull())
throw new FullCollectionException();
@@ -125,7 +126,7 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- public Object remove() throws EmptyCollectionException {
+ public E remove() throws EmptyCollectionException {
if (isEmpty())
throw new EmptyCollectionException();
@@ -148,12 +149,12 @@
* @return Per Collection.add(), we return a boolean to indicate if
* the object modified the collection.
*/
- protected abstract boolean addLast(Object obj);
+ protected abstract boolean addLast(E obj);
/**
* Remove the first object in the queue
*
* @return First object in the queue
*/
- protected abstract Object removeFirst();
+ protected abstract E removeFirst();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/ArrayIterator.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/ArrayIterator.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/ArrayIterator.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,9 +34,12 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class ArrayIterator
implements Iterator, Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** Array to iterate over. */
protected final Object[] array;
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CachedCollection.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CachedCollection.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CachedCollection.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class CachedCollection
extends AbstractCollection
{
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CachedList.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CachedList.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CachedList.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class CachedList
extends AbstractList
{
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CollectionException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CollectionException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CollectionException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -30,6 +30,8 @@
public class CollectionException
extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <code>CollectionException</code> with the specified
* detail message.
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CollectionsUtil.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CollectionsUtil.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CollectionsUtil.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class CollectionsUtil
{
/**
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CompoundIterator.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CompoundIterator.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CompoundIterator.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class CompoundIterator
implements Iterator
{
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/CompoundKey.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/CompoundKey.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/CompoundKey.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,8 @@
public class CompoundKey
implements Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The elements of the key */
private final Object elements[];
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/EmptyCollectionException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/EmptyCollectionException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/EmptyCollectionException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,8 @@
public class EmptyCollectionException
extends CollectionException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <code>EmptyCollectionException</code> with the specified
* detail message.
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/FullCollectionException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/FullCollectionException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/FullCollectionException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,8 @@
public class FullCollectionException
extends CollectionException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <code>FullCollectionException</code> with the specified
* detail message.
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/Iterators.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/Iterators.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/Iterators.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public final class Iterators
{
/////////////////////////////////////////////////////////////////////////
@@ -70,7 +71,7 @@
/**
* Return an Iterator wrapper for the given Enumeration
*
- * @param enum Enumeration to wrap
+ * @param enumeration Enumeration to wrap
* @return Enumeration wrapped as an Iterator
*/
public static Iterator forEnumeration(final Enumeration enumeration) {
@@ -208,7 +209,7 @@
/**
* Returns a synchronized version of the given Enumeration.
*
- * @param enum Enumeration to synchronize.
+ * @param enumeration Enumeration to synchronize.
* @return Synchronized Enumeration.
*/
public static Enumeration makeSynchronized(final Enumeration enumeration) {
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/LazyList.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/LazyList.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/LazyList.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,6 +39,8 @@
*/
public class LazyList<T> implements List<T>, Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The delegate list */
private List<T> delegate = Collections.emptyList();
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/LazyMap.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/LazyMap.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/LazyMap.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,6 +39,8 @@
*/
public class LazyMap<K, V> implements Map<K, V>, Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The delegate map */
private Map<K, V> delegate = Collections.emptyMap();
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/LazySet.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/LazySet.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/LazySet.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,8 @@
*/
public class LazySet<T> implements Set<T>, Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The delegate set */
private Set<T> delegate = Collections.emptySet();
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/ListQueue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/ListQueue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/ListQueue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,14 +31,15 @@
* A ListQueue implements a first-in, first-out container using a List as
* a data structure.
*
+ * @param <E> the element type
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
-public class ListQueue
- extends AbstractQueue
+public class ListQueue<E>
+ extends AbstractQueue<E>
{
/** List container */
- protected final List list;
+ protected final List<E> list;
/**
* Construct a new <i>constrained</i> ListQueue.
@@ -48,7 +49,7 @@
*
* @exception IllegalArgumentException List is <i>null</i>.
*/
- public ListQueue(final List list, final int maxSize) {
+ public ListQueue(final List<E> list, final int maxSize) {
super(maxSize);
if (list == null)
@@ -65,7 +66,7 @@
*/
public ListQueue(final int maxSize) {
super(maxSize);
- this.list = new LinkedList();
+ this.list = new LinkedList<E>();
}
/**
@@ -75,7 +76,7 @@
*
* @exception IllegalArgumentException List is <i>null</i>
*/
- public ListQueue(final List list) {
+ public ListQueue(final List<E> list) {
this(list, UNLIMITED_MAXIMUM_SIZE);
}
@@ -84,7 +85,7 @@
* <code>LinkedList</code> for a data-structure.
*/
public ListQueue() {
- this(new LinkedList(), UNLIMITED_MAXIMUM_SIZE);
+ this(new LinkedList<E>(), UNLIMITED_MAXIMUM_SIZE);
}
/**
@@ -92,7 +93,7 @@
*
* @param obj Object to append.
*/
- protected boolean addLast(final Object obj) {
+ protected boolean addLast(final E obj) {
return list.add(obj);
}
@@ -101,7 +102,7 @@
*
* @return First object in the queue.
*/
- protected Object removeFirst() {
+ protected E removeFirst() {
return list.remove(0);
}
@@ -119,7 +120,7 @@
*
* @return An iterator over the elements in this list in proper sequence.
*/
- public Iterator iterator() {
+ public Iterator<E> iterator() {
return list.iterator();
}
@@ -130,7 +131,7 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- public Object getFront() throws EmptyCollectionException {
+ public E getFront() throws EmptyCollectionException {
if (isEmpty())
throw new EmptyCollectionException();
@@ -144,7 +145,7 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- public Object getBack() throws EmptyCollectionException {
+ public E getBack() throws EmptyCollectionException {
if (isEmpty())
throw new EmptyCollectionException();
@@ -156,8 +157,8 @@
*
* @return An iterator over the elements in this list in reverse sequence.
*/
- public Iterator reverseIterator() {
- return new ReverseListIterator(list);
+ public Iterator<E> reverseIterator() {
+ return new ReverseListIterator<E>(list);
}
/**
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/ListSet.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/ListSet.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/ListSet.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,10 +38,13 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class ListSet
extends AbstractSet
implements Set, Cloneable, Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The <tt>List</tt> which will be used for element storage. */
protected final List list;
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/Queue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/Queue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/Queue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -25,12 +25,13 @@
/**
* An iterface used to implement a first-in, first-out container.
- *
+ *
+ * @param <E> the element type
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
-public interface Queue
- extends Collection
+public interface Queue<E>
+ extends Collection<E>
{
/** Unlimited maximum queue size identifier. */
int UNLIMITED_MAXIMUM_SIZE = -1;
@@ -73,7 +74,7 @@
*
* @exception FullCollectionException The queue is full.
*/
- boolean add(Object obj) throws FullCollectionException;
+ boolean add(E obj) throws FullCollectionException;
/**
* Dequeue an object from the queue.
@@ -82,7 +83,7 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- Object remove() throws EmptyCollectionException;
+ E remove() throws EmptyCollectionException;
/**
* Get the object at the front of the queue.
@@ -91,7 +92,7 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- Object getFront() throws EmptyCollectionException;
+ E getFront() throws EmptyCollectionException;
/**
* Get the object at the back of the queue.
@@ -100,5 +101,5 @@
*
* @exception EmptyCollectionException The queue is empty.
*/
- Object getBack() throws EmptyCollectionException;
+ E getBack() throws EmptyCollectionException;
}
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/ReverseListIterator.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/ReverseListIterator.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/ReverseListIterator.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -30,12 +30,13 @@
*
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
+ * @param <E>
*/
-public class ReverseListIterator
- implements Iterator
+public class ReverseListIterator<E>
+ implements Iterator<E>
{
/** The list to get elements from */
- protected final List list;
+ protected final List<E> list;
/** The current index of the list */
protected int current;
@@ -45,7 +46,7 @@
*
* @param list List to iterate over.
*/
- public ReverseListIterator(final List list) {
+ public ReverseListIterator(final List<E> list) {
this.list = list;
current = list.size() - 1;
}
@@ -66,7 +67,7 @@
*
* @throws NoSuchElementException
*/
- public Object next() {
+ public E next() {
if (current <= 0) {
throw new NoSuchElementException();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/SerializableEnumeration.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/SerializableEnumeration.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/SerializableEnumeration.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,10 +32,13 @@
* @author ???
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class SerializableEnumeration
extends ArrayList
implements Enumeration
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
private int index;
public SerializableEnumeration () {
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/SoftSet.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/SoftSet.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/SoftSet.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class SoftSet implements Set
{
private HashMap map = new HashMap();
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/SoftValueHashMap.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/SoftValueHashMap.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/SoftValueHashMap.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
*/
+ at SuppressWarnings("unchecked")
public class SoftValueHashMap
extends AbstractMap
implements Map
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/WeakClassCache.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/WeakClassCache.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/WeakClassCache.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,7 @@
*
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public abstract class WeakClassCache
{
/** The cache */
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/WeakIdentityHashMap.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/WeakIdentityHashMap.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/WeakIdentityHashMap.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -46,6 +46,7 @@
* @see java.util.IdentityHashMap
* @see java.util.WeakHashMap
*/
+ at SuppressWarnings("unchecked")
public class WeakIdentityHashMap /*extends AbstractMap*/ implements Map {
/**
@@ -154,7 +155,7 @@
*/
public WeakIdentityHashMap() {
this.loadFactor = DEFAULT_LOAD_FACTOR;
- threshold = (int)(DEFAULT_INITIAL_CAPACITY);
+ threshold = DEFAULT_INITIAL_CAPACITY;
table = new Entry[DEFAULT_INITIAL_CAPACITY];
}
@@ -674,7 +675,6 @@
return true;
}
- /** The common parts of next() across different types of iterators */
protected Entry nextEntry() {
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
@@ -856,7 +856,6 @@
if (!(o instanceof Map.Entry))
return false;
Map.Entry e = (Map.Entry)o;
- Object k = e.getKey();
Entry candidate = getEntry(e.getKey());
return candidate != null && candidate.equals(e);
}
@@ -924,7 +923,6 @@
}
public int hashCode() {
- Object v;
return ((key == null) ? 0 : key.hashCode()) ^
((value == null) ? 0 : value.hashCode());
}
Modified: common-core/trunk/src/main/java/org/jboss/util/collection/WeakSet.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/collection/WeakSet.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/collection/WeakSet.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -41,6 +41,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class WeakSet
extends AbstractSet
implements Set
Modified: common-core/trunk/src/main/java/org/jboss/util/deadlock/ApplicationDeadlockException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/deadlock/ApplicationDeadlockException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/deadlock/ApplicationDeadlockException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,6 +39,8 @@
*/
public class ApplicationDeadlockException extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
protected boolean retry = false;
@@ -61,6 +63,8 @@
/**
* Detects exception contains is or a ApplicationDeadlockException.
+ * @param t
+ * @return true when it is a deadlock
*/
public static ApplicationDeadlockException isADE(Throwable t)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/deadlock/DeadlockDetector.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/deadlock/DeadlockDetector.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/deadlock/DeadlockDetector.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
* Time: 2:10:46 PM
* To change this template use Options | File Templates.
*/
+ at SuppressWarnings("unchecked")
public class DeadlockDetector
{
// TODO Maybe this should be an MBean in the future
@@ -77,6 +78,8 @@
/**
* Add a transaction waiting for a lock
+ * @param holder
+ * @param resource
*/
public void addWaiting(Object holder, Resource resource)
{
@@ -88,6 +91,7 @@
/**
* Remove a transaction waiting for a lock
+ * @param holder
*/
public void removeWaiting(Object holder)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,6 +34,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public abstract class ArchiveBrowser
{
public interface Filter
Modified: common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowserFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowserFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/ArchiveBrowserFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -30,6 +30,7 @@
* @author <a href="bill at jboss.com">Bill Burke</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public interface ArchiveBrowserFactory
{
Iterator create(URL url, ArchiveBrowser.Filter filter);
Modified: common-core/trunk/src/main/java/org/jboss/util/file/ClassFileFilter.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/ClassFileFilter.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/ClassFileFilter.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -27,6 +27,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
+ at SuppressWarnings("deprecation")
public class ClassFileFilter implements ArchiveBrowser.Filter
{
public boolean accept(String filename)
Modified: common-core/trunk/src/main/java/org/jboss/util/file/DirectoryArchiveBrowser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/DirectoryArchiveBrowser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/DirectoryArchiveBrowser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,10 +34,12 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class DirectoryArchiveBrowser implements Iterator
{
private Iterator files;
+ @SuppressWarnings("deprecation")
public DirectoryArchiveBrowser(File file, ArchiveBrowser.Filter filter)
{
ArrayList list = new ArrayList();
@@ -52,6 +54,7 @@
files = list.iterator();
}
+ @SuppressWarnings("deprecation")
public static void create(List list, File dir, ArchiveBrowser.Filter filter) throws Exception
{
File[] files = dir.listFiles();
Modified: common-core/trunk/src/main/java/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/FileProtocolArchiveBrowserFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,9 +32,9 @@
* @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
* @version $Revision: 2305 $
*/
+ at SuppressWarnings("unchecked")
public class FileProtocolArchiveBrowserFactory implements ArchiveBrowserFactory
{
-
public Iterator create(URL url, ArchiveBrowser.Filter filter)
{
File f = new File(url.getPath());
Modified: common-core/trunk/src/main/java/org/jboss/util/file/JarArchiveBrowser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/JarArchiveBrowser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/JarArchiveBrowser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -21,16 +21,14 @@
*/
package org.jboss.util.file;
+import java.io.File;
+import java.io.IOException;
+import java.net.JarURLConnection;
+import java.util.Enumeration;
import java.util.Iterator;
-import java.util.Enumeration;
+import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
-import java.util.zip.ZipFile;
import java.util.zip.ZipEntry;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.JarURLConnection;
/**
* Comment
@@ -39,6 +37,7 @@
* @version $Revision$
*
**/
+ at SuppressWarnings("unchecked")
public class JarArchiveBrowser implements Iterator
{
JarFile zip;
@@ -46,6 +45,7 @@
JarEntry next;
ArchiveBrowser.Filter filter;
+ @SuppressWarnings("deprecation")
public JarArchiveBrowser(JarURLConnection url, ArchiveBrowser.Filter filter)
{
this.filter = filter;
Modified: common-core/trunk/src/main/java/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/JarProtocolArchiveBrowserFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -21,13 +21,10 @@
*/
package org.jboss.util.file;
-import java.util.Iterator;
-import java.net.URL;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.JarURLConnection;
-import java.io.File;
import java.io.IOException;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.Iterator;
/**
* comment
@@ -35,9 +32,11 @@
* @author <a href="bill at jboss.com">Bill Burke</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class JarProtocolArchiveBrowserFactory implements ArchiveBrowserFactory
{
+ @SuppressWarnings("deprecation")
public Iterator create(URL url, ArchiveBrowser.Filter filter)
{
if (url.toString().endsWith("!/"))
Modified: common-core/trunk/src/main/java/org/jboss/util/file/JarStreamBrowser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/JarStreamBrowser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/JarStreamBrowser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,19 +36,23 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision: 1958 $
*/
+ at SuppressWarnings("unchecked")
public class JarStreamBrowser implements Iterator
{
// ZipFile zip;
// Enumeration entries;
JarInputStream jar;
JarEntry next;
+ @SuppressWarnings("deprecation")
ArchiveBrowser.Filter filter;
+ @SuppressWarnings("deprecation")
public JarStreamBrowser(File file, ArchiveBrowser.Filter filter) throws IOException
{
this(new FileInputStream(file), filter);
}
+ @SuppressWarnings("deprecation")
public JarStreamBrowser(InputStream is, ArchiveBrowser.Filter filter) throws IOException
{
this.filter = filter;
Modified: common-core/trunk/src/main/java/org/jboss/util/file/JarUtils.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/file/JarUtils.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/file/JarUtils.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -65,6 +65,7 @@
* written.
* @param src The file or directory to jar up. Directories will be
* processed recursively.
+ * @throws IOException
*/
public static void jar(OutputStream out, File src) throws IOException
{
@@ -83,6 +84,7 @@
* written.
* @param src The file or directory to jar up. Directories will be
* processed recursively.
+ * @throws IOException
*/
public static void jar(OutputStream out, File[] src) throws IOException
{
@@ -105,6 +107,7 @@
* @param filter The filter to use while processing directories. Only
* those files matching will be included in the jar archive. If
* null, then all files are included.
+ * @throws IOException
*/
public static void jar(OutputStream out, File[] src, FileFilter filter)
throws IOException
@@ -130,6 +133,7 @@
* used.
* @param man The manifest to use for the Jar archive. If null, then no
* manifest will be included.
+ * @throws IOException
*/
public static void jar(OutputStream out, File[] src, FileFilter filter,
String prefix, Manifest man) throws IOException
@@ -246,9 +250,6 @@
}
}
- /**
- * Dump the contents of a JarArchive to the dpecified destination.
- */
public static void unjar(InputStream in, File dest) throws IOException
{
if (!dest.exists())
@@ -337,6 +338,7 @@
a jar protocol URL
@param dest the directory into which the nested jar will be extracted.
@return the file: URL for the jar referenced by the jarURL parameter.
+ * @throws IOException
*/
public static URL extractNestedJar(URL jarURL, File dest)
throws IOException
@@ -389,10 +391,6 @@
}
- /**
- * A simple jar-like tool used for testing. It's actually faster than
- * jar, though doesn't sipport as many options.
- */
public static void main(String[] args) throws Exception
{
if (args.length == 0)
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/DFSVisitor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/DFSVisitor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/DFSVisitor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -28,6 +28,7 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
*/
public interface DFSVisitor<T>
{
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/Edge.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/Edge.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/Edge.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -26,6 +26,7 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
*/
public class Edge<T>
{
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/Graph.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/Graph.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/Graph.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,7 +31,9 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
*/
+ at SuppressWarnings("unchecked")
public class Graph<T>
{
/** Color used to mark unvisited nodes */
@@ -252,7 +254,6 @@
/**
* Clear the mark state of all edges in the graph by calling
* clearMark() on all edges.
- * @see Edge<T>#clearMark()
*/
public void clearEdges()
{
@@ -281,6 +282,7 @@
/**
* Perform a depth first serach using recursion. The search may
* be cut short if the visitor throws an exception.
+ * @param <E>
*
* @param v - the Vertex to start the search from
* @param visitor - the vistor to inform prior to
@@ -327,6 +329,7 @@
* Perform a breadth first search of this graph, starting at v. The
* vist may be cut short if visitor throws an exception during
* a vist callback.
+ * @param <E>
*
* @param v - the search starting point
* @param visitor - the vistor whose vist method is called prior
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/Vertex.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/Vertex.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/Vertex.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,7 +29,9 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
*/
+ at SuppressWarnings("unchecked")
public class Vertex<T>
{
private List<Edge<T>> incomingEdges;
@@ -141,7 +143,7 @@
* mathcing e.
*
* @param e the edge to check
- * @return
+ * @return true it has an edge
*/
public boolean hasEdge(Edge<T> e)
{
@@ -321,7 +323,7 @@
/**
* Get the mark state value.
- * @return
+ * @return the mark state
*/
public int getMarkState()
{
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/Visitor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/Visitor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/Visitor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -26,6 +26,7 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
*/
public interface Visitor<T>
{
Modified: common-core/trunk/src/main/java/org/jboss/util/graph/VisitorEX.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/graph/VisitorEX.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/graph/VisitorEX.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -27,6 +27,8 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
+ * @param <T>
+ * @param <E>
*/
public interface VisitorEX<T, E extends Exception>
{
Modified: common-core/trunk/src/main/java/org/jboss/util/id/GUID.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/id/GUID.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/id/GUID.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -43,6 +43,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class GUID
implements ID, Comparable
{
Modified: common-core/trunk/src/main/java/org/jboss/util/id/SerialVersion.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/id/SerialVersion.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/id/SerialVersion.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @author <a href="mailto:Adrian.Brock at JBoss.com">Adrian Brock</a>.
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class SerialVersion
{
// Static --------------------------------------------------------
Modified: common-core/trunk/src/main/java/org/jboss/util/id/UID.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/id/UID.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/id/UID.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -71,6 +71,7 @@
/**
* Copy a UID.
+ * @param uid
*/
protected UID(final UID uid) {
time = uid.time;
Modified: common-core/trunk/src/main/java/org/jboss/util/id/VMID.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/id/VMID.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/id/VMID.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -54,9 +54,12 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class VMID
implements ID
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The address of the current virtual machine */
protected final byte[] address;
@@ -138,7 +141,7 @@
StringBuffer buff = new StringBuffer();
for (int i=0; i<address.length; i++) {
- int n = (int) (address[i] & 0xFF);
+ int n = (address[i] & 0xFF);
buff.append(Integer.toString(n, Character.MAX_RADIX));
}
Modified: common-core/trunk/src/main/java/org/jboss/util/loading/ConstructorTCCLClassLoaderSource.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/loading/ConstructorTCCLClassLoaderSource.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/loading/ConstructorTCCLClassLoaderSource.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
*
* @author Brian Stansberry
*/
+ at SuppressWarnings("unchecked")
public class ConstructorTCCLClassLoaderSource implements ClassLoaderSource
{
private final WeakReference classLoaderRef;
Modified: common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,6 +34,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public class ContextClassLoader
{
/**
Modified: common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoaderSwitcher.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoaderSwitcher.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/loading/ContextClassLoaderSwitcher.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -40,6 +40,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public class ContextClassLoaderSwitcher
extends ContextClassLoader
{
@@ -51,6 +52,7 @@
/**
* Instantiate a new context class loader switcher
*/
+ @SuppressWarnings("hiding")
public static final NewInstance INSTANTIATOR = new NewInstance();
/**
@@ -67,8 +69,7 @@
/**
* Set the context classloader
- *
- * @param the new context classloader
+ * @param cl
*/
public void setContextClassLoader(final ClassLoader cl)
{
@@ -79,7 +80,7 @@
* Set the context classloader for the given thread
*
* @param thread the thread
- * @param the new context classloader
+ * @param cl the new context classloader
*/
public void setContextClassLoader(final Thread thread, final ClassLoader cl)
{
@@ -163,7 +164,7 @@
}
/**
- * Retrieve the current thread
+ * @return the current thread
*/
public Thread getThread()
{
@@ -171,7 +172,7 @@
}
/**
- * Retrieve the original classloader
+ * @return the original classloader
*/
public ClassLoader getOriginalClassLoader()
{
@@ -179,7 +180,7 @@
}
/**
- * Retrieve the current classloader
+ * @return the current classloader
* (as set through this class).
*/
public ClassLoader getCurrentClassLoader()
Modified: common-core/trunk/src/main/java/org/jboss/util/loading/DelegatingClassLoader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/loading/DelegatingClassLoader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/loading/DelegatingClassLoader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,7 +39,7 @@
public class DelegatingClassLoader
extends URLClassLoader
{
- /** The value returned by {@link getURLs}. */
+ /** The value returned by {@link #getURLs()}. */
public static final URL[] EMPTY_URL_ARRAY = {};
/** Whether to use standard loading */
@@ -60,7 +60,7 @@
/**
* Constructor
*
- * @param parent, the parent classloader, cannot be null.
+ * @param parent the parent classloader, cannot be null.
* @param factory the url stream factory.
*/
public DelegatingClassLoader(ClassLoader parent, URLStreamHandlerFactory factory)
@@ -78,7 +78,7 @@
* @return the loaded class
* @throws ClassNotFoundException when the class could not be found
*/
- protected Class loadClass(String className, boolean resolve)
+ protected Class<?> loadClass(String className, boolean resolve)
throws ClassNotFoundException
{
// Revert to standard rules
@@ -86,7 +86,7 @@
return super.loadClass(className, resolve);
// Ask the parent
- Class clazz = null;
+ Class<?> clazz = null;
try
{
clazz = getParent().loadClass(className);
Modified: common-core/trunk/src/main/java/org/jboss/util/loading/Translator.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/loading/Translator.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/loading/Translator.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,8 +37,7 @@
*
* <P> If a transformer has been registered with the class loading layer,
* the transformer will be called for every new class definition.
- * The request for a new class definition is made with
- * {@link java.lang.ClassLoader#defineClass ClassLoader.defineClass}.
+ * The request for a new class definition is made with defineClass
* The transformer is called during the processing of the request, before
* the class file bytes have been verified or applied.
*
@@ -65,7 +64,7 @@
*/
public byte[] transform(ClassLoader loader,
String className,
- Class classBeingRedefined,
+ Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer)
throws Exception;
Modified: common-core/trunk/src/main/java/org/jboss/util/naming/ENCThreadLocalKey.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/naming/ENCThreadLocalKey.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/naming/ENCThreadLocalKey.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,7 @@
* @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class ENCThreadLocalKey
implements ObjectFactory
{
Modified: common-core/trunk/src/main/java/org/jboss/util/naming/NonSerializableFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/naming/NonSerializableFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/naming/NonSerializableFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -85,6 +85,7 @@
* @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>.
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class NonSerializableFactory implements ObjectFactory
{
private static Map wrapperMap = Collections.synchronizedMap(new HashMap());
@@ -92,10 +93,10 @@
/** Place an object into the NonSerializableFactory namespace for subsequent
access by getObject. There cannot be an already existing binding for key.
- @param key, the name to bind target under. This should typically be the
+ @param key the name to bind target under. This should typically be the
name that will be used to bind target in the JNDI namespace, but it does
not have to be.
- @param target, the non-Serializable object to bind.
+ @param target the non-Serializable object to bind.
@throws NameAlreadyBoundException thrown if key already exists in the
NonSerializableFactory map
*/
@@ -109,10 +110,10 @@
for subsequent access by getObject. Any existing binding for key will be
replaced by target.
- @param key, the name to bind target under. This should typically be the
+ @param key the name to bind target under. This should typically be the
name that will be used to bind target in the JNDI namespace, but it does
not have to be.
- @param target, the non-Serializable object to bind.
+ @param target the non-Serializable object to bind.
*/
public static void rebind(String key, Object target)
{
@@ -121,7 +122,7 @@
/** Remove a binding from the NonSerializableFactory map.
- @param key, the key into the NonSerializableFactory map to remove.
+ @param key the key into the NonSerializableFactory map to remove.
@throws NameNotFoundException thrown if key does not exist in the
NonSerializableFactory map
*/
@@ -132,7 +133,7 @@
}
/** Remove a binding from the NonSerializableFactory map.
- @param name, the name for the key into NonSerializableFactory map to remove.
+ @param name the name for the key into NonSerializableFactory map to remove.
The key is obtained as name.toString().
@throws NameNotFoundException thrown if key does not exist in the
NonSerializableFactory map
@@ -145,6 +146,7 @@
}
/** Lookup a value from the NonSerializableFactory map.
+ * @param key
@return the object bound to key is one exists, null otherwise.
*/
public static Object lookup(String key)
@@ -153,6 +155,7 @@
return value;
}
/** Lookup a value from the NonSerializableFactory map.
+ * @param name
@return the object bound to key is one exists, null otherwise.
*/
public static Object lookup(Name name)
@@ -165,10 +168,10 @@
/** A convience method that simplifies the process of rebinding a
non-zerializable object into a JNDI context.
- @param ctx, the JNDI context to rebind to.
- @param key, the key to use in both the NonSerializableFactory map and JNDI. It
+ @param ctx the JNDI context to rebind to.
+ @param key the key to use in both the NonSerializableFactory map and JNDI. It
must be a valid name for use in ctx.bind().
- @param target, the non-Serializable object to bind.
+ @param target the non-Serializable object to bind.
@throws NamingException thrown on failure to rebind key into ctx.
*/
public static synchronized void rebind(Context ctx, String key, Object target) throws NamingException
@@ -186,11 +189,11 @@
non-zerializable object into a JNDI context. This version binds the
target object into the default IntitialContext using name path.
- @param name, the name to use as JNDI path name. The key into the
+ @param name the name to use as JNDI path name. The key into the
NonSerializableFactory map is obtained from the toString() value of name.
The name parameter cannot be a 0 length name.
Any subcontexts between the root and the name must exist.
- @param target, the non-Serializable object to bind.
+ @param target the non-Serializable object to bind.
@throws NamingException thrown on failure to rebind key into ctx.
*/
public static synchronized void rebind(Name name, Object target) throws NamingException
@@ -202,11 +205,11 @@
non-zerializable object into a JNDI context. This version binds the
target object into the default IntitialContext using name path.
- @param name, the name to use as JNDI path name. The key into the
+ @param name the name to use as JNDI path name. The key into the
NonSerializableFactory map is obtained from the toString() value of name.
The name parameter cannot be a 0 length name.
- @param target, the non-Serializable object to bind.
- @param createSubcontexts, a flag indicating if subcontexts of name should
+ @param target the non-Serializable object to bind.
+ @param createSubcontexts a flag indicating if subcontexts of name should
be created if they do not already exist.
@throws NamingException thrown on failure to rebind key into ctx.
*/
@@ -227,13 +230,13 @@
/** Transform the obj Reference bound into the JNDI namespace into the
actual non-Serializable object.
- @param obj, the object bound in the JNDI namespace. This must be an implementation
+ @param obj the object bound in the JNDI namespace. This must be an implementation
of javax.naming.Reference with a javax.naming.RefAddr of type "nns" whose
content is the String key used to location the non-Serializable object in the
NonSerializableFactory map.
- @param name, ignored.
- @param nameCtx, ignored.
- @param env, ignored.
+ @param name ignored.
+ @param nameCtx ignored.
+ @param env ignored.
@return the non-Serializable object associated with the obj Reference if one
exists, null if one does not.
Modified: common-core/trunk/src/main/java/org/jboss/util/naming/ReadOnlyContext.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/naming/ReadOnlyContext.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/naming/ReadOnlyContext.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
@author Scott.Stark at jboss.org
@version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class ReadOnlyContext implements Context
{
/** The actual context we impose the read-only behavior on */
Modified: common-core/trunk/src/main/java/org/jboss/util/naming/Util.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/naming/Util.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/naming/Util.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,13 +36,14 @@
* @author adrian at jboss.com
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class Util
{
private static final Logger log = Logger.getLogger(Util.class);
/** Create a subcontext including any intermediate contexts.
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx of the subcontext.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx of the subcontext.
@return The new or existing JNDI subcontext
@throws javax.naming.NamingException on any JNDI failure
*/
@@ -53,8 +54,8 @@
}
/** Create a subcontext including any intermediate contexts.
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx of the subcontext.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx of the subcontext.
@return The new or existing JNDI subcontext
@throws NamingException on any JNDI failure
*/
@@ -79,9 +80,10 @@
}
/** Bind val to name in ctx, and make sure that all intermediate contexts exist
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx where value will be bound
- @param value, the value to bind.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx where value will be bound
+ @param value the value to bind.
+ @throws NamingException for any error
*/
public static void bind(Context ctx, String name, Object value) throws NamingException
{
@@ -90,9 +92,10 @@
}
/** Bind val to name in ctx, and make sure that all intermediate contexts exist
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx where value will be bound
- @param value, the value to bind.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx where value will be bound
+ @param value the value to bind.
+ @throws NamingException for any error
*/
public static void bind(Context ctx, Name name, Object value) throws NamingException
{
@@ -103,9 +106,10 @@
}
/** Rebind val to name in ctx, and make sure that all intermediate contexts exist
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx where value will be bound
- @param value, the value to bind.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx where value will be bound
+ @param value the value to bind.
+ @throws NamingException for any error
*/
public static void rebind(Context ctx, String name, Object value) throws NamingException
{
@@ -114,9 +118,10 @@
}
/** Rebind val to name in ctx, and make sure that all intermediate contexts exist
- @param ctx, the parent JNDI Context under which value will be bound
- @param name, the name relative to ctx where value will be bound
- @param value, the value to bind.
+ @param ctx the parent JNDI Context under which value will be bound
+ @param name the name relative to ctx where value will be bound
+ @param value the value to bind.
+ @throws NamingException for any error
*/
public static void rebind(Context ctx, Name name, Object value) throws NamingException
{
@@ -127,8 +132,9 @@
}
/** Unbinds a name from ctx, and removes parents if they are empty
- @param ctx, the parent JNDI Context under which the name will be unbound
- @param name, The name to unbind
+ @param ctx the parent JNDI Context under which the name will be unbound
+ @param name The name to unbind
+ @throws NamingException for any error
*/
public static void unbind(Context ctx, String name) throws NamingException
{
@@ -136,8 +142,9 @@
}
/** Unbinds a name from ctx, and removes parents if they are empty
- @param ctx, the parent JNDI Context under which the name will be unbound
- @param name, The name to unbind
+ @param ctx the parent JNDI Context under which the name will be unbound
+ @param name The name to unbind
+ @throws NamingException for any error
*/
public static void unbind(Context ctx, Name name) throws NamingException
{
@@ -167,7 +174,7 @@
* @return the object
* @throws Exception for any error
*/
- public static Object lookup(String name, Class clazz) throws Exception
+ public static Object lookup(String name, Class<?> clazz) throws Exception
{
InitialContext ctx = new InitialContext();
try
@@ -188,7 +195,7 @@
* @return the object
* @throws Exception for any error
*/
- public static Object lookup(Name name, Class clazz) throws Exception
+ public static Object lookup(Name name, Class<?> clazz) throws Exception
{
InitialContext ctx = new InitialContext();
try
@@ -314,6 +321,7 @@
* @param name the name to lookup
* @param object the object
* @param clazz the expected type
+ * @throws Exception for any error
*/
protected static void checkObject(Context context, String name, Object object, Class clazz) throws Exception
{
Modified: common-core/trunk/src/main/java/org/jboss/util/platform/PID.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/platform/PID.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/platform/PID.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,8 @@
public class PID
implements Serializable, Cloneable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The <tt>int</tt> process identifier. */
protected final int id;
@@ -69,6 +71,7 @@
/**
* Return a string representation of this PID.
+ * @param radix
*
* @return A string representation of this PID.
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/property/DefaultPropertyReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/DefaultPropertyReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/DefaultPropertyReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -65,6 +65,7 @@
*
* @param propertyName Property to read filenames from.
* @return Array of filenames.
+ * @throws PropertyException
*/
public static String[] getFilenames(final String propertyName)
throws PropertyException
Modified: common-core/trunk/src/main/java/org/jboss/util/property/FieldBoundPropertyListener.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/FieldBoundPropertyListener.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/FieldBoundPropertyListener.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -112,6 +112,7 @@
* field binding.
*
* @param value Property value.
+ * @return the filtered value
*/
public String filterValue(String value) {
return value;
@@ -130,7 +131,7 @@
value = filterValue(value);
// coerce value to field type
- Class type = fieldInstance.getField().getType();
+ Class<?> type = fieldInstance.getField().getType();
PropertyEditor editor = PropertyEditors.findEditor(type);
editor.setAsText(value);
Object coerced = editor.getValue();
Modified: common-core/trunk/src/main/java/org/jboss/util/property/FilePropertyReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/FilePropertyReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/FilePropertyReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public class FilePropertyReader
implements PropertyReader
{
Modified: common-core/trunk/src/main/java/org/jboss/util/property/MethodBoundPropertyListener.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/MethodBoundPropertyListener.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/MethodBoundPropertyListener.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -102,7 +102,7 @@
private PropertyDescriptor getPropertyDescriptor(final String beanPropertyName)
throws IntrospectionException
{
- Class instanceType = instance.getClass();
+ Class<?> instanceType = instance.getClass();
BeanInfo beanInfo = Introspector.getBeanInfo(instanceType);
PropertyDescriptor descriptors[] = beanInfo.getPropertyDescriptors();
PropertyDescriptor descriptor = null;
@@ -148,7 +148,7 @@
protected void invokeSetter(String value) {
try {
// coerce value to field type
- Class type = descriptor.getPropertyType();
+ Class<?> type = descriptor.getPropertyType();
PropertyEditor editor = PropertyEditors.findEditor(type);
editor.setAsText(value);
Object coerced = editor.getValue();
Modified: common-core/trunk/src/main/java/org/jboss/util/property/Property.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/Property.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/Property.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public final class Property
{
/** Platform dependent line separator. */
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyContainer.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyContainer.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyContainer.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,13 +32,14 @@
public class PropertyContainer
extends PropertyMap
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** The group name for this container. */
protected String groupname = "<unknown>";
/**
* Initialize the container with a property group.
- *
- * @param group Properties.
+ * @param props
*/
public PropertyContainer(final Properties props) {
super(props);
@@ -59,7 +60,7 @@
*
* @param type The class whos name will be the property group name.
*/
- public PropertyContainer(final Class type) {
+ public PropertyContainer(final Class<?> type) {
this(type.getName());
}
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyError.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyError.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyError.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,8 @@
public class PropertyError
extends NestedError
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>PropertyError</tt> with the specified detail
* message.
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyEvent.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyEvent.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyEvent.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -34,6 +34,8 @@
public class PropertyEvent
extends EventObject
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** Property name. */
protected final String name;
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -33,6 +33,8 @@
public class PropertyException
extends NestedRuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/**
* Construct a <tt>PropertyException</tt> with the specified detail
* message.
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyGroup.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyGroup.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyGroup.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -42,6 +42,7 @@
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public class PropertyGroup extends PropertyMap
{
/** Serial version uid */
@@ -161,6 +162,7 @@
* This is currently ver inefficient, but should get the
* job done for now.
*/
+ @SuppressWarnings("unchecked")
public Set entrySet()
{
final Set superSet = super.entrySet(true);
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyManager.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyManager.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyManager.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public final class PropertyManager
{
/** Property reader list property name */
@@ -158,6 +159,7 @@
*
* @param prefix Prefix to append to all map keys (or <tt>null</tt>).
* @param map Map containing properties to load.
+ * @throws PropertyException
*/
public static void load(final String prefix, final Map map) throws PropertyException
{
@@ -171,6 +173,8 @@
* Load properties from a map.
*
* @param map Map containing properties to load.
+ * @throws PropertyException
+ * @throws IOException
*/
public static void load(final Map map) throws PropertyException, IOException
{
@@ -184,6 +188,8 @@
* Load properties from a <tt>PropertyReader</tt>.
*
* @param reader <tt>PropertyReader</tt> to read properties from.
+ * @throws PropertyException
+ * @throws IOException
*/
public static void load(final PropertyReader reader) throws PropertyException, IOException
{
@@ -199,6 +205,8 @@
*
* @param classname Class name of a <tt>PropertyReader</tt> to
* read from.
+ * @throws PropertyException
+ * @throws IOException
*/
public static void load(final String classname) throws PropertyException, IOException
{
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyMap.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyMap.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyMap.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -52,6 +52,7 @@
* @author Scott.Stark at jboss.org
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
*/
+ at SuppressWarnings("unchecked")
public class PropertyMap extends Properties
{
/** Serial version uid */
@@ -236,6 +237,8 @@
/**
* Returns a set of keys for all entries in this group and optionally
* all of the keys in the defaults map.
+ * @param includeDefaults
+ * @return the key set
*/
public Set keySet(final boolean includeDefaults)
{
@@ -253,6 +256,8 @@
/**
* Returns a set of entrys for all entries in this group and optionally
* all of the entrys in the defaults map.
+ * @param includeDefaults
+ * @return the entry set
*/
public Set entrySet(final boolean includeDefaults)
{
@@ -529,6 +534,7 @@
*
* @param prefix Prefix to append to all map keys (or null).
* @param map Map containing properties to load.
+ * @throws PropertyException
*/
public void load(String prefix, Map map) throws PropertyException
{
@@ -554,6 +560,7 @@
* Load properties from a map.
*
* @param map Map containing properties to load.
+ * @throws PropertyException
*/
public void load(Map map) throws PropertyException
{
@@ -564,6 +571,8 @@
* Load properties from a PropertyReader.
*
* @param reader PropertyReader to read properties from.
+ * @throws PropertyException
+ * @throws IOException
*/
public void load(PropertyReader reader) throws PropertyException, IOException
{
@@ -577,6 +586,8 @@
* Load properties from a PropertyReader specifed by the given class name.
*
* @param className Class name of a PropertyReader to read from.
+ * @throws PropertyException
+ * @throws IOException
*/
public void load(String className) throws PropertyException, IOException
{
Modified: common-core/trunk/src/main/java/org/jboss/util/property/PropertyReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/PropertyReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/PropertyReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -32,6 +32,7 @@
* @version <tt>$Revision$</tt>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
*/
+ at SuppressWarnings("unchecked")
public interface PropertyReader
{
/**
Modified: common-core/trunk/src/main/java/org/jboss/util/property/jmx/SystemPropertyClassValueMBean.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/property/jmx/SystemPropertyClassValueMBean.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/property/jmx/SystemPropertyClassValueMBean.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -27,22 +27,24 @@
public interface SystemPropertyClassValueMBean {
/**
- * The system property value
+ * @return the system property value
*/
java.lang.String getProperty() ;
/**
* The system property value
+ * @param property
*/
void setProperty(java.lang.String property) ;
/**
- * The class name to use a value for the system property when it is available
+ * @return The class name to use a value for the system property when it is available
*/
java.lang.String getClassName() ;
/**
* The class name to use a value for the system property when it is available
+ * @param className
*/
void setClassName(java.lang.String className) ;
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassArrayEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassArrayEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassArrayEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,13 +39,13 @@
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
StringTokenizer tokenizer = new StringTokenizer(text, ", \t\r\n");
- ArrayList classes = new ArrayList();
+ ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
while( tokenizer.hasMoreTokens() == true )
{
String name = tokenizer.nextToken();
try
{
- Class c = loader.loadClass(name);
+ Class<?> c = loader.loadClass(name);
classes.add(c);
}
catch(ClassNotFoundException e)
@@ -54,7 +54,7 @@
}
}
- Class[] theValue = new Class[classes.size()];
+ Class<?>[] theValue = new Class[classes.size()];
classes.toArray(theValue);
setValue(theValue);
}
@@ -64,7 +64,7 @@
*/
public String getAsText()
{
- Class[] theValue = (Class[]) getValue();
+ Class<?>[] theValue = (Class[]) getValue();
StringBuffer text = new StringBuffer();
int length = theValue == null ? 0 : theValue.length;
for(int n = 0; n < length; n ++)
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ClassEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -44,7 +44,7 @@
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
String classname = getAsText();
- Class type = loader.loadClass(classname);
+ Class<?> type = loader.loadClass(classname);
return type;
}
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/DateEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/DateEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/DateEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -43,6 +43,7 @@
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
* @version <tt>$Revision$</tt>
*/
+ at SuppressWarnings("unchecked")
public class DateEditor extends PropertyEditorSupport
{
/** The formats to use when parsing the string date */
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ElementEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ElementEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/ElementEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -33,8 +33,6 @@
{
/**
* Sets as an Element created by a String.
- *
- * @throws NestedRuntimeException A parse exception occured
*/
public void setAsText(String text)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertiesEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertiesEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertiesEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class PropertiesEditor extends TextPropertyEditorSupport
{
/**
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertyEditors.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertyEditors.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/PropertyEditors.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -47,6 +47,7 @@
* @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
* @version <tt>$Revision$</tt>
*/
+ at SuppressWarnings("unchecked")
public class PropertyEditors
{
/** The Logger object */
@@ -134,7 +135,7 @@
* @param type The class of the object to be edited.
* @return An editor for the given type or null if none was found.
*/
- public static PropertyEditor findEditor(final Class type)
+ public static PropertyEditor findEditor(final Class<?> type)
{
return PropertyEditorManager.findEditor(type);
}
@@ -144,12 +145,13 @@
*
* @param typeName The class name of the object to be edited.
* @return An editor for the given type or null if none was found.
+ * @throws ClassNotFoundException when the class could not be found
*/
public static PropertyEditor findEditor(final String typeName)
throws ClassNotFoundException
{
// see if it is a primitive type first
- Class type = Classes.getPrimitiveTypeForName(typeName);
+ Class<?> type = Classes.getPrimitiveTypeForName(typeName);
if (type == null)
{
// nope try look up
@@ -168,7 +170,7 @@
*
* @throws RuntimeException No editor was found.
*/
- public static PropertyEditor getEditor(final Class type)
+ public static PropertyEditor getEditor(final Class<?> type)
{
PropertyEditor editor = findEditor(type);
if (editor == null)
@@ -186,6 +188,7 @@
* @return An editor for the given type.
*
* @throws RuntimeException No editor was found.
+ * @throws ClassNotFoundException when the class is not found
*/
public static PropertyEditor getEditor(final String typeName)
throws ClassNotFoundException
@@ -205,7 +208,7 @@
* @param type The class of the objetcs to be edited.
* @param editorType The class of the editor.
*/
- public static void registerEditor(final Class type, final Class editorType)
+ public static void registerEditor(final Class<?> type, final Class<?> editorType)
{
PropertyEditorManager.registerEditor(type, editorType);
}
@@ -215,14 +218,15 @@
*
* @param typeName The classname of the objetcs to be edited.
* @param editorTypeName The class of the editor.
+ * @throws ClassNotFoundException when the class could not be found
*/
public static void registerEditor(final String typeName,
final String editorTypeName)
throws ClassNotFoundException
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class type = loader.loadClass(typeName);
- Class editorType = loader.loadClass(editorTypeName);
+ Class<?> type = loader.loadClass(typeName);
+ Class<?> editorType = loader.loadClass(editorTypeName);
PropertyEditorManager.registerEditor(type, editorType);
}
@@ -243,7 +247,7 @@
throws ClassNotFoundException, IntrospectionException
{
// see if it is a primitive type first
- Class typeClass = Classes.getPrimitiveTypeForName(typeName);
+ Class<?> typeClass = Classes.getPrimitiveTypeForName(typeName);
if (typeClass == null)
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -301,7 +305,7 @@
throws IntrospectionException
{
- HashMap propertyMap = new HashMap();
+ HashMap<String, PropertyDescriptor> propertyMap = new HashMap<String, PropertyDescriptor>();
BeanInfo beanInfo = Introspector.getBeanInfo(bean.getClass());
PropertyDescriptor[] props = beanInfo.getPropertyDescriptors();
for (int p = 0; p < props.length; p++)
@@ -318,7 +322,7 @@
{
String name = (String) keys.next();
String text = beanProps.getProperty(name);
- PropertyDescriptor pd = (PropertyDescriptor) propertyMap.get(name);
+ PropertyDescriptor pd = propertyMap.get(name);
if (pd == null)
{
/* Try the property name with the first char uppercased to handle
@@ -332,13 +336,13 @@
{
char first = name.charAt(0);
String exName = Character.toUpperCase(first) + name.substring(1);
- pd = (PropertyDescriptor) propertyMap.get(exName);
+ pd = propertyMap.get(exName);
// Be lenient and check the other way around, e.g. ServerName -> serverName
if (pd == null)
{
exName = Character.toLowerCase(first) + name.substring(1);
- pd = (PropertyDescriptor) propertyMap.get(exName);
+ pd = propertyMap.get(exName);
}
}
@@ -361,7 +365,7 @@
log.trace("Property editor found for: "+name+", editor: "+pd+", setter: "+setter);
if (setter != null)
{
- Class ptype = pd.getPropertyType();
+ Class<?> ptype = pd.getPropertyType();
PropertyEditor editor = PropertyEditorManager.findEditor(ptype);
if (editor == null)
{
@@ -403,7 +407,7 @@
PropertyEditorManager.setEditorSearchPath(path);
}
- private static class Initialize implements PrivilegedAction
+ private static class Initialize implements PrivilegedAction<Object>
{
static Initialize instance = new Initialize();
@@ -423,13 +427,13 @@
class name to editor name algorithm. For example, the type String[] has
a name '[Ljava.lang.String;' which does not map to a XXXEditor name.
*/
- Class strArrayType = String[].class;
+ Class<?> strArrayType = String[].class;
PropertyEditorManager.registerEditor(strArrayType, StringArrayEditor.class);
- Class clsArrayType = Class[].class;
+ Class<?> clsArrayType = Class[].class;
PropertyEditorManager.registerEditor(clsArrayType, ClassArrayEditor.class);
- Class intArrayType = int[].class;
+ Class<?> intArrayType = int[].class;
PropertyEditorManager.registerEditor(intArrayType, IntArrayEditor.class);
- Class byteArrayType = byte[].class;
+ Class<?> byteArrayType = byte[].class;
PropertyEditorManager.registerEditor(byteArrayType, ByteArrayEditor.class);
// There is no default char editor.
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/StringArrayEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/StringArrayEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/StringArrayEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -41,7 +41,7 @@
static String[] parseList(String text)
{
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
StringBuffer tmp = new StringBuffer();
for(int n = 0; n < text.length(); n ++)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/propertyeditor/URIEditor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/propertyeditor/URIEditor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/propertyeditor/URIEditor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -21,7 +21,6 @@
*/
package org.jboss.util.propertyeditor;
-import java.net.URI;
import java.net.URISyntaxException;
import org.jboss.util.NestedRuntimeException;
Modified: common-core/trunk/src/main/java/org/jboss/util/state/IllegalTransitionException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/state/IllegalTransitionException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/state/IllegalTransitionException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -28,6 +28,8 @@
*/
public class IllegalTransitionException extends Exception
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
public IllegalTransitionException(String msg)
{
super(msg);
Modified: common-core/trunk/src/main/java/org/jboss/util/state/State.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/state/State.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/state/State.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -30,6 +30,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class State
{
/** The name of the state */
Modified: common-core/trunk/src/main/java/org/jboss/util/state/StateMachine.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/state/StateMachine.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/state/StateMachine.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class StateMachine implements Cloneable
{
private static Logger log = Logger.getLogger(StateMachine.class);
@@ -112,7 +113,7 @@
/** Transition to the next state given the name of a valid transition.
* @param actionName - the name of transition that is valid for the
* current state.
- * @return
+ * @return the next state
* @throws IllegalTransitionException
*/
public State nextState(String actionName)
Modified: common-core/trunk/src/main/java/org/jboss/util/state/xml/StateMachineParser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/state/xml/StateMachineParser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/state/xml/StateMachineParser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -71,13 +71,11 @@
@author Dimitris.Andreadis at jboss.org
@version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class StateMachineParser
{
private static Logger log = Logger.getLogger(StateMachineParser.class);
- /**
- * Parse an xml description of the state machine
- */
public StateMachine parse(URL source) throws Exception
{
// parse the XML document into a DOM structure
Modified: common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -39,6 +39,8 @@
{
/**
* Creates a new instance of MarshalledValueOutputStream
+ * @param is
+ * @throws IOException
*/
public MarshalledValueInputStream(InputStream is) throws IOException
{
@@ -50,7 +52,7 @@
*
* @throws java.io.IOException Any exception thrown by the underlying OutputStream.
*/
- protected Class resolveClass(ObjectStreamClass v)
+ protected Class<?> resolveClass(ObjectStreamClass v)
throws IOException, ClassNotFoundException
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -60,12 +62,12 @@
return Class.forName(className, false, loader);
}
- protected Class resolveProxyClass(String[] interfaces)
+ protected Class<?> resolveProxyClass(String[] interfaces)
throws IOException, ClassNotFoundException
{
// Load the interfaces from the thread context class loader
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class[] ifaceClasses = new Class[interfaces.length];
+ Class<?>[] ifaceClasses = new Class[interfaces.length];
for (int i = 0; i < interfaces.length; i++)
{
ifaceClasses[i] = loader.loadClass(interfaces[i]);
Modified: common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueOutputStream.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueOutputStream.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/stream/MarshalledValueOutputStream.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -44,6 +44,8 @@
If there is a security manager installed, this method requires a
SerializablePermission("enableSubstitution") permission to ensure it's
ok to enable the stream to do replacement of objects in the stream.
+ * @param os
+ * @throws IOException
*/
public MarshalledValueOutputStream(OutputStream os) throws IOException
{
@@ -54,7 +56,7 @@
/**
* @throws java.io.IOException Any exception thrown by the underlying OutputStream.
*/
- protected void annotateClass(Class cl) throws IOException
+ protected void annotateClass(Class<?> cl) throws IOException
{
super.annotateClass(cl);
}
@@ -62,7 +64,7 @@
/**
* @throws java.io.IOException Any exception thrown by the underlying OutputStream.
*/
- protected void annotateProxyClass(Class cl) throws IOException
+ protected void annotateProxyClass(Class<?> cl) throws IOException
{
super.annotateProxyClass(cl);
}
Modified: common-core/trunk/src/main/java/org/jboss/util/stream/NotifyingBufferedOutputStream.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/stream/NotifyingBufferedOutputStream.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/stream/NotifyingBufferedOutputStream.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,6 +56,7 @@
* @param os the output stream to be buffered
* @param size the buffer size
* @param chunkSize the chunk size
+ * @param listener
* @exception IllegalArgumentException for a size <= 0 or chunkSize <= size or a null listener
*/
public NotifyingBufferedOutputStream(OutputStream os, int size, int chunkSize, StreamListener listener)
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/BasicThreadPool.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/BasicThreadPool.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/BasicThreadPool.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -49,6 +49,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class BasicThreadPool implements ThreadPool, BasicThreadPoolMBean
{
// Constants -----------------------------------------------------
@@ -283,7 +284,7 @@
* work queue and ThreadPoolExecutor, so this needs to be called
* before doing any work with the pool.
*
- * @param new work queue capacity
+ * @param size new work queue capacity
*/
public void setMaximumQueueSize(int size)
{
@@ -515,7 +516,7 @@
TimeoutInfo info = null;
if(this.tasksWithTimeouts.isEmpty() == false)
{
- info = (TimeoutInfo) this.tasksWithTimeouts.remove();
+ info = this.tasksWithTimeouts.remove();
}
return info;
}
@@ -641,6 +642,7 @@
*/
private class TimeoutMonitor implements Runnable
{
+ @SuppressWarnings("hiding")
final Logger log;
TimeoutMonitor(String name, Logger log)
{
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/MinPooledExecutor.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/MinPooledExecutor.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/MinPooledExecutor.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -48,6 +48,7 @@
@author adrian at jboss.org
@version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class MinPooledExecutor extends ThreadPoolExecutor
{
// Constants -----------------------------------------------------
@@ -75,7 +76,7 @@
/**
* Construct a new executor
*
- * @param channel the queue for any requests
+ * @param queue the queue for any requests
* @param poolSize the maximum pool size
*/
public MinPooledExecutor(BlockingQueue queue, int poolSize)
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/StartTimeoutException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/StartTimeoutException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/StartTimeoutException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,8 @@
*/
public class StartTimeoutException extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/Task.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/Task.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/Task.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -91,7 +91,7 @@
* The task has been rejected
*
* @param time the time taken to reject the task
- * @param throwable any error associated with the rejection
+ * @param t any error associated with the rejection
*/
void rejected(long time, Throwable t);
@@ -106,7 +106,7 @@
* The task has been completed
*
* @param time the time taken to reject the task
- * @param throwable any error associated with the completion
+ * @param t any error associated with the completion
*/
void completed(long time, Throwable t);
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/TaskStoppedException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/TaskStoppedException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/TaskStoppedException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,8 @@
*/
public class TaskStoppedException extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolFullException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolFullException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolFullException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,8 @@
*/
public class ThreadPoolFullException extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolMBean.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolMBean.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolMBean.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -83,7 +83,7 @@
void setMaximumPoolSize(int size);
/**
- * Get the instance
+ * @return the instance
*/
ThreadPool getInstance();
Modified: common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolStoppedException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolStoppedException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/threadpool/ThreadPoolStoppedException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -29,6 +29,8 @@
*/
public class ThreadPoolStoppedException extends RuntimeException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/HashedTimeoutPriorityQueueImpl.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/HashedTimeoutPriorityQueueImpl.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/HashedTimeoutPriorityQueueImpl.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -143,8 +143,6 @@
*
* If you are interested, you can find this data structure and its
* associated operations in most textbooks on algorithmics.
- *
- * @see checkTree
*
* @author <a href="osh at sparre.dk">Ole Husgaard</a>
* @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/Timeout.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/Timeout.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/Timeout.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -41,6 +41,8 @@
* used. The reason for this is that an implementation may reuse
* cancelled timeouts, and at return the instance may already be
* in use for another timeout.
+ *
+ * @return true when cancelled
*/
public boolean cancel();
}
\ No newline at end of file
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutExt.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutExt.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutExt.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,7 +37,7 @@
TimeoutTarget getTimeoutTarget();
/**
- * Get the time of this timeout
+ * @return the time of this timeout
*/
long getTime();
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutFactory.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutFactory.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutFactory.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class TimeoutFactory
{
/** The priority queue property */
@@ -53,7 +54,7 @@
private static int timeoutFactoriesCount = 0;
/** The priority queue class */
- private static Class priorityQueueClass;
+ private static Class<?> priorityQueueClass;
/** The default threadpool used to execute timeouts */
private static BasicThreadPool DEFAULT_TP = new BasicThreadPool("Timeouts");
@@ -95,7 +96,6 @@
/** The priority queue */
private TimeoutPriorityQueue queue;
- /** Lazy constructions of the TimeoutFactory singleton */
public synchronized static TimeoutFactory getSingleton()
{
if (singleton == null)
@@ -107,6 +107,9 @@
/**
* Schedules a new timeout using the singleton TimeoutFactory
+ * @param time
+ * @param target
+ * @return the timeout
*/
static public Timeout createTimeout(long time, TimeoutTarget target)
{
@@ -115,6 +118,7 @@
/**
* Constructs a new TimeoutFactory that uses the provided ThreadPool
+ * @param threadPool
*/
public TimeoutFactory(ThreadPool threadPool)
{
@@ -153,6 +157,7 @@
*
* @param time absolute time
* @param target target to fire
+ * @return the timeout
*/
public Timeout schedule(long time, TimeoutTarget target)
{
@@ -171,6 +176,7 @@
*
* @param time absolute time
* @param run runnable to run
+ * @return the timeout
*/
public Timeout schedule(long time, Runnable run)
{
@@ -197,7 +203,7 @@
}
/**
- * Returns true if the TimeoutFactory has been cancelled,
+ * @return true if the TimeoutFactory has been cancelled,
* false if it is operational (i.e. accepts timeout schedules).
*/
public boolean isCancelled()
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueue.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueue.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueue.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -73,6 +73,7 @@
/**
* Removes the passed timeout from the queue
+ * @param timeout
*
* @return true when the timeout was removed
*/
@@ -89,7 +90,7 @@
void cancel();
/**
- * The size of the queue
+ * @return the size of the queue
*/
int size();
}
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueueImpl.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueueImpl.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutPriorityQueueImpl.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -139,8 +139,6 @@
*
* If you are interested, you can find this data structure and its
* associated operations in most textbooks on algorithmics.
- *
- * @see checkTree
*
* @author <a href="osh at sparre.dk">Ole Husgaard</a>
* @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
Modified: common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutTarget.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutTarget.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/timeout/TimeoutTarget.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -31,6 +31,7 @@
{
/**
* The timeout callback function is invoked when the timeout expires.
+ * @param timeout
*/
public void timedOut(Timeout timeout);
}
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/DOMUtils.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/DOMUtils.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/DOMUtils.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -54,6 +54,7 @@
* @author Thomas.Diesler at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public final class DOMUtils
{
private static Logger log = Logger.getLogger(DOMUtils.class);
@@ -83,8 +84,6 @@
{
}
- /** Initialise the the DocumentBuilder
- */
public static DocumentBuilder getDocumentBuilder()
{
DocumentBuilder builder = (DocumentBuilder)builderThreadLocal.get();
@@ -92,6 +91,9 @@
}
/** Parse the given XML string and return the root Element
+ * @param xmlString
+ * @return the element
+ * @throws IOException
*/
public static Element parse(String xmlString) throws IOException
{
@@ -107,6 +109,9 @@
}
/** Parse the given XML stream and return the root Element
+ * @param xmlStream
+ * @return the element
+ * @throws IOException
*/
public static Element parse(InputStream xmlStream) throws IOException
{
@@ -123,6 +128,9 @@
}
/** Parse the given input source and return the root Element
+ * @param source
+ * @return the element
+ * @throws IOException
*/
public static Element parse(InputSource source) throws IOException
{
@@ -139,6 +147,8 @@
}
/** Create an Element for a given name
+ * @param localPart
+ * @return the element
*/
public static Element createElement(String localPart)
{
@@ -148,6 +158,9 @@
}
/** Create an Element for a given name and prefix
+ * @param localPart
+ * @param prefix
+ * @return the element
*/
public static Element createElement(String localPart, String prefix)
{
@@ -157,6 +170,10 @@
}
/** Create an Element for a given name, prefix and uri
+ * @param localPart
+ * @param prefix
+ * @param uri
+ * @return the element
*/
public static Element createElement(String localPart, String prefix, String uri)
{
@@ -174,6 +191,8 @@
}
/** Create an Element for a given QName
+ * @param qname
+ * @return the element
*/
public static Element createElement(QName qname)
{
@@ -181,6 +200,8 @@
}
/** Create a org.w3c.dom.Text node
+ * @param value
+ * @return the text node
*/
public static Text createTextNode(String value)
{
@@ -188,7 +209,8 @@
return doc.createTextNode(value);
}
- /** Get the qname of the given node.
+ /** @return the qname of the given node.
+ * @param el
*/
public static QName getElementQName(Element el)
{
@@ -197,6 +219,9 @@
}
/** Transform the giveen qualified name into a QName
+ * @param el
+ * @param qualifiedName
+ * @return the resolved name
*/
public static QName resolveQName(Element el, String qualifiedName)
{
@@ -235,6 +260,8 @@
}
/** Get the value from the given attribute
+ * @param el
+ * @param attrName
*
* @return null if the attribute value is empty or the attribute is not present
*/
@@ -244,6 +271,8 @@
}
/** Get the value from the given attribute
+ * @param el
+ * @param attrName
*
* @return null if the attribute value is empty or the attribute is not present
*/
@@ -260,7 +289,9 @@
return attr;
}
- /** Get the qname value from the given attribute
+ /** @return the qname value from the given attribute
+ * @param el
+ * @param attrName
*/
public static QName getAttributeValueAsQName(Element el, String attrName)
{
@@ -268,7 +299,9 @@
}
- /** Get the qname value from the given attribute
+ /** @return the qname value from the given attribute
+ * @param el
+ * @param attrName
*/
public static QName getAttributeValueAsQName(Element el, QName attrName)
{
@@ -283,14 +316,18 @@
return qname;
}
- /** Get the boolean value from the given attribute
+ /** @return the boolean value from the given attribute
+ * @param el
+ * @param attrName
*/
public static boolean getAttributeValueAsBoolean(Element el, String attrName)
{
return getAttributeValueAsBoolean(el, new QName(attrName));
}
- /** Get the boolean value from the given attribute
+ /** @return the boolean value from the given attribute
+ * @param el
+ * @param attrName
*/
public static boolean getAttributeValueAsBoolean(Element el, QName attrName)
{
@@ -299,14 +336,18 @@
return ret;
}
- /** Get the integer value from the given attribute
+ /** @return the integer value from the given attribute
+ * @param el
+ * @param attrName
*/
public static Integer getAttributeValueAsInteger(Element el, String attrName)
{
return getAttributeValueAsInteger(el, new QName(attrName));
}
- /** Get the integer value from the given attribute
+ /** @param el
+ * @param attrName
+ * @return the integer value from the given attribute
*/
public static Integer getAttributeValueAsInteger(Element el, QName attrName)
{
@@ -314,7 +355,8 @@
return (attrVal != null ? new Integer(attrVal) : null);
}
- /** Get the attributes as Map<QName, String>
+ /** @param el
+ * @return the attributes as Map<QName, String>
*/
public static Map getAttributes(Element el)
{
@@ -332,6 +374,8 @@
}
/** Copy attributes between elements
+ * @param destElement
+ * @param srcElement
*/
public static void copyAttributes(Element destElement, Element srcElement)
{
@@ -357,6 +401,8 @@
}
/** True if the node has child elements
+ * @param node
+ * @return true when has child elements
*/
public static boolean hasChildElements(Node node)
{
@@ -371,6 +417,8 @@
}
/** Gets child elements
+ * @param node
+ * @return the iterator
*/
public static Iterator getChildElements(Node node)
{
@@ -386,6 +434,7 @@
}
/** Get the concatenated text content, or null.
+ * @param node
* @return getTextContent(node, false).
*/
public static String getTextContent(Node node)
@@ -393,8 +442,9 @@
return getTextContent(node, false);
}
/** Get the concatenated text content, or null.
- * @param the node to search for TEXT_NODE conent
+ * @param node node to search for TEXT_NODE conent
* @param replaceProps flag indicating if ${x} property refs should be replace
+ * @return the text content
*/
public static String getTextContent(Node node, boolean replaceProps)
{
@@ -417,21 +467,26 @@
return text;
}
- /** Gets the first child element
+ /** @return the first child element
+ * @param node
*/
public static Element getFirstChildElement(Node node)
{
return getFirstChildElementIntern(node, null);
}
- /** Gets the first child element for a given local name without namespace
+ /** @param node
+ * @param nodeName
+ * @return the first child element for a given local name without namespace
*/
public static Element getFirstChildElement(Node node, String nodeName)
{
return getFirstChildElementIntern(node, new QName(nodeName));
}
- /** Gets the first child element for a given qname
+ /** @param node
+ * @param nodeName
+ * @return the first child element for a given qname
*/
public static Element getFirstChildElement(Node node, QName nodeName)
{
@@ -450,6 +505,9 @@
}
/** Gets the child elements for a given local name without namespace
+ * @param node
+ * @param nodeName
+ * @return the iterator
*/
public static Iterator getChildElements(Node node, String nodeName)
{
@@ -457,6 +515,9 @@
}
/** Gets the child element for a given qname
+ * @param node
+ * @param nodeName
+ * @return the iterator
*/
public static Iterator getChildElements(Node node, QName nodeName)
{
@@ -498,6 +559,8 @@
}
/** Gets parent element or null if there is none
+ * @param node
+ * @return the element
*/
public static Element getParentElement(Node node)
{
@@ -505,7 +568,7 @@
return (parent instanceof Element ? (Element)parent : null);
}
- /** Get the owner document that is associated with the current thread */
+ /** @return the owner document that is associated with the current thread */
public static Document getOwnerDocument()
{
Document doc = (Document)documentThreadLocal.get();
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/DOMWriter.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/DOMWriter.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/DOMWriter.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -80,6 +80,7 @@
* @author Thomas.Diesler at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class DOMWriter
{
// Print writer
@@ -142,6 +143,9 @@
/**
* Print a node with explicit prettyprinting.
* The defaults for all other DOMWriter properties apply.
+ * @param node
+ * @param prettyprint
+ * @return the node as a string
*
*/
public static String printNode(Node node, boolean prettyprint)
@@ -159,6 +163,8 @@
/**
* Set wheter entities should appear in their canonical form.
* The default is false.
+ * @param canonical
+ * @return the dom writer
*/
public DOMWriter setCanonical(boolean canonical)
{
@@ -170,6 +176,8 @@
* Set wheter subelements should have their namespaces completed.
* Setting this to false may lead to invalid XML fragments.
* The default is true.
+ * @param complete
+ * @return the dom writer
*/
public DOMWriter setCompleteNamespaces(boolean complete)
{
@@ -185,6 +193,8 @@
/**
* Set wheter element should be indented.
* The default is false.
+ * @param prettyprint
+ * @return the dom writer
*/
public DOMWriter setPrettyprint(boolean prettyprint)
{
@@ -200,6 +210,8 @@
/**
* Set wheter the XML declaration should be written.
* The default is false.
+ * @param flag
+ * @return the dom writer
*/
public DOMWriter setWriteXMLDeclaration(boolean flag)
{
@@ -517,7 +529,11 @@
return (array);
}
- /** Normalizes the given string. */
+ /** Normalizes the given string.
+ * @param s
+ * @param canonical
+ * @return the normalized string
+ */
public static String normalize(String s, boolean canonical)
{
StringBuffer str = new StringBuffer();
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -50,6 +50,7 @@
* @author Dimitris.Andreadis at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class JBossEntityResolver implements EntityResolver
{
private static final Logger log = Logger.getLogger(JBossEntityResolver.class);
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/XmlHelper.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/XmlHelper.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/XmlHelper.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -36,6 +36,7 @@
* @author <a href="mailto:chris at kimptoc.net">Chris Kimpton</a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class XmlHelper
{
public static void write(Writer out, Document dom)
@@ -65,7 +66,7 @@
Node currentChild = children.item(i);
if (currentChild.getNodeType() == Node.ELEMENT_NODE &&
((Element)currentChild).getTagName().equals(tagName)) {
- goodChildren.add((Element)currentChild);
+ goodChildren.add(currentChild);
}
}
return goodChildren.iterator();
@@ -108,6 +109,7 @@
* @param element the parent element
* @param tagName the name of the desired child
* @return either the named child or null
+ * @throws Exception
*/
public static Element getOptionalChild(Element element, String tagName)
throws Exception
@@ -125,6 +127,7 @@
* @param defaultElement the element to return if the child
* doesn't exist
* @return either the named child or the supplied default
+ * @throws Exception
*/
public static Element getOptionalChild(Element element,
String tagName,
@@ -150,6 +153,7 @@
*
* @param element The element to get the content for.
* @return The content of the element or null.
+ * @throws Exception
*/
public static String getElementContent(final Element element)
throws Exception
@@ -163,6 +167,7 @@
* @param element The element to get the content for.
* @param defaultStr The default to return when there is no content.
* @return The content of the element or the default.
+ * @throws Exception
*/
public static String getElementContent(Element element, String defaultStr)
throws Exception
@@ -193,6 +198,7 @@
* @param element The parent element.
* @param tagName The name of the desired child.
* @return The element content or null.
+ * @throws Exception
*/
public static String getUniqueChildContent(Element element,
String tagName)
@@ -207,6 +213,7 @@
* @param element The parent element.
* @param tagName The name of the desired child.
* @return The element content or null.
+ * @throws Exception
*/
public static String getOptionalChildContent(Element element,
String tagName)
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/XmlLoadable.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/XmlLoadable.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/XmlLoadable.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -27,7 +27,6 @@
/**
* <description>
*
- * @see <related>
* @author <a href="mailto:sebastien.alborini at m4x.org">Sebastien Alborini</a>
* @version $Revision$
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Catalog.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Catalog.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Catalog.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,25 +56,25 @@
package org.jboss.util.xml.catalog;
+import java.io.DataInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.io.DataInputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
-import java.net.URL;
-import java.net.MalformedURLException;
-import org.jboss.util.xml.catalog.CatalogManager;
+
+import javax.xml.parsers.SAXParserFactory;
+
import org.jboss.util.xml.catalog.helpers.PublicId;
import org.jboss.util.xml.catalog.readers.CatalogReader;
import org.jboss.util.xml.catalog.readers.OASISXMLCatalogReader;
import org.jboss.util.xml.catalog.readers.SAXCatalogReader;
import org.jboss.util.xml.catalog.readers.TR9401CatalogReader;
-import javax.xml.parsers.SAXParserFactory;
-
/**
* Represents OASIS Open Catalog files.
*
@@ -175,7 +175,7 @@
* catalogs, or any number of other storage formats.</p>
*
* <p>Additional catalogs may also be loaded with the
- * {@link #parseCatalog} method.</p>
+ * {@link #parseCatalog(String)} method.</p>
* </dd>
* </dl>
*
@@ -217,6 +217,7 @@
* <p>Derived from public domain code originally published by Arbortext,
* Inc.</p>
*/
+ at SuppressWarnings("unchecked")
public class Catalog {
/** The BASE Catalog Entry type. */
public static final int BASE = CatalogEntry.addEntryType("BASE", 1);
@@ -394,13 +395,14 @@
* <p>The constructor interrogates the relevant system properties
* using the specified Catalog Manager
* and initializes the catalog data structures.</p>
+ * @param manager
*/
public Catalog(CatalogManager manager) {
catalogManager = manager;
}
/**
- * Return the CatalogManager used by this catalog.
+ * @return the CatalogManager used by this catalog.
*
*/
public CatalogManager getCatalogManager() {
@@ -409,6 +411,7 @@
/**
* Establish the CatalogManager used by this catalog.
+ * @param manager
*
*/
public void setCatalogManager(CatalogManager manager) {
@@ -514,6 +517,8 @@
* <p>N.B. All Catalog subtypes should call newCatalog() to construct
* a new Catalog. Do not simply use "new Subclass()" since that will
* confuse future subclasses.</p>
+ *
+ * @return the catalog
*/
protected Catalog newCatalog() {
String catalogClass = this.getClass().getName();
@@ -542,14 +547,14 @@
}
/**
- * Returns the current base URI.
+ * @return the current base URI.
*/
public String getCurrentBase() {
return base.toString();
}
/**
- * Returns the default override setting associated with this
+ * @return the default override setting associated with this
* catalog.
*
* <p>All catalog files loaded by this catalog will have the
@@ -727,6 +732,8 @@
*
* <p>Catalogs may refer to other catalogs, this method parses
* all of the currently pending catalog files.</p>
+ * @throws MalformedURLException
+ * @throws IOException
*/
protected synchronized void parsePendingCatalogs()
throws MalformedURLException, IOException {
@@ -826,12 +833,11 @@
* @throws MalformedURLException The fileName cannot be turned into
* a valid URL.
* @throws IOException Error reading catalog file.
+ * @throws CatalogException for any error
*/
protected synchronized void parseCatalogFile(String fileName)
throws MalformedURLException, IOException, CatalogException {
- CatalogEntry entry;
-
// The base-base is the cwd. If the catalog file is specified
// with a relative path, this assures that it gets resolved
// properly...
@@ -1096,6 +1102,7 @@
*
* <p>This method exists to allow subclasses to deal with unknown
* entry types.</p>
+ * @param strings
*/
public void unknownEntry(Vector strings) {
if (strings != null && strings.size() > 0) {
@@ -1616,7 +1623,7 @@
if (e.getEntryType() == DELEGATE_PUBLIC
&& (over || systemId == null)) {
- String p = (String) e.getEntryArg(0);
+ String p = e.getEntryArg(0);
if (p.length() <= publicId.length()
&& p.equals(publicId.substring(0, p.length()))) {
// delegate this match to the other catalog
@@ -1707,6 +1714,8 @@
* @param systemId The system ID to locate in the catalog
*
* @return The mapped system identifier or null
+ * @throws MalformedURLException
+ * @throws IOException
*/
protected String resolveLocalSystem(String systemId)
throws MalformedURLException, IOException {
@@ -1732,7 +1741,7 @@
CatalogEntry e = (CatalogEntry) enumt.nextElement();
if (e.getEntryType() == REWRITE_SYSTEM) {
- String p = (String) e.getEntryArg(0);
+ String p = e.getEntryArg(0);
if (p.length() <= systemId.length()
&& p.equals(systemId.substring(0, p.length()))) {
// Is this the longest prefix?
@@ -1757,7 +1766,7 @@
CatalogEntry e = (CatalogEntry) enumt.nextElement();
if (e.getEntryType() == DELEGATE_SYSTEM) {
- String p = (String) e.getEntryArg(0);
+ String p = e.getEntryArg(0);
if (p.length() <= systemId.length()
&& p.equals(systemId.substring(0, p.length()))) {
// delegate this match to the other catalog
@@ -1844,6 +1853,8 @@
* @param uri The URI to locate in the catalog
*
* @return The mapped URI or null
+ * @throws MalformedURLException
+ * @throws IOException
*/
protected String resolveLocalURI(String uri)
throws MalformedURLException, IOException {
@@ -1864,7 +1875,7 @@
CatalogEntry e = (CatalogEntry) enumt.nextElement();
if (e.getEntryType() == REWRITE_URI) {
- String p = (String) e.getEntryArg(0);
+ String p = e.getEntryArg(0);
if (p.length() <= uri.length()
&& p.equals(uri.substring(0, p.length()))) {
// Is this the longest prefix?
@@ -1889,7 +1900,7 @@
CatalogEntry e = (CatalogEntry) enumt.nextElement();
if (e.getEntryType() == DELEGATE_URI) {
- String p = (String) e.getEntryArg(0);
+ String p = e.getEntryArg(0);
if (p.length() <= uri.length()
&& p.equals(uri.substring(0, p.length()))) {
// delegate this match to the other catalog
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogEntry.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogEntry.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogEntry.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -85,6 +85,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class CatalogEntry {
/** The nextEntry is the ordinal number of the next entry type. */
protected static int nextEntry = 0;
@@ -124,8 +125,7 @@
*
* @param name The name of the catalog entry type.
* @return The type of the catalog entry with the specified name.
- * @throws InvalidCatalogEntryTypeException if no entry has the
- * specified name.
+ * @throws CatalogException for any error
*/
public static int getEntryType(String name)
throws CatalogException {
@@ -147,8 +147,7 @@
*
* @param name The name of the catalog entry type.
* @return The number of arguments that entry type is required to have.
- * @throws InvalidCatalogEntryTypeException if no entry has the
- * specified name.
+ * @throws CatalogException for any error
*/
public static int getEntryArgCount(String name)
throws CatalogException {
@@ -160,7 +159,7 @@
*
* @param type A valid catalog entry type.
* @return The number of arguments that entry type is required to have.
- * @throws InvalidCatalogEntryTypeException if the type is invalid.
+ * @throws CatalogException for any error
*/
public static int getEntryArgCount(int type)
throws CatalogException {
@@ -188,10 +187,7 @@
*
* @param name The name of the entry type
* @param args A String Vector of arguments
- * @throws InvalidCatalogEntryTypeException if no such entry type
- * exists.
- * @throws InvalidCatalogEntryException if the wrong number of arguments
- * is passed.
+ * @throws CatalogException for any error
*/
public CatalogEntry(String name, Vector args)
throws CatalogException {
@@ -219,12 +215,9 @@
/**
* Construct a catalog entry of the specified type.
*
- * @param name The name of the entry type
+ * @param type
* @param args A String Vector of arguments
- * @throws InvalidCatalogEntryTypeException if no such entry type
- * exists.
- * @throws InvalidCatalogEntryException if the wrong number of arguments
- * is passed.
+ * @throws CatalogException for any error
*/
public CatalogEntry(int type, Vector args)
throws CatalogException {
@@ -276,6 +269,7 @@
* Catalog entries should not mutate over time.</p>
*
* @param argNum The argument number (arguments are numbered from 0).
+ * @param newspec
* @throws ArrayIndexOutOfBoundsException if an invalid argument
* number is provided.
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogException.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogException.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogException.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -70,6 +70,8 @@
* @version 1.0
*/
public class CatalogException extends Exception {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
/** A wrapper around another exception */
public static final int WRAPPER = 1;
/** An invalid entry */
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogManager.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogManager.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/CatalogManager.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -158,6 +158,7 @@
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class CatalogManager {
private static String pFiles = "xml.catalog.files";
private static String pVerbosity = "xml.catalog.verbosity";
@@ -249,7 +250,8 @@
// to avoid it.
}
- /** Constructor that specifies an explicit property file. */
+ /** Constructor that specifies an explicit property file.
+ * @param propertyFile */
public CatalogManager(String propertyFile) {
this.propertyFile = propertyFile;
@@ -261,12 +263,13 @@
// to avoid it.
}
- /** Set the bootstrap resolver.*/
+ /** Set the bootstrap resolver.
+ * @param resolver */
public void setBootstrapResolver(BootstrapResolver resolver) {
bResolver = resolver;
}
- /** Get the bootstrap resolver.*/
+ /** @return the bootstrap resolver.*/
public BootstrapResolver getBootstrapResolver() {
return bResolver;
}
@@ -316,6 +319,7 @@
/**
* Allow access to the static CatalogManager
+ * @return the catalog manager
*/
public static CatalogManager getStaticManager() {
return staticManager;
@@ -327,6 +331,7 @@
* <p>If true, missing or unreadable property files will
* not be reported. Otherwise, a message will be sent to System.err.
* </p>
+ * @return the value
*/
public boolean getIgnoreMissingProperties() {
return ignoreMissingProperties;
@@ -338,6 +343,7 @@
* <p>If ignore is true, missing or unreadable property files will
* not be reported. Otherwise, a message will be sent to System.err.
* </p>
+ * @param ignore
*/
public void setIgnoreMissingProperties(boolean ignore) {
ignoreMissingProperties = ignore;
@@ -349,6 +355,7 @@
* <p>If ignore is true, missing or unreadable property files will
* not be reported. Otherwise, a message will be sent to System.err.
* </p>
+ * @param ignore
*
* @deprecated No longer static; use get/set methods.
*/
@@ -385,7 +392,7 @@
}
/**
- * What is the current verbosity?
+ * @return the current verbosity?
*/
public int getVerbosity() {
if (verbosity == null) {
@@ -397,6 +404,7 @@
/**
* Set the current verbosity.
+ * @param verbosity
*/
public void setVerbosity (int verbosity) {
this.verbosity = new Integer(verbosity);
@@ -404,7 +412,7 @@
}
/**
- * What is the current verbosity?
+ * @return the current verbosity?
*
* @deprecated No longer static; use get/set methods.
*/
@@ -463,10 +471,8 @@
/**
* Set the relativeCatalogs setting.
+ * @param relative
*
- * @return The relativeCatalogs setting from the propertyFile or the
- * defaultRelativeCatalogs.
- *
* @see #getRelativeCatalogs()
*/
public void setRelativeCatalogs (boolean relative) {
@@ -474,7 +480,7 @@
}
/**
- * Get the relativeCatalogs setting.
+ * @return the relativeCatalogs setting.
*
* @deprecated No longer static; use get/set methods.
*/
@@ -545,6 +551,7 @@
/**
* Set the list of catalog files.
+ * @param fileList
*/
public void setCatalogFiles(String fileList) {
catalogFiles = fileList;
@@ -606,8 +613,7 @@
/**
* Set the prefer public setting.
- *
- * @return True if public identifiers are preferred.
+ * @param preferPublic
*/
public void setPreferPublic (boolean preferPublic) {
this.preferPublic = new Boolean(preferPublic);
@@ -656,7 +662,7 @@
}
/**
- * Get the current use static catalog setting.
+ * @return the current use static catalog setting.
*/
public boolean getUseStaticCatalog() {
if (useStaticCatalog == null) {
@@ -668,13 +674,14 @@
/**
* Set the use static catalog setting.
+ * @param useStatic
*/
public void setUseStaticCatalog(boolean useStatic) {
useStaticCatalog = new Boolean(useStatic);
}
/**
- * Get the current use static catalog setting.
+ * @return the current use static catalog setting.
*
* @deprecated No longer static; use get/set methods.
*/
@@ -683,7 +690,7 @@
}
/**
- * Get a new catalog instance.
+ * @return a new catalog instance.
*
* This method always returns a new instance of the underlying catalog class.
*/
@@ -712,7 +719,7 @@
} catch (ClassCastException cnfe) {
debug.message(1,"Class named '"
+ catalogClassName
- + "' is not a Catalog. Using default.");
+ + "' is not a Catalog. Using default.");
catalog = new Catalog();
}
}
@@ -733,7 +740,7 @@
}
/**
- * Get a catalog instance.
+ * @return a catalog instance.
*
* If this manager uses static catalogs, the same static catalog will
* always be returned. Otherwise a new catalog will be returned.
@@ -787,7 +794,7 @@
}
/**
- * Get the current XML Catalog PI setting.
+ * @return the current XML Catalog PI setting.
*/
public boolean getAllowOasisXMLCatalogPI () {
if (oasisXMLCatalogPI == null) {
@@ -799,13 +806,14 @@
/**
* Set the XML Catalog PI setting
+ * @param allowPI
*/
public void setAllowOasisXMLCatalogPI(boolean allowPI) {
oasisXMLCatalogPI = new Boolean(allowPI);
}
/**
- * Get the current XML Catalog PI setting.
+ * @return the current XML Catalog PI setting.
*
* @deprecated No longer static; use get/set methods.
*/
@@ -815,6 +823,7 @@
/**
* Obtain the Catalog class name setting from the properties.
+ * @return the name
*
*/
public String queryCatalogClassName () {
@@ -834,7 +843,7 @@
}
/**
- * Get the current Catalog class name.
+ * @return the current Catalog class name.
*/
public String getCatalogClassName() {
if (catalogClassName == null) {
@@ -846,13 +855,14 @@
/**
* Set the Catalog class name.
+ * @param className
*/
public void setCatalogClassName(String className) {
catalogClassName = className;
}
/**
- * Get the current Catalog class name.
+ * @return the current Catalog class name.
*
* @deprecated No longer static; use get/set methods.
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Resolver.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Resolver.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/Resolver.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,23 +56,22 @@
package org.jboss.util.xml.catalog;
+import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileNotFoundException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.Enumeration;
import java.util.Vector;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
+import javax.xml.parsers.SAXParserFactory;
+
import org.jboss.util.xml.catalog.readers.ExtendedXMLCatalogReader;
import org.jboss.util.xml.catalog.readers.OASISXMLCatalogReader;
import org.jboss.util.xml.catalog.readers.SAXCatalogReader;
import org.jboss.util.xml.catalog.readers.TR9401CatalogReader;
import org.jboss.util.xml.catalog.readers.XCatalogReader;
-import javax.xml.parsers.SAXParserFactory;
-
/**
* An extension to OASIS Open Catalog files, this class supports
* suffix-based matching and an external RFC2483 resolver.
@@ -84,6 +83,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class Resolver extends Catalog {
/**
* The URISUFFIX Catalog Entry type.
@@ -121,6 +121,7 @@
/**
* Setup readers.
*/
+ @SuppressWarnings("deprecation")
public void setupReaders() {
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
@@ -351,6 +352,8 @@
* @param resolver The name of the resolver to use.
*
* @return The system identifier to use for the systemId.
+ * @throws MalformedURLException
+ * @throws IOException
*/
protected String resolveExternalSystem(String systemId, String resolver)
throws MalformedURLException, IOException {
@@ -368,6 +371,8 @@
* @param publicId The system ID to locate.
* @param resolver The name of the resolver to use.
*
+ * @throws MalformedURLException
+ * @throws IOException
* @return The system identifier to use for the systemId.
*/
protected String resolveExternalPublic(String publicId, String resolver)
@@ -394,11 +399,9 @@
String command,
String arg1,
String arg2) {
- InputStream iStream = null;
String RFC2483 = resolver + "?command=" + command
+ "&format=tr9401&uri=" + arg1
+ "&uri2=" + arg2;
- String line = null;
try {
URL url = new URL(RFC2483);
@@ -457,6 +460,8 @@
*
* @param systemId The system ID to locate.
*
+ * @throws MalformedURLException
+ * @throws IOException
* @return A vector of URNs that map to the systemId.
*/
public Vector resolveAllSystemReverse(String systemId)
@@ -483,6 +488,8 @@
*
* @param systemId The system ID to locate.
*
+ * @throws MalformedURLException
+ * @throws IOException
* @return A (single) URN that maps to the systemId.
*/
public String resolveSystemReverse(String systemId)
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/BootstrapResolver.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/BootstrapResolver.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/BootstrapResolver.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -86,6 +86,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class BootstrapResolver implements EntityResolver, URIResolver {
/** URI of the W3C XML Schema for OASIS XML Catalog files. */
public static final String xmlCatalogXSD = "http://www.oasis-open.org/committees/entity/release/1.0/catalog.xsd";
@@ -172,11 +173,9 @@
throws TransformerException {
String uri = href;
- String fragment = null;
int hashPos = href.indexOf("#");
if (hashPos >= 0) {
uri = href.substring(0, hashPos);
- fragment = href.substring(hashPos+1);
}
String result = null;
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/Debug.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/Debug.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/Debug.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -77,12 +77,13 @@
// nop
}
- /** Set the debug level for future messages. */
+ /** Set the debug level for future messages.
+ * @param newDebug */
public void setDebug(int newDebug) {
debug = newDebug;
}
- /** Get the current debug level. */
+ /** @return the current debug level. */
public int getDebug() {
return debug;
}
@@ -111,7 +112,7 @@
*
* @param level The debug level of this message. This message
* will only be
- * displayed if the current debug level is at least equal to this
+ * displayd if the current debug level is at least equal to this
* value.
* @param message The text of the message.
* @param spec An argument to the message.
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/PublicId.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/PublicId.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/helpers/PublicId.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -140,7 +140,7 @@
* <p>This method is declared static so that other classes
* can use it directly.</p>
*
- * @param publicId The unnormalized public identifier.
+ * @param urn The unnormalized public identifier.
*
* @return The normalized identifier.
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/CatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/CatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/CatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -90,10 +90,7 @@
* @throws MalformedURLException if the specified URL cannot be
* turned into a URL object.
* @throws IOException if the URL cannot be read.
- * @throws UnknownCatalogFormatException if the catalog format is
- * not recognized.
- * @throws UnparseableCatalogException if the catalog cannot be parsed.
- * (For example, if it is supposed to be XML and isn't well-formed.)
+ * @throws CatalogException for any error
*/
public void readCatalog(Catalog catalog, String fileUrl)
throws MalformedURLException, IOException, CatalogException;
@@ -106,10 +103,7 @@
* @param catalog The catalog for which this reader is called.
* @param is The input stream that is to be read.
* @throws IOException if the URL cannot be read.
- * @throws UnknownCatalogFormatException if the catalog format is
- * not recognized.
- * @throws UnparseableCatalogException if the catalog cannot be parsed.
- * (For example, if it is supposed to be XML and isn't well-formed.)
+ * @throws CatalogException for any error
*/
public void readCatalog(Catalog catalog, InputStream is)
throws IOException, CatalogException;
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/DOMCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/DOMCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/DOMCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -106,6 +106,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class DOMCatalogReader implements CatalogReader {
/**
* Mapping table from QNames to CatalogParser classes.
@@ -181,9 +182,6 @@
* @param catalog The catalog for which this reader is called.
* @param is The input stream that is to be read.
* @throws IOException if the URL cannot be read.
- * @throws UnknownCatalogFormatException if the catalog format is
- * not recognized.
- * @throws UnparseableCatalogException if the catalog cannot be parsed.
* (For example, if it is supposed to be XML and isn't well-formed or
* if the parser class cannot be instantiated.)
*/
@@ -266,10 +264,6 @@
* @throws MalformedURLException if the specified URL cannot be
* turned into a URL object.
* @throws IOException if the URL cannot be read.
- * @throws UnknownCatalogFormatException if the catalog format is
- * not recognized.
- * @throws UnparseableCatalogException if the catalog cannot be parsed.
- * (For example, if it is supposed to be XML and isn't well-formed.)
*/
public void readCatalog(Catalog catalog, String fileUrl)
throws MalformedURLException, IOException, CatalogException {
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/ExtendedXMLCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/ExtendedXMLCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/ExtendedXMLCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -62,10 +62,9 @@
import org.jboss.util.xml.catalog.CatalogEntry;
import org.jboss.util.xml.catalog.CatalogException;
import org.jboss.util.xml.catalog.Resolver;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-
/**
* Parse Extended OASIS Entity Resolution Technical Committee
* XML Catalog files.
@@ -77,6 +76,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class ExtendedXMLCatalogReader extends OASISXMLCatalogReader {
/** The namespace name of extended catalog elements */
public static final String extendedNamespaceName = "http://nwalsh.com/xcatalog/1.0";
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/OASISXMLCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/OASISXMLCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/OASISXMLCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,17 +56,18 @@
package org.jboss.util.xml.catalog.readers;
+import java.util.Enumeration;
import java.util.Stack;
import java.util.Vector;
-import java.util.Enumeration;
+
import org.jboss.util.xml.catalog.Catalog;
import org.jboss.util.xml.catalog.CatalogEntry;
import org.jboss.util.xml.catalog.CatalogException;
import org.jboss.util.xml.catalog.helpers.PublicId;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-
/**
* Parse OASIS Entity Resolution Technical Committee
* XML Catalog files.
@@ -78,6 +79,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class OASISXMLCatalogReader extends SAXCatalogReader implements SAXCatalogParser {
/** The catalog object needs to be stored by the object so that
* SAX callbacks can use it.
@@ -100,7 +102,7 @@
debug = catalog.getCatalogManager().debug;
}
- /** Get the current catalog. */
+ /** @return the current catalog. */
public Catalog getCatalog () {
return catalog;
}
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogParser.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogParser.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogParser.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -73,7 +73,9 @@
*
* @version 1.0
*/
+ at SuppressWarnings("deprecation")
public interface SAXCatalogParser extends ContentHandler, DocumentHandler {
- /** Set the Catalog for which parsing is being performed. */
+ /** Set the Catalog for which parsing is being performed.
+ * @param catalog */
public void setCatalog(Catalog catalog);
}
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/SAXCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -113,6 +113,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings({"unchecked", "deprecation"})
public class SAXCatalogReader implements CatalogReader, ContentHandler, DocumentHandler {
/** The SAX Parser Factory */
protected SAXParserFactory parserFactory = null;
@@ -141,23 +142,25 @@
private Catalog catalog;
/** Set the XML SAX Parser Factory.
+ * @param parserFactory
*/
public void setParserFactory(SAXParserFactory parserFactory) {
this.parserFactory = parserFactory;
}
/** Set the XML SAX Parser Class
+ * @param parserClass
*/
public void setParserClass(String parserClass) {
this.parserClass = parserClass;
}
- /** Get the parser factory currently in use. */
+ /** @return the parser factory currently in use. */
public SAXParserFactory getParserFactory() {
return parserFactory;
}
- /** Get the parser class currently in use. */
+ /** @return the parser class currently in use. */
public String getParserClass() {
return parserClass;
}
@@ -179,18 +182,23 @@
parserClass = null;
}
- /** The constructor */
+ /** The constructor
+ * @param parserFactory */
public SAXCatalogReader(SAXParserFactory parserFactory) {
this.parserFactory = parserFactory;
}
- /** The constructor */
+ /** The constructor
+ * @param parserClass */
public SAXCatalogReader(String parserClass) {
this.parserClass = parserClass;
}
/** Set the SAXCatalogParser class for the given namespace/root
* element type.
+ * @param namespaceURI
+ * @param rootElement
+ * @param parserClass
*/
public void setCatalogParser(String namespaceURI,
String rootElement,
@@ -204,6 +212,9 @@
/** Get the SAXCatalogParser class for the given namespace/root
* element type.
+ * @param namespaceURI
+ * @param rootElement
+ * @return the catalog parser
*/
public String getCatalogParser(String namespaceURI,
String rootElement) {
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TR9401CatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TR9401CatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TR9401CatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -53,7 +53,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.jboss.util.xml.catalog.readers;
import java.io.InputStream;
@@ -86,6 +85,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class TR9401CatalogReader extends TextCatalogReader {
/**
@@ -97,8 +97,6 @@
* identifiers. There is no delegate entry for system identifiers
* or URIs.</p>
*
- * @param fileUrl The URL or filename of the catalog file to process
- *
* @throws MalformedURLException Improper fileUrl
* @throws IOException Error reading catalog file
*/
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TextCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TextCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/TextCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -81,6 +81,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class TextCatalogReader implements CatalogReader {
/** The input stream used to read the catalog */
protected InputStream catfile = null;
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/XCatalogReader.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/XCatalogReader.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/catalog/readers/XCatalogReader.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -77,6 +77,7 @@
*
* @version 1.0
*/
+ at SuppressWarnings("unchecked")
public class XCatalogReader extends SAXCatalogReader implements SAXCatalogParser {
/** The catalog object needs to be stored by the object so that
* SAX callbacks can use it.
@@ -88,12 +89,13 @@
this.catalog = catalog;
}
- /** Get the current catalog. */
+ /** @return the current catalog. */
public Catalog getCatalog () {
return catalog;
}
- /** The constructor */
+ /** The constructor
+ * @param parserFactory */
public XCatalogReader(SAXParserFactory parserFactory) {
super(parserFactory);
}
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/ClassesUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/ClassesUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/ClassesUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -17,17 +17,17 @@
{
public void testGetAllInterfaces()
{
- List list = new ArrayList();
+ List<Class<?>> list = new ArrayList<Class<?>>();
Classes.getAllInterfaces(list, ExtendedClass.class);
assertEquals(3, list.size());
- assertEquals(Interface1.class, (java.lang.Class)list.get(0));
- assertEquals(Interface1.class, (java.lang.Class)list.get(1));
- assertEquals(Interface2.class, (java.lang.Class)list.get(2));
+ assertEquals(Interface1.class, list.get(0));
+ assertEquals(Interface1.class, list.get(1));
+ assertEquals(Interface2.class, list.get(2));
}
public void testGetAllUniqueInterfaces()
{
- Class[] interfaces = Classes.getAllUniqueInterfaces(ExtendedClass.class);
+ Class<?>[] interfaces = Classes.getAllUniqueInterfaces(ExtendedClass.class);
assertEquals(2, interfaces.length);
}
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/collection/WeakSetUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/collection/WeakSetUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/collection/WeakSetUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -12,6 +12,7 @@
* @author <a href="mailto:sven at meiers.net">Sven Meier</a>
* @version $Revision: 43534 $
*/
+ at SuppressWarnings("unchecked")
public class WeakSetUnitTestCase extends TestCase
{
public void testNullElement()
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolRunnableUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolRunnableUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolRunnableUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -40,6 +40,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class ThreadPoolRunnableUnitTestCase extends TestCase
{
private static Logger log = Logger.getLogger(ThreadPoolRunnableUnitTestCase.class);
@@ -72,9 +73,6 @@
super(name);
}
- /**
- * Basic test
- */
public void testBasic() throws Exception
{
log.debug("testBasic");
@@ -92,9 +90,6 @@
}
}
- /**
- * Multiple Basic test
- */
public void testMultipleBasic() throws Exception
{
log.debug("testMultipleBasic");
@@ -114,9 +109,6 @@
}
}
- /**
- * Test pooling
- */
public void testSimplePooling() throws Exception
{
log.debug("testSimplePooling");
@@ -136,9 +128,6 @@
}
}
- /**
- * Test multiple pooling
- */
public void testMultiplePooling() throws Exception
{
log.debug("testMultiplePooling");
@@ -159,9 +148,6 @@
}
}
- /**
- * Test maximum pool
- */
public void testMaximumPool() throws Exception
{
log.debug("testMaximumPool");
@@ -184,9 +170,6 @@
}
}
- /**
- * Test maximum cache
- */
public void testMaximumQueue() throws Exception
{
log.debug("testMaximumQueue");
@@ -220,9 +203,6 @@
}
}
- /**
- * Test runnable timeouts
- */
public void testRunnableTimeout() throws Exception
{
log.debug("testRunnableTimeout");
@@ -244,9 +224,6 @@
}
}
- /**
- * Test runnable timeouts
- */
public void testRunnableTimeoutWithSpinLoop() throws Exception
{
log.debug("testRunnableTimeoutWithSpinLoop");
@@ -273,9 +250,6 @@
}
}
- /**
- * Test runnable timeouts
- */
public void testRunnableTimeoutWithSpinLoop2() throws Exception
{
log.debug("testRunnableTimeoutWithSpinLoop2");
@@ -315,9 +289,6 @@
threadNames.put(data, name);
}
- /**
- * Wait for expected starts
- */
public synchronized void waitStarted(int target)
throws InterruptedException
{
@@ -338,9 +309,6 @@
notifyAll();
}
- /**
- * Wait for release started
- */
public synchronized void waitForReleaseStarted(String data)
{
try
@@ -354,9 +322,6 @@
}
}
- /**
- * Notify started
- */
public synchronized void notifyStarted(String data)
{
log.info("notifyStarted, data="+data);
@@ -373,9 +338,6 @@
startedRunnables.clear();
}
- /**
- * Wait for expected finishes
- */
public synchronized void waitFinished(int target)
throws InterruptedException
{
@@ -384,9 +346,6 @@
wait();
}
- /**
- * Notify finished
- */
public synchronized void notifyFinished(String data)
{
log.info("notifyFinished, data="+data);
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolTaskUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolTaskUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/concurrent/ThreadPoolTaskUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -38,6 +38,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class ThreadPoolTaskUnitTestCase extends TestCase
{
private static Logger log = Logger.getLogger(ThreadPoolTaskUnitTestCase.class);
@@ -86,9 +87,6 @@
log.debug("=====> Stopping test: " + getName());
}
- /**
- * Basic test
- */
public void testBasic() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -107,9 +105,6 @@
}
}
- /**
- * Multiple Basic test
- */
public void testMultipleBasic() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -130,9 +125,6 @@
}
}
- /**
- * Test pooling
- */
public void testSimplePooling() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -151,9 +143,6 @@
}
}
- /**
- * Test multiple pooling
- */
public void testMultiplePooling() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -173,9 +162,6 @@
}
}
- /**
- * Test maximum pool
- */
public void testMaximumPool() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -197,9 +183,6 @@
}
}
- /**
- * Test maximum cache
- */
public void testMaximumQueue() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -224,9 +207,6 @@
}
}
- /**
- * Test maximum cache
- */
public void testCompleteTimeout() throws Exception
{
BasicThreadPool pool = new BasicThreadPool();
@@ -484,9 +464,6 @@
this.name = name;
}
- /**
- * Wait for expected
- */
public void wait(int target)
throws InterruptedException
{
@@ -515,9 +492,6 @@
}
}
- /**
- * Wait for release
- */
public void waitForRelease(String data)
{
log.debug(Thread.currentThread().getName() + ": Waiting for release " + name + " data=" + data);
@@ -535,9 +509,6 @@
}
}
- /**
- * Notify
- */
public void notify(String data)
{
log.debug(Thread.currentThread().getName() + ": Notifying " + name + " data=" + data);
@@ -549,9 +520,6 @@
}
}
- /**
- * Notify
- */
public void notify(String data, long time)
{
log.debug(Thread.currentThread().getName() + ": Notifying " + name + " data=" + data + " time=" + time);
@@ -564,9 +532,6 @@
log.debug(Thread.currentThread().getName() + ": Notified " + name + " data=" + data + " time=" + time);
}
- /**
- * Notify
- */
public void notify(String data, long time, Throwable throwable)
{
if (throwable != null)
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -37,6 +37,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class GraphTestCase extends TestCase
{
Vertex<String> a = new Vertex<String>("A", "x.ear");
@@ -74,9 +75,6 @@
System.out.println("visit "+v.getName());
order.add(v);
}
- public void visit(Graph g, Vertex v, Edge e)
- {
- }
};
graph.depthFirstSearch(a, visitor);
@@ -113,9 +111,6 @@
System.out.println("visit "+v.getName());
order.add(v);
}
- public void visit(Graph g, Vertex v, Edge e)
- {
- }
};
graph.breadthFirstSearch(a, visitor);
@@ -123,14 +118,14 @@
// Validate the expected order and visited state
for(int n = 0; n < order.size(); n ++)
{
- Vertex v = (Vertex) order.get(n);
+ Vertex v = order.get(n);
System.out.println(v);
assertTrue(v.getName()+" is visited", v.visited());
}
String[] names = {"A", "B", "F", "C", "G", "E", "I", "H"};
for(int n = 0; n < order.size(); n ++)
{
- Vertex v = (Vertex) order.get(n);
+ Vertex v = order.get(n);
assertTrue("#"+n+" is "+names[n]+"("+v.getName()+")",
v.getName().equals(names[n]));
}
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ConstructorTCCLClassLoaderSourceUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ConstructorTCCLClassLoaderSourceUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ConstructorTCCLClassLoaderSourceUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -24,7 +24,6 @@
import org.jboss.util.loading.ClassLoaderSource;
import org.jboss.util.loading.ConstructorTCCLClassLoaderSource;
-import org.jboss.util.loading.MyClassLoaderClassLoaderSource;
/**
* Unit tests of {@link ConstructorTCCLClassLoaderSource}.
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/propertyeditor/PropertyEditorsUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/propertyeditor/PropertyEditorsUnitTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/propertyeditor/PropertyEditorsUnitTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -56,6 +56,7 @@
* @author Dimitris.Andreadis at jboss.org
* @version $Revision: 43534 $
*/
+ at SuppressWarnings("unchecked")
public class PropertyEditorsUnitTestCase extends TestCase
{
private static Logger log = Logger.getLogger(PropertyEditorsUnitTestCase.class);
@@ -88,8 +89,8 @@
{
public int compare(Object o1, Object o2)
{
- Class[] a1 = (Class[]) o1;
- Class[] a2 = (Class[]) o2;
+ Class<?>[] a1 = (Class[]) o1;
+ Class<?>[] a2 = (Class[]) o2;
int compare = a1.length - a2.length;
for(int n = 0; n < a1.length; n ++)
{
@@ -136,6 +137,7 @@
/** The mechanism for mapping java.lang.* variants of the primative types
misses editors for java.lang.Boolean and java.lang.Integer. Here we test
the java.lang.* variants we expect editors for.
+ * @throws Exception
**/
public void testJavaLangEditors()
throws Exception
@@ -195,7 +197,8 @@
}
/** Test custom JBoss property editors.
- **/
+ * @throws Exception
+ */
public void testJBossEditors()
throws Exception
{
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java 2008-03-31 15:34:37 UTC (rev 2786)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java 2008-03-31 17:55:30 UTC (rev 2787)
@@ -2,9 +2,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectStreamClass;
-
import java.util.Arrays;
import junit.framework.TestCase;
More information about the jboss-svn-commits
mailing list