From 36f7c9bb7bf37b79e34045cd558c0fda3c62ad40 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 3 Aug 2001 14:34:07 +0000 Subject: [PATCH] Some minor JDK 1.1 compatibility problems. MMetricsStreamHandler.java still won't compile. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269452 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/metamata/AbstractMetamataTask.java | 2 +- .../ant/taskdefs/optional/metamata/MMetricsStreamHandler.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index aff21e6e2..8dffd42b0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -225,7 +225,7 @@ public abstract class AbstractMetamataTask extends Task{ /** return the location of the jar file used to run */ protected final File getMetamataJar(File home){ - return new File(home.getAbsoluteFile(), "lib/metamata.jar"); + return new File(new File(home.getAbsolutePath()), "lib/metamata.jar"); } /** validate options set */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 4732309a0..a5ad561d0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -406,7 +406,8 @@ class MetricsElement { // construct name, we'll need all this to figure out what type of // construct it is since we lost all semantics :( // (#indent[/]*)(#construct.*) - String name = (String)metrics.remove(0); + String name = (String)metrics.elementAt(0); + metrics.removeElementAt(0); int indent = 0; pos = name.lastIndexOf('/'); if (pos != -1){