From 183b544b785955923b387c98e6e8e0969f954354 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Mon, 11 Sep 2006 22:24:32 +0000 Subject: [PATCH] Restore non-BC removal of protected lSep property; WS git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@442375 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/compilers/DefaultCompilerAdapter.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 9c76799a6..0e7c41cf9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -19,7 +19,7 @@ package org.apache.tools.ant.taskdefs.compilers; //Java5 style -//import static org.apache.tools.ant.util.StringUtils.LINE_SEP; +//import static org.apache.tools.ant.util.StringUtils.LINE_SEP; import java.io.File; import java.io.FileWriter; @@ -48,10 +48,6 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - /* jdg - TODO - all these attributes are currently protected, but they - * should probably be private in the near future. - */ - protected Path src; protected File destDir; protected String encoding; @@ -73,9 +69,10 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { protected String memoryMaximumSize; protected File[] compileList; - //protected static final String lSep = System.getProperty("line.separator"); protected Javac attributes; + //must keep for subclass BC, though unused: + protected static final String lSep = StringUtils.LINE_SEP; /** * Set the Javac instance which contains the configured compilation @@ -517,7 +514,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { /** * Add extdirs to classpath * @param classpath the classpath to use - * @deprecated since 1.5.x. + * @deprecated since 1.5.x. * Use org.apache.tools.ant.types.Path#addExtdirs instead. */ protected void addExtdirsToClasspath(Path classpath) {