Author: bodewig
Date: Mon Aug 31 15:20:27 2009
New Revision: 809624
URL: http://svn.apache.org/viewvc?rev=809624&view=rev
Log:
whitespace
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java?rev=809624&r1=809623&r2=809624&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java Mon Aug
31 15:20:27 2009
@@ -189,12 +189,12 @@
*/
public void addText(String msg) {
if (!valueAttributeUsed) {
- msg = getProject().replaceProperties(msg);
- String currentValue = getValue();
- if (currentValue != null) {
- msg = currentValue + msg;
- }
- internalSetValue(msg);
+ msg = getProject().replaceProperties(msg);
+ String currentValue = getValue();
+ if (currentValue != null) {
+ msg = currentValue + msg;
+ }
+ internalSetValue(msg);
} else if (msg.trim().length() > 0) {
throw new BuildException("can't combine nested text with value"
+ " attribute");
@@ -502,13 +502,13 @@
* @see java.util.Properties#loadFromXML(InputStream)
*/
private void loadProperties(
- Properties props, InputStream is, boolean isXml) throws IOException {
+ Properties props, InputStream is, boolean
isXml) throws IOException {
if (isXml) {
// load the xml based property definition
// use reflection because of bwc to Java 1.3
try {
Method loadXmlMethod =
props.getClass().getMethod("loadFromXML",
- new Class[] {InputStream.class});
+ new Class[]
{InputStream.class});
loadXmlMethod.invoke(props, new Object[] {is});
} catch (NoSuchMethodException e) {
e.printStackTrace();
@@ -543,7 +543,7 @@
addProperties(props);
} else {
log("Unable to find property file: " + file.getAbsolutePath(),
- Project.MSG_VERBOSE);
+ Project.MSG_VERBOSE);
}
} catch (IOException ex) {
throw new BuildException(ex, getLocation());
@@ -610,7 +610,7 @@
log("Ignoring: " + entry, Project.MSG_WARN);
} else {
props.put(prefix + entry.substring(0, pos),
- entry.substring(pos + 1));
+ entry.substring(pos + 1));
}
}
addProperties(props);
@@ -672,9 +672,9 @@
PropertyHelper propertyHelper
= (PropertyHelper) PropertyHelper.getPropertyHelper(getProject());
new ResolvePropertyMap(
- getProject(),
- propertyHelper,
- propertyHelper.getExpanders()).resolveAllProperties(props);
+ getProject(),
+ propertyHelper,
+
propertyHelper.getExpanders()).resolveAllProperties(props);
}
}
Modified: ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml?rev=809624&r1=809623&r2=809624&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml Mon Aug 31
15:20:27 2009
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<import file="../antunit-base.xml" />
