| @@ -362,7 +362,7 @@ public final class SortFilter extends BaseParamFilterReader | |||||
| if (reverse) { | if (reverse) { | ||||
| Collections.sort(lines, new Comparator<String>() { | Collections.sort(lines, new Comparator<String>() { | ||||
| public int compare(String s1, String s2) { | public int compare(String s1, String s2) { | ||||
| return (-s1.compareTo(s2)); | |||||
| return (-s1.compareTo(s2)); //NOSONAR | |||||
| } | } | ||||
| }); | }); | ||||
| } else { | } else { | ||||
| @@ -151,7 +151,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver { | |||||
| + " is not declared static"); | + " is not declared static"); | ||||
| } | } | ||||
| if (timeout == null) { | if (timeout == null) { | ||||
| run(); | |||||
| run(); //NOSONAR | |||||
| } else { | } else { | ||||
| thread = new Thread(this, "ExecuteJava"); | thread = new Thread(this, "ExecuteJava"); | ||||
| Task currentThreadTask | Task currentThreadTask | ||||
| @@ -1066,7 +1066,7 @@ public class Manifest { | |||||
| try { | try { | ||||
| write(new PrintWriter(sw)); | write(new PrintWriter(sw)); | ||||
| } catch (IOException e) { | } catch (IOException e) { | ||||
| return null; | |||||
| return ""; | |||||
| } | } | ||||
| return sw.toString(); | return sw.toString(); | ||||
| } | } | ||||
| @@ -216,7 +216,7 @@ public abstract class ArchiveResource extends Resource { | |||||
| if (isReference()) { | if (isReference()) { | ||||
| return getCheckedRef().equals(another); | return getCheckedRef().equals(another); | ||||
| } | } | ||||
| if (another == null || !(another.getClass().equals(getClass()))) { | |||||
| if (another == null || another.getClass() != getClass()) { | |||||
| return false; | return false; | ||||
| } | } | ||||
| ArchiveResource r = (ArchiveResource) another; | ArchiveResource r = (ArchiveResource) another; | ||||
| @@ -95,7 +95,7 @@ public class MappedResource extends ResourceDecorator { | |||||
| */ | */ | ||||
| @Override | @Override | ||||
| public boolean equals(Object other) { | public boolean equals(Object other) { | ||||
| if (other == null || !other.getClass().equals(getClass())) { | |||||
| if (other == null || other.getClass() != getClass()) { | |||||
| return false; | return false; | ||||
| } | } | ||||
| MappedResource m = (MappedResource) other; | MappedResource m = (MappedResource) other; | ||||
| @@ -74,6 +74,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * Get the name of the resource. | * Get the name of the resource. | ||||
| * @return the name of the wrapped resource. | * @return the name of the wrapped resource. | ||||
| */ | */ | ||||
| @Override | |||||
| public String getName() { | public String getName() { | ||||
| return getResource().getName(); | return getResource().getName(); | ||||
| } | } | ||||
| @@ -82,6 +83,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * The exists attribute tells whether a file exists. | * The exists attribute tells whether a file exists. | ||||
| * @return true if this resource exists. | * @return true if this resource exists. | ||||
| */ | */ | ||||
| @Override | |||||
| public boolean isExists() { | public boolean isExists() { | ||||
| return getResource().isExists(); | return getResource().isExists(); | ||||
| } | } | ||||
| @@ -92,6 +94,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * @return 0 if the resource does not exist to mirror the behavior | * @return 0 if the resource does not exist to mirror the behavior | ||||
| * of {@link java.io.File File}. | * of {@link java.io.File File}. | ||||
| */ | */ | ||||
| @Override | |||||
| public long getLastModified() { | public long getLastModified() { | ||||
| return getResource().getLastModified(); | return getResource().getLastModified(); | ||||
| } | } | ||||
| @@ -100,6 +103,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * Tells if the resource is a directory. | * Tells if the resource is a directory. | ||||
| * @return boolean flag indicating if the resource is a directory. | * @return boolean flag indicating if the resource is a directory. | ||||
| */ | */ | ||||
| @Override | |||||
| public boolean isDirectory() { | public boolean isDirectory() { | ||||
| return getResource().isDirectory(); | return getResource().isDirectory(); | ||||
| } | } | ||||
| @@ -109,6 +113,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * @return the size, as a long, 0 if the Resource does not exist (for | * @return the size, as a long, 0 if the Resource does not exist (for | ||||
| * compatibility with java.io.File), or UNKNOWN_SIZE if not known. | * compatibility with java.io.File), or UNKNOWN_SIZE if not known. | ||||
| */ | */ | ||||
| @Override | |||||
| public long getSize() { | public long getSize() { | ||||
| return getResource().getSize(); | return getResource().getSize(); | ||||
| } | } | ||||
| @@ -121,6 +126,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * @throws UnsupportedOperationException if InputStreams are not | * @throws UnsupportedOperationException if InputStreams are not | ||||
| * supported for this Resource type. | * supported for this Resource type. | ||||
| */ | */ | ||||
| @Override | |||||
| public InputStream getInputStream() throws IOException { | public InputStream getInputStream() throws IOException { | ||||
| return getResource().getInputStream(); | return getResource().getInputStream(); | ||||
| } | } | ||||
| @@ -133,6 +139,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * @throws UnsupportedOperationException if OutputStreams are not | * @throws UnsupportedOperationException if OutputStreams are not | ||||
| * supported for this Resource type. | * supported for this Resource type. | ||||
| */ | */ | ||||
| @Override | |||||
| public OutputStream getOutputStream() throws IOException { | public OutputStream getOutputStream() throws IOException { | ||||
| return getResource().getOutputStream(); | return getResource().getOutputStream(); | ||||
| } | } | ||||
| @@ -141,6 +148,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * Fulfill the ResourceCollection contract. | * Fulfill the ResourceCollection contract. | ||||
| * @return whether this Resource is a FileProvider. | * @return whether this Resource is a FileProvider. | ||||
| */ | */ | ||||
| @Override | |||||
| public boolean isFilesystemOnly() { | public boolean isFilesystemOnly() { | ||||
| return as(FileProvider.class) != null; | return as(FileProvider.class) != null; | ||||
| } | } | ||||
| @@ -149,6 +157,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * Overrides the base version. | * Overrides the base version. | ||||
| * @param r the Reference to set. | * @param r the Reference to set. | ||||
| */ | */ | ||||
| @Override | |||||
| public void setRefid(Reference r) { | public void setRefid(Reference r) { | ||||
| if (resource != null) { | if (resource != null) { | ||||
| throw noChildrenAllowed(); | throw noChildrenAllowed(); | ||||
| @@ -159,6 +168,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| /** | /** | ||||
| * {@inheritDoc} | * {@inheritDoc} | ||||
| */ | */ | ||||
| @Override | |||||
| public <T> T as(Class<T> clazz) { | public <T> T as(Class<T> clazz) { | ||||
| return getResource().as(clazz); | return getResource().as(clazz); | ||||
| } | } | ||||
| @@ -166,6 +176,7 @@ public abstract class ResourceDecorator extends Resource { | |||||
| /** | /** | ||||
| * {@inheritDoc} | * {@inheritDoc} | ||||
| */ | */ | ||||
| @Override | |||||
| public int compareTo(Resource other) { | public int compareTo(Resource other) { | ||||
| if (other == this) { | if (other == this) { | ||||
| return 0; | return 0; | ||||
| @@ -181,7 +192,9 @@ public abstract class ResourceDecorator extends Resource { | |||||
| * Get the hash code for this Resource. | * Get the hash code for this Resource. | ||||
| * @return hash code as int. | * @return hash code as int. | ||||
| */ | */ | ||||
| public int hashCode() { | |||||
| @Override | |||||
| public int hashCode() { // NOSONAR | |||||
| // super.equals + compareTo are consistent with this implementation | |||||
| return (getClass().hashCode() << 4) | getResource().hashCode(); | return (getClass().hashCode() << 4) | getResource().hashCode(); | ||||
| } | } | ||||
| @@ -267,4 +280,5 @@ public abstract class ResourceDecorator extends Resource { | |||||
| throw new BuildException("you can't change the size of a " | throw new BuildException("you can't change the size of a " | ||||
| + getDataTypeName()); | + getDataTypeName()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -71,6 +71,7 @@ public class StringResource extends Resource { | |||||
| * Enforce String immutability. | * Enforce String immutability. | ||||
| * @param s the new name/value for this StringResource. | * @param s the new name/value for this StringResource. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized void setName(String s) { | public synchronized void setName(String s) { | ||||
| if (getName() != null) { | if (getName() != null) { | ||||
| throw new BuildException(new ImmutableResourceException()); | throw new BuildException(new ImmutableResourceException()); | ||||
| @@ -90,6 +91,7 @@ public class StringResource extends Resource { | |||||
| * Synchronize access. | * Synchronize access. | ||||
| * @return the name/value of this StringResource. | * @return the name/value of this StringResource. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized String getName() { | public synchronized String getName() { | ||||
| return super.getName(); | return super.getName(); | ||||
| } | } | ||||
| @@ -107,6 +109,7 @@ public class StringResource extends Resource { | |||||
| * | * | ||||
| * @return true if this resource exists. | * @return true if this resource exists. | ||||
| */ | */ | ||||
| @Override | |||||
| public boolean isExists() { | public boolean isExists() { | ||||
| return getValue() != null; | return getValue() != null; | ||||
| } | } | ||||
| @@ -144,6 +147,7 @@ public class StringResource extends Resource { | |||||
| * @return the size, as a long, 0 if the Resource does not exist (for | * @return the size, as a long, 0 if the Resource does not exist (for | ||||
| * compatibility with java.io.File), or UNKNOWN_SIZE if not known. | * compatibility with java.io.File), or UNKNOWN_SIZE if not known. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized long getSize() { | public synchronized long getSize() { | ||||
| return isReference() ? ((Resource) getCheckedRef()).getSize() | return isReference() ? ((Resource) getCheckedRef()).getSize() | ||||
| : getContent().length(); | : getContent().length(); | ||||
| @@ -153,7 +157,9 @@ public class StringResource extends Resource { | |||||
| * Get the hash code for this Resource. | * Get the hash code for this Resource. | ||||
| * @return hash code as int. | * @return hash code as int. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized int hashCode() { | public synchronized int hashCode() { | ||||
| // super.equals + super.compareTo are consistent with this implementation | |||||
| if (isReference()) { | if (isReference()) { | ||||
| return getCheckedRef().hashCode(); | return getCheckedRef().hashCode(); | ||||
| } | } | ||||
| @@ -166,6 +172,7 @@ public class StringResource extends Resource { | |||||
| * @return the string contents of the resource. | * @return the string contents of the resource. | ||||
| * @since Ant 1.7 | * @since Ant 1.7 | ||||
| */ | */ | ||||
| @Override | |||||
| public String toString() { | public String toString() { | ||||
| return String.valueOf(getContent()); | return String.valueOf(getContent()); | ||||
| } | } | ||||
| @@ -178,6 +185,7 @@ public class StringResource extends Resource { | |||||
| * @throws UnsupportedOperationException if InputStreams are not | * @throws UnsupportedOperationException if InputStreams are not | ||||
| * supported for this Resource type. | * supported for this Resource type. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized InputStream getInputStream() throws IOException { | public synchronized InputStream getInputStream() throws IOException { | ||||
| if (isReference()) { | if (isReference()) { | ||||
| return ((Resource) getCheckedRef()).getInputStream(); | return ((Resource) getCheckedRef()).getInputStream(); | ||||
| @@ -198,6 +206,7 @@ public class StringResource extends Resource { | |||||
| * @throws UnsupportedOperationException if OutputStreams are not | * @throws UnsupportedOperationException if OutputStreams are not | ||||
| * supported for this Resource type. | * supported for this Resource type. | ||||
| */ | */ | ||||
| @Override | |||||
| public synchronized OutputStream getOutputStream() throws IOException { | public synchronized OutputStream getOutputStream() throws IOException { | ||||
| if (isReference()) { | if (isReference()) { | ||||
| return ((Resource) getCheckedRef()).getOutputStream(); | return ((Resource) getCheckedRef()).getOutputStream(); | ||||
| @@ -212,6 +221,7 @@ public class StringResource extends Resource { | |||||
| * Overrides the super version. | * Overrides the super version. | ||||
| * @param r the Reference to set. | * @param r the Reference to set. | ||||
| */ | */ | ||||
| @Override | |||||
| public void setRefid(Reference r) { | public void setRefid(Reference r) { | ||||
| if (encoding != DEFAULT_ENCODING) { | if (encoding != DEFAULT_ENCODING) { | ||||
| throw tooManyAttributes(); | throw tooManyAttributes(); | ||||
| @@ -250,6 +260,7 @@ public class StringResource extends Resource { | |||||
| baos = (ByteArrayOutputStream) out; | baos = (ByteArrayOutputStream) out; | ||||
| } | } | ||||
| @Override | |||||
| public void close() throws IOException { | public void close() throws IOException { | ||||
| super.close(); | super.close(); | ||||
| String result = encoding == null | String result = encoding == null | ||||
| @@ -313,7 +313,7 @@ public class URLResource extends Resource implements URLProvider { | |||||
| if (isReference()) { | if (isReference()) { | ||||
| return getCheckedRef().equals(another); | return getCheckedRef().equals(another); | ||||
| } | } | ||||
| if (another == null || !(another.getClass().equals(getClass()))) { | |||||
| if (another == null || another.getClass() != getClass()) { | |||||
| return false; | return false; | ||||
| } | } | ||||
| URLResource otheru = (URLResource) another; | URLResource otheru = (URLResource) another; | ||||
| @@ -72,7 +72,7 @@ public class ResourceUtils { | |||||
| */ | */ | ||||
| public static final String ISO_8859_1 = "ISO-8859-1"; | public static final String ISO_8859_1 = "ISO-8859-1"; | ||||
| private static final long MAX_IO_CHUNK_SIZE = 16*1024*1024; // 16 MB | |||||
| private static final long MAX_IO_CHUNK_SIZE = 16*1024*1024l; // 16 MB | |||||
| /** | /** | ||||
| * Tells which source files should be reprocessed based on the | * Tells which source files should be reprocessed based on the | ||||
| @@ -630,7 +630,7 @@ public class ResourceUtils { | |||||
| } | } | ||||
| expected = in1.readLine(); | expected = in1.readLine(); | ||||
| } | } | ||||
| return in2.readLine() == null ? 0 : -1; | |||||
| return in2.readLine() == null ? 0 : -1; //NOSONAR | |||||
| } finally { | } finally { | ||||
| FileUtils.close(in1); | FileUtils.close(in1); | ||||
| FileUtils.close(in2); | FileUtils.close(in2); | ||||
| @@ -975,7 +975,7 @@ class BlockSort { | |||||
| runningOrder[i] = i; | runningOrder[i] = i; | ||||
| } | } | ||||
| for (int h = 364; h != 1;) { | |||||
| for (int h = 364; h != 1;) { //NOSONAR | |||||
| h /= 3; | h /= 3; | ||||
| for (int i = h; i <= 255; i++) { | for (int i = h; i <= 255; i++) { | ||||
| final int vv = runningOrder[i]; | final int vv = runningOrder[i]; | ||||
| @@ -191,7 +191,7 @@ public class TarUtils { | |||||
| if (negative) { | if (negative) { | ||||
| // 2's complement | // 2's complement | ||||
| val--; | val--; | ||||
| val ^= (long) Math.pow(2, (length - 1) * 8) - 1; | |||||
| val ^= (long) Math.pow(2, (length - 1) * 8.0) - 1; | |||||
| } | } | ||||
| return negative ? -val : val; | return negative ? -val : val; | ||||
| } | } | ||||