From 2efc45999181f493c8438ae9a50b9d61ae085f8f Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 27 Jan 2002 23:38:21 +0000 Subject: [PATCH] Reuse constants already defined by JDK git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270966 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/org/apache/tools/ant/taskdefs/Manifest.java | 7 ++++--- .../src/todo/org/apache/tools/ant/taskdefs/Manifest.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java index be45b11cf..0990a5cb1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; +import java.util.jar.Attributes; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -38,12 +39,12 @@ public class Manifest /** * The standard manifest version header */ - public final static String ATTRIBUTE_MANIFEST_VERSION = "Manifest-Version"; + public final static String ATTRIBUTE_MANIFEST_VERSION = Attributes.Name.MANIFEST_VERSION.toString(); /** * The standard Signature Version header */ - public final static String ATTRIBUTE_SIGNATURE_VERSION = "Signature-Version"; + public final static String ATTRIBUTE_SIGNATURE_VERSION = Attributes.Name.SIGNATURE_VERSION.toString(); /** * The Name Attribute is the first in a named section @@ -58,7 +59,7 @@ public class Manifest /** * The Class-Path Header is special - it can be duplicated */ - public final static String ATTRIBUTE_CLASSPATH = "class-path"; + public final static String ATTRIBUTE_CLASSPATH = Attributes.Name.CLASS_PATH.toString(); /** * Default Manifest version if one is not specified diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java index be45b11cf..0990a5cb1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; +import java.util.jar.Attributes; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -38,12 +39,12 @@ public class Manifest /** * The standard manifest version header */ - public final static String ATTRIBUTE_MANIFEST_VERSION = "Manifest-Version"; + public final static String ATTRIBUTE_MANIFEST_VERSION = Attributes.Name.MANIFEST_VERSION.toString(); /** * The standard Signature Version header */ - public final static String ATTRIBUTE_SIGNATURE_VERSION = "Signature-Version"; + public final static String ATTRIBUTE_SIGNATURE_VERSION = Attributes.Name.SIGNATURE_VERSION.toString(); /** * The Name Attribute is the first in a named section @@ -58,7 +59,7 @@ public class Manifest /** * The Class-Path Header is special - it can be duplicated */ - public final static String ATTRIBUTE_CLASSPATH = "class-path"; + public final static String ATTRIBUTE_CLASSPATH = Attributes.Name.CLASS_PATH.toString(); /** * Default Manifest version if one is not specified