java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 4 +--- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 1 - java/code/src/com/redhat/rhn/manager/user/UserManager.java | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
New commits: commit d2714e2e6e48dcf84bf79ed19d60f2109b9294e4 Author: Tomas Lestach tlestach@redhat.com Date: Wed May 30 08:51:07 2012 +0200
remove unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java index ca28bd9..8654c0b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java @@ -66,9 +66,7 @@ public class XccdfSearchHelper extends RhnAction { return ScapManager.ruleResultsByIdentIdsForSsm(context.getCurrentUser(), identIds); } - else { - return ScapManager.ruleResultsByIdentIds(context.getCurrentUser(), identIds); - } + return ScapManager.ruleResultsByIdentIds(context.getCurrentUser(), identIds); }
private static String preprocessSearchString(String searchString) {
commit 37836faf25c0c9ed705ad9ea7ff5451018ec8b80 Author: Tomas Lestach tlestach@redhat.com Date: Wed May 30 08:50:00 2012 +0200
remove unused imports
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 5931155..0233572 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -76,7 +76,6 @@ import com.redhat.rhn.manager.user.UserManager; import com.redhat.rhn.taskomatic.TaskomaticApi; import com.redhat.rhn.taskomatic.task.TaskConstants;
-import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger;
diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/java/code/src/com/redhat/rhn/manager/user/UserManager.java index a73b776..43195a5 100644 --- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java +++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java @@ -43,7 +43,6 @@ import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.SatManager;
-import org.apache.commons.lang.BooleanUtils; import org.apache.log4j.Logger;
import java.sql.Types;