java/code/src/com/redhat/rhn/domain/iss/IssFactory.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java | 2 --
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java | 10
+++-------
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java | 10
+++-------
5 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit e874937a066f6f419b548dd1c0c5c5224ae6ab12
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:13:55 2013 +0200
removing @Override annotation from methods that aren't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
index 365cf65..c32e1e2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
@@ -154,7 +154,6 @@ public class MapOrgsAction extends RhnAction {
*/
class OrgComparator implements Comparator<OrgDto> {
- @Override
public int compare(OrgDto o1, OrgDto o2) {
if (o1 == null || o2 == null) {
throw new NullPointerException("Can't compare OrgDto with
null");
@@ -170,7 +169,6 @@ class OrgComparator implements Comparator<OrgDto> {
*/
class IssSyncOrgComparator implements Comparator<IssMasterOrg> {
- @Override
public int compare(IssMasterOrg so1, IssMasterOrg so2) {
if (so1 == null || so2 == null) {
throw new NullPointerException("Can't compare IssSyncOrg with
null");
commit 3ab1697156f5047f83ba219d80aca3491662e9d9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:12:28 2013 +0200
removing unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index 07d7b93..bda681a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -85,9 +85,7 @@ public class RemoveSlavesAction extends RhnAction {
}
return destination;
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
// if I have a previous set selections populate data using it
@@ -110,9 +108,7 @@ public class RemoveSlavesAction extends RhnAction {
if (sid != null) {
return Long.parseLong(sid);
}
- else {
- return null;
- }
+ return null;
}
private List<IssSlave> findSelectedSlaves(Set sessionSet, Object sidIn) {
commit 98774a46d2d3be44a06d44282f5e4fce4d8bb7d2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:12:09 2013 +0200
removing unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index 0053648..e557a8a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -85,9 +85,7 @@ public class RemoveMastersAction extends RhnAction {
}
return destination;
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
// if I have a previous set selections populate data using it
@@ -110,9 +108,7 @@ public class RemoveMastersAction extends RhnAction {
if (mid != null) {
return Long.parseLong(mid);
}
- else {
- return null;
- }
+ return null;
}
private List<IssMaster> findSelectedMasters(Set sessionSet, Long midIn) {
commit 5d416cfa91fa6543b7a9271384761bf2f19e7f33
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:11:41 2013 +0200
removing unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
index 5eaf9ad..c7beeb4 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
@@ -75,7 +75,7 @@ public class IssFactory extends HibernateFactory {
*/
public static List<IssSlave> listAllIssSlaves() {
Map params = new HashMap();
- return (List<IssSlave>)singleton.listObjectsByNamedQuery(
+ return singleton.listObjectsByNamedQuery(
"IssSlave.lookupAll", params);
}
@@ -113,7 +113,7 @@ public class IssFactory extends HibernateFactory {
*/
public static List<IssMaster> listAllMasters() {
Map params = new HashMap();
- return (List<IssMaster>)singleton.listObjectsByNamedQuery(
+ return singleton.listObjectsByNamedQuery(
"IssMaster.lookupAll", params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
index 198c574..2b26a8d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
@@ -123,7 +123,7 @@ public class AllowSlaveOrgsAction extends RhnAction {
RequestContext context,
Long sid,
Set sessionSet) {
- Set<String> soids = (Set<String>) sessionSet;
+ Set<String> soids = sessionSet;
Set<Org> allowedOrgs = new HashSet<Org>();
IssSlave s = IssFactory.lookupSlaveById(sid);
for (String soid : soids) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index b297b25..0053648 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -119,7 +119,7 @@ public class RemoveMastersAction extends RhnAction {
List<IssMaster> masters = new ArrayList<IssMaster>();
if (sessionSet != null) {
- Set<String> mids = (Set<String>) sessionSet;
+ Set<String> mids = sessionSet;
for (String mid : mids) {
IssMaster aMaster = IssFactory.lookupMasterById(Long.parseLong(mid));
masters.add(aMaster);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index fa373a6..07d7b93 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -119,7 +119,7 @@ public class RemoveSlavesAction extends RhnAction {
List<IssSlave> slaves = new ArrayList<IssSlave>();
if (sessionSet != null) {
- Set<String> sids = (Set<String>) sessionSet;
+ Set<String> sids = sessionSet;
for (String sid : sids) {
IssSlave aSlave = IssFactory.lookupSlaveById(Long.parseLong(sid));
slaves.add(aSlave);