diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRules.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRules.java
index 4f14546744..d473164d3d 100644
--- a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRules.java
+++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRules.java
@@ -1,94 +1,195 @@
 /*
- * User: tom
- * Date: Jul 9, 2002
- * Time: 1:18:38 PM
+ *  User: tom
+ *  Date: Jul 9, 2002
+ *  Time: 1:18:38 PM
  */
 package net.sourceforge.pmd.jedit;
 
-import net.sourceforge.pmd.Rule;
-import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSetFactory;
-import net.sourceforge.pmd.RuleSetNotFoundException;
-import org.gjt.sp.jedit.jEdit;
-
-import javax.swing.*;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class SelectedRules {
+import javax.swing.*;
+import org.gjt.sp.jedit.jEdit;
 
-    // Rule -> JCheckBox
-    private Map rules = new TreeMap(new Comparator() {
-        public int compare(Object o1, Object o2) {
-            Rule r1 = (Rule)o1;
-            Rule r2 = (Rule)o2;
-            return r1.getName().compareTo(r2.getName());
-        }
-    });
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.RuleSet;
+import net.sourceforge.pmd.RuleSetFactory;
+import net.sourceforge.pmd.RuleSetNotFoundException;
+import java.util.StringTokenizer;
 
-    public SelectedRules() throws RuleSetNotFoundException {
-        RuleSetFactory rsf = new RuleSetFactory();
-        for (Iterator i = rsf.getRegisteredRuleSets(); i.hasNext();) {
-            RuleSet rs = (RuleSet)i.next();
-            for (Iterator j = rs.getRules().iterator(); j.hasNext();) {
-                Rule rule = (Rule)j.next();
-                rules.put(rule,  createCheckBox(rule.getName()));
-            }
-        }
-    }
 
-    public int size() {
-        return rules.size();
-    }
+/**
+ *  Description of the Class
+ *
+ * @author     jiger.p
+ * @created    April 22, 2003
+ */
+public class SelectedRules
+{
 
-    public Rule getRule(JCheckBox candidate) {
-        for (Iterator i = rules.keySet().iterator(); i.hasNext();) {
-            Rule rule = (Rule)i.next();
-            JCheckBox box = (JCheckBox)rules.get(rule);
-            if (box.equals(candidate)) {
-                return rule;
-            }
-        }
-        throw new RuntimeException("Couldn't find a rule that mapped to the passed in JCheckBox " + candidate);
-    }
+	// Rule -> JCheckBox
+	private Map rules = new TreeMap(
+							new Comparator()
+							{
+								public int compare(Object o1, Object o2)
+								{
+									Rule r1 = (Rule)o1;
+									Rule r2 = (Rule)o2;
+									return r1.getName().compareTo(r2.getName());
+								}
+							});
 
-    public JCheckBox get(Object key) {
-        return (JCheckBox)rules.get(key);
-    }
 
-    public Object[] getAllBoxes() {
-        Object[] foo = new Object[rules.size()];
-        int idx = 0;
-        for (Iterator i = rules.values().iterator(); i.hasNext();) {
-            foo[idx] = i.next();
-            idx++;
-        }
-        return foo;
-    }
+	/**
+	 *  Constructor for the SelectedRules object
+	 *
+	 * @exception  RuleSetNotFoundException  Description of the Exception
+	 */
+	public SelectedRules() throws RuleSetNotFoundException
+	{
+		RuleSetFactory rsf = new RuleSetFactory();
+		for(Iterator i = rsf.getRegisteredRuleSets(); i.hasNext(); )
+		{
+			RuleSet rs = (RuleSet)i.next();
+			addRuleSet2Rules(rs);
+		}
 
-    public void save() {
-        for (Iterator i = rules.keySet().iterator(); i.hasNext();) {
-            Rule rule = (Rule)i.next();
-            jEdit.setBooleanProperty(PMDJEditPlugin.OPTION_RULES_PREFIX + rule.getName(), get(rule).isSelected());
-        }
-    }
+		//Load custom RuleSets if any.
 
-    public RuleSet getSelectedRules() {
-        RuleSet newRuleSet = new RuleSet();
-        for (Iterator i = rules.keySet().iterator(); i.hasNext();) {
-            Rule rule = (Rule)i.next();
-            if (get(rule).isSelected()) {
-                newRuleSet.addRule(rule);
-            }
-        }
-        return newRuleSet;
-    }
+		String customRuleSetPath = jEdit.getProperty("pmd.customRulesPath");
+		if(!(customRuleSetPath == null))
+		{
+			StringTokenizer strtok = new StringTokenizer(customRuleSetPath, ",");
+			while(strtok.hasMoreTokens())
+			{
+				RuleSet rs = rsf.createRuleSet(strtok.nextToken());
+				addRuleSet2Rules(rs);
+			}
+		}
+	}
 
-    private JCheckBox createCheckBox(String name) {
-        JCheckBox box = new JCheckBox(name);
-        box.setSelected(jEdit.getBooleanProperty(PMDJEditPlugin.OPTION_RULES_PREFIX + name, true));
-        return box;
-    }
+
+	/**
+	 *  Description of the Method
+	 *
+	 * @return    Description of the Return Value
+	 */
+	public int size()
+	{
+		return rules.size();
+	}
+
+
+	/**
+	 *  Gets the rule attribute of the SelectedRules object
+	 *
+	 * @param  candidate  Description of the Parameter
+	 * @return            The rule value
+	 */
+	public Rule getRule(JCheckBox candidate)
+	{
+		for(Iterator i = rules.keySet().iterator(); i.hasNext(); )
+		{
+			Rule rule = (Rule)i.next();
+			JCheckBox box = (JCheckBox)rules.get(rule);
+			if(box.equals(candidate))
+			{
+				return rule;
+			}
+		}
+		throw new RuntimeException("Couldn't find a rule that mapped to the passed in JCheckBox " + candidate);
+	}
+
+
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  key  Description of the Parameter
+	 * @return      Description of the Return Value
+	 */
+	public JCheckBox get(Object key)
+	{
+		return (JCheckBox)rules.get(key);
+	}
+
+
+	/**
+	 *  Gets the allBoxes attribute of the SelectedRules object
+	 *
+	 * @return    The allBoxes value
+	 */
+	public Object[] getAllBoxes()
+	{
+		Object[] foo = new Object[rules.size()];
+		int idx = 0;
+		for(Iterator i = rules.values().iterator(); i.hasNext(); )
+		{
+			foo[idx] = i.next();
+			idx++;
+		}
+		return foo;
+	}
+
+
+	/**  Description of the Method */
+	public void save()
+	{
+		for(Iterator i = rules.keySet().iterator(); i.hasNext(); )
+		{
+			Rule rule = (Rule)i.next();
+			jEdit.setBooleanProperty(PMDJEditPlugin.OPTION_RULES_PREFIX + rule.getName(), get(rule).isSelected());
+		}
+	}
+
+
+	/**
+	 *  Gets the selectedRules attribute of the SelectedRules object
+	 *
+	 * @return    The selectedRules value
+	 */
+	public RuleSet getSelectedRules()
+	{
+		RuleSet newRuleSet = new RuleSet();
+		for(Iterator i = rules.keySet().iterator(); i.hasNext(); )
+		{
+			Rule rule = (Rule)i.next();
+			if(get(rule).isSelected())
+			{
+				newRuleSet.addRule(rule);
+			}
+		}
+		return newRuleSet;
+	}
+
+
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  name  Description of the Parameter
+	 * @return       Description of the Return Value
+	 */
+	private JCheckBox createCheckBox(String name)
+	{
+		JCheckBox box = new JCheckBox(name);
+		box.setSelected(jEdit.getBooleanProperty(PMDJEditPlugin.OPTION_RULES_PREFIX + name, true));
+		return box;
+	}
+
+
+	/**
+	 *  Adds a feature to the RuleSet2Rules attribute of the SelectedRules object
+	 *
+	 * @param  rs  The feature to be added to the RuleSet2Rules attribute
+	 */
+	private void addRuleSet2Rules(RuleSet rs)
+	{
+		for(Iterator j = rs.getRules().iterator(); j.hasNext(); )
+		{
+			Rule rule = (Rule)j.next();
+			rules.put(rule, createCheckBox(rule.getName()));
+		}
+	}
 }
+