5 commits - java/code

Tomas Lestach tlestach at fedoraproject.org
Wed Jun 20 07:42:37 UTC 2012


 java/code/src/com/redhat/rhn/domain/credentials/Credentials.java                               |    4 +---
 java/code/src/com/redhat/rhn/domain/image/Image.java                                           |    1 -
 java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java |    8 ++++----
 java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java                          |    2 --
 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java                         |    6 ++----
 5 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 10ffcf319d8f280af3c3bb90eae1c28eae733500
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Wed Jun 20 09:38:55 2012 +0200

    removing @Override annotations, methods aren't overriden

diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
index 71bd777..1dfb908 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
@@ -63,7 +63,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
     /**
      * {@inheritDoc}
      */
-    @Override
     public String toText() {
         // really a noop
         return "";
@@ -73,7 +72,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
      *
      * {@inheritDoc}
      */
-    @Override
     public Transaction getTransaction() {
         return txn;
     }


commit 41840975f5b74cc709e78efb342cc9419f35c5e2
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Wed Jun 20 09:38:42 2012 +0200

    removing @Override annotation, method isn't overriden

diff --git a/java/code/src/com/redhat/rhn/domain/image/Image.java b/java/code/src/com/redhat/rhn/domain/image/Image.java
index 937f356..a3ad87c 100644
--- a/java/code/src/com/redhat/rhn/domain/image/Image.java
+++ b/java/code/src/com/redhat/rhn/domain/image/Image.java
@@ -224,7 +224,6 @@ public class Image extends BaseDto implements Comparable<Image> {
     /**
      * {@inheritDoc}
      */
-    @Override
     public int compareTo(Image image) {
         int ret = 0;
         if (!this.name.equals(image.getName())) {


commit 226254382f3687ae349b7cb96c3369241f5a3208
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Wed Jun 20 09:37:28 2012 +0200

    remove unnecessary else clause

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index a3873c7..bf29289 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -956,10 +956,8 @@ public class ErrataHandler extends BaseHandler {
                     inheritPackages);
             return new ArrayList<Errata>().toArray();
         }
-        else {
-            return ErrataManager.cloneErrataApi(channel, errataToClone,
-                    loggedInUser, inheritPackages);
-        }
+        return ErrataManager.cloneErrataApi(channel, errataToClone,
+                loggedInUser, inheritPackages);
     }
 
 


commit dd918224edf6d6aa87ae5cd469a918b608dc5680
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Wed Jun 20 09:37:12 2012 +0200

    remove unnecessary else clause

diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
index 259dbe6..c896337 100644
--- a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
+++ b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
@@ -143,9 +143,7 @@ public class Credentials extends BaseDomainHelper {
         if (this.encodedPassword != null) {
             return new String(Base64.decodeBase64(this.encodedPassword.getBytes()));
         }
-        else {
-            return this.encodedPassword;
-        }
+        return this.encodedPassword;
     }
 
     /**


commit 953670396c9c87ebf3f86fe8548cc7e74ba325df
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Wed Jun 20 09:35:59 2012 +0200

    remove unnecessary casts

diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
index a3a9491..cf1a1e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
@@ -68,10 +68,10 @@ public class ScheduleImageDeploymentAction extends RhnAction {
             DynaActionForm form = (DynaActionForm) actionForm;
             Long vcpus = (Long) form.get("vcpus");
             Long memkb = (Long) form.get("mem_mb") * 1024;
-            String bridge = (String) form.getString("bridge");
-            String proxyServer = (String) form.getString("proxy_server");
-            String proxyUser = (String) form.getString("proxy_user");
-            String proxyPass = (String) form.getString("proxy_pass");
+            String bridge = form.getString("bridge");
+            String proxyServer = form.getString("proxy_server");
+            String proxyUser = form.getString("proxy_user");
+            String proxyPass = form.getString("proxy_pass");
 
             // Find the requested image
             String imageId = request.getParameter("image_id");




More information about the spacewalk-commits mailing list