Updated to PMD 1.6

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@2575 51baf565-9d33-0410-a72c-fc3788e3496d

pmd-jedit/PMDPlugin/build.properties

@@ -1,2 +1,2 @@
-jedit.install.dir=/home/jiger/jEdit42
+jedit.install.dir=c:\\jiger\\jEdit42
 install.dir=${jedit.install.dir}\\jars

pmd-jedit/PMDPlugin/build.xml

@@ -5,7 +5,7 @@
 	<property name="src" value="src/"/>
 	<property name="lib" value="lib"/>
 	<property name="build" value="build"/>
-	<property name="pmdjar" value="pmd-1.5.jar"/>
+	<property name="pmdjar" value="pmd-1.6.jar"/>
 	<property name="pluginversion" value="2.4"/>
 	<property name="jedit.install.dir" value="../.."/>
 	<property name="jedit.jars.dir" value="${jedit.install.dir}\jars"/>

pmd-jedit/PMDPlugin/etc/changelog.txt

@@ -5,6 +5,7 @@
 - Added option to export PMD results to files in various formats such as HTML, XML, Text, CSV etc.
 - Added a new feature to show Progressbar when working on Large file sets.
 - Progressbar color configured via jEdit Properties.
+- Improvements in Copy/Paste Detector
 
 October 31st 2003 - 2.3
 1. Updated to PMD 1.3

pmd-jedit/PMDPlugin/jedit.html

@@ -42,11 +42,13 @@ then 2) select the "PMD->Check directory recursively" menu option.</p>
 		<h3>2.4</h3>
 		<ol>
 			<li>Optimized usage of ErrorSource for faster Error Highlighting.</li>
-			<li>Updated to PMD 1.5</li>
+			<li>Updated to PMD 1.6</li>
 			<li>Fixed Run on save running when the buffer is non Java also.</li>
 			<li>Added option to export PMD results to a file in various formats such as HTML, XML, Text, CSV etc.</li>
 			<li>Added a new feature to show Progressbar when working on Large file sets.</li>
 			<li>Made Progress bar color user-configurable.</li>
+			<li>Improvement in Copy/Paste Detector.</li>
+
 		</ol>
 		<h3>2.3</h3>
 		<ol>

pmd-jedit/PMDPlugin/pmd.props

@@ -8,7 +8,7 @@ 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.02.01.00
 plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.2=plugin errorlist.ErrorListPlugin 1.2
-plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-1.5.jar jaxen-core-1.0-fcs.jar saxpath-1.0-fcs.jar pmd-swingui-0.1.jar
+plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-1.6.jar jaxen-core-1.0-fcs.jar saxpath-1.0-fcs.jar pmd-swingui-0.1.jar
 
 #
 # Menu properties

pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java

@@ -375,10 +375,11 @@ public class PMDJEditPlugin extends EBPlugin {
 	public static void cpdCurrentFile(View view) throws IOException
 	{
 		/* if(!view.getBuffer().getMode().getName().equals("java"))
-	{
-			JOptionPane.showMessageDialog(view,"Copy/Paste detection can only be performed on Java code.","Copy/Paste Detector",JOptionPane.INFORMATION_MESSAGE);
-			return;
-	} */
+			{
+					JOptionPane.showMessageDialog(view,"Copy/Paste detection can only be performed on Java code.","Copy/Paste Detector",JOptionPane.INFORMATION_MESSAGE);
+					return;
+			}
+		*/
 		CPD cpd = null;
 		//Log.log(Log.DEBUG, PMDJEditPlugin.class , "See mode " + view.getBuffer().getMode().getName());
 
@@ -485,7 +486,7 @@ public class PMDJEditPlugin extends EBPlugin {
 			{
 				TokenEntry mark = (TokenEntry)occurrences.next();
 
-				System.out.println("Begin line " + mark.getBeginLine() +" of file "+ mark.getTokenSrcID() +" Line Count "+ match.getLineCount());
+				//System.out.println("Begin line " + mark.getBeginLine() +" of file "+ mark.getTokenSrcID() +" Line Count "+ match.getLineCount());
 				int lastLine = mark.getBeginLine()+match.getLineCount();
 
 				CPDDuplicateCodeViewer.Duplicate duplicate =  dv.new Duplicate(mark.getTokenSrcID(),mark.getBeginLine(),lastLine);