[jsword-svn] r1029 - in trunk/javatar: .settings
src/main/java/com/ice/tar
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 5 05:00:41 MST 2006
Author: dmsmith
Date: 2006-03-05 05:00:31 -0700 (Sun, 05 Mar 2006)
New Revision: 1029
Modified:
trunk/javatar/.settings/org.eclipse.jdt.core.prefs
trunk/javatar/src/main/java/com/ice/tar/TarEntry.java
trunk/javatar/src/main/java/com/ice/tar/TarGzOutputStream.java
trunk/javatar/src/main/java/com/ice/tar/TarHeader.java
trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java
trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java
Log:
Updated to Java 5
Modified: trunk/javatar/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/javatar/.settings/org.eclipse.jdt.core.prefs 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/.settings/org.eclipse.jdt.core.prefs 2006-03-05 12:00:31 UTC (rev 1029)
@@ -1,4 +1,4 @@
-#Wed Mar 01 22:42:13 EST 2006
+#Sat Mar 04 11:22:32 EST 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -13,58 +13,58 @@
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
Modified: trunk/javatar/src/main/java/com/ice/tar/TarEntry.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarEntry.java 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/src/main/java/com/ice/tar/TarEntry.java 2006-03-05 12:00:31 UTC (rev 1029)
@@ -204,7 +204,8 @@
/**
* Clone the entry.
*/
- public Object clone()
+ @Override
+ public Object clone()
{
TarEntry entry = null;
@@ -880,6 +881,7 @@
hdr.devMinor = 0;
}
+ @Override
public String toString()
{
StringBuffer result = new StringBuffer(128);
Modified: trunk/javatar/src/main/java/com/ice/tar/TarGzOutputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarGzOutputStream.java 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/src/main/java/com/ice/tar/TarGzOutputStream.java 2006-03-05 12:00:31 UTC (rev 1029)
@@ -41,16 +41,19 @@
// proxy all methods, but buffer if unknown size
+ @Override
public void setDebug(boolean b)
{
this.tos.setDebug(b);
}
+ @Override
public void setBufferDebug(boolean b)
{
this.tos.setBufferDebug(b);
}
+ @Override
public void finish() throws IOException
{
if (this.currentEntry != null)
@@ -61,17 +64,20 @@
this.tos.finish();
}
+ @Override
public void close() throws IOException
{
this.tos.close();
this.gzip.finish();
}
+ @Override
public int getRecordSize()
{
return this.tos.getRecordSize();
}
+ @Override
public void putNextEntry(TarEntry entry) throws IOException
{
if (entry.getSize() != 0)
@@ -84,6 +90,7 @@
}
}
+ @Override
public void closeEntry() throws IOException
{
if (this.currentEntry == null)
@@ -101,6 +108,7 @@
}
}
+ @Override
public void write(int b) throws IOException
{
if (this.currentEntry == null)
@@ -113,6 +121,7 @@
}
}
+ @Override
public void write(byte[] b) throws IOException
{
if (this.currentEntry == null)
@@ -125,6 +134,7 @@
}
}
+ @Override
public void write(byte[] b, int start, int length) throws IOException
{
if (this.currentEntry == null)
Modified: trunk/javatar/src/main/java/com/ice/tar/TarHeader.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarHeader.java 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/src/main/java/com/ice/tar/TarHeader.java 2006-03-05 12:00:31 UTC (rev 1029)
@@ -207,6 +207,7 @@
/**
* TarHeaders can be cloned.
*/
+ @Override
public Object clone()
{
TarHeader hdr = null;
Modified: trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java 2006-03-05 12:00:31 UTC (rev 1029)
@@ -107,6 +107,7 @@
/**
* Closes this stream. Calls the TarBuffer's close() method.
*/
+ @Override
public void close() throws IOException
{
this.buffer.close();
@@ -132,6 +133,7 @@
*
* @return The number of available bytes for the current entry.
*/
+ @Override
public int available() throws IOException
{
return (int) (this.entrySize - this.entryOffset);
@@ -146,6 +148,7 @@
* @param numToSkip The number of bytes to skip.
* @return The actual number of bytes skipped.
*/
+ @Override
public long skip(long numToSkip) throws IOException
{
// REVIEW
@@ -173,6 +176,7 @@
*
* @return False.
*/
+ @Override
public boolean markSupported()
{
return false;
@@ -183,6 +187,7 @@
*
* @param markLimit The limit to mark.
*/
+ @Override
public void mark(int markLimit)
{
}
@@ -190,6 +195,7 @@
/**
* Since we do not support marking just yet, we do nothing.
*/
+ @Override
public void reset()
{
}
@@ -318,6 +324,7 @@
*
* @return The byte read, or -1 at EOF.
*/
+ @Override
public int read() throws IOException
{
int num = this.read(this.oneBuf, 0, 1);
@@ -337,6 +344,7 @@
* @param buf The buffer into which to place bytes read.
* @return The number of bytes read, or -1 at EOF.
*/
+ @Override
public int read(byte[] buf) throws IOException
{
return this.read(buf, 0, buf.length);
@@ -354,6 +362,7 @@
* @param numToRead The number of bytes to read.
* @return The number of bytes read, or -1 at EOF.
*/
+ @Override
public int read(byte[] buf, int offset, int numToRead) throws IOException
{
int totalRead = 0;
Modified: trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java 2006-03-05 11:57:25 UTC (rev 1028)
+++ trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java 2006-03-05 12:00:31 UTC (rev 1029)
@@ -104,6 +104,7 @@
* TarBuffer's close().
*/
+ @Override
public void close() throws IOException
{
this.finish();
@@ -195,6 +196,7 @@
*
* @param b The byte written.
*/
+ @Override
public void write(int b) throws IOException
{
this.oneBuf[0] = (byte) b;
@@ -208,6 +210,7 @@
*
* @param wBuf The buffer to write to the archive.
*/
+ @Override
public void write(byte[] wBuf) throws IOException
{
this.write(wBuf, 0, wBuf.length);
@@ -228,6 +231,7 @@
* @param wOffset The offset in the buffer from which to get bytes.
* @param numToWrite The number of bytes to write.
*/
+ @Override
public void write(byte[] wBuf, int wOffset, int numToWrite) throws IOException
{
if ((this.currBytes + numToWrite) > this.currSize)
More information about the jsword-svn
mailing list