[jsword-svn] r1989 - in trunk/javatar: .settings src/main/java/com/ice/tar
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Oct 23 11:53:40 MST 2010
Author: dmsmith
Date: 2010-10-23 11:53:40 -0700 (Sat, 23 Oct 2010)
New Revision: 1989
Modified:
trunk/javatar/.settings/org.eclipse.jdt.core.prefs
trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java
trunk/javatar/src/main/java/com/ice/tar/TarArchive.java
trunk/javatar/src/main/java/com/ice/tar/TarBuffer.java
trunk/javatar/src/main/java/com/ice/tar/TarEntry.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:
remove NON-NLS comments
Modified: trunk/javatar/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/javatar/.settings/org.eclipse.jdt.core.prefs 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/.settings/org.eclipse.jdt.core.prefs 2010-10-23 18:53:40 UTC (rev 1989)
@@ -1,77 +1,94 @@
-#Fri Apr 07 21:11:29 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-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=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=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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=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=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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.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=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-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=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=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=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
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+#Sun Jan 31 17:57:47 EST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+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=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=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=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+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=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=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+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.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+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.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=disabled
+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=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
Modified: trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -137,14 +137,14 @@
by[i] = (headerBuf[i] == 0 ? 20 : headerBuf[i]);
}
String s = new String(by);
- System.out.println("\n" + s); //$NON-NLS-1$
+ System.out.println("\n" + s);
}
if (!(headerBuf[257] == 'u' && headerBuf[258] == 's' && headerBuf[259] == 't' && headerBuf[260] == 'a' && headerBuf[261] == 'r'))
{
- throw new InvalidHeaderException("header magic is not'ustar', but '" + headerBuf[257] + headerBuf[258] + headerBuf[259] + headerBuf[260] //$NON-NLS-1$
- + headerBuf[261] + "', or (dec) " + ((int) headerBuf[257]) + ", " + ((int) headerBuf[258]) + ", " + ((int) headerBuf[259]) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + ", " + ((int) headerBuf[260]) + ", " + ((int) headerBuf[261])); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new InvalidHeaderException("header magic is not'ustar', but '" + headerBuf[257] + headerBuf[258] + headerBuf[259] + headerBuf[260]
+ + headerBuf[261] + "', or (dec) " + ((int) headerBuf[257]) + ", " + ((int) headerBuf[258]) + ", " + ((int) headerBuf[259])
+ + ", " + ((int) headerBuf[260]) + ", " + ((int) headerBuf[261]));
}
}
catch (InvalidHeaderException ex)
@@ -167,13 +167,13 @@
int idx = 0;
if (args.length > 0)
{
- if (args[idx].equals("-d")) //$NON-NLS-1$
+ if (args[idx].equals("-d"))
{
debug = true;
idx++;
}
- if (args[idx].endsWith(".gz") || args[idx].endsWith(".tgz")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (args[idx].endsWith(".gz") || args[idx].endsWith(".tgz"))
{
in = new GZIPInputStream(new FileInputStream(args[idx]));
}
@@ -203,7 +203,7 @@
if (entry.isDirectory())
{
// TYPE
- System.out.print("D "); //$NON-NLS-1$
+ System.out.print("D ");
// NAME
padBuf.setLength(0);
@@ -238,7 +238,7 @@
else
{
// TYPE
- System.out.print("F "); //$NON-NLS-1$
+ System.out.print("F ");
// NAME
padBuf.setLength(0);
@@ -273,7 +273,7 @@
System.out.print(padBuf.toString());
}
- System.out.println(""); //$NON-NLS-1$
+ System.out.println("");
}
}
catch (IOException ex)
Modified: trunk/javatar/src/main/java/com/ice/tar/TarArchive.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarArchive.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarArchive.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -135,12 +135,12 @@
{
this.rootPath = null;
this.pathPrefix = null;
- this.tempPath = System.getProperty("user.dir"); //$NON-NLS-1$
+ this.tempPath = System.getProperty("user.dir");
this.userId = 0;
- this.userName = ""; //$NON-NLS-1$
+ this.userName = "";
this.groupId = 0;
- this.groupName = ""; //$NON-NLS-1$
+ this.groupName = "";
this.debug = false;
this.verbose = false;
@@ -361,7 +361,7 @@
private String getTempFilePath(File eFile)
{
- String pathStr = this.tempPath + File.separator + eFile.getName() + ".tmp"; //$NON-NLS-1$
+ String pathStr = this.tempPath + File.separator + eFile.getName() + ".tmp";
for (int i = 1; i < 5; ++i)
{
@@ -370,7 +370,7 @@
if (!f.exists())
break;
- pathStr = this.tempPath + File.separator + eFile.getName() + "-" + i + ".tmp"; //$NON-NLS-1$ //$NON-NLS-2$
+ pathStr = this.tempPath + File.separator + eFile.getName() + "-" + i + ".tmp";
}
return pathStr;
@@ -410,7 +410,7 @@
{
if (this.debug)
{
- System.err.println("READ EOF RECORD"); //$NON-NLS-1$
+ System.err.println("READ EOF RECORD");
}
break;
}
@@ -436,7 +436,7 @@
{
if (this.debug)
{
- System.err.println("READ EOF RECORD"); //$NON-NLS-1$
+ System.err.println("READ EOF RECORD");
}
break;
}
@@ -472,7 +472,7 @@
{
if (!destFile.mkdirs())
{
- throw new IOException("error making directory path '" + destFile.getPath() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new IOException("error making directory path '" + destFile.getPath() + "'");
}
}
}
@@ -484,7 +484,7 @@
{
if (!subDir.mkdirs())
{
- throw new IOException("error making directory path '" + subDir.getPath() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new IOException("error making directory path '" + subDir.getPath() + "'");
}
}
@@ -493,7 +493,7 @@
if (this.verbose)
{
if (this.progressDisplay != null)
- this.progressDisplay.showTarProgressMessage("not overwriting " + entry.getName()); //$NON-NLS-1$
+ this.progressDisplay.showTarProgressMessage("not overwriting " + entry.getName());
}
}
else
@@ -513,7 +513,7 @@
mime = new MimeType(contentType);
- if (mime.getPrimaryType().equalsIgnoreCase("text")) //$NON-NLS-1$
+ if (mime.getPrimaryType().equalsIgnoreCase("text"))
{
asciiTrans = true;
}
@@ -524,8 +524,8 @@
if (this.debug)
{
- System.err.println("EXTRACT TRANS? '" + asciiTrans + "' ContentType='" + contentType + "' PrimaryType='" + mime.getPrimaryType() //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + "'"); //$NON-NLS-1$
+ System.err.println("EXTRACT TRANS? '" + asciiTrans + "' ContentType='" + contentType + "' PrimaryType='" + mime.getPrimaryType()
+ + "'");
}
}
@@ -613,7 +613,7 @@
mime = new MimeType(contentType);
- if (mime.getPrimaryType().equalsIgnoreCase("text")) //$NON-NLS-1$
+ if (mime.getPrimaryType().equalsIgnoreCase("text"))
{
asciiTrans = true;
}
@@ -625,7 +625,7 @@
if (this.debug)
{
- System.err.println("CREATE TRANS? '" + asciiTrans + "' ContentType='" + contentType + "' PrimaryType='" + mime.getPrimaryType() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ System.err.println("CREATE TRANS? '" + asciiTrans + "' ContentType='" + contentType + "' PrimaryType='" + mime.getPrimaryType() + "'");
}
if (asciiTrans)
@@ -670,7 +670,7 @@
if (this.pathPrefix != null)
{
- newName = (newName == null) ? this.pathPrefix + "/" + entry.getName() : this.pathPrefix + "/" + newName; //$NON-NLS-1$ //$NON-NLS-2$
+ newName = (newName == null) ? this.pathPrefix + "/" + entry.getName() : this.pathPrefix + "/" + newName;
}
if (newName != null)
Modified: trunk/javatar/src/main/java/com/ice/tar/TarBuffer.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarBuffer.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarBuffer.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -158,11 +158,11 @@
{
if (this.debug)
{
- System.err.println("SkipRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("SkipRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx);
}
if (this.inStream == null)
- throw new IOException("reading (via skip) from an output buffer"); //$NON-NLS-1$
+ throw new IOException("reading (via skip) from an output buffer");
if (this.currRecIdx >= this.recsPerBlock)
{
@@ -182,11 +182,11 @@
{
if (this.debug)
{
- System.err.println("ReadRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("ReadRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx);
}
if (this.inStream == null)
- throw new IOException("reading from an output buffer"); //$NON-NLS-1$
+ throw new IOException("reading from an output buffer");
if (this.currRecIdx >= this.recsPerBlock)
{
@@ -210,11 +210,11 @@
{
if (this.debug)
{
- System.err.println("ReadBlock: blkIdx = " + this.currBlkIdx); //$NON-NLS-1$
+ System.err.println("ReadBlock: blkIdx = " + this.currBlkIdx);
}
if (this.inStream == null)
- throw new IOException("reading from an output buffer"); //$NON-NLS-1$
+ throw new IOException("reading from an output buffer");
this.currRecIdx = 0;
@@ -247,7 +247,7 @@
{
if (this.debug)
{
- System.err.println("ReadBlock: INCOMPLETE READ " + numBytes + " of " + this.blockSize + " bytes read."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ System.err.println("ReadBlock: INCOMPLETE READ " + numBytes + " of " + this.blockSize + " bytes read.");
}
}
}
@@ -288,14 +288,14 @@
{
if (this.debug)
{
- System.err.println("WriteRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("WriteRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx);
}
if (this.outStream == null)
- throw new IOException("writing to an input buffer"); //$NON-NLS-1$
+ throw new IOException("writing to an input buffer");
if (record.length != this.recordSize)
- throw new IOException("record to write has length '" + record.length + "' which is not the record size of '" + this.recordSize + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ throw new IOException("record to write has length '" + record.length + "' which is not the record size of '" + this.recordSize + "'");
if (this.currRecIdx >= this.recsPerBlock)
{
@@ -320,15 +320,15 @@
{
if (this.debug)
{
- System.err.println("WriteRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("WriteRecord: recIdx = " + this.currRecIdx + " blkIdx = " + this.currBlkIdx);
}
if (this.outStream == null)
- throw new IOException("writing to an input buffer"); //$NON-NLS-1$
+ throw new IOException("writing to an input buffer");
if ((offset + this.recordSize) > buf.length)
- throw new IOException("record has length '" + buf.length + "' with offset '" + offset + "' which is less than the record size of '" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + this.recordSize + "'"); //$NON-NLS-1$
+ throw new IOException("record has length '" + buf.length + "' with offset '" + offset + "' which is less than the record size of '"
+ + this.recordSize + "'");
if (this.currRecIdx >= this.recsPerBlock)
{
@@ -347,11 +347,11 @@
{
if (this.debug)
{
- System.err.println("WriteBlock: blkIdx = " + this.currBlkIdx); //$NON-NLS-1$
+ System.err.println("WriteBlock: blkIdx = " + this.currBlkIdx);
}
if (this.outStream == null)
- throw new IOException("writing to an input buffer"); //$NON-NLS-1$
+ throw new IOException("writing to an input buffer");
this.outStream.write(this.blockBuffer, 0, this.blockSize);
this.outStream.flush();
@@ -368,11 +368,11 @@
{
if (this.debug)
{
- System.err.println("TarBuffer.flushBlock() called."); //$NON-NLS-1$
+ System.err.println("TarBuffer.flushBlock() called.");
}
if (this.outStream == null)
- throw new IOException("writing to an input buffer"); //$NON-NLS-1$
+ throw new IOException("writing to an input buffer");
// Thanks to 'Todd Kofford <tkofford at bigfoot.com>' for this patch.
// Use a buffer initialized with 0s to initialize everything in the
@@ -399,7 +399,7 @@
{
if (this.debug)
{
- System.err.println("TarBuffer.closeBuffer()."); //$NON-NLS-1$
+ System.err.println("TarBuffer.closeBuffer().");
}
if (this.outStream != null)
Modified: trunk/javatar/src/main/java/com/ice/tar/TarEntry.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarEntry.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarEntry.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -524,7 +524,7 @@
if (this.header.linkFlag == TarHeader.LF_DIR)
return true;
- if (this.header.name.toString().endsWith("/")) //$NON-NLS-1$
+ if (this.header.name.toString().endsWith("/"))
return true;
}
@@ -542,7 +542,7 @@
this.file = newFile;
String name = newFile.getPath();
- String osname = System.getProperty("os.name"); //$NON-NLS-1$
+ String osname = System.getProperty("os.name");
if (osname != null)
{
// Strip off drive letters!
@@ -556,7 +556,7 @@
// Windows OS check was contributed by
// Patrick Beard <beard at netscape.com>
- String Win32Prefix = "windows"; //$NON-NLS-1$
+ String Win32Prefix = "windows";
if (osname.toLowerCase().startsWith(Win32Prefix))
{
if (name.length() > 2)
@@ -577,10 +577,10 @@
// Windows (and Posix?) paths can start with "\\NetworkDrive\",
// so we loop on starting /'s.
- for (; name.startsWith("/");) //$NON-NLS-1$
+ for (; name.startsWith("/");)
name = name.substring(1);
- hdr.linkName = new StringBuffer(""); //$NON-NLS-1$
+ hdr.linkName = new StringBuffer("");
hdr.name = new StringBuffer(name);
@@ -590,7 +590,7 @@
hdr.mode = 040755;
hdr.linkFlag = TarHeader.LF_DIR;
if (hdr.name.charAt(hdr.name.length() - 1) != '/')
- hdr.name.append("/"); //$NON-NLS-1$
+ hdr.name.append("/");
}
else
{
@@ -663,7 +663,7 @@
if (this.isUnixTarFormat())
{
if (this.header.name.length() > 100)
- throw new InvalidHeaderException("file path is greater than 100 characters, " + this.header.name); //$NON-NLS-1$
+ throw new InvalidHeaderException("file path is greater than 100 characters, " + this.header.name);
}
offset = TarHeader.getFileNameBytes(this.header.name.toString(), outbuf);
@@ -754,7 +754,7 @@
{
StringBuffer buf = new StringBuffer(128);
- buf.append("header magic is not 'ustar' or unix-style zeros, it is '"); //$NON-NLS-1$
+ buf.append("header magic is not 'ustar' or unix-style zeros, it is '");
buf.append(headerBuf[257]);
buf.append(headerBuf[258]);
buf.append(headerBuf[259]);
@@ -762,19 +762,19 @@
buf.append(headerBuf[261]);
buf.append(headerBuf[262]);
buf.append(headerBuf[263]);
- buf.append("', or (dec) "); //$NON-NLS-1$
+ buf.append("', or (dec) ");
buf.append(headerBuf[257]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[258]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[259]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[260]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[261]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[262]);
- buf.append(", "); //$NON-NLS-1$
+ buf.append(", ");
buf.append(headerBuf[263]);
throw new InvalidHeaderException(buf.toString());
@@ -838,9 +838,9 @@
{
hdr.devMajor = 0;
hdr.devMinor = 0;
- hdr.magic = new StringBuffer(""); //$NON-NLS-1$
- hdr.userName = new StringBuffer(""); //$NON-NLS-1$
- hdr.groupName = new StringBuffer(""); //$NON-NLS-1$
+ hdr.magic = new StringBuffer("");
+ hdr.userName = new StringBuffer("");
+ hdr.groupName = new StringBuffer("");
}
}
@@ -852,7 +852,7 @@
*/
public void nameTarHeader(TarHeader hdr, String name)
{
- boolean isDir = name.endsWith("/"); //$NON-NLS-1$
+ boolean isDir = name.endsWith("/");
this.gnuFormat = false;
this.ustarFormat = true;
@@ -873,9 +873,9 @@
hdr.linkFlag = isDir ? TarHeader.LF_DIR : TarHeader.LF_NORMAL;
- hdr.linkName = new StringBuffer(""); //$NON-NLS-1$
- hdr.userName = new StringBuffer(""); //$NON-NLS-1$
- hdr.groupName = new StringBuffer(""); //$NON-NLS-1$
+ hdr.linkName = new StringBuffer("");
+ hdr.userName = new StringBuffer("");
+ hdr.groupName = new StringBuffer("");
hdr.devMajor = 0;
hdr.devMinor = 0;
@@ -885,9 +885,9 @@
public String toString()
{
StringBuffer result = new StringBuffer(128);
- return result.append("[TarEntry name=").append(this.getName()).append(", isDir=").append(this.isDirectory()).append(", size=").append(this.getSize()) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- .append(", userId=").append(this.getUserId()).append(", user=").append(this.getUserName()).append(", groupId=").append( //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- this.getGroupId()).append(", group=").append(this.getGroupName()).append("]").toString(); //$NON-NLS-1$ //$NON-NLS-2$
+ return result.append("[TarEntry name=").append(this.getName()).append(", isDir=").append(this.isDirectory()).append(", size=").append(this.getSize())
+ .append(", userId=").append(this.getUserId()).append(", user=").append(this.getUserName()).append(", groupId=").append(
+ this.getGroupId()).append(", group=").append(this.getGroupName()).append("]").toString();
}
}
Modified: trunk/javatar/src/main/java/com/ice/tar/TarHeader.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarHeader.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarHeader.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -122,12 +122,12 @@
/**
* The magic tag representing a POSIX tar archive.
*/
- public static final String TMAGIC = "ustar"; //$NON-NLS-1$
+ public static final String TMAGIC = "ustar";
/**
* The magic tag representing a GNU tar archive.
*/
- public static final String GNU_TMAGIC = "ustar "; //$NON-NLS-1$
+ public static final String GNU_TMAGIC = "ustar ";
/**
* The entry's name.
@@ -193,7 +193,7 @@
this.name = new StringBuffer();
this.linkName = new StringBuffer();
- String user = System.getProperty("user.name", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ String user = System.getProperty("user.name", "");
if (user.length() > 31)
user = user.substring(0, 31);
@@ -201,7 +201,7 @@
this.userId = 0;
this.groupId = 0;
this.userName = new StringBuffer(user);
- this.groupName = new StringBuffer(""); //$NON-NLS-1$
+ this.groupName = new StringBuffer("");
}
/**
@@ -311,7 +311,7 @@
result.append((char) header[i]);
}
- result.append("/"); //$NON-NLS-1$
+ result.append("/");
}
for (int i = 0; i < 100 && header[i] != 0; ++i)
@@ -364,9 +364,9 @@
if (newName.length() > 100)
{
// Locate a pathname "break" prior to the maximum name length...
- int index = newName.indexOf("/", newName.length() - 100); //$NON-NLS-1$
+ int index = newName.indexOf("/", newName.length() - 100);
if (index == -1)
- throw new InvalidHeaderException("file name is greater than 100 characters, " + newName); //$NON-NLS-1$
+ throw new InvalidHeaderException("file name is greater than 100 characters, " + newName);
// Get the "suffix subpath" of the name.
String name = newName.substring(index + 1);
@@ -374,7 +374,7 @@
// Get the "prefix subpath", or "prefix", of the name.
String prefix = newName.substring(0, index);
if (prefix.length() > TarHeader.PREFIXLEN)
- throw new InvalidHeaderException("file prefix is greater than 155 characters"); //$NON-NLS-1$
+ throw new InvalidHeaderException("file prefix is greater than 155 characters");
TarHeader.getNameBytes(new StringBuffer(name), outbuf, TarHeader.NAMEOFFSET, TarHeader.NAMELEN);
Modified: trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarInputStream.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -249,8 +249,8 @@
long numToSkip = (this.entrySize - this.entryOffset);
if (this.debug)
- System.err.println("TarInputStream: SKIP currENTRY '" + this.currEntry.getName() + "' SZ " + this.entrySize + " OFF " + this.entryOffset //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + " skipping " + numToSkip + " bytes"); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("TarInputStream: SKIP currENTRY '" + this.currEntry.getName() + "' SZ " + this.entrySize + " OFF " + this.entryOffset
+ + " skipping " + numToSkip + " bytes");
if (numToSkip > 0)
{
@@ -266,7 +266,7 @@
{
if (this.debug)
{
- System.err.println("READ NULL RECORD"); //$NON-NLS-1$
+ System.err.println("READ NULL RECORD");
}
this.hasHitEOF = true;
@@ -275,7 +275,7 @@
{
if (this.debug)
{
- System.err.println("READ EOF RECORD"); //$NON-NLS-1$
+ System.err.println("READ EOF RECORD");
}
this.hasHitEOF = true;
@@ -299,7 +299,7 @@
}
if (this.debug)
- System.err.println("TarInputStream: SET CURRENTRY '" + this.currEntry.getName() + "' size = " + this.currEntry.getSize()); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("TarInputStream: SET CURRENTRY '" + this.currEntry.getName() + "' size = " + this.currEntry.getSize());
this.entryOffset = 0;
this.entrySize = this.currEntry.getSize();
@@ -309,8 +309,8 @@
this.entrySize = 0;
this.entryOffset = 0;
this.currEntry = null;
- throw new InvalidHeaderException("bad header in block " + this.buffer.getCurrentBlockNum() + " record " + this.buffer.getCurrentRecordNum() //$NON-NLS-1$ //$NON-NLS-2$
- + ", " + ex.getMessage()); //$NON-NLS-1$
+ throw new InvalidHeaderException("bad header in block " + this.buffer.getCurrentBlockNum() + " record " + this.buffer.getCurrentRecordNum()
+ + ", " + ex.getMessage());
}
}
@@ -404,7 +404,7 @@
if (rec == null)
{
// Unexpected EOF!
- throw new IOException("unexpected EOF with " + numToRead + " bytes unread"); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new IOException("unexpected EOF with " + numToRead + " bytes unread");
}
int sz = numToRead;
Modified: trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java 2010-04-19 23:39:21 UTC (rev 1988)
+++ trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java 2010-10-23 18:53:40 UTC (rev 1989)
@@ -147,8 +147,8 @@
if ((entry.isUnixTarFormat() && name.length() > TarHeader.NAMELEN)
|| (!entry.isUnixTarFormat() && name.length() > (TarHeader.NAMELEN + TarHeader.PREFIXLEN)))
{
- throw new InvalidHeaderException("file name '" + name + "' is too long ( " + name.length() + " > " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + (entry.isUnixTarFormat() ? TarHeader.NAMELEN : (TarHeader.NAMELEN + TarHeader.PREFIXLEN)) + " bytes )"); //$NON-NLS-1$
+ throw new InvalidHeaderException("file name '" + name + "' is too long ( " + name.length() + " > "
+ + (entry.isUnixTarFormat() ? TarHeader.NAMELEN : (TarHeader.NAMELEN + TarHeader.PREFIXLEN)) + " bytes )");
}
entry.writeEntryHeader(this.recordBuf);
@@ -186,7 +186,7 @@
}
if (this.currBytes < this.currSize)
- throw new IOException("entry closed at '" + this.currBytes + "' before the '" + this.currSize + "' bytes specified in the header were written"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ throw new IOException("entry closed at '" + this.currBytes + "' before the '" + this.currSize + "' bytes specified in the header were written");
}
/**
@@ -235,7 +235,7 @@
public void write(byte[] wBuf, int wOffset, int numToWrite) throws IOException
{
if ((this.currBytes + numToWrite) > this.currSize)
- throw new IOException("request to write '" + numToWrite + "' bytes exceeds size in header of '" + this.currSize + "' bytes"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ throw new IOException("request to write '" + numToWrite + "' bytes exceeds size in header of '" + this.currSize + "' bytes");
//
// We have to deal with assembly!!!
More information about the jsword-svn
mailing list