From fc25aa54ba31beccc373e0d8818d7ddc6e146c52 Mon Sep 17 00:00:00 2001
From: Colin Coe <colin.coe@gmail.com>
Date: Thu, 25 Sep 2008 20:58:32 +0800
Subject: [PATCH] Tidy code, remove commmented code and fix documentation comments

---
 .../xmlrpc/serializer/KickstartDataSerializer.java |    4 --
 .../system/profile/ServerProfileHandler.java       |   42 ++++++++------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
index 1ebe440..ce692c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
@@ -93,7 +93,3 @@ public class KickstartDataSerializer implements XmlRpcCustomSerializer {
         helper.writeTo(output);
     }
 }
-/*
-        <set name="preserveFileLists" table="rhnKickstartPreserveFileList" lazy="true">
-        <set name="childChannels" table="rhnKickstartChildChannel">
-*/
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/profile/ServerProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/profile/ServerProfileHandler.java
index fc88815..d5ae021 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/profile/ServerProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/profile/ServerProfileHandler.java
@@ -14,14 +14,11 @@
  */
 package com.redhat.rhn.frontend.xmlrpc.system.profile;
 
-//import java.lang.Object;
-//import java.util.ArrayList;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
-//import java.util.Date;
-//import java.util.Iterator;
-//import java.util.LinkedList;
-//import java.util.List;
-//import java.util.Map;
+import java.util.List;
+import java.util.Set;
 import java.util.SortedSet;
 
 import com.redhat.rhn.domain.kickstart.KickstartCommand;
@@ -33,37 +30,32 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
 import com.redhat.rhn.frontend.xmlrpc.serializer.KickstartCustomOptionSerializer;
 import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper;
 
+import redstone.xmlrpc.XmlRpcArray;
+
 /**
- * ServerConfigChannelHandler
+ * ServerProfileHandler
  * @version $Rev$
- * @xmlrpc.namespace system.config
+ * @xmlrpc.namespace system.profile
  * @xmlrpc.doc Provides methods to access and modify many aspects of 
- * configuration channels and server association.
- * basically system.config name space
+ * kickstart profile and server association.
+ * basically system.profile name space
  */
 public class ServerProfileHandler extends BaseHandler {
+
     /**
-     * List files in a given server
+     * List custom options in a kickstart profile
      * @param sessionKey the session key
-     * @param sid the server id
-     * @param listLocal true if a list of paths in local override is desired
-     *                  false if  list of paths in sandbox channel is desired
-     * @return a list of dto's holding this info.
+     * @param ksLabel the kickstart label
+     * @return a list of hashes holding this info.
      *
-     * @xmlrpc.doc Return the list of files in a given channel.
+     * @xmlrpc.doc List custom options in a kickstart profile
      * @xmlrpc.param #session_key() 
      * @xmlrpc.param #param("int","serverId")
-     * @xmlrpc.param #param("int","listLocal")
-     *      #options()
-     *          #item_desc ("1", "to return configuration files 
-     *              in the system's local override configuration channel")
-     *          #item_desc ("0", "to return configuration files 
-     *              in the system's sandbox configuration channel")
-     *      #options_end()
+     * @xmlrpc.param #param("string","ksLabel")
      *  
      * @xmlrpc.returntype
      * #array()
-     * $ConfigFileDtoSerializer
+     * $KickstartCommandSerializer
      * #array_end()
      */
 
-- 
1.5.5.1