java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
| 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
| 8 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
| 46 +++++-----
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
| 16 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
| 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
| 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
| 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
| 13 +-
9 files changed, 57 insertions(+), 45 deletions(-)
New commits:
commit b1a8ffa2d26b79e043faa7fe15b977a28dbc41ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 11:05:25 2009 +0100
checkstyle errors removed
no functionality changes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index ca1cd8d..6bb4beb 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,7 +21,6 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import
com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
@@ -427,7 +426,7 @@ public class KickstartData {
/**
* Adds a KickstartPackage object to ksPackages.
- * @param p KickstartPackage to add
+ * @param kp KickstartPackage to add
*/
public void addKsPackage(KickstartPackage kp) {
@@ -437,7 +436,7 @@ public class KickstartData {
/**
* Removes a KickstartPackage object from ksPackages.
- * @param p KickstartPackage to remove
+ * @param kp KickstartPackage to remove
*/
public void removeKsPackage(KickstartPackage kp) {
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 4e269fb..c07f688 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -1046,16 +1046,22 @@ public class KickstartFactory extends HibernateFactory {
return custom;
}
+ /**
+ * @param p KickstartPackage to add to DB
+ */
public static void savePackage(KickstartPackage p) {
singleton.saveObject(p);
}
+ /**
+ * @param p KickstartPackage to remove from DB
+ */
public static void removePackage(KickstartPackage p) {
singleton.removeObject(p);
}
/**
- * @param ksData KcikstartDate to lookup
+ * @param ksData KcikstartData to lookup
* @param packageName PackageName to lookup
* @return KickstartPackge list
*/
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index c00bfd0..d6ae523 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -16,7 +16,6 @@ package com.redhat.rhn.domain.kickstart;
import java.util.Date;
import java.io.Serializable;
-import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.redhat.rhn.domain.rhnpackage.PackageName;
@@ -41,13 +40,13 @@ public class KickstartPackage
}
/**
- * @param ksdata
- * @param package_name_id
+ * @param ksDataIn identifies kickstart
+ * @param packageNameIn PackageName to be assciated
*/
- public KickstartPackage(KickstartData ksdata, PackageName package_name_id) {
+ public KickstartPackage(KickstartData ksDataIn, PackageName packageNameIn) {
super();
- this.ksData = ksdata;
- this.packageName = package_name_id;
+ this.ksData = ksDataIn;
+ this.packageName = packageNameIn;
}
/**
@@ -58,9 +57,9 @@ public class KickstartPackage
}
/**
- * @param position The position to set.
+ * @param positionIn The position to set.
*/
- public void setPosition(Long position) {
+ public void setPosition(Long positionIn) {
this.position = position;
}
@@ -72,10 +71,10 @@ public class KickstartPackage
}
/**
- * @param created The created to set.
+ * @param createdIn The created to set.
*/
- public void setCreated(Date created) {
- this.created = created;
+ public void setCreated(Date createdIn) {
+ this.created = createdIn;
}
/**
@@ -86,10 +85,10 @@ public class KickstartPackage
}
/**
- * @param modified The modified to set.
+ * @param modifiedIn The modified to set.
*/
- public void setModified(Date modified) {
- this.modified = modified;
+ public void setModified(Date modifiedIn) {
+ this.modified = modifiedIn;
}
/**
@@ -120,21 +119,25 @@ public class KickstartPackage
this.packageName = pn;
}
+ /**
+ * @param that KickstartPackage to be compared
+ * @return -1,0,1 for sort algo
+ */
public int compareTo(KickstartPackage that) {
- final int EQUAL = 0;
+ final int equal = 0;
if (this.equals(that)) {
- return EQUAL;
+ return equal;
}
int comparism = this.getKsData().getId().compareTo(that.getKsData().getId());
- if (EQUAL != comparism) {
+ if (equal != comparism) {
return comparism;
}
comparism = this.getPosition().compareTo(that.getPosition());
- if (EQUAL != comparism){
+ if (equal != comparism) {
return comparism;
}
return this.getPackageName().compareTo(that.getPackageName());
@@ -148,7 +151,7 @@ public class KickstartPackage
return false;
}
KickstartPackage that = (KickstartPackage) other;
- return this.hashCode()== other.hashCode();
+ return this.hashCode() == other.hashCode();
}
/**
@@ -162,6 +165,9 @@ public class KickstartPackage
.toHashCode();
}
+ /**
+ * {@inheritDoc}
+ */
public String toString() {
return "packageName: ".concat(this.getKsData().getId().toString())
.concat(", ").concat(this.getPosition().toString())
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index ba27013..3b2ccf4 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -464,8 +464,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setKernelParams(KERNEL_PARAMS);
- k.addKsPackage(new KickstartPackage(k,pn));
- k.addKsPackage(new KickstartPackage(k,pn2));
+ k.addKsPackage(new KickstartPackage(k, pn));
+ k.addKsPackage(new KickstartPackage(k, pn2));
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index 0f3c88e..2d3ec6f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -28,7 +28,6 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.StringTokenizer;
@@ -138,8 +137,10 @@ public class EditPackagesAction extends RhnAction {
// first clear the kickstart packages set
Set ksPackages = ksdata.getKsPackages();
for (Iterator iter = ksPackages.iterator(); iter.hasNext();) {
- KickstartFactory.removePackage((KickstartPackage)iter.next()); // remove
from DB
- iter.remove(); // remove from collection
+ // remove from DB
+ KickstartFactory.removePackage((KickstartPackage)iter.next());
+ // remove from collection
+ iter.remove();
}
String newPackages = form.getString(PACKAGE_LIST);
@@ -152,11 +153,12 @@ public class EditPackagesAction extends RhnAction {
continue;
}
PackageName pn = PackageFactory.lookupOrCreatePackageByName(pkg);
- KickstartPackage ks_p = new KickstartPackage(ksdata,pn);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
- if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(ksdata,
pn).isEmpty()) {
- ksdata.addKsPackage(ks_p); // save to collection
- KickstartFactory.savePackage(ks_p); // save to DB
+ if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(
+ ksdata, pn).isEmpty()) {
+ ksdata.addKsPackage(kp); // save to collection
+ KickstartFactory.savePackage(kp); // save to DB
}
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 61feda3..4da20a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -31,7 +31,6 @@ import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import
com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.user.User;
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index db1e611..0c2cc27 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -92,7 +92,7 @@ public class SoftwareHandler extends BaseHandler {
packages.clear();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- packages.add(new KickstartPackage(ksdata,pn));
+ packages.add(new KickstartPackage(ksdata, pn));
}
KickstartFactory.saveKickstartData(ksdata);
return 1;
@@ -123,9 +123,9 @@ public class SoftwareHandler extends BaseHandler {
Set<KickstartPackage> packages = ksdata.getKsPackages();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- KickstartPackage ks_p = new KickstartPackage(ksdata, pn);
- if (!packages.contains(ks_p)) {
- packages.add(ks_p);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
+ if (!packages.contains(kp)) {
+ packages.add(kp);
}
}
KickstartFactory.saveKickstartData(ksdata);
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index ccf9536..a6ccff7 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.SoftwareHandler;
import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
index 870ec17..64159bb 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
@@ -186,7 +186,8 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testDownloadKickstart() throws Exception {
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.addKsPackage(new KickstartPackage(ks1,
PackageFactory.lookupOrCreatePackageByName("blahPackage")));
+ ks1.addKsPackage(new KickstartPackage(ks1,
+ PackageFactory.lookupOrCreatePackageByName("blahPackage")));
ActivationKey key = ActivationKeyTest.createTestActivationKey(admin);
ks1.addDefaultRegToken(key.getToken());
@@ -458,11 +459,11 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package2 = PackageTest.createTestPackage(admin.getOrg());
Package package3 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
- ks1.addKsPackage(new KickstartPackage(ks1,package2.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package2.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package1.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package3.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package1.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package3.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
KickstartFactory.saveKickstartData(ks2);
@@ -498,7 +499,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package1 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
KickstartFactory.saveKickstartData(ks1);