Author: ggregory
Date: Fri Jan 11 13:02:50 2013
New Revision: 1432026
URL: http://svn.apache.org/viewvc?rev=1432026&view=rev
Log:
Remove unnecessary parentheses.
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogConfigurationException.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogSource.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Log4JLogger.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogKitLogger.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/WeakHashtable.java
commons/proper/logging/trunk/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
commons/proper/logging/trunk/src/test/org/apache/commons/logging/jdk14/TestHandler.java
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/StandardTests.java
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java
commons/proper/logging/trunk/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogConfigurationException.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogConfigurationException.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogConfigurationException.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogConfigurationException.java
Fri Jan 11 13:02:50 2013
@@ -60,7 +60,7 @@ public class LogConfigurationException e
*/
public LogConfigurationException(Throwable cause) {
- this((cause == null) ? null : cause.toString(), cause);
+ this(cause == null ? null : cause.toString(), cause);
}
@@ -90,7 +90,7 @@ public class LogConfigurationException e
*/
public Throwable getCause() {
- return (this.cause);
+ return this.cause;
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogFactory.java
Fri Jan 11 13:02:50 2013
@@ -683,7 +683,7 @@ public abstract class LogFactory {
public static Log getLog(Class clazz)
throws LogConfigurationException {
- return (getFactory().getInstance(clazz));
+ return getFactory().getInstance(clazz);
}
@@ -702,7 +702,7 @@ public abstract class LogFactory {
public static Log getLog(String name)
throws LogConfigurationException {
- return (getFactory().getInstance(name));
+ return getFactory().getInstance(name);
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogSource.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogSource.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/LogSource.java
Fri Jan 11 13:02:50 2013
@@ -84,8 +84,8 @@ public class LogSource {
// Is JDK 1.4 Logging Available?
try {
- jdk14IsAvailable = (null !=
Class.forName("java.util.logging.Logger")) &&
- (null !=
Class.forName("org.apache.commons.logging.impl.Jdk14Logger"));
+ jdk14IsAvailable = null !=
Class.forName("java.util.logging.Logger") &&
+ null !=
Class.forName("org.apache.commons.logging.impl.Jdk14Logger");
} catch (Throwable t) {
jdk14IsAvailable = false;
}
@@ -185,7 +185,7 @@ public class LogSource {
/** Get a <code>Log</code> instance by class name */
static public Log getInstance(String name) {
- Log log = (Log) (logs.get(name));
+ Log log = (Log) logs.get(name);
if (null == log) {
log = makeNewLogInstance(name);
logs.put(name, log);
@@ -229,7 +229,7 @@ public class LogSource {
Log log;
try {
Object[] args = { name };
- log = (Log) (logImplctor.newInstance(args));
+ log = (Log) logImplctor.newInstance(args);
} catch (Throwable t) {
log = null;
}
@@ -246,7 +246,7 @@ public class LogSource {
* all logs known to me.
*/
static public String[] getLogNames() {
- return (String[]) (logs.keySet().toArray(new String[logs.size()]));
+ return (String[]) logs.keySet().toArray(new String[logs.size()]);
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
Fri Jan 11 13:02:50 2013
@@ -211,7 +211,7 @@ public class Jdk13LumberjackLogger imple
if (logger == null) {
logger = Logger.getLogger(name);
}
- return (logger);
+ return logger;
}
@@ -242,7 +242,7 @@ public class Jdk13LumberjackLogger imple
* Is debug logging currently enabled?
*/
public boolean isDebugEnabled() {
- return (getLogger().isLoggable(Level.FINE));
+ return getLogger().isLoggable(Level.FINE);
}
@@ -250,7 +250,7 @@ public class Jdk13LumberjackLogger imple
* Is error logging currently enabled?
*/
public boolean isErrorEnabled() {
- return (getLogger().isLoggable(Level.SEVERE));
+ return getLogger().isLoggable(Level.SEVERE);
}
@@ -258,7 +258,7 @@ public class Jdk13LumberjackLogger imple
* Is fatal logging currently enabled?
*/
public boolean isFatalEnabled() {
- return (getLogger().isLoggable(Level.SEVERE));
+ return getLogger().isLoggable(Level.SEVERE);
}
@@ -266,7 +266,7 @@ public class Jdk13LumberjackLogger imple
* Is info logging currently enabled?
*/
public boolean isInfoEnabled() {
- return (getLogger().isLoggable(Level.INFO));
+ return getLogger().isLoggable(Level.INFO);
}
@@ -274,7 +274,7 @@ public class Jdk13LumberjackLogger imple
* Is trace logging currently enabled?
*/
public boolean isTraceEnabled() {
- return (getLogger().isLoggable(Level.FINEST));
+ return getLogger().isLoggable(Level.FINEST);
}
@@ -282,7 +282,7 @@ public class Jdk13LumberjackLogger imple
* Is warn logging currently enabled?
*/
public boolean isWarnEnabled() {
- return (getLogger().isLoggable(Level.WARNING));
+ return getLogger().isLoggable(Level.WARNING);
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk14Logger.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
Fri Jan 11 13:02:50 2013
@@ -180,7 +180,7 @@ public class Jdk14Logger implements Log,
if (logger == null) {
logger = Logger.getLogger(name);
}
- return (logger);
+ return logger;
}
@@ -211,7 +211,7 @@ public class Jdk14Logger implements Log,
* Is debug logging currently enabled?
*/
public boolean isDebugEnabled() {
- return (getLogger().isLoggable(Level.FINE));
+ return getLogger().isLoggable(Level.FINE);
}
@@ -219,7 +219,7 @@ public class Jdk14Logger implements Log,
* Is error logging currently enabled?
*/
public boolean isErrorEnabled() {
- return (getLogger().isLoggable(Level.SEVERE));
+ return getLogger().isLoggable(Level.SEVERE);
}
@@ -227,7 +227,7 @@ public class Jdk14Logger implements Log,
* Is fatal logging currently enabled?
*/
public boolean isFatalEnabled() {
- return (getLogger().isLoggable(Level.SEVERE));
+ return getLogger().isLoggable(Level.SEVERE);
}
@@ -235,7 +235,7 @@ public class Jdk14Logger implements Log,
* Is info logging currently enabled?
*/
public boolean isInfoEnabled() {
- return (getLogger().isLoggable(Level.INFO));
+ return getLogger().isLoggable(Level.INFO);
}
@@ -243,7 +243,7 @@ public class Jdk14Logger implements Log,
* Is trace logging currently enabled?
*/
public boolean isTraceEnabled() {
- return (getLogger().isLoggable(Level.FINEST));
+ return getLogger().isLoggable(Level.FINEST);
}
@@ -251,7 +251,7 @@ public class Jdk14Logger implements Log,
* Is warn logging currently enabled?
*/
public boolean isWarnEnabled() {
- return (getLogger().isLoggable(Level.WARNING));
+ return getLogger().isLoggable(Level.WARNING);
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Log4JLogger.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Log4JLogger.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Log4JLogger.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/Log4JLogger.java
Fri Jan 11 13:02:50 2013
@@ -273,7 +273,7 @@ public class Log4JLogger implements Log,
if (logger == null) {
logger = Logger.getLogger(name);
}
- return (this.logger);
+ return this.logger;
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
Fri Jan 11 13:02:50 2013
@@ -268,7 +268,7 @@ public class LogFactoryImpl extends LogF
*/
public Object getAttribute(String name) {
- return (attributes.get(name));
+ return attributes.get(name);
}
@@ -294,7 +294,7 @@ public class LogFactoryImpl extends LogF
*/
public Log getInstance(Class clazz) throws LogConfigurationException {
- return (getInstance(clazz.getName()));
+ return getInstance(clazz.getName());
}
@@ -323,7 +323,7 @@ public class LogFactoryImpl extends LogF
instance = newInstance(name);
instances.put(name, instance);
}
- return (instance);
+ return instance;
}
@@ -600,7 +600,7 @@ public class LogFactoryImpl extends LogF
logMethod.invoke(instance, params);
}
- return (instance);
+ return instance;
} catch (LogConfigurationException lce) {
@@ -891,7 +891,7 @@ public class LogFactoryImpl extends LogF
"No user-specified Log implementation; performing discovery" +
" using the standard supported logging implementations...");
}
- for(int i=0; (i<classesToDiscover.length) && (result == null); ++i) {
+ for(int i=0; i<classesToDiscover.length && result == null; ++i) {
result = createLogFromClass(classesToDiscover[i], logCategory,
true);
}
@@ -1168,7 +1168,7 @@ public class LogFactoryImpl extends LogF
currentCL = getParentClassLoader(currentCL);
}
- if ((logAdapter != null) && affectState) {
+ if (logAdapter != null && affectState) {
// We've succeeded, so set instance fields
this.logClassName = logAdapterClassName;
this.logConstructor = constructor;
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogKitLogger.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogKitLogger.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogKitLogger.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/LogKitLogger.java
Fri Jan 11 13:02:50 2013
@@ -77,7 +77,7 @@ public class LogKitLogger implements Log
if (logger == null) {
logger = Hierarchy.getDefaultHierarchy().getLoggerFor(name);
}
- return (logger);
+ return logger;
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/SimpleLog.java
Fri Jan 11 13:02:50 2013
@@ -128,10 +128,10 @@ public class SimpleLog implements Log, S
public static final int LOG_LEVEL_FATAL = 6;
/** Enable all logging levels */
- public static final int LOG_LEVEL_ALL = (LOG_LEVEL_TRACE - 1);
+ public static final int LOG_LEVEL_ALL = LOG_LEVEL_TRACE - 1;
/** Enable no logging levels */
- public static final int LOG_LEVEL_OFF = (LOG_LEVEL_FATAL + 1);
+ public static final int LOG_LEVEL_OFF = LOG_LEVEL_FATAL + 1;
// ------------------------------------------------------------ Initializer
@@ -142,17 +142,17 @@ public class SimpleLog implements Log, S
} catch (SecurityException e) {
// Ignore
}
- return (prop == null) ? simpleLogProps.getProperty(name) : prop;
+ return prop == null ? simpleLogProps.getProperty(name) : prop;
}
private static String getStringProperty(String name, String dephault) {
String prop = getStringProperty(name);
- return (prop == null) ? dephault : prop;
+ return prop == null ? dephault : prop;
}
private static boolean getBooleanProperty(String name, boolean dephault) {
String prop = getStringProperty(name);
- return (prop == null) ? dephault : "true".equalsIgnoreCase(prop);
+ return prop == null ? dephault : "true".equalsIgnoreCase(prop);
}
// Initialize class attributes.
@@ -364,7 +364,7 @@ public class SimpleLog implements Log, S
protected boolean isLevelEnabled(int logLevel) {
// log level are numerically ordered so can use simple numeric
// comparison
- return (logLevel >= currentLogLevel);
+ return logLevel >= currentLogLevel;
}
Modified:
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/WeakHashtable.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/WeakHashtable.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/WeakHashtable.java
(original)
+++
commons/proper/logging/trunk/src/java/org/apache/commons/logging/impl/WeakHashtable.java
Fri Jan 11 13:02:50 2013
@@ -240,7 +240,7 @@ public final class WeakHashtable extends
changeCount = 0;
}
// do a partial purge more often
- else if ((changeCount % PARTIAL_PURGE_COUNT) == 0) {
+ else if (changeCount % PARTIAL_PURGE_COUNT == 0) {
purgeOne();
}
@@ -280,7 +280,7 @@ public final class WeakHashtable extends
changeCount = 0;
}
// do a partial purge more often
- else if ((changeCount % PARTIAL_PURGE_COUNT) == 0) {
+ else if (changeCount % PARTIAL_PURGE_COUNT == 0) {
purgeOne();
}
return super.remove(new Referenced(key));
@@ -436,7 +436,7 @@ public final class WeakHashtable extends
Object thisKeyValue = getValue();
Object otherKeyValue = otherKey.getValue();
if (thisKeyValue == null) {
- result = (otherKeyValue == null);
+ result = otherKeyValue == null;
// Since our hashcode was calculated from the original
// non-null referant, the above check breaks the
@@ -444,7 +444,7 @@ public final class WeakHashtable extends
// objects could test equal but have different hashcodes.
// We can reduce (not eliminate) the chance of this
// happening by comparing hashcodes.
- result = result && (this.hashCode() ==
otherKey.hashCode());
+ result = result && this.hashCode() == otherKey.hashCode();
// In any case, as our c'tor does not allow null referants
// and Hashtable does not do equality checks between
// existing keys, normal hashtable operations should never
Modified:
commons/proper/logging/trunk/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
(original)
+++
commons/proper/logging/trunk/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
Fri Jan 11 13:02:50 2013
@@ -270,7 +270,7 @@ public class WeakHashtableTest extends T
public void run() {
for (int i = 0; i < RUN_LOOPS; i++) {
- hashtable.put("key" + ":" + (i%10), Boolean.TRUE);
+ hashtable.put("key" + ":" + i%10, Boolean.TRUE);
if(i%50 == 0) {
yield();
}
Modified:
commons/proper/logging/trunk/src/test/org/apache/commons/logging/jdk14/TestHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/test/org/apache/commons/logging/jdk14/TestHandler.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/test/org/apache/commons/logging/jdk14/TestHandler.java
(original)
+++
commons/proper/logging/trunk/src/test/org/apache/commons/logging/jdk14/TestHandler.java
Fri Jan 11 13:02:50 2013
@@ -46,7 +46,7 @@ public class TestHandler extends Handler
public Iterator records() {
- return (records.iterator());
+ return records.iterator();
}
Modified:
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/StandardTests.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/StandardTests.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/StandardTests.java
(original)
+++
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/StandardTests.java
Fri Jan 11 13:02:50 2013
@@ -170,22 +170,22 @@ public abstract class StandardTests exte
ev = (LogEvent) logEvents.get(0);
assertEquals("Info message expected", "info", ev.msg);
assertEquals("Info level expected", "INFO", ev.level);
- assertEquals("Exception data incorrect", (ev.throwable!=null), thrown);
+ assertEquals("Exception data incorrect", ev.throwable!=null, thrown);
ev = (LogEvent) logEvents.get(1);
assertEquals("Warn message expected", "warn", ev.msg);
assertEquals("Warn level expected", "WARN", ev.level);
- assertEquals("Exception data incorrect", (ev.throwable!=null), thrown);
+ assertEquals("Exception data incorrect", ev.throwable!=null, thrown);
ev = (LogEvent) logEvents.get(2);
assertEquals("Error message expected", "error", ev.msg);
assertEquals("Error level expected", "ERROR", ev.level);
- assertEquals("Exception data incorrect", (ev.throwable!=null), thrown);
+ assertEquals("Exception data incorrect", ev.throwable!=null, thrown);
ev = (LogEvent) logEvents.get(3);
assertEquals("Fatal message expected", "fatal", ev.msg);
assertEquals("Fatal level expected", "FATAL", ev.level);
- assertEquals("Exception data incorrect", (ev.throwable!=null), thrown);
+ assertEquals("Exception data incorrect", ev.throwable!=null, thrown);
}
Modified:
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java
(original)
+++
commons/proper/logging/trunk/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java
Fri Jan 11 13:02:50 2013
@@ -73,7 +73,7 @@ public class TestAppender extends Append
public boolean requiresLayout() {
- return (false);
+ return false;
}
Modified:
commons/proper/logging/trunk/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java?rev=1432026&r1=1432025&r2=1432026&view=diff
==============================================================================
---
commons/proper/logging/trunk/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java
(original)
+++
commons/proper/logging/trunk/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java
Fri Jan 11 13:02:50 2013
@@ -43,27 +43,27 @@ public class DecoratedSimpleLog extends
// ------------------------------------------------------------- Properties
public DateFormat getDateTimeFormatter() {
- return (dateFormatter);
+ return dateFormatter;
}
public String getDateTimeFormat() {
- return (dateTimeFormat);
+ return dateTimeFormat;
}
public String getLogName() {
- return (logName);
+ return logName;
}
public boolean getShowDateTime() {
- return (showDateTime);
+ return showDateTime;
}
public boolean getShowShortName() {
- return (showShortName);
+ return showShortName;
}
@@ -94,7 +94,7 @@ public class DecoratedSimpleLog extends
// Return cache
public List getCache() {
- return (this.cache);
+ return this.cache;
}
