[jbosstools-commits] JBoss Tools SVN: r32934 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
Author: adietish
Date: 2011-07-15 05:24:06 -0400 (Fri, 15 Jul 2011)
New Revision: 32934
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] cleaned implementation (removed unnecessary additional check, renamed wrong
named local var)
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-15
04:11:56 UTC (rev 32933)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-15
09:24:06 UTC (rev 32934)
@@ -48,23 +48,17 @@
@SuppressWarnings("unchecked")
public static <ADAPTER> ADAPTER checkedGetServerAdapter(IServer server,
Class<ADAPTER> behaviorClass) throws CoreException {
- ADAPTER serverBehavior = (ADAPTER) server.loadAdapter(behaviorClass, new
NullProgressMonitor());
- if (serverBehavior == null) {
+ ADAPTER adapter = (ADAPTER) server.loadAdapter(behaviorClass, new
NullProgressMonitor());
+ if (adapter == null) {
throw new CoreException(
new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CouldNotFindServerBehavior, server.getName())));
}
- return serverBehavior;
+ return adapter;
}
public static IJBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws
CoreException {
- IJBossBehaviourDelegate delegate = checkedGetServerAdapter(server,
DelegatingServerBehavior.class).getDelegate();
- if (delegate == null) {
- throw new CoreException(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.CouldNotFindServerBehavior, server.getName())));
- }
- return delegate;
+ return checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate();
}
@Deprecated