hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Added Ignore Literals and Identifiers option for CPD

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@3106 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Jiger Patel
2004-12-27 11:26:25 +00:00
parent c0c49c31fb
commit b8b5aacb8c
5 changed files with 77 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-jedit/PMDPlugin/etc/changelog.txt
View File

@@ -1,3 +1,7 @@
??? - 2.6
- Updated to PMD 2.1
- Added "Ignore Literals & identifiers" option for CPD.
16th August 2004 - 2.5
- Updated to PMD 1.9
- Removed Recursive Directory options and integrated them into FileChooser itself.

1
pmd-jedit/PMDPlugin/jedit.html
View File

@@ -54,6 +54,7 @@ Take a look at the <a href="#releasenotes">Release Notes and Changelog</a> for m
<h3>2.6</h3>
<ol>
<li>Updated to PMD 2.0</li>
<li>Added &quot;Ignore Literals &amp; identifiers&quot; option for CPD. </li>
</ol>
<h3>2.5</h3>
<ol>

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

@@ -82,8 +82,8 @@ public class CPDDuplicateCodeViewer extends JPanel
{
view.setBuffer(buffer);
int start = buffer.getLineStartOffset(duplicate.getBeginLine());
int end = buffer.getLineEndOffset(duplicate.getEndLine()-3);
int start = buffer.getLineStartOffset(duplicate.getBeginLine()-1);
int end = buffer.getLineEndOffset(duplicate.getEndLine()-2);
//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()+1)+"-"+(getEndLine()-2);
return filename + ":"+ (getBeginLine())+"-"+(getEndLine());
}
}

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

@@ -6,8 +6,8 @@
package net.sourceforge.pmd.jedit;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.Color;
import java.awt.FlowLayout;
import java.io.*;
import java.util.*;
import javax.swing.*;
@@ -25,6 +25,9 @@ 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.JavaTokenizer;
import net.sourceforge.pmd.cpd.Language;
import net.sourceforge.pmd.cpd.LanguageFactory;
import net.sourceforge.pmd.cpd.Match;
import net.sourceforge.pmd.cpd.PHPLanguage;
import net.sourceforge.pmd.cpd.TokenEntry;
@@ -43,6 +46,7 @@ public class PMDJEditPlugin extends EBPlugin
public static final String RUN_PMD_ON_SAVE = "pmd.runPMDOnSave";
public static final String CUSTOM_RULES_PATH_KEY = "pmd.customRulesPath";
public static final String SHOW_PROGRESS = "pmd.showprogress";
public static final String IGNORE_LITERALS = "pmd.ignoreliterals";
//private static RE re = new UncheckedRE("Starting at line ([0-9]*) of (\\S*)");
private static PMDJEditPlugin instance;
@@ -416,15 +420,15 @@ public class PMDJEditPlugin extends EBPlugin
{
if(name.endsWith("java"))
{
return "java";
return LanguageFactory.JAVA_KEY;
}
else if(name.endsWith("php"))
{
return "php";
return LanguageFactory.PHP_KEY;
}
else if(name.endsWith("c") || name.endsWith("cpp") || name.endsWith("c++"))
{
return "c";
return LanguageFactory.CPP_KEY;
}
}
return null;
@@ -432,34 +436,21 @@ public class PMDJEditPlugin extends EBPlugin
private void instanceCPDCurrentFile(View view, String filename, String fileType) throws IOException
{
CPD cpd = null;
CPD cpd = getCPD(fileType, view);
//Log.log(Log.DEBUG, PMDJEditPlugin.class , "See mode " + view.getBuffer().getMode().getName());
if (fileType.equals("java"))
if(cpd != null)
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing java");
cpd = new CPD(jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100),new JavaLanguage());
}
else if (fileType.equals("php"))
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing PHP");
cpd = new CPD(jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100),new PHPLanguage());
}
else if (fileType.equals("c"))
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing C/C++");
cpd = new CPD(jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100),new CPPLanguage());
cpd.add(new File(filename));
cpd.go();
instance.processDuplicates(cpd, view);
view.getDockableWindowManager().showDockableWindow("cpd-viewer");
}
else
{
JOptionPane.showMessageDialog(view,"Copy/Paste detection can only be performed on Java,C/C++,PHP code.","Copy/Paste Detector",JOptionPane.INFORMATION_MESSAGE);
view.getStatus().setMessageAndClear("Cannot run CPD on an Invalid file type");
return;
}
cpd.add(new File(filename));
cpd.go();
instance.processDuplicates(cpd, view);
view.getDockableWindowManager().showDockableWindow("cpd-viewer");
}
@@ -548,19 +539,26 @@ public class PMDJEditPlugin extends EBPlugin
{
jEdit.setProperty("pmd.cpd.lastDirectory",dir);
instance.errorSource.clear();
CPD cpd = getCPD(tileSize, "java", view);
CPD cpd = new CPD(tileSize, new JavaLanguage());
if(recursive)
if(cpd != null)
{
cpd.addRecursively(dir);
if(recursive)
{
cpd.addRecursively(dir);
}
else
{
cpd.addAllInDirectory(dir);
}
cpd.go();
instance.processDuplicates(cpd, view);
}
else
{
cpd.addAllInDirectory(dir);
view.getStatus().setMessageAndClear("Cannot run CPD on Invalid directory/files.");
return;
}
cpd.go();
instance.processDuplicates(cpd, view);
}//End of if(dir != null)
}
@@ -587,8 +585,8 @@ 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());
int lastLine = mark.getBeginLine()+match.getLineCount();
System.out.println("Begin line " + mark.getBeginLine() +" of file "+ mark.getTokenSrcID() +" Line Count "+ match.getLineCount() +" last line "+ lastLine);
CPDDuplicateCodeViewer.Duplicate duplicate = dv.new Duplicate(mark.getTokenSrcID(),mark.getBeginLine(),lastLine);
@@ -775,6 +773,39 @@ public class PMDJEditPlugin extends EBPlugin
}
private CPD getCPD(int tileSize, String fileType, View view)
{
Language lang;
LanguageFactory lf = new LanguageFactory();
if (fileType.equals(LanguageFactory.JAVA_KEY))
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing java");
Properties props = new Properties();
props.setProperty(JavaTokenizer.IGNORE_LITERALS, String.valueOf(jEdit.getBooleanProperty(PMDJEditPlugin.IGNORE_LITERALS)));
lang = lf.createLanguage(LanguageFactory.JAVA_KEY, props);
}
else if (fileType.equals(LanguageFactory.PHP_KEY))
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing PHP");
lang = lf.createLanguage(LanguageFactory.PHP_KEY);
}
else if (fileType.equals(LanguageFactory.CPP_KEY))
{
//Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing C/C++");
lang = lf.createLanguage(LanguageFactory.CPP_KEY);
}
else
{
JOptionPane.showMessageDialog(view,"Copy/Paste detection can only be performed on Java,C/C++,PHP code.","Copy/Paste Detector",JOptionPane.INFORMATION_MESSAGE);
return null;
}
return new CPD(tileSize,lang);
}
private CPD getCPD(String fileType, View view)
{
return getCPD(jEdit.getIntegerProperty(PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY,100), fileType, view);
}
}

