diff --git a/pmd-jedit/etc/build.xml b/pmd-jedit/etc/build.xml
index f1329dc902..bbe1b90d5a 100644
--- a/pmd-jedit/etc/build.xml
+++ b/pmd-jedit/etc/build.xml
@@ -53,6 +53,7 @@
+
diff --git a/pmd-jedit/etc/doing_the_next_pmd_jedit_release.txt b/pmd-jedit/etc/doing_the_next_pmd_jedit_release.txt
index 9c41ca9d6b..b742a305da 100644
--- a/pmd-jedit/etc/doing_the_next_pmd_jedit_release.txt
+++ b/pmd-jedit/etc/doing_the_next_pmd_jedit_release.txt
@@ -3,11 +3,12 @@ change config/pmd.props to reflect actual pmd.jar file version
Create the binary release:
ant release
+move the zip file into c:\tmp
Create the src release:
cd lib
cvs add -kb PMDJEditPlugin-0.2.jar
-// FOR 0.2 release: cvs rm PMDJEditPlugin-0.2.jar
+cvs rm PMDJEditPlugin-0.1.jar
cvs ci -m "adding new jar, removing old one"
cd c:\data\pmd
cvs rtag -D tomorrow "pmd_jedit_release_0_2" pmd-jedit
@@ -20,6 +21,7 @@ unzip binary release into c:\jedit
TESTS:
1) Can you run jedit ok?
3) Can you run it it on a file and find some unused code?
+3) Are options persistant?
if you see a bug and fix it, you can delete the release using:
cvs rtag -d pmd_jedit_release_0_2 pmd
diff --git a/pmd-jedit/lib/PMDJEditPlugin-0.2.jar b/pmd-jedit/lib/PMDJEditPlugin-0.2.jar
new file mode 100644
index 0000000000..5401cf0a6b
Binary files /dev/null and b/pmd-jedit/lib/PMDJEditPlugin-0.2.jar differ
diff --git a/pmd-jedit/lib/PMDJEditPlugin.jar b/pmd-jedit/lib/PMDJEditPlugin.jar
deleted file mode 100644
index 595e54d94f..0000000000
Binary files a/pmd-jedit/lib/PMDJEditPlugin.jar and /dev/null differ
diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDOptionPane.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDOptionPane.java
index 75aad0f88b..c342fbe661 100644
--- a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDOptionPane.java
+++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDOptionPane.java
@@ -49,29 +49,42 @@ public class PMDOptionPane extends AbstractOptionPane implements OptionPane {
public void _init() {
super._init();
+ JPanel textPanel = new JPanel();
+ textPanel.setBackground(Color.white);
+ textPanel.setLayout(new BorderLayout());
+ textPanel.add(new JLabel("Select the rulesets you want to use and click 'Save'."), BorderLayout.NORTH);
+ textPanel.add(new JLabel("Please see http://pmd.sourceforge.net/ for more information on what's in each rule set."), BorderLayout.SOUTH);
+
JPanel checkBoxPanel = new JPanel();
checkBoxPanel.setBackground(Color.white);
+ checkBoxPanel.setBackground(Color.white);
checkBoxPanel.setLayout(new GridLayout(selectedRuleSets.size(), 2));
for (Iterator i = selectedRuleSets.keys(); i.hasNext();) {
String key = (String)i.next();
JPanel oneBoxPanel = new JPanel();
+ oneBoxPanel.setBackground(Color.white);
oneBoxPanel.add(new JLabel(key, JLabel.LEFT));
oneBoxPanel.add((JCheckBox)selectedRuleSets.get(key));
checkBoxPanel.add(oneBoxPanel);
}
JButton saveButton = new JButton("Save");
+ saveButton.setMnemonic('s');
saveButton.addActionListener(new SaveAL());
- JPanel buttonPanel = new JPanel();
- buttonPanel.add(saveButton);
JButton closeButton = new JButton("Close");
+ closeButton.setMnemonic('c');
closeButton.addActionListener(new CloseAL());
+
+ JPanel buttonPanel = new JPanel();
+ buttonPanel.setBackground(Color.white);
+ buttonPanel.add(saveButton);
buttonPanel.add(closeButton);
dialog = new JDialog(jEdit.getFirstView(), PMDJEditPlugin.NAME, true);
dialog.setTitle(PMDJEditPlugin.NAME);
dialog.getContentPane().setLayout(new BorderLayout());
+ dialog.getContentPane().add(textPanel, BorderLayout.NORTH);
dialog.getContentPane().add(checkBoxPanel, BorderLayout.CENTER);
dialog.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
dialog.setSize(new Dimension(500,300));
diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java
index d0f139b1f7..5120d03d93 100644
--- a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java
+++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java
@@ -9,6 +9,8 @@ import org.gjt.sp.jedit.jEdit;
import javax.swing.*;
import java.util.*;
+import java.util.List;
+import java.awt.*;
public class SelectedRuleSetsMap {
private Map selections = new HashMap();
@@ -51,6 +53,7 @@ public class SelectedRuleSetsMap {
private JCheckBox createCheckBox(String name) {
JCheckBox box = new JCheckBox();
+ box.setBackground(Color.white);
box.setSelected(jEdit.getBooleanProperty(PMDJEditPlugin.OPTION_RULESETS_PREFIX + name, true));
return box;
}