From 3494ca7bb3adf2962b4d05abfc666b65adf18e09 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 27 Jan 2002 01:20:34 +0000 Subject: [PATCH] NAMELEN constant moved to TarEntry git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270926 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/org/apache/tools/ant/taskdefs/Tar.java | 16 ++++++---------- .../todo/org/apache/tools/ant/taskdefs/Tar.java | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java index 60f535c40..6a9fb39e0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -13,16 +13,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import org.apache.myrmidon.api.TaskException; - - - -import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.aut.tar.TarConstants; import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarOutputStream; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.MergingMapper; /** * Creates a TAR archive. @@ -249,7 +245,7 @@ public class Tar path += "/"; } - if( path.length() >= TarConstants.NAMELEN ) + if( path.length() >= TarEntry.NAMELEN ) { if( longFileMode.isOmitMode() ) { @@ -260,7 +256,7 @@ public class Tar else if( longFileMode.isWarnMode() ) { final String message = "Entry: " + path + " longer than " + - TarConstants.NAMELEN + " characters."; + TarEntry.NAMELEN + " characters."; getLogger().warn( message ); if( !longWarningGiven ) { @@ -273,7 +269,7 @@ public class Tar else if( longFileMode.isFailMode() ) { final String message = "Entry: " + path + " longer than " + - TarConstants.NAMELEN + "characters."; + TarEntry.NAMELEN + "characters."; throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java index 60f535c40..6a9fb39e0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java @@ -13,16 +13,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import org.apache.myrmidon.api.TaskException; - - - -import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.aut.tar.TarConstants; import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarOutputStream; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.MergingMapper; /** * Creates a TAR archive. @@ -249,7 +245,7 @@ public class Tar path += "/"; } - if( path.length() >= TarConstants.NAMELEN ) + if( path.length() >= TarEntry.NAMELEN ) { if( longFileMode.isOmitMode() ) { @@ -260,7 +256,7 @@ public class Tar else if( longFileMode.isWarnMode() ) { final String message = "Entry: " + path + " longer than " + - TarConstants.NAMELEN + " characters."; + TarEntry.NAMELEN + " characters."; getLogger().warn( message ); if( !longWarningGiven ) { @@ -273,7 +269,7 @@ public class Tar else if( longFileMode.isFailMode() ) { final String message = "Entry: " + path + " longer than " + - TarConstants.NAMELEN + "characters."; + TarEntry.NAMELEN + "characters."; throw new TaskException( message ); } }