1
0

More removal of trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1432587 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart
2013-01-13 11:11:32 +00:00
parent 81e90d14a3
commit 2789e087fd
51 changed files with 334 additions and 357 deletions

View File

@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import junit.framework.TestCase; import junit.framework.TestCase;

View File

@@ -24,8 +24,6 @@ import junit.framework.TestCase;
* Test the ability to force the LogFactory class to use some * Test the ability to force the LogFactory class to use some
* arbitrary Hashtable implementation to store its mapping from * arbitrary Hashtable implementation to store its mapping from
* context-classloader -> LogFactory object. * context-classloader -> LogFactory object.
* <p>
* This is done by
*/ */
public class AltHashtableTestCase extends TestCase { public class AltHashtableTestCase extends TestCase {

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -58,7 +57,6 @@ public class BasicOperationsTestCase extends TestCase
} }
} }
public void testMessageWithoutExceptionClassLog() public void testMessageWithoutExceptionClassLog()
{ {
Log log = LogFactory.getLog(BasicOperationsTestCase.class); Log log = LogFactory.getLog(BasicOperationsTestCase.class);

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
/** /**

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import java.io.File; import java.io.File;

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import java.util.Properties; import java.util.Properties;

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.logging.impl.SimpleLog;

View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -22,7 +21,6 @@ import org.apache.commons.logging.impl.LogFactoryImpl;
public class UserClass { public class UserClass {
/** /**
* Set the ALLOW_FLAWED_CONTEXT feature on the LogFactoryImpl object * Set the ALLOW_FLAWED_CONTEXT feature on the LogFactoryImpl object
* associated with this class' classloader. * associated with this class' classloader.

View File

@@ -54,7 +54,6 @@ public class WeakHashtableTest extends TestCase {
super(testName); super(testName);
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
weakHashtable = new WeakHashtable(); weakHashtable = new WeakHashtable();
@@ -134,7 +133,7 @@ public class WeakHashtableTest extends TestCase {
} }
} }
/** Tests public Object get(Object<EFBFBD>key) */ /** Tests public Object get(Object key) */
public void testGet() throws Exception { public void testGet() throws Exception {
assertEquals(valueOne, weakHashtable.get(keyOne)); assertEquals(valueOne, weakHashtable.get(keyOne));
assertEquals(valueTwo, weakHashtable.get(keyTwo)); assertEquals(valueTwo, weakHashtable.get(keyTwo));
@@ -205,7 +204,7 @@ public class WeakHashtableTest extends TestCase {
assertEquals(anotherNewValue, weakHashtable.get(anotherNewKey)); assertEquals(anotherNewValue, weakHashtable.get(anotherNewKey));
} }
/** Tests public Object remove(Object<EFBFBD>key) */ /** Tests public Object remove(Object key) */
public void testRemove() throws Exception { public void testRemove() throws Exception {
weakHashtable.remove(keyOne); weakHashtable.remove(keyOne);
assertEquals(2, weakHashtable.size()); assertEquals(2, weakHashtable.size());

View File

@@ -46,8 +46,7 @@ import org.apache.commons.logging.PathableTestSuite;
public class CustomConfigTestCase extends DefaultConfigTestCase { public class CustomConfigTestCase extends DefaultConfigTestCase {
protected static final String HANDLER_NAME protected static final String HANDLER_NAME = "org.apache.commons.logging.jdk14.TestHandler";
= "org.apache.commons.logging.jdk14.TestHandler";
// ----------------------------------------------------------- Constructors // ----------------------------------------------------------- Constructors
@@ -147,9 +146,7 @@ public class CustomConfigTestCase extends DefaultConfigTestCase {
ClassLoader srcCL = CustomConfigAPITestCase.class.getClassLoader(); ClassLoader srcCL = CustomConfigAPITestCase.class.getClassLoader();
byte[] classData = readClass(className, srcCL); byte[] classData = readClass(className, srcCL);
Class[] params = new Class[] { Class[] params = new Class[] { String.class, classData.getClass(), Integer.TYPE, Integer.TYPE };
String.class, classData.getClass(),
Integer.TYPE, Integer.TYPE};
Method m = ClassLoader.class.getDeclaredMethod("defineClass", params); Method m = ClassLoader.class.getDeclaredMethod("defineClass", params);
Object[] args = new Object[4]; Object[] args = new Object[4];

View File

@@ -262,7 +262,7 @@ public class ChildFirstTestCase extends TestCase {
urls = toURLArray(resources); urls = toURLArray(resources);
assertEquals("Unexpected number of Log4JLogger.class resources found", 2, urls.length); assertEquals("Unexpected number of Log4JLogger.class resources found", 2, urls.length);
// There is no gaurantee about the ordering of results returned from getResources // There is no guarantee about the ordering of results returned from getResources
// To make this test portable across JVMs, sort the string to give them a known order // To make this test portable across JVMs, sort the string to give them a known order
String[] urlsToStrings = new String[2]; String[] urlsToStrings = new String[2];
urlsToStrings[0] = urls[0].toString(); urlsToStrings[0] = urls[0].toString();

View File

@@ -1,20 +1,18 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one or more
* or more contributor license agreements. See the NOTICE file * contributor license agreements. See the NOTICE file distributed with
* distributed with this work for additional information * this work for additional information regarding copyright ownership.
* regarding copyright ownership. The ASF licenses this file * The ASF licenses this file to You under the Apache License, Version 2.0
* to you under the Apache License, Version 2.0 (the * (the "License"); you may not use this file except in compliance with
* "License"); you may not use this file except in compliance * the License. You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing, software
* software distributed under the License is distributed on an * distributed under the License is distributed on an "AS IS" BASIS,
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* KIND, either express or implied. See the License for the * See the License for the specific language governing permissions and
* specific language governing permissions and limitations * limitations under the License.
* under the License.
*/ */
package org.apache.commons.logging.security; package org.apache.commons.logging.security;

View File

@@ -1,20 +1,18 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one or more
* or more contributor license agreements. See the NOTICE file * contributor license agreements. See the NOTICE file distributed with
* distributed with this work for additional information * this work for additional information regarding copyright ownership.
* regarding copyright ownership. The ASF licenses this file * The ASF licenses this file to You under the Apache License, Version 2.0
* to you under the Apache License, Version 2.0 (the * (the "License"); you may not use this file except in compliance with
* "License"); you may not use this file except in compliance * the License. You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing, software
* software distributed under the License is distributed on an * distributed under the License is distributed on an "AS IS" BASIS,
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* KIND, either express or implied. See the License for the * See the License for the specific language governing permissions and
* specific language governing permissions and limitations * limitations under the License.
* under the License.
*/ */
package org.apache.commons.logging.security; package org.apache.commons.logging.security;

View File

@@ -1,20 +1,18 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one or more
* or more contributor license agreements. See the NOTICE file * contributor license agreements. See the NOTICE file distributed with
* distributed with this work for additional information * this work for additional information regarding copyright ownership.
* regarding copyright ownership. The ASF licenses this file * The ASF licenses this file to You under the Apache License, Version 2.0
* to you under the Apache License, Version 2.0 (the * (the "License"); you may not use this file except in compliance with
* "License"); you may not use this file except in compliance * the License. You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing, software
* software distributed under the License is distributed on an * distributed under the License is distributed on an "AS IS" BASIS,
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* KIND, either express or implied. See the License for the * See the License for the specific language governing permissions and
* specific language governing permissions and limitations * limitations under the License.
* under the License.
*/ */
package org.apache.commons.logging.security; package org.apache.commons.logging.security;

View File

@@ -89,12 +89,12 @@ public class DateTimeCustomConfigTestCase extends CustomConfigTestCase {
protected void checkDecoratedDateTime() { protected void checkDecoratedDateTime() {
assertEquals("Expected date format to be set", "dd.mm.yyyy", assertEquals("Expected date format to be set", "dd.mm.yyyy",
((DecoratedSimpleLog) log).getDateTimeFormat()); ((DecoratedSimpleLog) log).getDateTimeFormat());
// try the formatter // try the formatter
Date now = new Date(); Date now = new Date();
DateFormat formatter = ((DecoratedSimpleLog) log).getDateTimeFormatter(); DateFormat formatter = ((DecoratedSimpleLog) log).getDateTimeFormatter();
SimpleDateFormat sampleFormatter = new SimpleDateFormat("dd.mm.yyyy"); SimpleDateFormat sampleFormatter = new SimpleDateFormat("dd.mm.yyyy");
assertEquals("Date should be formatters to pattern dd.mm.yyyy", sampleFormatter.format(now), formatter.format(now)); assertEquals("Date should be formatters to pattern dd.mm.yyyy",
sampleFormatter.format(now), formatter.format(now));
} }
/** Hook for subclassses */ /** Hook for subclassses */