Author: kkolinko
Date: Sat Feb 9 00:58:08 2013
New Revision: 1444303
URL: http://svn.apache.org/r1444303
Log:
Remove unnecessary casts
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java Sat Feb
9 00:58:08 2013
@@ -19,7 +19,6 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
@@ -43,11 +42,8 @@ public class ConnectorSF extends StoreFa
if (aConnector instanceof Connector) {
Connector connector = (Connector) aConnector;
// Store nested <Listener> elements
- if (connector instanceof Lifecycle) {
- LifecycleListener listeners[] = ((Lifecycle) connector)
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- }
+ LifecycleListener listeners[] = connector.findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Sat Feb 9 00:58:08 2013
@@ -93,7 +93,7 @@ public class ConnectorStoreAppender exte
Iterator<String> propertyIterator = propertyKeys.iterator();
while (propertyIterator.hasNext()) {
String key = propertyIterator.next();
- Object value = (Object) IntrospectionUtils.getProperty(bean, key);
+ Object value = IntrospectionUtils.getProperty(bean, key);
if (desc.isTransientAttribute(key)) {
continue; // Skip the specified exceptions
@@ -172,7 +172,7 @@ public class ConnectorStoreAppender exte
}
String key = descriptors[i].getName();
if (replacements.get(key) != null) {
- key = (String) replacements.get(key);
+ key = replacements.get(key);
}
if (!propertyKeys.contains(key)) {
propertyKeys.add(key);
@@ -243,7 +243,7 @@ public class ConnectorStoreAppender exte
Object value) {
String repl = name;
if (replacements.get(name) != null) {
- repl = (String) replacements.get(name);
+ repl = replacements.get(name);
}
super.printValue(writer, indent, repl, value);
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Sat Feb 9 00:58:08 2013
@@ -30,7 +30,6 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
@@ -151,7 +150,7 @@ public class StandardContextSF extends S
* @throws Exception
*/
protected void storeWithBackup(StandardContext aContext) throws Exception {
- StoreFileMover mover = getConfigFileWriter((Context) aContext);
+ StoreFileMover mover = getConfigFileWriter(aContext);
if (mover != null) {
// Bugzilla 37781 Check to make sure we can write this output file
if ((mover.getConfigOld() == null)
@@ -243,11 +242,9 @@ public class StandardContextSF extends S
if (aContext instanceof StandardContext) {
StandardContext context = (StandardContext) aContext;
// Store nested <Listener> elements
- if (context instanceof Lifecycle) {
- LifecycleListener listeners[] = context
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- }
+ LifecycleListener listeners[] = context.findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
+
// Store nested <Valve> elements
Valve valves[] = context.getPipeline().getValves();
storeElementArray(aWriter, indent, valves);
@@ -373,7 +370,7 @@ public class StandardContextSF extends S
continue;
resource.add(wresources[i]);
}
- return (String[]) resource.toArray(new String[resource.size()]);
+ return resource.toArray(new String[resource.size()]);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java Sat
Feb 9 00:58:08 2013
@@ -51,11 +51,9 @@ public class StandardEngineSF extends St
if (aEngine instanceof StandardEngine) {
StandardEngine engine = (StandardEngine) aEngine;
// Store nested <Listener> elements
- if (engine instanceof Lifecycle) {
- LifecycleListener listeners[] = ((Lifecycle) engine)
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- }
+ LifecycleListener listeners[] = ((Lifecycle) engine)
+ .findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
// Store nested <Realm> element
Realm realm = engine.getRealm();
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java Sat
Feb 9 00:58:08 2013
@@ -55,11 +55,9 @@ public class StandardHostSF extends Stor
if (aHost instanceof StandardHost) {
StandardHost host = (StandardHost) aHost;
// Store nested <Listener> elements
- if (host instanceof Lifecycle) {
- LifecycleListener listeners[] = ((Lifecycle) host)
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- }
+ LifecycleListener listeners[] = ((Lifecycle) host)
+ .findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
// Store nested <Alias> elements
String aliases[] = host.findAliases();
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
Sat Feb 9 00:58:08 2013
@@ -45,11 +45,10 @@ public class StandardServiceSF extends S
if (aService instanceof StandardService) {
StandardService service = (StandardService) aService;
// Store nested <Listener> elements
- if (service instanceof Lifecycle) {
- LifecycleListener listeners[] = ((Lifecycle) service)
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- }
+ LifecycleListener listeners[] = ((Lifecycle) service)
+ .findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
+
// Store nested <Executor> elements
Executor[] executors = service.findExecutors();
storeElementArray(aWriter, indent, executors);
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Sat
Feb 9 00:58:08 2013
@@ -252,7 +252,7 @@ public class StoreAppender {
if (bean instanceof ResourceBase) {
ResourceBase resource = (ResourceBase) bean;
for (Iterator<String> iter = resource.listProperties();
iter.hasNext();) {
- String name = (String) iter.next();
+ String name = iter.next();
Object value = resource.getProperty(name);
if (!isPersistable(value.getClass())) {
continue;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java Sat Feb
9 00:58:08 2013
@@ -137,14 +137,15 @@ public class StoreConfig implements ISto
desc.setStoreSeparate(true);
desc.setBackup(backup);
desc.setExternalAllowed(externalAllowed);
- store((Server) aServer);
+ store(aServer);
} finally {
desc.setStoreSeparate(oldSeparate);
desc.setBackup(oldBackup);
desc.setExternalAllowed(oldExternalAllowed);
}
- } else
- store((Server) aServer);
+ } else {
+ store(aServer);
+ }
} catch (Exception e) {
if (log.isInfoEnabled())
log.info("Object " + aServerName
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java Sat
Feb 9 00:58:08 2013
@@ -105,7 +105,7 @@ public class StoreRegistry {
public StoreDescription findDescription(String id) {
if (log.isDebugEnabled())
log.debug("search descriptor " + id);
- StoreDescription desc = (StoreDescription) descriptors.get(id);
+ StoreDescription desc = descriptors.get(id);
if (desc == null) {
Class<?> aClass = null;
try {
@@ -115,11 +115,10 @@ public class StoreRegistry {
log.error("ClassName:" + id, e);
}
if (aClass != null) {
- desc = (StoreDescription) descriptors.get(aClass.getName());
+ desc = descriptors.get(aClass.getName());
for (int i = 0; desc == null && i < interfaces.length; i++) {
if (interfaces[i].isAssignableFrom(aClass)) {
- desc = (StoreDescription) descriptors.get(interfaces[i]
- .getName());
+ desc = descriptors.get(interfaces[i].getName());
}
}
}
@@ -187,7 +186,7 @@ public class StoreRegistry {
String key = desc.getId();
if (key == null || "".equals(key))
key = desc.getTagClass();
- return (StoreDescription) descriptors.remove(key);
+ return descriptors.remove(key);
}
// Attributes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
