Author: adietish Date: 2011-06-10 18:41:07 -0400 (Fri, 10 Jun 2011) New Revision: 32030 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java Log: [JBIDE-9054] made code more readable: 1) transformed "if"s into "else if"s and switched the type checked so that it gets null-safe if the type is null Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:14:45 UTC (rev 32029) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:41:07 UTC (rev 32030) @@ -61,7 +61,7 @@ /* Copied from JBossServer.getDeployFolder(etc) */ public static String getDeployRootFolder(IServer server, String type) { - if( type.equals(JBossServer.DEPLOY_CUSTOM)) { + if( JBossServer.DEPLOY_CUSTOM.equals(type)) { String val = server.getAttribute(JBossServer.DEPLOY_DIRECTORY, (String)null); if( val != null ) { IPath val2 = new Path(val); @@ -71,10 +71,10 @@ type = JBossServer.DEPLOY_SERVER; } // This should *NOT* happen, so if it does, we will default to server location - if( type.equals(JBossServer.DEPLOY_METADATA)) { + else if( JBossServer.DEPLOY_METADATA.equals(type)) { type = JBossServer.DEPLOY_SERVER; } - if( type.equals(JBossServer.DEPLOY_SERVER)) { + else if(JBossServer.DEPLOY_SERVER.equals(type)) { // TODO !!!! Need API (nmaybe in JBossServer?) so servers can override this behavior // Cannot move this code to JBossServer because this requires an RSE-specific key!! Damn!