java/code/src/com/redhat/rhn/domain/common/Checksum.java | 7
+++----
java/code/src/com/redhat/rhn/domain/common/CommonFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 4 ++--
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 3 ++-
7 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 9adf8731e0fd5e64bacb93a8685d0617f68d9476
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 10 17:24:37 2009 +0100
making java changes compilable and checkstyle compliant
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
index b17ff61..bfb9ed4 100644
--- a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.domain.common;
import com.redhat.rhn.domain.BaseDomainHelper;
-import com.redhat.rhn.domain.common.ChecksumType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -61,7 +60,7 @@ public class Checksum extends BaseDomainHelper {
/**
* @return Returns the type of checksum.
*/
- public String getChecksumType() {
+ public ChecksumType getChecksumType() {
return checksumType;
}
@@ -81,9 +80,9 @@ public class Checksum extends BaseDomainHelper {
return false;
}
- Checksum checksum = (Checksum) o;
+ Checksum other = (Checksum) o;
- if (id != null ? !id.equals(checksum.id) : checksum.id != null) {
+ if (id != null ? !id.equals(other.id) : other.id != null) {
return false;
}
diff --git a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
index ff3e2a4..3a32587 100644
--- a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
@@ -16,7 +16,6 @@ package com.redhat.rhn.domain.common;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.hibernate.HibernateFactory;
-import com.redhat.rhn.domain.common.Checksum;
import
com.redhat.rhn.domain.org.Org;
import org.apache.commons.codec.binary.Hex;
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
index 3ac9212..6852052 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
@@ -257,14 +257,14 @@ public class Package extends BaseDomainHelper {
/**
* @return Returns the checksum.
*/
- public String getChecksum() {
+ public Checksum getChecksum() {
return checksum;
}
/**
* @param checksumIn The checksum to set.
*/
- public void setChecksum(String checksumIn) {
+ public void setChecksum(Checksum checksumIn) {
this.checksum = checksumIn;
}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
index 967b15b..0138972 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
@@ -49,7 +49,7 @@ public class PackageSource extends BaseDomainHelper {
/**
* @return Returns the sig checksum.
*/
- public String getSigchecksum() {
+ public Checksum getSigchecksum() {
return sigchecksum;
}
@@ -147,7 +147,7 @@ public class PackageSource extends BaseDomainHelper {
/**
* @return Returns the checksum.
*/
- public String getChecksum() {
+ public Checksum getChecksum() {
return checksum;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index e95b2f3..0976365 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -31,7 +31,7 @@ public class PackageDto extends BaseDto {
private String epoch;
private String archLabel;
private String checksum;
- private String checksumType
+ private String checksumType;
private Long cid;
private String channelName;
private String summary;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
index 2bfe4d4..c09dfcd 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
@@ -95,7 +95,8 @@ public class PackageHelper {
addEntry(pkgMap, "checksum",
StringUtils.defaultString(pkg.getChecksum().getChecksum()));
addEntry(pkgMap, "checksum_type",
-
StringUtils.defaultString(pkg.getChecksum().getChecksumType().getLabel()));
+ StringUtils.defaultString(
+ pkg.getChecksum().getChecksumType().getLabel()));
addEntry(pkgMap, "vendor",
StringUtils.defaultString(pkg.getVendor()));
addEntry(pkgMap, "summary",
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
index 61a0bee..e4b7c05 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
@@ -218,7 +218,8 @@ public class PackagesHandler extends BaseHandler {
row.put("size", file.get("file_size"));
row.put("linkto", StringUtils.defaultString((String)
file.get("linkto")));
row.put("checksum", StringUtils.defaultString((String)
file.get("checksum")));
- row.put("checksum_type", StringUtils.defaultString((String)
file.get("checksumtype")));
+ row.put("checksum_type", StringUtils.defaultString(
+ (String) file.get("checksumtype")));
// Determine the file_type
if (file.get("checksum") != null) {