From c7509e73df20e12700f097643290b8fe357a3455 Mon Sep 17 00:00:00 2001 From: Tom Copeland Date: Thu, 18 Jul 2002 00:26:19 +0000 Subject: [PATCH] various updates, moving towards the next release git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@423 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd-jedit/config/pmd.props | 4 ++-- pmd-jedit/etc/build.xml | 12 +++++++----- pmd-jedit/etc/scp.bat | 6 +++--- .../net/sourceforge/pmd/jedit/PMDJEditPlugin.java | 4 ++-- .../pmd/jedit/PMDRuleViolationDialog.java | 4 ++++ .../sourceforge/pmd/jedit/SelectedRuleSetsMap.java | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pmd-jedit/config/pmd.props b/pmd-jedit/config/pmd.props index 46cf1510f7..13c18b99ba 100644 --- a/pmd-jedit/config/pmd.props +++ b/pmd-jedit/config/pmd.props @@ -3,11 +3,11 @@ # plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.name=PMD plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.author=Tom Copeland -plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.version=0.3 +plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.version=0.4 plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.docs=jedit.html plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.0=jdk 1.3 plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.1=jedit 04.00.99.00 -plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-0.4.jar +plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-0.5.jar # # Menu properties diff --git a/pmd-jedit/etc/build.xml b/pmd-jedit/etc/build.xml index eed3fa0a8e..0f0b13ddb3 100644 --- a/pmd-jedit/etc/build.xml +++ b/pmd-jedit/etc/build.xml @@ -1,14 +1,16 @@ - + + + - + @@ -53,9 +55,9 @@ - - - + + + diff --git a/pmd-jedit/etc/scp.bat b/pmd-jedit/etc/scp.bat index 5bc300ff3b..38dec91353 100755 --- a/pmd-jedit/etc/scp.bat +++ b/pmd-jedit/etc/scp.bat @@ -1,4 +1,4 @@ @echo off -set CLASSPATH=build/ -set CLASSPATH=%CLASSPATH%;lib\pmd-0.4.jar -set CLASSPATH=%CLASSPATH%;lib\jedit.jar \ No newline at end of file +set CLASSPATH=..\build +set CLASSPATH=%CLASSPATH%;..\lib\pmd-0.5.jar +set CLASSPATH=%CLASSPATH%;..\lib\jedit.jar \ No newline at end of file diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java index acc727f5d2..07b6d01d26 100644 --- a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java +++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java @@ -54,13 +54,13 @@ public class PMDJEditPlugin extends EBPlugin { ctx.setSourceCodeFilename("this"); try { pmd.processFile(new StringReader(view.getTextArea().getText()), rules, ctx); - PMDRuleViolationDialog dialog = new PMDRuleViolationDialog(ctx.getReport()); + new PMDRuleViolationDialog(ctx.getReport()); } catch (FileNotFoundException fnfe) { fnfe.printStackTrace(); } } public void instanceDisplayPreferencesDialog(View view) { - PMDOptionPane options = new PMDOptionPane(); + new PMDOptionPane(); } } diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDRuleViolationDialog.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDRuleViolationDialog.java index 2df2962354..9baf285bc8 100644 --- a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDRuleViolationDialog.java +++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDRuleViolationDialog.java @@ -55,6 +55,10 @@ public class PMDRuleViolationDialog { private RuleViolationListModel rvListModel; public PMDRuleViolationDialog(Report report) { + if (report.isEmpty()) { + JOptionPane.showMessageDialog(jEdit.getFirstView(), "No errors found"); + return; + } dialog = new JDialog(jEdit.getFirstView(), PMDJEditPlugin.NAME, true); rvListModel = new RuleViolationListModel(report); diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java index 7e6b670736..d16dae6f7d 100644 --- a/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java +++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/SelectedRuleSetsMap.java @@ -9,8 +9,7 @@ import org.gjt.sp.jedit.jEdit; import javax.swing.*; import java.util.*; -import java.util.List; -import java.awt.*; +import java.awt.Color; public class SelectedRuleSetsMap { private Map selections = new HashMap(); @@ -20,6 +19,7 @@ public class SelectedRuleSetsMap { selections.put("unusedcode", createCheckBox("unusedcode")); selections.put("design", createCheckBox("design")); selections.put("naming", createCheckBox("naming")); + selections.put("imports", createCheckBox("imports")); } public Iterator keys() {