java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 4
++--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 2
+-
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 7
++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 4
++--
4 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit df571b46c37182785468f858545da0936fcee225
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 16:56:49 2009 +0100
replacing HashSet with TreeSet
since java.util.HashSet cannot be cast to java.util.SortedSet
+ one parameter name change (bug introduced by checkstyle error removal)
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 6bb4beb..d15c925 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -104,7 +104,7 @@ public class KickstartData {
cryptoKeys = new HashSet();
defaultRegTokens = new HashSet();
preserveFileLists = new HashSet();
- ksPackages = new HashSet<KickstartPackage>();
+ ksPackages = new TreeSet<KickstartPackage>();
commands = new HashSet<KickstartCommand>();
ips = new HashSet();
scripts = new HashSet<KickstartScript>();
@@ -1225,7 +1225,7 @@ public class KickstartData {
}
cloned.setOrg(this.getOrg());
if (this.getKsPackages() != null) {
- cloned.setKsPackages(new HashSet(this.getKsPackages()));
+ cloned.setKsPackages(new TreeSet(this.getKsPackages()));
}
if (this.getPreserveFileLists() != null) {
cloned.setPreserveFileLists(new HashSet(this.getPreserveFileLists()));
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 d6ae523..f9552b7 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -60,7 +60,7 @@ public class KickstartPackage
* @param positionIn The position to set.
*/
public void setPosition(Long positionIn) {
- this.position = position;
+ this.position = positionIn;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
index 046bb14..66bdc30 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
@@ -46,6 +46,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -209,7 +210,7 @@ public class KickstartBuilder {
"%packages tag.");
}
- Set<KickstartPackage> ksPackagesSet = new
HashSet<KickstartPackage>();
+ Set<KickstartPackage> ksPackagesSet = new
TreeSet<KickstartPackage>();
for (Iterator<String> it = lines.iterator(); it.hasNext();) {
String currentLine = (String)it.next();
@@ -350,7 +351,7 @@ public class KickstartBuilder {
setupBasicInfo(label, ksdata, tree, virtualizationType);
if (ksdata.getKsPackages() == null) {
- ksdata.setKsPackages(new HashSet<KickstartPackage>());
+ ksdata.setKsPackages(new TreeSet<KickstartPackage>());
}
buildCommands(ksdata, parser.getOptionLines(), tree, kickstartHost);
@@ -531,7 +532,7 @@ public class KickstartBuilder {
cmd.processSkipKey(ksdata);
cmd.processRepos(ksdata);
if (ksdata.getKsPackages() == null) {
- ksdata.setKsPackages(new HashSet<KickstartPackage>());
+ ksdata.setKsPackages(new TreeSet<KickstartPackage>());
}
PackageName pn = cmd.findPackageName("@ Base");
ksdata.addKsPackage(new KickstartPackage(ksdata, pn));
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 4da20a5..f5349b9 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
@@ -824,11 +824,11 @@ public class ProfileHandler extends BaseHandler {
// Set operations to determine deltas
Set<KickstartPackage> onlyInProfile1 =
- new HashSet<KickstartPackage>(profile1.getKsPackages());
+ new TreeSet<KickstartPackage>(profile1.getKsPackages());
onlyInProfile1.removeAll(profile2.getKsPackages());
Set<KickstartPackage> onlyInProfile2 =
- new HashSet<KickstartPackage>(profile2.getKsPackages());
+ new TreeSet<KickstartPackage>(profile2.getKsPackages());
onlyInProfile2.removeAll(profile1.getKsPackages());
// Convert the remaining into strings for return
Show replies by date