phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to new CPD class changes with some minor improvements to pmd-jedit CPD viewer

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@2567 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Jiger Patel
2004-03-13 11:50:24 +00:00
parent 4680ca0b33
commit c518525c60
6 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-jedit/PMDPlugin/build.properties
View File

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

BIN
pmd-jedit/PMDPlugin/lib/jaxen-core-1.0-fcs.jar
View File

Binary file not shown.

BIN
pmd-jedit/PMDPlugin/lib/pmd-swingui-0.1.jar
View File

Binary file not shown.

BIN
pmd-jedit/PMDPlugin/lib/saxpath-1.0-fcs.jar
View File

Binary file not shown.

4
pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDDuplicateCodeViewer.java
View File

@ -83,7 +83,7 @@ public class CPDDuplicateCodeViewer extends JPanel
view.setBuffer(buffer);
int start = buffer.getLineStartOffset(duplicate.getBeginLine());
int end = buffer.getLineEndOffset(duplicate.getEndLine()-2);
int end = buffer.getLineEndOffset(duplicate.getEndLine()-3);
//Log.log(Log.DEBUG, this.getClass(), "Start Line "+ duplicate.getBeginLine() + " End Line "+ duplicate.getEndLine() + " Start " + start + " End "+ end);
//Since an AIOOB Exception is thrown if the end is the end of file. we do a -1 from end to fix it.
view.getTextArea().setSelection(new Selection.Range(start,end -1));
@ -162,7 +162,7 @@ public class CPDDuplicateCodeViewer extends JPanel
public String toString()
{
return filename + ":"+ getBeginLine()+"-"+getEndLine();
return filename + ":"+ (getBeginLine()+1)+"-"+(getEndLine()-2);
}
}

58
pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
View File

@ -5,7 +5,9 @@
*/
package net.sourceforge.pmd.jedit;
import javax.swing.JWindow;
import errorlist.DefaultErrorSource;
import errorlist.ErrorList;
import errorlist.ErrorSource;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Rectangle;
@ -16,48 +18,43 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JTextField;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDException;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RuleSetNotFoundException;
import net.sourceforge.pmd.RuleViolation;
import javax.swing.JWindow;
import javax.swing.plaf.basic.BasicProgressBarUI;
import javax.swing.tree.DefaultMutableTreeNode;
import net.sourceforge.pmd.cpd.CPD;
import net.sourceforge.pmd.cpd.CPPLanguage;
import net.sourceforge.pmd.cpd.FileFinder;
import net.sourceforge.pmd.cpd.JavaLanguage;
import net.sourceforge.pmd.cpd.Mark;
import net.sourceforge.pmd.cpd.Match;
import net.sourceforge.pmd.cpd.PHPLanguage;
import net.sourceforge.pmd.cpd.TokenEntry;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDException;
import net.sourceforge.pmd.renderers.*;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RuleSetNotFoundException;
import net.sourceforge.pmd.RuleViolation;
import org.gjt.sp.jedit.browser.VFSBrowser;
import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.EBMessage;
import org.gjt.sp.jedit.EBPlugin;
import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.browser.VFSBrowser;
import org.gjt.sp.jedit.io.VFS;
import org.gjt.sp.jedit.io.VFSManager;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.msg.BufferUpdate;
import org.gjt.sp.jedit.View;
import org.gjt.sp.util.Log;
import errorlist.DefaultErrorSource;
import errorlist.ErrorList;
import errorlist.ErrorSource;
import javax.swing.JDialog;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
import javax.swing.plaf.basic.BasicProgressBarUI;
public class PMDJEditPlugin extends EBPlugin {
@ -473,26 +470,37 @@ public class PMDJEditPlugin extends EBPlugin {
CPDDuplicateCodeViewer dv = getCPDDuplicateCodeViewer(view);
dv.clearDuplicates();
boolean foundDuplicates = false;
for (Iterator i = cpd.getMatches(); i.hasNext();)
{
if(!foundDuplicates) //Set foundDuplicates to true and that too only once.
{
foundDuplicates = true;
}
Match match = (Match)i.next();
CPDDuplicateCodeViewer.Duplicates duplicates = dv.new Duplicates(match.getLineCount() + " duplicate lines", match.getSourceCodeSlice());
for (Iterator occurrences = match.iterator(); occurrences.hasNext();)
{
Mark mark = (Mark)occurrences.next();
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);
//System.out.println("Adding Duplicate " + duplicate +" to Duplicates "+ duplicates);
duplicates.addDuplicate(duplicate);
}
}//End of inner for
dv.addDuplicates(duplicates);
}//End of outer for
if(!foundDuplicates)
{
dv.getRoot().add(new DefaultMutableTreeNode("No Duplicates found.",false));
}
dv.refreshTree();
dv.expandAll();
}//End of processDuplicates