diff --git a/pmd-jbuilder/PMDOpenTool.jpx.local b/pmd-jbuilder/PMDOpenTool.jpx.local
index fdd60ddc74..c0ef71b258 100644
--- a/pmd-jbuilder/PMDOpenTool.jpx.local
+++ b/pmd-jbuilder/PMDOpenTool.jpx.local
@@ -25,10 +25,10 @@ debug.NoTracingClasses.6[0]=30 com.borland.jbuilder.runtime.*1  1 -1
 debug.NoTracingClasses.7[0]=17 com.borland.sql.*1  1 -1
 debug.NoTracingClasses.8[0]=9  com.sun.*1  1 -1
 debug.NoTracingClasses.9[0]=6  java.*1  1 -1
-history.files.active[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java
-history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;136,1658
-history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java,F;13,593
-history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java,F;0,754
+history.files.active[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
+history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;70,2966
+history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java,F;26,523
+history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java,F;122,6504
 import.optimize.packageprefixgroupings.1[0]=java
 import.optimize.packageprefixgroupings.2[0]=<blank line>
 import.optimize.packageprefixgroupings.3[0]=javax
@@ -39,7 +39,9 @@ sys.DefaultPackage[0]=net.sourceforge.pmd.jbuilder
 team.ActiveVCS[0]=CVS
 team.CvsAccessMethod[0]=ext
 team.CvsAutosaveEnabled[0]=1
+team.CvsBranch[0]=<main>
 team.CvsModule[0]=pmd-jbuilder
+team.CvsRemoteShell[0]=ssh
 team.CvsRepository[0]=/cvsroot/pmd
 team.CvsServer[0]=cvs.pmd.sourceforge.net
 team.CvsShowConsole[0]=0
diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar
index b64f956137..ff74ec964d 100644
Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ
diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
index 00da9fee92..44838d96a1 100644
--- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
+++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
@@ -133,31 +133,31 @@ public class RuleSetPropertyPage extends PropertyPage {
 
     void jbSelectRuleSets_actionPerformed(ActionEvent e) {
         //get the selected elements in the selected list and move to the available list
-        int [] selectedItems = jlistAvailableRuleSets.getSelectedIndices();
-        if (selectedItems != null) {
-            for (int i=0; i<selectedItems.length; i++) {
-                ListEntry le = (ListEntry)dlmAvailableRuleSets.get(selectedItems[i]);
-                dlmSelectedRuleSets.addElement(le);
-                dlmAvailableRuleSets.remove(selectedItems[i]);
-                jlistSelectedRuleSets.updateUI();
-                jlistAvailableRuleSets.updateUI();
-            }
+        int selectedIndex = jlistAvailableRuleSets.getSelectedIndex();
+        while (selectedIndex != -1) {
+            ListEntry le = (ListEntry)dlmAvailableRuleSets.get(selectedIndex);
+            dlmSelectedRuleSets.addElement(le);
+            dlmAvailableRuleSets.remove(selectedIndex);
+            selectedIndex = jlistAvailableRuleSets.getSelectedIndex();
         }
+        jlistSelectedRuleSets.updateUI();
+        jlistAvailableRuleSets.updateUI();
+
 
     }
 
     void jbDeselectRuleSets_actionPerformed(ActionEvent e) {
         //get the selected elements in the available list and move to the selected list
-        int [] selectedItems = jlistSelectedRuleSets.getSelectedIndices();
-        if (selectedItems != null) {
-            for (int i=0; i<selectedItems.length; i++) {
-                ListEntry le = (ListEntry)dlmSelectedRuleSets.get(selectedItems[i]);
-                dlmAvailableRuleSets.addElement(le);
-                dlmSelectedRuleSets.remove(selectedItems[i]);
-                jlistSelectedRuleSets.updateUI();
-                jlistAvailableRuleSets.updateUI();
-            }
+        int selectedIndex = jlistSelectedRuleSets.getSelectedIndex();
+        while(selectedIndex != -1) {
+            ListEntry le = (ListEntry)dlmSelectedRuleSets.get(selectedIndex);
+            dlmAvailableRuleSets.addElement(le);
+            dlmSelectedRuleSets.remove(selectedIndex);
+            selectedIndex = jlistSelectedRuleSets.getSelectedIndex();
         }
+        jlistSelectedRuleSets.updateUI();
+        jlistAvailableRuleSets.updateUI();
+
     }
 
 }