diff --git a/pmd/src/net/sourceforge/pmd/cpd/CPD.java b/pmd/src/net/sourceforge/pmd/cpd/CPD.java index e10f1914cc..0df253d1e7 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/CPD.java +++ b/pmd/src/net/sourceforge/pmd/cpd/CPD.java @@ -110,8 +110,8 @@ public class CPD { Iterator i = results.getOccurrences(tile); TokenEntry firstToken = (TokenEntry)i.next(); TokenList tl = tokenSets.getTokenList(firstToken); - int endLine = firstToken.getBeginLine()+ results.getTileLineCount(tile, tokenSets)-1; - return tl.getSlice(firstToken.getBeginLine()-1, endLine); + int endLine = firstToken.getBeginLine()+ results.getTileLineCount(tile, tokenSets); + return tl.getSlice(firstToken.getBeginLine()-1, endLine-1); } catch (Exception ex) {ex.printStackTrace(); } return ""; } diff --git a/pmd/src/net/sourceforge/pmd/cpd/GUI.java b/pmd/src/net/sourceforge/pmd/cpd/GUI.java index 2d6b0527c1..5e0f45e74b 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/GUI.java +++ b/pmd/src/net/sourceforge/pmd/cpd/GUI.java @@ -48,10 +48,8 @@ public class GUI implements CPDListener { } //private JTextField rootDirectoryField= new JTextField("C:\\data\\datagrabber\\datagrabber\\src\\org\\cougaar\\mlm\\ui\\newtpfdd\\transit\\"); - private JTextField rootDirectoryField= new JTextField("c:\\data\\pmd\\pmd\\src\\net\\sourceforge\\pmd\\rules\\"); - //private JTextField rootDirectoryField = new JTextField(System.getProperty("user.home")); - //private JTextField rootDirectoryField= new JTextField("c:\\data\\cougaar\\core\\src"); + private JTextField rootDirectoryField= new JTextField("c:\\data\\cougaar\\core\\src"); private JTextField minimumLengthField= new JTextField("30"); private JProgressBar tokenizingFilesBar = new JProgressBar();