7
pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDOptionPane.java
View File

@@ -78,12 +78,13 @@ public class PMDOptionPane extends AbstractOptionPane implements OptionPane {
SelectedRules rules;
JTextArea exampleTextArea= new JTextArea(10, 50);
private JCheckBox chkRunPMDOnSave, chkShowProgressBar;
private JCheckBox chkRunPMDOnSave, chkShowProgressBar, chkIgnoreLiterals;
JTextField txtMinTileSize;
JTextField txtCustomRules;
JComboBox comboRenderer;
public PMDOptionPane() {
super(PMDJEditPlugin.NAME);
try {
@@ -116,6 +117,7 @@ public class PMDOptionPane extends AbstractOptionPane implements OptionPane {
chkRunPMDOnSave = new JCheckBox("Run PMD on Save", jEdit.getBooleanProperty(PMDJEditPlugin.RUN_PMD_ON_SAVE));
chkShowProgressBar = new JCheckBox("Show PMD Progress Bar", jEdit.getBooleanProperty(PMDJEditPlugin.SHOW_PROGRESS));
chkIgnoreLiterals = new JCheckBox("Ignore Literals & identifiers when detecting Duplicate Code", jEdit.getBooleanProperty(PMDJEditPlugin.IGNORE_LITERALS));
JPanel pnlSouth = new JPanel(new GridLayout(0,1));
@@ -134,12 +136,14 @@ public class PMDOptionPane extends AbstractOptionPane implements OptionPane {
pnlTileSize.add(comboRenderer);
pnlTileSize.add(chkShowProgressBar);
JPanel mainPanel = new JPanel();
mainPanel.setLayout(new BorderLayout());
mainPanel.add(rulesPanel, BorderLayout.NORTH);
mainPanel.add(textPanel, BorderLayout.CENTER);
pnlSouth.add(chkRunPMDOnSave);
pnlSouth.add(chkIgnoreLiterals);
pnlSouth.add(pnlTileSize);
mainPanel.add(pnlSouth, BorderLayout.SOUTH);
addComponent(mainPanel);
@@ -150,6 +154,7 @@ public class PMDOptionPane extends AbstractOptionPane implements OptionPane {
jEdit.setIntegerProperty(PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY,(txtMinTileSize.getText().length() == 0)?100:Integer.parseInt(txtMinTileSize.getText()));
jEdit.setBooleanProperty(PMDJEditPlugin.RUN_PMD_ON_SAVE,(chkRunPMDOnSave.isSelected()));
jEdit.setBooleanProperty(PMDJEditPlugin.IGNORE_LITERALS,(chkIgnoreLiterals.isSelected()));
jEdit.setProperty(PMDJEditPlugin.RENDERER, (String)comboRenderer.getSelectedItem());
jEdit.setBooleanProperty(PMDJEditPlugin.SHOW_PROGRESS, chkShowProgressBar.isSelected());