tag:old.nabble.com,2006:forum-2381
Nabble - Java PMD
2009-12-10T01:23:13Z
PMD scans Java source code and looks for potential problems like: Empty try/catch/finally/switch blocks; Unused local variables, parameters and private methods; Empty if/while statements; Overcomplicated expressions - unnecessary if statements, for loops that could be while loops; Classes with high Cyclomatic Complexity measurements Java PMD home is <a href="http://pmd.sourceforge.net/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26724202
Re: About the "AnyLanguage" constructor...
2009-12-10T01:23:13Z
2009-12-10T01:23:13Z
Dale Anson
:) Yes, I realize it's not the best solution, but this little change of 3 dots means I can let the jEdit plugin run CPD on just about every file type that jEdit supports. I added this to my local copy yesterday, and already have found a ton of dupe code in html files and properties files at work that I can clean up. <br>
<br>Thanks,<br><br>Dale<br><br><br><div class="gmail_quote">On Thu, Dec 10, 2009 at 1:46 AM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724202&i=0" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
It won't cause an issue with internal usage. If anyone is out there using it, making it var-arg is compatible at the source level, so I don't see a problem there. Regardless, it's not the best first choice for custom CPD languages, so I'm not too sympathetic to custom usage of this class anyway.<br>
<br>Go ahead and change it.<br><br>Ryan<br><br><div class="gmail_quote"><div><div></div><div class="h5">On Wed, Dec 9, 2009 at 9:35 PM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724202&i=1" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div><div></div><div class="h5">
I noticed that the constructor for net.sourceforge.pmd.cpd.AnyLanguage takes a single string, where the super constructor (net.sourceforge.pmd.cpd.AbstractLanguage) accepts a variable number of strings. Would anyone be opposed if I added ... to the AnyLanguage constructor so it could also accept a variable number of strings?<br>
<br>Thanks,<br><font color="#888888"><br>Dale<br><br><br>
</font><br></div></div>------------------------------------------------------------------------------<br>
Return on Information:<br>
Google Enterprise Search pays you back<br>
Get the facts.<br>
<a href="http://p.sf.net/sfu/google-dev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>
<br>_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724202&i=2" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
<br></blockquote></div><br>
</blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724202&i=3" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26723831
Re: About the "AnyLanguage" constructor...
2009-12-10T00:46:17Z
2009-12-10T00:46:17Z
Ryan Gustafson-3
It won't cause an issue with internal usage. If anyone is out there using it, making it var-arg is compatible at the source level, so I don't see a problem there. Regardless, it's not the best first choice for custom CPD languages, so I'm not too sympathetic to custom usage of this class anyway.<br>
<br>Go ahead and change it.<br><br>Ryan<br><br><div class="gmail_quote">On Wed, Dec 9, 2009 at 9:35 PM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26723831&i=0" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I noticed that the constructor for net.sourceforge.pmd.cpd.AnyLanguage takes a single string, where the super constructor (net.sourceforge.pmd.cpd.AbstractLanguage) accepts a variable number of strings. Would anyone be opposed if I added ... to the AnyLanguage constructor so it could also accept a variable number of strings?<br>
<br>Thanks,<br><font color="#888888"><br>Dale<br><br><br>
</font><br>------------------------------------------------------------------------------<br>
Return on Information:<br>
Google Enterprise Search pays you back<br>
Get the facts.<br>
<a href="http://p.sf.net/sfu/google-dev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>
<br>_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26723831&i=1" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
<br></blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26723831&i=2" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26722279
SF.net SVN: pmd:[7026] trunk/pmd-jedit/PMDPlugin
2009-12-09T21:11:16Z
2009-12-09T21:11:16Z
daleanson
Revision: 7026
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7026&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7026&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-10 05:11:13 +0000 (Thu, 10 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Update to pmd 4.2.6, added code to let CPD parse files for all jEdit modes. Note this relies on a modification to AnyLanguage in CPD that is not yet in subversion but is in the pmd-4.2.6.jar included with this plugin.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd-jedit/PMDPlugin/PMDPlugin.props
<br> trunk/pmd-jedit/PMDPlugin/build.xml
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd-jedit/PMDPlugin/lib/pmd-4.2.6.jar
<br><br>Removed Paths:
<br>-------------
<br> trunk/pmd-jedit/PMDPlugin/lib/pmd-4.2.5.jar
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/PMDPlugin.props
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/PMDPlugin.props 2009-12-09 17:11:39 UTC (rev 7025)
<br>+++ trunk/pmd-jedit/PMDPlugin/PMDPlugin.props 2009-12-10 05:11:13 UTC (rev 7026)
<br>@@ -9,7 +9,7 @@
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.1=jedit 04.03.18.00
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.2=plugin errorlist.ErrorListPlugin 1.8
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.3=plugin CommonControlsPlugin 1.1
<br>-plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-4.2.5.jar jaxen-1.1.1.jar asm-3.1.jar
<br>+plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-4.2.6.jar jaxen-1.1.1.jar asm-3.1.jar
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.description=The PMD plugin is a Java source code analysis tool.
<br>
<br>
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/build.xml
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/build.xml 2009-12-09 17:11:39 UTC (rev 7025)
<br>+++ trunk/pmd-jedit/PMDPlugin/build.xml 2009-12-10 05:11:13 UTC (rev 7026)
<br>@@ -20,6 +20,7 @@
<br> <path id="project.class.path">
<br> <pathelement location="${jedit.install.dir}/jedit.jar"/>
<br> <pathelement location="${jedit.plugins.dir}/ErrorList.jar"/>
<br>+ <pathelement location="${jedit.plugins.dir}/kappalayout.jar"/>
<br> <pathelement location="${build}"/>
<br> <fileset casesensitive="false" id="pmd.libs" dir="${lib}">
<br> <include name="*.jar"/>
<br><br>Deleted: trunk/pmd-jedit/PMDPlugin/lib/pmd-4.2.5.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Added: trunk/pmd-jedit/PMDPlugin/lib/pmd-4.2.6.jar
<br>===================================================================
<br>(Binary files differ)
<br><br><br>Property changes on: trunk/pmd-jedit/PMDPlugin/lib/pmd-4.2.6.jar
<br>___________________________________________________________________
<br>Added: svn:mime-type
<br> + application/octet-stream
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java 2009-12-09 17:11:39 UTC (rev 7025)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java 2009-12-10 05:11:13 UTC (rev 7026)
<br>@@ -72,7 +72,20 @@
<br> return mode;
<br> }
<br>
<br>+ public String[] getExtensions() {
<br>+ return extensions;
<br>+ }
<br>+
<br> public String toString() {
<br>- return description;
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append(description);
<br>+ sb.append(" (");
<br>+ for (String s : extensions) {
<br>+ sb.append(s).append(',');
<br>+ }
<br>+ sb.deleteCharAt(sb.lastIndexOf(","));
<br>+ sb.append(')');
<br>+
<br>+ return sb.toString();
<br> }
<br> }
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-09 17:11:39 UTC (rev 7025)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-10 05:11:13 UTC (rev 7026)
<br>@@ -11,10 +11,7 @@
<br> import java.io.FileInputStream;
<br> import java.io.FileNotFoundException;
<br> import java.io.IOException;
<br>-import java.util.ArrayList;
<br>-import java.util.Iterator;
<br>-import java.util.List;
<br>-import java.util.Properties;
<br>+import java.util.*;
<br>
<br> import javax.swing.*;
<br> import javax.swing.border.EtchedBorder;
<br>@@ -31,6 +28,7 @@
<br> import net.sourceforge.pmd.SourceType;
<br> import net.sourceforge.pmd.cpd.CPD;
<br> import net.sourceforge.pmd.util.FileFinder;
<br>+import net.sourceforge.pmd.cpd.AnyLanguage;
<br> import net.sourceforge.pmd.cpd.JavaTokenizer;
<br> import net.sourceforge.pmd.cpd.Language;
<br> import net.sourceforge.pmd.cpd.LanguageFactory;
<br>@@ -45,6 +43,7 @@
<br> import org.gjt.sp.jedit.Buffer;
<br> import org.gjt.sp.jedit.EBMessage;
<br> import org.gjt.sp.jedit.EBPlugin;
<br>+import org.gjt.sp.jedit.Mode;
<br> import org.gjt.sp.jedit.View;
<br> import org.gjt.sp.jedit.jEdit;
<br> import org.gjt.sp.jedit.browser.VFSBrowser;
<br>@@ -128,7 +127,7 @@
<br> chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
<br>
<br> JPanel pnlAccessory = new JPanel();
<br>- JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty("net.sf.pmd.Recursive", "Recursive"), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty( "net.sf.pmd.Recursive", "Recursive" ), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br> pnlAccessory.add( chkRecursive );
<br> chooser.setAccessory( pnlAccessory );
<br>
<br>@@ -141,7 +140,7 @@
<br> selectedFile = chooser.getSelectedFile();
<br>
<br> if ( !selectedFile.isDirectory() ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_not_a_directory.", "Selection not a directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Selection_not_a_directory.", "Selection not a directory." ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -213,7 +212,7 @@
<br> // only show popup if run on save is NOT selected, otherwise it is annoying
<br> boolean run_on_save = jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE );
<br> if ( !run_on_save ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.No_problems_found", "No problems found"), NAME, JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.No_problems_found", "No problems found" ), NAME, JOptionPane.INFORMATION_MESSAGE );
<br> }
<br> errorSource.clear();
<br> }
<br>@@ -238,7 +237,7 @@
<br> Log.log( Log.ERROR, this, "RuleSet not found", rsne );
<br> }
<br> catch ( PMDException pmde ) {
<br>- String msg = jEdit.getProperty("net.sf.pmd.Error_while_processing_", "Error while processing ") + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br>+ String msg = jEdit.getProperty( "net.sf.pmd.Error_while_processing_", "Error while processing " ) + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br> Log.log( Log.ERROR, this, msg, pmde );
<br> JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>@@ -285,7 +284,7 @@
<br> catch ( RuleSetNotFoundException rsne ) {
<br> // should never happen since rulesets are fetched via getRegisteredRuleSet, nonetheless:
<br> Log.log( Log.ERROR, this, "PMD ERROR: Couldn't find a ruleset", rsne );
<br>- JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty("net.sf.pmd.Unable_to_find_rulesets,_halting_PMD", "Unable to find rulesets, halting PMD"), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty( "net.sf.pmd.Unable_to_find_rulesets,_halting_PMD", "Unable to find rulesets, halting PMD" ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -314,7 +313,7 @@
<br> Log.log( Log.ERROR, this, "PMD ERROR: Unable to open file " + file.getAbsolutePath(), fnfe );
<br> }
<br> catch ( PMDException pmde ) {
<br>- String msg = jEdit.getProperty("net.sf.pmd.Error_while_processing_", "Error while processing ") + file.getAbsolutePath() + ":\n" + pmde.getMessage();
<br>+ String msg = jEdit.getProperty( "net.sf.pmd.Error_while_processing_", "Error while processing " ) + file.getAbsolutePath() + ":\n" + pmde.getMessage();
<br> Log.log( Log.ERROR, this, msg, pmde );
<br> JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>@@ -325,7 +324,7 @@
<br> }
<br>
<br> if ( !foundProblems ) {
<br>- JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty("net.sf.pmd.No_problems_found", "No problems found"), NAME, JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty( "net.sf.pmd.No_problems_found", "No problems found" ), NAME, JOptionPane.INFORMATION_MESSAGE );
<br> errorSource.clear();
<br> }
<br> else {
<br>@@ -353,9 +352,9 @@
<br> public static void cpdCurrentFile( View view ) throws IOException {
<br> String modeName = getFileType( view.getBuffer().getMode().getName() );
<br> if ( modeName == null ) {
<br>- JOptionPane.showMessageDialog( view,
<br>- jEdit.getProperty("net.sf.pmd.Copy/Paste_detection_can_not_be_performed_on_this_file\nbecause_the_mode_can_not_be_determined.", "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined."),
<br>- jEdit.getProperty("net.sf.pmd.Copy/Paste_Detector", "Copy/Paste Detector"), JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view,
<br>+ jEdit.getProperty( "net.sf.pmd.Copy/Paste_detection_can_not_be_performed_on_this_file\nbecause_the_mode_can_not_be_determined.", "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined." ),
<br>+ jEdit.getProperty( "net.sf.pmd.Copy/Paste_Detector", "Copy/Paste Detector" ), JOptionPane.INFORMATION_MESSAGE );
<br> return ;
<br> }
<br> instance.instanceCPDCurrentFile( view, view.getBuffer().getPath(), modeName );
<br>@@ -365,12 +364,12 @@
<br> VFSFile selectedFile[] = browser.getSelectedFiles();
<br>
<br> if ( selectedFile == null || selectedFile.length == 0 ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.One_file_must_be_selected", "One file must be selected"), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.One_file_must_be_selected", "One file must be selected" ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br> if ( selectedFile[ 0 ].getType() == VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selected_file_cannot_be_a_Directory.", "Selected file cannot be a Directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Selected_file_cannot_be_a_Directory.", "Selected file cannot be a Directory." ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br> String path = selectedFile[ 0 ].getPath();
<br>@@ -388,7 +387,7 @@
<br> return "cpp";
<br> }
<br> }
<br>- return null;
<br>+ return name;
<br> }
<br>
<br> private void instanceCPDCurrentFile( View view, String filename, String fileType ) throws IOException {
<br>@@ -402,7 +401,7 @@
<br> view.getDockableWindowManager().showDockableWindow( "cpd-viewer" );
<br> }
<br> else {
<br>- view.getStatus().setMessageAndClear( jEdit.getProperty("net.sf.pmd.CPD_does_not_yet_support_this_file_type>_", "CPD does not yet support this file type: ") + fileType );
<br>+ view.getStatus().setMessageAndClear( jEdit.getProperty( "net.sf.pmd.CPD_does_not_yet_support_this_file_type>_", "CPD does not yet support this file type: " ) + fileType );
<br> return ;
<br> }
<br> }
<br>@@ -413,44 +412,34 @@
<br> chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
<br>
<br> JPanel pnlAccessory = new JPanel();
<br>- pnlAccessory.setLayout(new KappaLayout());
<br>+ pnlAccessory.setLayout( new KappaLayout() );
<br>
<br>- JLabel lblMinTileSize = new JLabel( jEdit.getProperty("net.sf.pmd.Minimum_Tile_size_>", "Minimum Tile size :") );
<br>+ JLabel lblMinTileSize = new JLabel( jEdit.getProperty( "net.sf.pmd.Minimum_Tile_size_>", "Minimum Tile size :" ) );
<br> JTextField txttilesize = new JTextField( 3 );
<br> txttilesize.setText( jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ) + "" );
<br>
<br>- JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty("net.sf.pmd.Recursive", "Recursive"), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty( "net.sf.pmd.Recursive", "Recursive" ), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>
<br>- JComboBox fileTypeSelector = new JComboBox();
<br>+ JComboBox fileTypeSelector = new JComboBox( getCPDFileFilters() );
<br> fileTypeSelector.setEditable( false );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "java", "Java files", "java" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "javascript", "Javascript files", "js" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" ) );
<br>- fileTypeSelector.addItem( new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" ) );
<br>-
<br>- // TODO: the "any" tokenizer doesn't seem to work
<br>- fileTypeSelector.addItem( new CPDFileFilter( "any", "All", "*" ) );
<br>
<br>- pnlAccessory.add( lblMinTileSize, "0, 0, 1, 1, W, , 3" );
<br>- pnlAccessory.add( txttilesize, "1, 0, 1, 1, W, , 3");
<br>- pnlAccessory.add( chkRecursive, "0, 1, 2, 1, W, , 3" );
<br>- pnlAccessory.add( fileTypeSelector,"0, 2, 2, 1, W, , 3" );
<br>+ pnlAccessory.add( lblMinTileSize, "0, 0, 1, 1, W, , 3" );
<br>+ pnlAccessory.add( txttilesize, "1, 0, 1, 1, W, , 3" );
<br>+ pnlAccessory.add( chkRecursive, "0, 1, 2, 1, W, , 3" );
<br>+ pnlAccessory.add( fileTypeSelector, "0, 2, 2, 1, W, , 3" );
<br>
<br> chooser.setAccessory( pnlAccessory );
<br>
<br> int returnVal = chooser.showOpenDialog( view );
<br> File selectedFile = null;
<br>- String mode = null;
<br>+ CPDFileFilter mode = null;
<br>
<br> if ( returnVal == JFileChooser.APPROVE_OPTION ) {
<br> selectedFile = chooser.getSelectedFile();
<br>- mode = ( ( CPDFileFilter ) fileTypeSelector.getSelectedItem() ).getMode();
<br>+ mode = ( CPDFileFilter ) fileTypeSelector.getSelectedItem();
<br>
<br> if ( !selectedFile.isDirectory() ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_not_a_directory.", "Selection not a directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Selection_not_a_directory.", "Selection not a directory." ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -472,7 +461,7 @@
<br> }
<br> }
<br> }
<br>-
<br>+
<br> /**
<br> * Run CPD on a directory selected from the File System Browser.
<br> * @param view The current view.
<br>@@ -484,42 +473,61 @@
<br> if ( view != null && browser != null ) {
<br> VFSFile selectedDir[] = browser.getSelectedFiles();
<br> if ( selectedDir == null || selectedDir.length == 0 ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.One_Directory_has_to_be_selected_in_which_to_detect_duplicate_code.", "One Directory has to be selected in which to detect duplicate code."), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.One_Directory_has_to_be_selected_in_which_to_detect_duplicate_code.", "One Directory has to be selected in which to detect duplicate code." ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br> if ( selectedDir[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selected_file_must_be_a_Directory.", "Selected file must be a Directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Selected_file_must_be_a_Directory.", "Selected file must be a Directory." ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>-
<br>+
<br> // display chooser for type of files to check
<br>- Object[] choices = new Object[8];
<br>- choices[0] = new CPDFileFilter( "java", "Java files", "java" );
<br>- choices[1] = new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" );
<br>- choices[2] = new CPDFileFilter( "javascript", "Javascript files", "js" );
<br>- choices[3] = new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" );
<br>- choices[4] = new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" );
<br>- choices[5] = new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" );
<br>- choices[6] = new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" );
<br>- choices[7] = new CPDFileFilter( "any", "All", "*" );
<br>-
<br>- Object choice = JOptionPane.showInputDialog(view,
<br>- jEdit.getProperty("net.sf.pmd.Select_type_of_files_to_check>", "Select type of files to check:"),
<br>- jEdit.getProperty("net.sf.pmd.CPD,_Select_File_Type", "CPD, Select File Type"),
<br>- JOptionPane.OK_CANCEL_OPTION, null, choices, choices[0]);
<br>+ CPDFileFilter[] choices = getCPDFileFilters();
<br>+ CPDFileFilter choice = ( CPDFileFilter ) JOptionPane.showInputDialog( view,
<br>+ jEdit.getProperty( "net.sf.pmd.Select_type_of_files_to_check>", "Select type of files to check:" ),
<br>+ jEdit.getProperty( "net.sf.pmd.CPD,_Select_File_Type", "CPD, Select File Type" ),
<br>+ JOptionPane.OK_CANCEL_OPTION, null, choices, choices[ 0 ] );
<br> if ( choice == null ) {
<br>- return;
<br>+ return ;
<br> }
<br>- String mode = ((CPDFileFilter)choice).getMode();
<br>-
<br>+
<br> instance.instanceCPDDir( view, selectedDir[ 0 ].getPath(),
<br> jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ),
<br>- recursive, mode );
<br>+ recursive, choice );
<br> }
<br> }
<br>
<br>- private void instanceCPDDir( View view, String dir, int tileSize, boolean recursive, String mode ) throws IOException {
<br>+ private static CPDFileFilter[] getCPDFileFilters() {
<br>+ /*
<br>+ CPDFileFilter[] choices = new CPDFileFilter[ 8 ];
<br>+ choices[ 0 ] = new CPDFileFilter( "java", "Java files", "java" );
<br>+ choices[ 1 ] = new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" );
<br>+ choices[ 2 ] = new CPDFileFilter( "ecmascript", "Javascript files", "js" );
<br>+ choices[ 3 ] = new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" );
<br>+ choices[ 4 ] = new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" );
<br>+ choices[ 5 ] = new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" );
<br>+ choices[ 6 ] = new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" );
<br>+ choices[ 7 ] = new CPDFileFilter( "any", "All", "*" );
<br>+ return choices;
<br>+ */
<br>+
<br>+ List<CPDFileFilter> filters = new ArrayList<CPDFileFilter>();
<br>+ Mode[] modes = jEdit.getModes();
<br>+ for ( Mode mode : modes ) {
<br>+ String filenameGlob = ( String ) mode.getProperty( "filenameGlob" );
<br>+ if ( filenameGlob == null ) {
<br>+ continue;
<br>+ }
<br>+ String modeName = mode.getName();
<br>+ filenameGlob = filenameGlob.replaceAll( "[*.{}\\[\\]]", "" );
<br>+ String[] extensions = filenameGlob.split( "[,]" );
<br>+ filters.add( new CPDFileFilter( modeName, modeName, extensions ) );
<br>+ }
<br>+ return filters.toArray( new CPDFileFilter[ 0 ] );
<br>+ }
<br>+
<br>+ private void instanceCPDDir( View view, String dir, int tileSize, boolean recursive, CPDFileFilter mode ) throws IOException {
<br> if ( dir != null ) {
<br> jEdit.setProperty( LAST_DIRECTORY, dir );
<br> instance.errorSource.clear();
<br>@@ -536,7 +544,7 @@
<br> instance.processDuplicates( cpd, view );
<br> }
<br> else {
<br>- view.getStatus().setMessageAndClear( jEdit.getProperty("net.sf.pmd.Cannot_run_CPD_on_Invalid_directory/files.", "Cannot run CPD on Invalid directory/files.") );
<br>+ view.getStatus().setMessageAndClear( jEdit.getProperty( "net.sf.pmd.Cannot_run_CPD_on_Invalid_directory/files.", "Cannot run CPD on Invalid directory/files." ) );
<br> return ;
<br> }
<br> }
<br>@@ -572,7 +580,7 @@
<br> }
<br>
<br> if ( !foundDuplicates ) {
<br>- dv.getRoot().add( new DefaultMutableTreeNode( jEdit.getProperty("net.sf.pmd.No_duplicates_found.", "No duplicates found."), false ) );
<br>+ dv.getRoot().add( new DefaultMutableTreeNode( jEdit.getProperty( "net.sf.pmd.No_duplicates_found.", "No duplicates found." ), false ) );
<br> }
<br>
<br> dv.refreshTree();
<br>@@ -608,7 +616,7 @@
<br> VFSFile de[] = browser.getSelectedFiles();
<br>
<br> if ( de == null || de.length == 0 || de[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_must_be_a_directory", "Selection must be a directory"), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Selection_must_be_a_directory", "Selection must be a directory" ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -649,7 +657,7 @@
<br> renderer = new TextRenderer();
<br> }
<br> else {
<br>- JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Invalid_Renderer", "Invalid Renderer"), NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty( "net.sf.pmd.Invalid_Renderer", "Invalid Renderer" ), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -698,7 +706,7 @@
<br>
<br> );
<br> pBar.setBorder( new EtchedBorder( EtchedBorder.RAISED ) );
<br>- pBar.setToolTipText( jEdit.getProperty("net.sf.pmd.PMD_Check_in_Progress", "PMD Check in Progress") );
<br>+ pBar.setToolTipText( jEdit.getProperty( "net.sf.pmd.PMD_Check_in_Progress", "PMD Check in Progress" ) );
<br> pBar.setForeground( jEdit.getColorProperty( "pmd.progressbar.background" ) );
<br> pBar.setBackground( jEdit.getColorProperty( "view.status.background" ) );
<br>
<br>@@ -720,24 +728,38 @@
<br> }
<br>
<br>
<br>- private CPD getCPD( int tileSize, String fileType ) {
<br>- Language lang;
<br>+ private CPD getCPD( int tileSize, CPDFileFilter fileType ) {
<br>+ Language lang = null;
<br> LanguageFactory lf = new LanguageFactory();
<br>+ List<String> supportedLanguages = Arrays.asList( LanguageFactory.supportedLanguages );
<br>
<br> Properties props = new Properties();
<br>- if ( "java".equals( fileType ) ) {
<br>+ if ( "java".equals( fileType.getMode() ) ) {
<br> props.setProperty( JavaTokenizer.IGNORE_LITERALS, String.valueOf( jEdit.getBooleanProperty( PMDJEditPlugin.IGNORE_LITERALS ) ) );
<br> }
<br>- lang = lf.createLanguage( fileType, props );
<br>- // TODO: the "any" tokenizer doesn't seem to work
<br>- if ( lang == null ) {
<br>- lang = lf.createLanguage( "any", props );
<br>+ if ( supportedLanguages.contains( fileType.getMode() ) ) {
<br>+ lang = lf.createLanguage( fileType.getMode(), props );
<br> }
<br>+ else {
<br>+ lang = new AnyLanguage( fileType.getExtensions() );
<br>+ }
<br> return lang == null ? null : new CPD( tileSize, lang );
<br> }
<br>
<br> private CPD getCPD( String fileType ) {
<br>- return getCPD( jEdit.getIntegerProperty( PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY, 100 ), fileType );
<br>+ Mode mode = jEdit.getMode( fileType );
<br>+ if ( mode == null ) {
<br>+ return null;
<br>+ }
<br>+ String filenameGlob = ( String ) mode.getProperty( "filenameGlob" );
<br>+ if ( filenameGlob == null ) {
<br>+ return null;
<br>+ }
<br>+ filenameGlob = filenameGlob.replaceAll( "[*.{}]", "" );
<br>+ String[] extensions = filenameGlob.split( "[,]" );
<br>+ String modeName = mode.getName();
<br>+ CPDFileFilter filter = new CPDFileFilter( modeName, modeName, extensions );
<br>+ return getCPD( jEdit.getIntegerProperty( PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY, 100 ), filter );
<br> }
<br>
<br> /**
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26722279&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26721657
About the "AnyLanguage" constructor...
2009-12-09T19:35:13Z
2009-12-09T19:35:13Z
Dale Anson
I noticed that the constructor for net.sourceforge.pmd.cpd.AnyLanguage takes a single string, where the super constructor (net.sourceforge.pmd.cpd.AbstractLanguage) accepts a variable number of strings. Would anyone be opposed if I added ... to the AnyLanguage constructor so it could also accept a variable number of strings?<br>
<br>Thanks,<br><br>Dale<br><br><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26721657&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713894
Re: Support for javascript in CPD?
2009-12-09T09:13:43Z
2009-12-09T09:13:43Z
Dale Anson
I changed javascript to ecmascript and updated the change log in both the trunk and the 4.2.x branch. Should be good, I think. Please let me know if I've missed anything.<br><br>Thanks,<br><br>Dale<br><br><br><br><div class="gmail_quote">
On Wed, Dec 9, 2009 at 7:59 AM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=0" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
It would be an easy enough for me to rename what I did to ecmascript instead of javascript. I'll go ahead and to that, then there is no need to come up with a story.<br><font color="#888888"><br>Dale</font><div><div>
</div><div class="h5"><br><br><br><br><div class="gmail_quote">
On Tue, Dec 8, 2009 at 8:26 PM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=1" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Update the sections talking about generic changes (i.e. no default numbers, or rulesets). Put it immediate below the JSP parser changes I recently added.<br><br>We need to come up with a story for the Javascript vs. Ecmascript naming issue. I went with Ecmascript in on trunk when I added it as a new Language.<br>
<br>Ryan<br><br><div class="gmail_quote"><div><div></div><div>On Tue, Dec 8, 2009 at 8:25 PM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=2" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div><div></div><div>
I've committed the code to add javascript support to CPD to both the trunk and the 4.2.x branch. I did not update the change log in either branch because it wasn't clear to me where to add the change.<br><font color="#888888"><br>
Dale</font><div><div></div><div><br>
<br><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:21 AM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=3" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Pretty soon, I'd say before year end, we're overdue. --Ryan<div><div></div><div><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:26 AM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=4" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">I'll get a test case or two together before committing. Do you have<br>
an idea of when the next release will be?<br>
<br>
Thanks,<br>
<font color="#888888"><br>
Dale<br>
</font><div><div></div><div><br>
<br>
<br>
On Thu, Dec 3, 2009 at 8:33 AM, Ryan Gustafson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=5" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
> Hi Dale,<br>
><br>
> Go ahead. It may not be the most optimal tokenizer and might make mistakes<br>
> on occasion, but it's passable like you say. That was the idea I think<br>
> behind AbstractTokenizer.<br>
><br>
> If you cannot get it on both 4.2.x branch and trunk let me know. Also,<br>
> please make sure you have some minimal test cases. As Romain points out<br>
> too, a small blurb in the changelog.<br>
><br>
> Ryan<br>
><br>
> On Thu, Dec 3, 2009 at 9:11 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=6" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>><br>
>> Hi Ryan,<br>
>><br>
>> Thanks for the help. I ended up just copying the RubyLanguage and<br>
>> RubyTokenizer files, then editing them a little for javascript, and<br>
>> that seems to work surprisingly well. I think I was expecting this to<br>
>> be more difficult.<br>
>><br>
>> Is it okay for me to check these in?<br>
>><br>
>> Thanks,<br>
>><br>
>> Dale<br>
>><br>
>><br>
>><br>
>> On Wed, Dec 2, 2009 at 11:34 PM, Ryan Gustafson<br>
>> <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=7" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
>> > Not that I'm aware of.<br>
>> ><br>
>> > The purpose of a CPD tokenizer is really quite simple. It's the same as<br>
>> > a<br>
>> > lexer. Break a stream of characters into blocks of characters (tokens)<br>
>> > using the rules of the language. CPD then looks for patterns in the<br>
>> > token<br>
>> > sequences across source files (ie. cut-n-paste). For example:<br>
>> ><br>
>> > while (true) {<br>
>> > System.exit();<br>
>> > }<br>
>> ><br>
>> > Would something like these tokens (totally contrived):<br>
>> ><br>
>> > while<br>
>> > (<br>
>> > true<br>
>> > )<br>
>> > {<br>
>> > System.exit<br>
>> > (<br>
>> > )<br>
>> > ;<br>
>> > }<br>
>> ><br>
>> > The tokenizer creates a sequence of TokenEntry objects which contain (a)<br>
>> > the<br>
>> > text of the token, (b) the source file name, and (c) a line number.<br>
>> > That's<br>
>> > it.<br>
>> ><br>
>> > The only special things some of the tokenizers do, is toss out tokens<br>
>> > that<br>
>> > would not be meaningful for the purposes of CPD. For example the tokens<br>
>> > for<br>
>> > an import statement in Java are not really something you worry about<br>
>> > finding<br>
>> > copies of in different source files!<br>
>> ><br>
>> > One could try using the TokenStream from Mozilla's Rhino as a ready to<br>
>> > go<br>
>> > tokenizer, but it seems to be package private. A bit of cheating using<br>
>> > the<br>
>> > Reflection APIs could likely break the Java access rules preventing<br>
>> > normal<br>
>> > usage. Or just put your CPD tokenizer in the same package. :)<br>
>> ><br>
>> > Good luck.<br>
>> ><br>
>> > Ryan<br>
>> ><br>
>> > On Thu, Dec 3, 2009 at 12:03 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=8" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>> >><br>
>> >> Hi,<br>
>> >><br>
>> >> I'm wondering if anyone is working on support for Javascript in CPD?<br>
>> >> If not, does anyone have some pointers for writing it myself? The<br>
>> >> how-to page is a little weak :) I've looked at the code for the<br>
>> >> existing supported languages, and I like the Ruby examples, but it's<br>
>> >> not clear to me what I need to define for a new tokenizer. I'd<br>
>> >> appreciate any help.<br>
>> >><br>
>> >> Thanks,<br>
>> >><br>
>> >> Dale<br>
>> >><br>
>> >><br>
>> >><br>
>> >> ------------------------------------------------------------------------------<br>
>> >> Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
>> >> a free event focused on virtualization and cloud computing.<br>
>> >> Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
>> >> <a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
>> >> _______________________________________________<br>
>> >> Pmd-devel mailing list<br>
>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=9" target="_top" rel="nofollow">Pmd-devel@...</a><br>
>> >> <a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
>> ><br>
>> ><br>
><br>
><br>
<br>
------------------------------------------------------------------------------<br>
Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
a free event focused on virtualization and cloud computing.<br>
Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
<a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=10" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>
</div></div><br></div></div>------------------------------------------------------------------------------<br>
Return on Information:<br>
Google Enterprise Search pays you back<br>
Get the facts.<br>
<a href="http://p.sf.net/sfu/google-dev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><div><br>
<br>_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=11" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
<br></div></blockquote></div><br>
</blockquote></div><br>
</div></div></blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713894&i=12" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713862
SF.net SVN: pmd:[7025] branches/pmd/4.2.x/etc/changelog.txt
2009-12-09T09:11:39Z
2009-12-09T09:11:39Z
daleanson
Revision: 7025
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7025&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7025&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 17:11:39 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Updated changelog to note Ecmascript is now supported by CPD.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/etc/changelog.txt
<br><br>Modified: branches/pmd/4.2.x/etc/changelog.txt
<br>===================================================================
<br>--- branches/pmd/4.2.x/etc/changelog.txt 2009-12-09 17:10:47 UTC (rev 7024)
<br>+++ branches/pmd/4.2.x/etc/changelog.txt 2009-12-09 17:11:39 UTC (rev 7025)
<br>@@ -15,6 +15,7 @@
<br> Fix issue with Type Resolution incorrectly handling of Classes with same name as a java.lang Class.
<br> The JSP/JSF parser can now parse Unicode input.
<br> The JSP/JSP parser can now handle <script>...</script> tags. The AST HtmlScript node contains the content.
<br>+Added Ecmascript as a supported language for CPD.
<br>
<br> Dependencies updates: asm updated to 3.2
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713862&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713850
SF.net SVN: pmd:[7024] branches/pmd/4.2.x
2009-12-09T09:10:47Z
2009-12-09T09:10:47Z
daleanson
Revision: 7024
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7024&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7024&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 17:10:47 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Changed javascript to ecmascript.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br><br>Modified: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 17:10:47 UTC (rev 7024)
<br>@@ -5,18 +5,18 @@
<br>
<br> import static org.junit.Assert.assertEquals;
<br> import net.sourceforge.pmd.PMD;
<br>-import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.EcmascriptTokenizer;
<br> import net.sourceforge.pmd.cpd.SourceCode;
<br> import net.sourceforge.pmd.cpd.Tokenizer;
<br> import net.sourceforge.pmd.cpd.Tokens;
<br>
<br> import org.junit.Test;
<br>
<br>-public class JavascriptTokenizerTest {
<br>+public class EcmascriptTokenizerTest {
<br>
<br> @Test
<br> public void test1() throws Throwable {
<br>- Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ Tokenizer tokenizer = new EcmascriptTokenizer();
<br> SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br> Tokens tokens = new Tokens();
<br> tokenizer.tokenize( sourceCode, tokens );
<br>@@ -25,7 +25,7 @@
<br>
<br> @Test
<br> public void test2() throws Throwable {
<br>- Tokenizer t = new JavascriptTokenizer();
<br>+ Tokenizer t = new EcmascriptTokenizer();
<br> SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br> Tokens tokens = new Tokens();
<br> t.tokenize( sourceCode, tokens );
<br>@@ -59,6 +59,6 @@
<br> }
<br>
<br> public static junit.framework.Test suite() {
<br>- return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ return new junit.framework.JUnit4TestAdapter( EcmascriptTokenizerTest.class );
<br> }
<br> }
<br>\ No newline at end of file
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 17:10:47 UTC (rev 7024)
<br>@@ -4,8 +4,8 @@
<br> */
<br> package net.sourceforge.pmd.cpd;
<br>
<br>-public class JavascriptLanguage extends AbstractLanguage {
<br>- public JavascriptLanguage() {
<br>- super(new JavascriptTokenizer(), ".js");
<br>+public class EcmascriptLanguage extends AbstractLanguage {
<br>+ public EcmascriptLanguage() {
<br>+ super(new EcmascriptTokenizer(), ".js");
<br> }
<br> }
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 17:10:47 UTC (rev 7024)
<br>@@ -5,8 +5,8 @@
<br> /**
<br> * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br> */
<br>-public class JavascriptTokenizer extends AbstractTokenizer {
<br>- public JavascriptTokenizer() {
<br>+public class EcmascriptTokenizer extends AbstractTokenizer {
<br>+ public EcmascriptTokenizer() {
<br> // setting markers for "string" in javascript
<br> this.stringToken = new ArrayList<String>();
<br> this.stringToken.add( "\'" );
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713850&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713821
SF.net SVN: pmd:[7023] branches/pmd/4.2.x
2009-12-09T09:09:15Z
2009-12-09T09:09:15Z
daleanson
Revision: 7023
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7023&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7023&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 17:09:14 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Changed javascript to ecmascript.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br><br>Added Paths:
<br>-----------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br><br>Removed Paths:
<br>-------------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br><br>Copied: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java (from rev 7019, branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java)
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java (rev 0)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -0,0 +1,64 @@
<br>+/**
<br>+* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+*/
<br>+package test.net.sourceforge.pmd.cpd;
<br>+
<br>+import static org.junit.Assert.assertEquals;
<br>+import net.sourceforge.pmd.PMD;
<br>+import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.SourceCode;
<br>+import net.sourceforge.pmd.cpd.Tokenizer;
<br>+import net.sourceforge.pmd.cpd.Tokens;
<br>+
<br>+import org.junit.Test;
<br>+
<br>+public class JavascriptTokenizerTest {
<br>+
<br>+ @Test
<br>+ public void test1() throws Throwable {
<br>+ Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ tokenizer.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ @Test
<br>+ public void test2() throws Throwable {
<br>+ Tokenizer t = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ t.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ // no semi-colons
<br>+ private String getCode1() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>+ sb.append( " real.focus()" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ // same as getCode1, but lines are ended with semi-colons
<br>+ private String getCode2() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>+ sb.append( " real.focus();" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ public static junit.framework.Test suite() {
<br>+ return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Deleted: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 17:04:46 UTC (rev 7022)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -1,64 +0,0 @@
<br>-/**
<br>-* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>-*/
<br>-package test.net.sourceforge.pmd.cpd;
<br>-
<br>-import static org.junit.Assert.assertEquals;
<br>-import net.sourceforge.pmd.PMD;
<br>-import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>-import net.sourceforge.pmd.cpd.SourceCode;
<br>-import net.sourceforge.pmd.cpd.Tokenizer;
<br>-import net.sourceforge.pmd.cpd.Tokens;
<br>-
<br>-import org.junit.Test;
<br>-
<br>-public class JavascriptTokenizerTest {
<br>-
<br>- @Test
<br>- public void test1() throws Throwable {
<br>- Tokenizer tokenizer = new JavascriptTokenizer();
<br>- SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>- Tokens tokens = new Tokens();
<br>- tokenizer.tokenize( sourceCode, tokens );
<br>- assertEquals( 22, tokens.size() );
<br>- }
<br>-
<br>- @Test
<br>- public void test2() throws Throwable {
<br>- Tokenizer t = new JavascriptTokenizer();
<br>- SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>- Tokens tokens = new Tokens();
<br>- t.tokenize( sourceCode, tokens );
<br>- assertEquals( 22, tokens.size() );
<br>- }
<br>-
<br>- // no semi-colons
<br>- private String getCode1() {
<br>- StringBuilder sb = new StringBuilder();
<br>- sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>- sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>- sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>- sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>- sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>- sb.append( " real.focus()" ).append(PMD.EOL);
<br>- sb.append( "}" ).append(PMD.EOL);
<br>- return sb.toString();
<br>- }
<br>-
<br>- // same as getCode1, but lines are ended with semi-colons
<br>- private String getCode2() {
<br>- StringBuilder sb = new StringBuilder();
<br>- sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>- sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>- sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>- sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>- sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>- sb.append( " real.focus();" ).append(PMD.EOL);
<br>- sb.append( "}" ).append(PMD.EOL);
<br>- return sb.toString();
<br>- }
<br>-
<br>- public static junit.framework.Test suite() {
<br>- return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>- }
<br>-}
<br>\ No newline at end of file
<br><br>Copied: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java (from rev 7019, branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java)
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java (rev 0)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -0,0 +1,11 @@
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713821&i=0" target="_top" rel="nofollow">zb@...</a>
<br>+ */
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+public class JavascriptLanguage extends AbstractLanguage {
<br>+ public JavascriptLanguage() {
<br>+ super(new JavascriptTokenizer(), ".js");
<br>+ }
<br>+}
<br><br>Copied: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java (from rev 7019, branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java)
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java (rev 0)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -0,0 +1,22 @@
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+import java.util.ArrayList;
<br>+
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ */
<br>+public class JavascriptTokenizer extends AbstractTokenizer {
<br>+ public JavascriptTokenizer() {
<br>+ // setting markers for "string" in javascript
<br>+ this.stringToken = new ArrayList<String>();
<br>+ this.stringToken.add( "\'" );
<br>+ this.stringToken.add( "\"" );
<br>+
<br>+ // setting markers for 'ignorable character' in javascript
<br>+ this.ignorableCharacter = new ArrayList<String>();
<br>+ this.ignorableCharacter.add( ";" );
<br>+
<br>+ // setting markers for 'ignorable string' in javascript
<br>+ this.ignorableStmt = new ArrayList<String>();
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Deleted: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 17:04:46 UTC (rev 7022)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -1,11 +0,0 @@
<br>-/**
<br>- * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>- * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713821&i=1" target="_top" rel="nofollow">zb@...</a>
<br>- */
<br>-package net.sourceforge.pmd.cpd;
<br>-
<br>-public class JavascriptLanguage extends AbstractLanguage {
<br>- public JavascriptLanguage() {
<br>- super(new JavascriptTokenizer(), ".js");
<br>- }
<br>-}
<br><br>Deleted: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 17:04:46 UTC (rev 7022)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -1,22 +0,0 @@
<br>-package net.sourceforge.pmd.cpd;
<br>-
<br>-import java.util.ArrayList;
<br>-
<br>-/**
<br>- * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>- */
<br>-public class JavascriptTokenizer extends AbstractTokenizer {
<br>- public JavascriptTokenizer() {
<br>- // setting markers for "string" in javascript
<br>- this.stringToken = new ArrayList<String>();
<br>- this.stringToken.add( "\'" );
<br>- this.stringToken.add( "\"" );
<br>-
<br>- // setting markers for 'ignorable character' in javascript
<br>- this.ignorableCharacter = new ArrayList<String>();
<br>- this.ignorableCharacter.add( ";" );
<br>-
<br>- // setting markers for 'ignorable string' in javascript
<br>- this.ignorableStmt = new ArrayList<String>();
<br>- }
<br>-}
<br>\ No newline at end of file
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 17:04:46 UTC (rev 7022)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 17:09:14 UTC (rev 7023)
<br>@@ -7,7 +7,7 @@
<br>
<br> public class LanguageFactory {
<br>
<br>- public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "javascript" };
<br>+ public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "ecmascript" };
<br> private static final String SUFFIX = "Language";
<br> public static final String EXTENSION = "extension";
<br> public static final String BY_EXTENSION = "by_extension";
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713821&i=2" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713755
SF.net SVN: pmd:[7022] trunk/pmd/etc/changelog.txt
2009-12-09T09:04:47Z
2009-12-09T09:04:47Z
daleanson
Revision: 7022
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7022&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7022&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 17:04:46 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Updated changelog to note Ecmascript is now supported by CPD.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/etc/changelog.txt
<br><br>Modified: trunk/pmd/etc/changelog.txt
<br>===================================================================
<br>--- trunk/pmd/etc/changelog.txt 2009-12-09 17:01:15 UTC (rev 7021)
<br>+++ trunk/pmd/etc/changelog.txt 2009-12-09 17:04:46 UTC (rev 7022)
<br>@@ -474,6 +474,7 @@
<br> AvoidUsingHardCodedIP modified to not use InetAddress.getByName(String), instead does better pattern analysis.
<br> The JSP/JSF parser can now parse Unicode input.
<br> The JSP/JSP parser can now handle <script>...</script> tags. The AST HtmlScript node contains the content.
<br>+Added Ecmascript as a supported language for CPD.
<br>
<br> New Java rules:
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713755&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713692
SF.net SVN: pmd:[7021] trunk/pmd
2009-12-09T09:01:15Z
2009-12-09T09:01:15Z
daleanson
Revision: 7021
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7021&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7021&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 17:01:15 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Changed javascript to ecmascript.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 17:01:15 UTC (rev 7021)
<br>@@ -5,18 +5,18 @@
<br>
<br> import static org.junit.Assert.assertEquals;
<br> import net.sourceforge.pmd.PMD;
<br>-import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.EcmascriptTokenizer;
<br> import net.sourceforge.pmd.cpd.SourceCode;
<br> import net.sourceforge.pmd.cpd.Tokenizer;
<br> import net.sourceforge.pmd.cpd.Tokens;
<br>
<br> import org.junit.Test;
<br>
<br>-public class JavascriptTokenizerTest {
<br>+public class EcmascriptTokenizerTest {
<br>
<br> @Test
<br> public void test1() throws Throwable {
<br>- Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ Tokenizer tokenizer = new EcmascriptTokenizer();
<br> SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br> Tokens tokens = new Tokens();
<br> tokenizer.tokenize( sourceCode, tokens );
<br>@@ -25,7 +25,7 @@
<br>
<br> @Test
<br> public void test2() throws Throwable {
<br>- Tokenizer t = new JavascriptTokenizer();
<br>+ Tokenizer t = new EcmascriptTokenizer();
<br> SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br> Tokens tokens = new Tokens();
<br> t.tokenize( sourceCode, tokens );
<br>@@ -59,6 +59,6 @@
<br> }
<br>
<br> public static junit.framework.Test suite() {
<br>- return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ return new junit.framework.JUnit4TestAdapter( EcmascriptTokenizerTest.class );
<br> }
<br> }
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 17:01:15 UTC (rev 7021)
<br>@@ -4,8 +4,8 @@
<br> */
<br> package net.sourceforge.pmd.cpd;
<br>
<br>-public class JavascriptLanguage extends AbstractLanguage {
<br>- public JavascriptLanguage() {
<br>- super(new JavascriptTokenizer(), ".js");
<br>+public class EcmascriptLanguage extends AbstractLanguage {
<br>+ public EcmascriptLanguage() {
<br>+ super(new EcmascriptTokenizer(), ".js");
<br> }
<br> }
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 17:01:15 UTC (rev 7021)
<br>@@ -5,8 +5,8 @@
<br> /**
<br> * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br> */
<br>-public class JavascriptTokenizer extends AbstractTokenizer {
<br>- public JavascriptTokenizer() {
<br>+public class EcmascriptTokenizer extends AbstractTokenizer {
<br>+ public EcmascriptTokenizer() {
<br> // setting markers for "string" in javascript
<br> this.stringToken = new ArrayList<String>();
<br> this.stringToken.add( "\'" );
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713692&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26713628
SF.net SVN: pmd:[7020] trunk/pmd
2009-12-09T08:57:02Z
2009-12-09T08:57:02Z
daleanson
Revision: 7020
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7020&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7020&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 16:57:00 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Renamed javascript to ecmascript.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
<br><br>Removed Paths:
<br>-------------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br><br>Copied: trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java (from rev 7019, trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java)
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java (rev 0)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -0,0 +1,64 @@
<br>+/**
<br>+* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+*/
<br>+package test.net.sourceforge.pmd.cpd;
<br>+
<br>+import static org.junit.Assert.assertEquals;
<br>+import net.sourceforge.pmd.PMD;
<br>+import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.SourceCode;
<br>+import net.sourceforge.pmd.cpd.Tokenizer;
<br>+import net.sourceforge.pmd.cpd.Tokens;
<br>+
<br>+import org.junit.Test;
<br>+
<br>+public class JavascriptTokenizerTest {
<br>+
<br>+ @Test
<br>+ public void test1() throws Throwable {
<br>+ Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ tokenizer.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ @Test
<br>+ public void test2() throws Throwable {
<br>+ Tokenizer t = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ t.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ // no semi-colons
<br>+ private String getCode1() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>+ sb.append( " real.focus()" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ // same as getCode1, but lines are ended with semi-colons
<br>+ private String getCode2() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>+ sb.append( " real.focus();" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ public static junit.framework.Test suite() {
<br>+ return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Deleted: trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -1,64 +0,0 @@
<br>-/**
<br>-* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>-*/
<br>-package test.net.sourceforge.pmd.cpd;
<br>-
<br>-import static org.junit.Assert.assertEquals;
<br>-import net.sourceforge.pmd.PMD;
<br>-import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>-import net.sourceforge.pmd.cpd.SourceCode;
<br>-import net.sourceforge.pmd.cpd.Tokenizer;
<br>-import net.sourceforge.pmd.cpd.Tokens;
<br>-
<br>-import org.junit.Test;
<br>-
<br>-public class JavascriptTokenizerTest {
<br>-
<br>- @Test
<br>- public void test1() throws Throwable {
<br>- Tokenizer tokenizer = new JavascriptTokenizer();
<br>- SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>- Tokens tokens = new Tokens();
<br>- tokenizer.tokenize( sourceCode, tokens );
<br>- assertEquals( 22, tokens.size() );
<br>- }
<br>-
<br>- @Test
<br>- public void test2() throws Throwable {
<br>- Tokenizer t = new JavascriptTokenizer();
<br>- SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>- Tokens tokens = new Tokens();
<br>- t.tokenize( sourceCode, tokens );
<br>- assertEquals( 22, tokens.size() );
<br>- }
<br>-
<br>- // no semi-colons
<br>- private String getCode1() {
<br>- StringBuilder sb = new StringBuilder();
<br>- sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>- sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>- sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>- sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>- sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>- sb.append( " real.focus()" ).append(PMD.EOL);
<br>- sb.append( "}" ).append(PMD.EOL);
<br>- return sb.toString();
<br>- }
<br>-
<br>- // same as getCode1, but lines are ended with semi-colons
<br>- private String getCode2() {
<br>- StringBuilder sb = new StringBuilder();
<br>- sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>- sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>- sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>- sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>- sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>- sb.append( " real.focus();" ).append(PMD.EOL);
<br>- sb.append( "}" ).append(PMD.EOL);
<br>- return sb.toString();
<br>- }
<br>-
<br>- public static junit.framework.Test suite() {
<br>- return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>- }
<br>-}
<br>\ No newline at end of file
<br><br>Copied: trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java (from rev 7019, trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java)
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java (rev 0)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -0,0 +1,11 @@
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713628&i=0" target="_top" rel="nofollow">zb@...</a>
<br>+ */
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+public class JavascriptLanguage extends AbstractLanguage {
<br>+ public JavascriptLanguage() {
<br>+ super(new JavascriptTokenizer(), ".js");
<br>+ }
<br>+}
<br><br>Copied: trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java (from rev 7019, trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java)
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java (rev 0)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -0,0 +1,22 @@
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+import java.util.ArrayList;
<br>+
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ */
<br>+public class JavascriptTokenizer extends AbstractTokenizer {
<br>+ public JavascriptTokenizer() {
<br>+ // setting markers for "string" in javascript
<br>+ this.stringToken = new ArrayList<String>();
<br>+ this.stringToken.add( "\'" );
<br>+ this.stringToken.add( "\"" );
<br>+
<br>+ // setting markers for 'ignorable character' in javascript
<br>+ this.ignorableCharacter = new ArrayList<String>();
<br>+ this.ignorableCharacter.add( ";" );
<br>+
<br>+ // setting markers for 'ignorable string' in javascript
<br>+ this.ignorableStmt = new ArrayList<String>();
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Deleted: trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -1,11 +0,0 @@
<br>-/**
<br>- * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>- * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713628&i=1" target="_top" rel="nofollow">zb@...</a>
<br>- */
<br>-package net.sourceforge.pmd.cpd;
<br>-
<br>-public class JavascriptLanguage extends AbstractLanguage {
<br>- public JavascriptLanguage() {
<br>- super(new JavascriptTokenizer(), ".js");
<br>- }
<br>-}
<br><br>Deleted: trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -1,22 +0,0 @@
<br>-package net.sourceforge.pmd.cpd;
<br>-
<br>-import java.util.ArrayList;
<br>-
<br>-/**
<br>- * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>- */
<br>-public class JavascriptTokenizer extends AbstractTokenizer {
<br>- public JavascriptTokenizer() {
<br>- // setting markers for "string" in javascript
<br>- this.stringToken = new ArrayList<String>();
<br>- this.stringToken.add( "\'" );
<br>- this.stringToken.add( "\"" );
<br>-
<br>- // setting markers for 'ignorable character' in javascript
<br>- this.ignorableCharacter = new ArrayList<String>();
<br>- this.ignorableCharacter.add( ";" );
<br>-
<br>- // setting markers for 'ignorable string' in javascript
<br>- this.ignorableStmt = new ArrayList<String>();
<br>- }
<br>-}
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 16:57:00 UTC (rev 7020)
<br>@@ -7,7 +7,7 @@
<br>
<br> public class LanguageFactory {
<br>
<br>- public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "javascript" };
<br>+ public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "ecmascript" };
<br> private static final String SUFFIX = "Language";
<br> public static final String EXTENSION = "extension";
<br> public static final String BY_EXTENSION = "by_extension";
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26713628&i=2" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26712073
Re: Support for javascript in CPD?
2009-12-09T06:59:52Z
2009-12-09T06:59:52Z
Dale Anson
It would be an easy enough for me to rename what I did to ecmascript instead of javascript. I'll go ahead and to that, then there is no need to come up with a story.<br><br>Dale<br><br><br><br><div class="gmail_quote">
On Tue, Dec 8, 2009 at 8:26 PM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=0" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Update the sections talking about generic changes (i.e. no default numbers, or rulesets). Put it immediate below the JSP parser changes I recently added.<br><br>We need to come up with a story for the Javascript vs. Ecmascript naming issue. I went with Ecmascript in on trunk when I added it as a new Language.<br>
<br>Ryan<br><br><div class="gmail_quote"><div><div></div><div class="h5">On Tue, Dec 8, 2009 at 8:25 PM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=1" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div><div></div><div class="h5">
I've committed the code to add javascript support to CPD to both the trunk and the 4.2.x branch. I did not update the change log in either branch because it wasn't clear to me where to add the change.<br><font color="#888888"><br>
Dale</font><div><div></div><div><br>
<br><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:21 AM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=2" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Pretty soon, I'd say before year end, we're overdue. --Ryan<div><div></div><div><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:26 AM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=3" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">I'll get a test case or two together before committing. Do you have<br>
an idea of when the next release will be?<br>
<br>
Thanks,<br>
<font color="#888888"><br>
Dale<br>
</font><div><div></div><div><br>
<br>
<br>
On Thu, Dec 3, 2009 at 8:33 AM, Ryan Gustafson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=4" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
> Hi Dale,<br>
><br>
> Go ahead. It may not be the most optimal tokenizer and might make mistakes<br>
> on occasion, but it's passable like you say. That was the idea I think<br>
> behind AbstractTokenizer.<br>
><br>
> If you cannot get it on both 4.2.x branch and trunk let me know. Also,<br>
> please make sure you have some minimal test cases. As Romain points out<br>
> too, a small blurb in the changelog.<br>
><br>
> Ryan<br>
><br>
> On Thu, Dec 3, 2009 at 9:11 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=5" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>><br>
>> Hi Ryan,<br>
>><br>
>> Thanks for the help. I ended up just copying the RubyLanguage and<br>
>> RubyTokenizer files, then editing them a little for javascript, and<br>
>> that seems to work surprisingly well. I think I was expecting this to<br>
>> be more difficult.<br>
>><br>
>> Is it okay for me to check these in?<br>
>><br>
>> Thanks,<br>
>><br>
>> Dale<br>
>><br>
>><br>
>><br>
>> On Wed, Dec 2, 2009 at 11:34 PM, Ryan Gustafson<br>
>> <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=6" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
>> > Not that I'm aware of.<br>
>> ><br>
>> > The purpose of a CPD tokenizer is really quite simple. It's the same as<br>
>> > a<br>
>> > lexer. Break a stream of characters into blocks of characters (tokens)<br>
>> > using the rules of the language. CPD then looks for patterns in the<br>
>> > token<br>
>> > sequences across source files (ie. cut-n-paste). For example:<br>
>> ><br>
>> > while (true) {<br>
>> > System.exit();<br>
>> > }<br>
>> ><br>
>> > Would something like these tokens (totally contrived):<br>
>> ><br>
>> > while<br>
>> > (<br>
>> > true<br>
>> > )<br>
>> > {<br>
>> > System.exit<br>
>> > (<br>
>> > )<br>
>> > ;<br>
>> > }<br>
>> ><br>
>> > The tokenizer creates a sequence of TokenEntry objects which contain (a)<br>
>> > the<br>
>> > text of the token, (b) the source file name, and (c) a line number.<br>
>> > That's<br>
>> > it.<br>
>> ><br>
>> > The only special things some of the tokenizers do, is toss out tokens<br>
>> > that<br>
>> > would not be meaningful for the purposes of CPD. For example the tokens<br>
>> > for<br>
>> > an import statement in Java are not really something you worry about<br>
>> > finding<br>
>> > copies of in different source files!<br>
>> ><br>
>> > One could try using the TokenStream from Mozilla's Rhino as a ready to<br>
>> > go<br>
>> > tokenizer, but it seems to be package private. A bit of cheating using<br>
>> > the<br>
>> > Reflection APIs could likely break the Java access rules preventing<br>
>> > normal<br>
>> > usage. Or just put your CPD tokenizer in the same package. :)<br>
>> ><br>
>> > Good luck.<br>
>> ><br>
>> > Ryan<br>
>> ><br>
>> > On Thu, Dec 3, 2009 at 12:03 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=7" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>> >><br>
>> >> Hi,<br>
>> >><br>
>> >> I'm wondering if anyone is working on support for Javascript in CPD?<br>
>> >> If not, does anyone have some pointers for writing it myself? The<br>
>> >> how-to page is a little weak :) I've looked at the code for the<br>
>> >> existing supported languages, and I like the Ruby examples, but it's<br>
>> >> not clear to me what I need to define for a new tokenizer. I'd<br>
>> >> appreciate any help.<br>
>> >><br>
>> >> Thanks,<br>
>> >><br>
>> >> Dale<br>
>> >><br>
>> >><br>
>> >><br>
>> >> ------------------------------------------------------------------------------<br>
>> >> Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
>> >> a free event focused on virtualization and cloud computing.<br>
>> >> Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
>> >> <a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
>> >> _______________________________________________<br>
>> >> Pmd-devel mailing list<br>
>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=8" target="_top" rel="nofollow">Pmd-devel@...</a><br>
>> >> <a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
>> ><br>
>> ><br>
><br>
><br>
<br>
------------------------------------------------------------------------------<br>
Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
a free event focused on virtualization and cloud computing.<br>
Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
<a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=9" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>
</div></div><br></div></div>------------------------------------------------------------------------------<br>
Return on Information:<br>
Google Enterprise Search pays you back<br>
Get the facts.<br>
<a href="http://p.sf.net/sfu/google-dev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><div class="im"><br>
<br>_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=10" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
<br></div></blockquote></div><br>
</blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712073&i=11" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26704612
Re: Support for javascript in CPD?
2009-12-08T19:26:28Z
2009-12-08T19:26:28Z
Ryan Gustafson-3
Update the sections talking about generic changes (i.e. no default numbers, or rulesets). Put it immediate below the JSP parser changes I recently added.<br><br>We need to come up with a story for the Javascript vs. Ecmascript naming issue. I went with Ecmascript in on trunk when I added it as a new Language.<br>
<br>Ryan<br><br><div class="gmail_quote">On Tue, Dec 8, 2009 at 8:25 PM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=0" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I've committed the code to add javascript support to CPD to both the trunk and the 4.2.x branch. I did not update the change log in either branch because it wasn't clear to me where to add the change.<br><font color="#888888"><br>
Dale</font><div><div></div><div class="h5"><br>
<br><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:21 AM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=1" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Pretty soon, I'd say before year end, we're overdue. --Ryan<div><div></div><div><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:26 AM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=2" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">I'll get a test case or two together before committing. Do you have<br>
an idea of when the next release will be?<br>
<br>
Thanks,<br>
<font color="#888888"><br>
Dale<br>
</font><div><div></div><div><br>
<br>
<br>
On Thu, Dec 3, 2009 at 8:33 AM, Ryan Gustafson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=3" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
> Hi Dale,<br>
><br>
> Go ahead. It may not be the most optimal tokenizer and might make mistakes<br>
> on occasion, but it's passable like you say. That was the idea I think<br>
> behind AbstractTokenizer.<br>
><br>
> If you cannot get it on both 4.2.x branch and trunk let me know. Also,<br>
> please make sure you have some minimal test cases. As Romain points out<br>
> too, a small blurb in the changelog.<br>
><br>
> Ryan<br>
><br>
> On Thu, Dec 3, 2009 at 9:11 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=4" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>><br>
>> Hi Ryan,<br>
>><br>
>> Thanks for the help. I ended up just copying the RubyLanguage and<br>
>> RubyTokenizer files, then editing them a little for javascript, and<br>
>> that seems to work surprisingly well. I think I was expecting this to<br>
>> be more difficult.<br>
>><br>
>> Is it okay for me to check these in?<br>
>><br>
>> Thanks,<br>
>><br>
>> Dale<br>
>><br>
>><br>
>><br>
>> On Wed, Dec 2, 2009 at 11:34 PM, Ryan Gustafson<br>
>> <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=5" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
>> > Not that I'm aware of.<br>
>> ><br>
>> > The purpose of a CPD tokenizer is really quite simple. It's the same as<br>
>> > a<br>
>> > lexer. Break a stream of characters into blocks of characters (tokens)<br>
>> > using the rules of the language. CPD then looks for patterns in the<br>
>> > token<br>
>> > sequences across source files (ie. cut-n-paste). For example:<br>
>> ><br>
>> > while (true) {<br>
>> > System.exit();<br>
>> > }<br>
>> ><br>
>> > Would something like these tokens (totally contrived):<br>
>> ><br>
>> > while<br>
>> > (<br>
>> > true<br>
>> > )<br>
>> > {<br>
>> > System.exit<br>
>> > (<br>
>> > )<br>
>> > ;<br>
>> > }<br>
>> ><br>
>> > The tokenizer creates a sequence of TokenEntry objects which contain (a)<br>
>> > the<br>
>> > text of the token, (b) the source file name, and (c) a line number.<br>
>> > That's<br>
>> > it.<br>
>> ><br>
>> > The only special things some of the tokenizers do, is toss out tokens<br>
>> > that<br>
>> > would not be meaningful for the purposes of CPD. For example the tokens<br>
>> > for<br>
>> > an import statement in Java are not really something you worry about<br>
>> > finding<br>
>> > copies of in different source files!<br>
>> ><br>
>> > One could try using the TokenStream from Mozilla's Rhino as a ready to<br>
>> > go<br>
>> > tokenizer, but it seems to be package private. A bit of cheating using<br>
>> > the<br>
>> > Reflection APIs could likely break the Java access rules preventing<br>
>> > normal<br>
>> > usage. Or just put your CPD tokenizer in the same package. :)<br>
>> ><br>
>> > Good luck.<br>
>> ><br>
>> > Ryan<br>
>> ><br>
>> > On Thu, Dec 3, 2009 at 12:03 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=6" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>> >><br>
>> >> Hi,<br>
>> >><br>
>> >> I'm wondering if anyone is working on support for Javascript in CPD?<br>
>> >> If not, does anyone have some pointers for writing it myself? The<br>
>> >> how-to page is a little weak :) I've looked at the code for the<br>
>> >> existing supported languages, and I like the Ruby examples, but it's<br>
>> >> not clear to me what I need to define for a new tokenizer. I'd<br>
>> >> appreciate any help.<br>
>> >><br>
>> >> Thanks,<br>
>> >><br>
>> >> Dale<br>
>> >><br>
>> >><br>
>> >><br>
>> >> ------------------------------------------------------------------------------<br>
>> >> Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
>> >> a free event focused on virtualization and cloud computing.<br>
>> >> Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
>> >> <a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
>> >> _______________________________________________<br>
>> >> Pmd-devel mailing list<br>
>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=7" target="_top" rel="nofollow">Pmd-devel@...</a><br>
>> >> <a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
>> ><br>
>> ><br>
><br>
><br>
<br>
------------------------------------------------------------------------------<br>
Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
a free event focused on virtualization and cloud computing.<br>
Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
<a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=8" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>
</div></div><br>------------------------------------------------------------------------------<br>
Return on Information:<br>
Google Enterprise Search pays you back<br>
Get the facts.<br>
<a href="http://p.sf.net/sfu/google-dev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>
<br>_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=9" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
<br></blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704612&i=10" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26704184
Re: Support for javascript in CPD?
2009-12-08T18:25:04Z
2009-12-08T18:25:04Z
Dale Anson
I've committed the code to add javascript support to CPD to both the trunk and the 4.2.x branch. I did not update the change log in either branch because it wasn't clear to me where to add the change.<br><br>Dale<br>
<br><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:21 AM, Ryan Gustafson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=0" target="_top" rel="nofollow">ryan.gustafson@...</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Pretty soon, I'd say before year end, we're overdue. --Ryan<div><div></div><div class="h5"><br><br><div class="gmail_quote">On Thu, Dec 3, 2009 at 10:26 AM, Dale Anson <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=1" target="_top" rel="nofollow">danson@...</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">I'll get a test case or two together before committing. Do you have<br>
an idea of when the next release will be?<br>
<br>
Thanks,<br>
<font color="#888888"><br>
Dale<br>
</font><div><div></div><div><br>
<br>
<br>
On Thu, Dec 3, 2009 at 8:33 AM, Ryan Gustafson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=2" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
> Hi Dale,<br>
><br>
> Go ahead. It may not be the most optimal tokenizer and might make mistakes<br>
> on occasion, but it's passable like you say. That was the idea I think<br>
> behind AbstractTokenizer.<br>
><br>
> If you cannot get it on both 4.2.x branch and trunk let me know. Also,<br>
> please make sure you have some minimal test cases. As Romain points out<br>
> too, a small blurb in the changelog.<br>
><br>
> Ryan<br>
><br>
> On Thu, Dec 3, 2009 at 9:11 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=3" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>><br>
>> Hi Ryan,<br>
>><br>
>> Thanks for the help. I ended up just copying the RubyLanguage and<br>
>> RubyTokenizer files, then editing them a little for javascript, and<br>
>> that seems to work surprisingly well. I think I was expecting this to<br>
>> be more difficult.<br>
>><br>
>> Is it okay for me to check these in?<br>
>><br>
>> Thanks,<br>
>><br>
>> Dale<br>
>><br>
>><br>
>><br>
>> On Wed, Dec 2, 2009 at 11:34 PM, Ryan Gustafson<br>
>> <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=4" target="_top" rel="nofollow">ryan.gustafson@...</a>> wrote:<br>
>> > Not that I'm aware of.<br>
>> ><br>
>> > The purpose of a CPD tokenizer is really quite simple. It's the same as<br>
>> > a<br>
>> > lexer. Break a stream of characters into blocks of characters (tokens)<br>
>> > using the rules of the language. CPD then looks for patterns in the<br>
>> > token<br>
>> > sequences across source files (ie. cut-n-paste). For example:<br>
>> ><br>
>> > while (true) {<br>
>> > System.exit();<br>
>> > }<br>
>> ><br>
>> > Would something like these tokens (totally contrived):<br>
>> ><br>
>> > while<br>
>> > (<br>
>> > true<br>
>> > )<br>
>> > {<br>
>> > System.exit<br>
>> > (<br>
>> > )<br>
>> > ;<br>
>> > }<br>
>> ><br>
>> > The tokenizer creates a sequence of TokenEntry objects which contain (a)<br>
>> > the<br>
>> > text of the token, (b) the source file name, and (c) a line number.<br>
>> > That's<br>
>> > it.<br>
>> ><br>
>> > The only special things some of the tokenizers do, is toss out tokens<br>
>> > that<br>
>> > would not be meaningful for the purposes of CPD. For example the tokens<br>
>> > for<br>
>> > an import statement in Java are not really something you worry about<br>
>> > finding<br>
>> > copies of in different source files!<br>
>> ><br>
>> > One could try using the TokenStream from Mozilla's Rhino as a ready to<br>
>> > go<br>
>> > tokenizer, but it seems to be package private. A bit of cheating using<br>
>> > the<br>
>> > Reflection APIs could likely break the Java access rules preventing<br>
>> > normal<br>
>> > usage. Or just put your CPD tokenizer in the same package. :)<br>
>> ><br>
>> > Good luck.<br>
>> ><br>
>> > Ryan<br>
>> ><br>
>> > On Thu, Dec 3, 2009 at 12:03 AM, Dale Anson <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=5" target="_top" rel="nofollow">danson@...</a>> wrote:<br>
>> >><br>
>> >> Hi,<br>
>> >><br>
>> >> I'm wondering if anyone is working on support for Javascript in CPD?<br>
>> >> If not, does anyone have some pointers for writing it myself? The<br>
>> >> how-to page is a little weak :) I've looked at the code for the<br>
>> >> existing supported languages, and I like the Ruby examples, but it's<br>
>> >> not clear to me what I need to define for a new tokenizer. I'd<br>
>> >> appreciate any help.<br>
>> >><br>
>> >> Thanks,<br>
>> >><br>
>> >> Dale<br>
>> >><br>
>> >><br>
>> >><br>
>> >> ------------------------------------------------------------------------------<br>
>> >> Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
>> >> a free event focused on virtualization and cloud computing.<br>
>> >> Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
>> >> <a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
>> >> _______________________________________________<br>
>> >> Pmd-devel mailing list<br>
>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=6" target="_top" rel="nofollow">Pmd-devel@...</a><br>
>> >> <a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
>> ><br>
>> ><br>
><br>
><br>
<br>
------------------------------------------------------------------------------<br>
Join us December 9, 2009 for the Red Hat Virtual Experience,<br>
a free event focused on virtualization and cloud computing.<br>
Attend in-depth sessions from your desk. Your couch. Anywhere.<br>
<a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_blank" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>
_______________________________________________<br>
Pmd-devel mailing list<br>
<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=7" target="_top" rel="nofollow">Pmd-devel@...</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_blank" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>
<br />------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br><br />_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704184&i=8" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26704167
SF.net SVN: pmd:[7019] branches/pmd/4.2.x
2009-12-08T18:22:56Z
2009-12-08T18:22:56Z
daleanson
Revision: 7019
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7019&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7019&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 02:22:56 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Added javascript as a supported language for CPD.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br><br>Added Paths:
<br>-----------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br><br>Added: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java (rev 0)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>@@ -0,0 +1,64 @@
<br>+/**
<br>+* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+*/
<br>+package test.net.sourceforge.pmd.cpd;
<br>+
<br>+import static org.junit.Assert.assertEquals;
<br>+import net.sourceforge.pmd.PMD;
<br>+import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.SourceCode;
<br>+import net.sourceforge.pmd.cpd.Tokenizer;
<br>+import net.sourceforge.pmd.cpd.Tokens;
<br>+
<br>+import org.junit.Test;
<br>+
<br>+public class JavascriptTokenizerTest {
<br>+
<br>+ @Test
<br>+ public void test1() throws Throwable {
<br>+ Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ tokenizer.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ @Test
<br>+ public void test2() throws Throwable {
<br>+ Tokenizer t = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ t.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ // no semi-colons
<br>+ private String getCode1() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>+ sb.append( " real.focus()" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ // same as getCode1, but lines are ended with semi-colons
<br>+ private String getCode2() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>+ sb.append( " real.focus();" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ public static junit.framework.Test suite() {
<br>+ return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Added: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java (rev 0)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>@@ -0,0 +1,11 @@
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704167&i=0" target="_top" rel="nofollow">zb@...</a>
<br>+ */
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+public class JavascriptLanguage extends AbstractLanguage {
<br>+ public JavascriptLanguage() {
<br>+ super(new JavascriptTokenizer(), ".js");
<br>+ }
<br>+}
<br><br>Added: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java (rev 0)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>@@ -0,0 +1,22 @@
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+import java.util.ArrayList;
<br>+
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ */
<br>+public class JavascriptTokenizer extends AbstractTokenizer {
<br>+ public JavascriptTokenizer() {
<br>+ // setting markers for "string" in javascript
<br>+ this.stringToken = new ArrayList<String>();
<br>+ this.stringToken.add( "\'" );
<br>+ this.stringToken.add( "\"" );
<br>+
<br>+ // setting markers for 'ignorable character' in javascript
<br>+ this.ignorableCharacter = new ArrayList<String>();
<br>+ this.ignorableCharacter.add( ";" );
<br>+
<br>+ // setting markers for 'ignorable string' in javascript
<br>+ this.ignorableStmt = new ArrayList<String>();
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 02:05:38 UTC (rev 7018)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 02:22:56 UTC (rev 7019)
<br>@@ -7,7 +7,7 @@
<br>
<br> public class LanguageFactory {
<br>
<br>- public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran" };
<br>+ public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "javascript" };
<br> private static final String SUFFIX = "Language";
<br> public static final String EXTENSION = "extension";
<br> public static final String BY_EXTENSION = "by_extension";
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704167&i=1" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26704040
SF.net SVN: pmd:[7018] trunk/pmd
2009-12-08T18:05:38Z
2009-12-08T18:05:38Z
daleanson
Revision: 7018
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7018&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7018&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-09 02:05:38 +0000 (Wed, 09 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Added javascript as a supported language for CPD.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br> trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br><br>Added: trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java (rev 0)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/cpd/JavascriptTokenizerTest.java 2009-12-09 02:05:38 UTC (rev 7018)
<br>@@ -0,0 +1,64 @@
<br>+/**
<br>+* BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+*/
<br>+package test.net.sourceforge.pmd.cpd;
<br>+
<br>+import static org.junit.Assert.assertEquals;
<br>+import net.sourceforge.pmd.PMD;
<br>+import net.sourceforge.pmd.cpd.JavascriptTokenizer;
<br>+import net.sourceforge.pmd.cpd.SourceCode;
<br>+import net.sourceforge.pmd.cpd.Tokenizer;
<br>+import net.sourceforge.pmd.cpd.Tokens;
<br>+
<br>+import org.junit.Test;
<br>+
<br>+public class JavascriptTokenizerTest {
<br>+
<br>+ @Test
<br>+ public void test1() throws Throwable {
<br>+ Tokenizer tokenizer = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ tokenizer.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ @Test
<br>+ public void test2() throws Throwable {
<br>+ Tokenizer t = new JavascriptTokenizer();
<br>+ SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) );
<br>+ Tokens tokens = new Tokens();
<br>+ t.tokenize( sourceCode, tokens );
<br>+ assertEquals( 22, tokens.size() );
<br>+ }
<br>+
<br>+ // no semi-colons
<br>+ private String getCode1() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass')" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass')" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline'" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none'" ).append(PMD.EOL);
<br>+ sb.append( " real.focus()" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ // same as getCode1, but lines are ended with semi-colons
<br>+ private String getCode2() {
<br>+ StringBuilder sb = new StringBuilder();
<br>+ sb.append( "function switchToRealPassword() {" ).append(PMD.EOL);
<br>+ sb.append( " var real = $('realPass');" ).append(PMD.EOL);
<br>+ sb.append( " var prompt = $('promptPass');" ).append(PMD.EOL);
<br>+ sb.append( " real.style.display = 'inline';" ).append(PMD.EOL);
<br>+ sb.append( " prompt.style.display = 'none';" ).append(PMD.EOL);
<br>+ sb.append( " real.focus();" ).append(PMD.EOL);
<br>+ sb.append( "}" ).append(PMD.EOL);
<br>+ return sb.toString();
<br>+ }
<br>+
<br>+ public static junit.framework.Test suite() {
<br>+ return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class );
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Added: trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java (rev 0)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptLanguage.java 2009-12-09 02:05:38 UTC (rev 7018)
<br>@@ -0,0 +1,11 @@
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ * @author Zev Blut <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704040&i=0" target="_top" rel="nofollow">zb@...</a>
<br>+ */
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+public class JavascriptLanguage extends AbstractLanguage {
<br>+ public JavascriptLanguage() {
<br>+ super(new JavascriptTokenizer(), ".js");
<br>+ }
<br>+}
<br><br>Added: trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java (rev 0)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/JavascriptTokenizer.java 2009-12-09 02:05:38 UTC (rev 7018)
<br>@@ -0,0 +1,22 @@
<br>+package net.sourceforge.pmd.cpd;
<br>+
<br>+import java.util.ArrayList;
<br>+
<br>+/**
<br>+ * BSD-style license; for more info see <a href="http://pmd.sourceforge.net/license.html" target="_top" rel="nofollow">http://pmd.sourceforge.net/license.html</a><br>+ */
<br>+public class JavascriptTokenizer extends AbstractTokenizer {
<br>+ public JavascriptTokenizer() {
<br>+ // setting markers for "string" in javascript
<br>+ this.stringToken = new ArrayList<String>();
<br>+ this.stringToken.add( "\'" );
<br>+ this.stringToken.add( "\"" );
<br>+
<br>+ // setting markers for 'ignorable character' in javascript
<br>+ this.ignorableCharacter = new ArrayList<String>();
<br>+ this.ignorableCharacter.add( ";" );
<br>+
<br>+ // setting markers for 'ignorable string' in javascript
<br>+ this.ignorableStmt = new ArrayList<String>();
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/cpd/LanguageFactory.java 2009-12-09 02:05:38 UTC (rev 7018)
<br>@@ -7,7 +7,7 @@
<br>
<br> public class LanguageFactory {
<br>
<br>- public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran" };
<br>+ public static String[] supportedLanguages = new String[]{"java", "jsp", "cpp", "c", "php", "ruby","fortran", "javascript" };
<br> private static final String SUFFIX = "Language";
<br> public static final String EXTENSION = "extension";
<br> public static final String BY_EXTENSION = "by_extension";
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26704040&i=1" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26668689
[ pmd-Bugs-2905035 ] 17% of PMD processing time is spent in ClassTypeResolver
2009-12-06T12:28:55Z
2009-12-06T12:28:55Z
SourceForge.net
Bugs item #2905035, was opened at 2009-11-27 19:01
<br>Message generated for change (Comment added) made by fmallet
<br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262</a><br><br>Please note that this message will contain a full copy of the comment thread,
<br>including the initial issue submission, for this request,
<br>not just the latest update.
<br>Category: pmd
<br>Group: None
<br>Status: Closed
<br>Resolution: Rejected
<br>Priority: 5
<br>Private: No
<br>Submitted By: Freddy Mallet (fmallet)
<br>Assigned to: Ryan Gustafson (rgustav)
<br>Summary: 17% of PMD processing time is spent in ClassTypeResolver
<br><br>Initial Comment:
<br>In the method net.sourceforge.pmd.typeresolution.ClassTypeResolver.populateType(...) most of the time is spent trying to load class from the ClassLoader.
<br><br>associated ticket : <a href="http://jira.codehaus.org/browse/SONAR-1286" target="_top" rel="nofollow">http://jira.codehaus.org/browse/SONAR-1286</a><br><br>----------------------------------------------------------------------
<br><br>Comment By: Freddy Mallet (fmallet)
<br>Date: 2009-12-06 23:35
<br><br>Message:
<br>Oups, my first comment was fired too quickly ...
<br><br>So thanks Ryan for your previous very detailed answer. An intermediate
<br>solution could be to simply add a proxy method before the
<br>ClassLoader.loadClass(...) method in order to keep a hashmap of all
<br>nonexistent classes. This hashmap could be progressively fed each time the
<br>loadClass(...) method throws a ClassNotFoundException. I can't manage to
<br>figure out what would be the benefit of such solution but ...
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Freddy Mallet (fmallet)
<br>Date: 2009-12-06 23:20
<br><br>Message:
<br>Thanks Ryan for this
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ryan Gustafson (rgustav)
<br>Date: 2009-12-02 02:27
<br><br>Message:
<br>On PreserveStackTrace I agree, and Romain knows about it now. It's very
<br>easy to use XPath with crappy performance. PMD performs much better now
<br>than it did in the past due improvements made in handling of XPath rules,
<br>but those improvements do not work on custom Java rules calling out to
<br>XPath.
<br><br>As for Type Resolution, it works by probing the classpath to see if it can
<br>find a Class for a name in the code. This is done by going to a
<br>ClassLoader and calling 'loadClass'. Having many glob imports (i.e. import
<br>foo.bar.*) means we sometimes ask the class loader multiple times on
<br>different on possible package names. Further, we are dependent upon the
<br>speed by which a ClassLoader can answer the question. I'm not horribly
<br>surprised that the more JARs you add the longer it takes for Maven to
<br>determine the answer. Generally the ClassLoaders take longer to say
<br>ClassNotFoundException than they do to return an actual class (anecdotally
<br>up to 5-10x longer). Likely because they don't store negative entries,
<br>they only track real Classes.
<br><br>Last evening I tried writing a smarter ClassLoader for use by PMD that can
<br>scan the entire classpath to determine all possible classes by name. In
<br>the hopes never asking the real/parent ClassLoader for a non-existent
<br>class. I had a gain in performance on the Type Resolution phase, but paid
<br>extra to scan the classpath. For my test case they balanced out. However,
<br>for a huge code base I imagine it could be a good win. Scanning is done
<br>once. The TR phase occurs once per file.
<br><br>For performance testing, I generally run every Rule against the PMD
<br>source. I also try the Hibernate source on occasion. Others sometime run
<br>against the Java source, which I should start doing.
<br><br>If you can provide a concrete performance regression, or example which
<br>demonstrates bad performance, I can look into it. But TR takes some time,
<br>and it always will, we can only hope to lessen it somewhat.
<br><br>For reference, TR was first turned on by default for PMD 4.1 if I'm
<br>reading the file history correctly.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Freddy Mallet (fmallet)
<br>Date: 2009-12-01 23:48
<br><br>Message:
<br>Ok Ryan, you're right and your message has been perfectly received ... but
<br>I'm fully convinced that there is an important performance bottlenecks here
<br>and on the PreserveStackTrace rule. So I need to understand what is your
<br>performance benchmark environment to give you some usable profiling
<br>information.
<br><br>On my side, each time we release a new version of
<br><a href="http://sonar.codehaus.org" target="_top" rel="nofollow">http://sonar.codehaus.org</a>, I'm in charge to execute the performance
<br>non-regression tests. I'm always doing this on the same sources with the
<br>same quality profile (set of checkstyle and PMD rules) to be able to
<br>compare results. To do this, we've arbitrary chosen STRUTS 1.2.9.
<br><br>Do you have such kind of reference : sources + set of rules ?
<br><br>FYI, I'm testing PMD through Maven and my feeling is that the problem with
<br>the ClassTypeResolver is increasing each time you add a new Maven
<br>dependencies, that is to say a new jar in the classpath.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ryan Gustafson (rgustav)
<br>Date: 2009-11-30 12:43
<br><br>Message:
<br>Insufficient details, so closing. You can reopen when you provide more.
<br><br>This is nothing I can use. The classloading during type resolution is a
<br>known part of the processing time, but in my testing is comparable to the
<br>parser overhead. Provide me something I can reproduce and some real
<br>numbers. If we're splitting hairs here on a 1 second total runtime, big
<br>deal. I'd be much more interested in things that are measured in minutes.
<br><br>FYI, if I check the PMD source code using every Java rule there is, it
<br>takes about 25 seconds, of which 2.5 seconds are spent in Type Resolution,
<br>more than 75% of the time is spent in the Rules. This is as measure using
<br>the -benchmark option from the command line.
<br><br><br>----------------------------------------------------------------------
<br><br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262</a><br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26668689&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26668545
[ pmd-Bugs-2905035 ] 17% of PMD processing time is spent in ClassTypeResolver
2009-12-06T12:13:08Z
2009-12-06T12:13:08Z
SourceForge.net
Bugs item #2905035, was opened at 2009-11-27 19:01
<br>Message generated for change (Comment added) made by fmallet
<br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262</a><br><br>Please note that this message will contain a full copy of the comment thread,
<br>including the initial issue submission, for this request,
<br>not just the latest update.
<br>Category: pmd
<br>Group: None
<br>Status: Closed
<br>Resolution: Rejected
<br>Priority: 5
<br>Private: No
<br>Submitted By: Freddy Mallet (fmallet)
<br>Assigned to: Ryan Gustafson (rgustav)
<br>Summary: 17% of PMD processing time is spent in ClassTypeResolver
<br><br>Initial Comment:
<br>In the method net.sourceforge.pmd.typeresolution.ClassTypeResolver.populateType(...) most of the time is spent trying to load class from the ClassLoader.
<br><br>associated ticket : <a href="http://jira.codehaus.org/browse/SONAR-1286" target="_top" rel="nofollow">http://jira.codehaus.org/browse/SONAR-1286</a><br><br>----------------------------------------------------------------------
<br><br>Comment By: Freddy Mallet (fmallet)
<br>Date: 2009-12-06 23:20
<br><br>Message:
<br>Thanks Ryan for this
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ryan Gustafson (rgustav)
<br>Date: 2009-12-02 02:27
<br><br>Message:
<br>On PreserveStackTrace I agree, and Romain knows about it now. It's very
<br>easy to use XPath with crappy performance. PMD performs much better now
<br>than it did in the past due improvements made in handling of XPath rules,
<br>but those improvements do not work on custom Java rules calling out to
<br>XPath.
<br><br>As for Type Resolution, it works by probing the classpath to see if it can
<br>find a Class for a name in the code. This is done by going to a
<br>ClassLoader and calling 'loadClass'. Having many glob imports (i.e. import
<br>foo.bar.*) means we sometimes ask the class loader multiple times on
<br>different on possible package names. Further, we are dependent upon the
<br>speed by which a ClassLoader can answer the question. I'm not horribly
<br>surprised that the more JARs you add the longer it takes for Maven to
<br>determine the answer. Generally the ClassLoaders take longer to say
<br>ClassNotFoundException than they do to return an actual class (anecdotally
<br>up to 5-10x longer). Likely because they don't store negative entries,
<br>they only track real Classes.
<br><br>Last evening I tried writing a smarter ClassLoader for use by PMD that can
<br>scan the entire classpath to determine all possible classes by name. In
<br>the hopes never asking the real/parent ClassLoader for a non-existent
<br>class. I had a gain in performance on the Type Resolution phase, but paid
<br>extra to scan the classpath. For my test case they balanced out. However,
<br>for a huge code base I imagine it could be a good win. Scanning is done
<br>once. The TR phase occurs once per file.
<br><br>For performance testing, I generally run every Rule against the PMD
<br>source. I also try the Hibernate source on occasion. Others sometime run
<br>against the Java source, which I should start doing.
<br><br>If you can provide a concrete performance regression, or example which
<br>demonstrates bad performance, I can look into it. But TR takes some time,
<br>and it always will, we can only hope to lessen it somewhat.
<br><br>For reference, TR was first turned on by default for PMD 4.1 if I'm
<br>reading the file history correctly.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Freddy Mallet (fmallet)
<br>Date: 2009-12-01 23:48
<br><br>Message:
<br>Ok Ryan, you're right and your message has been perfectly received ... but
<br>I'm fully convinced that there is an important performance bottlenecks here
<br>and on the PreserveStackTrace rule. So I need to understand what is your
<br>performance benchmark environment to give you some usable profiling
<br>information.
<br><br>On my side, each time we release a new version of
<br><a href="http://sonar.codehaus.org" target="_top" rel="nofollow">http://sonar.codehaus.org</a>, I'm in charge to execute the performance
<br>non-regression tests. I'm always doing this on the same sources with the
<br>same quality profile (set of checkstyle and PMD rules) to be able to
<br>compare results. To do this, we've arbitrary chosen STRUTS 1.2.9.
<br><br>Do you have such kind of reference : sources + set of rules ?
<br><br>FYI, I'm testing PMD through Maven and my feeling is that the problem with
<br>the ClassTypeResolver is increasing each time you add a new Maven
<br>dependencies, that is to say a new jar in the classpath.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ryan Gustafson (rgustav)
<br>Date: 2009-11-30 12:43
<br><br>Message:
<br>Insufficient details, so closing. You can reopen when you provide more.
<br><br>This is nothing I can use. The classloading during type resolution is a
<br>known part of the processing time, but in my testing is comparable to the
<br>parser overhead. Provide me something I can reproduce and some real
<br>numbers. If we're splitting hairs here on a 1 second total runtime, big
<br>deal. I'd be much more interested in things that are measured in minutes.
<br><br>FYI, if I check the PMD source code using every Java rule there is, it
<br>takes about 25 seconds, of which 2.5 seconds are spent in Type Resolution,
<br>more than 75% of the time is spent in the Rules. This is as measure using
<br>the -benchmark option from the command line.
<br><br><br>----------------------------------------------------------------------
<br><br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=2905035&group_id=56262</a><br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26668545&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26660240
SF.net SVN: pmd:[7017] trunk/pmd
2009-12-05T14:51:55Z
2009-12-05T14:51:55Z
rgustav
Revision: 7017
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7017&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7017&view=rev</a><br>Author: rgustav
<br>Date: 2009-12-05 22:51:55 +0000 (Sat, 05 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Add support for Unicode for JSP/JSF.
<br>Add support to not parse body of <script> for JSP/JSF.
<br>Add new NoInlineScript rule for JSP/JSF.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/build.xml
<br> trunk/pmd/etc/changelog.txt
<br> trunk/pmd/etc/grammar/JspParser.jjt
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java
<br> trunk/pmd/rulesets/jsp/basic.xml
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/JspParser.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParser.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTreeConstants.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitor.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitorAdapter.java
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/rule/AbstractJspRule.java
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml
<br> trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/ASTHtmlScript.java
<br><br>Modified: trunk/pmd/build.xml
<br>===================================================================
<br>--- trunk/pmd/build.xml 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/build.xml 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -409,7 +409,7 @@
<br> <delete file="src/net/sourceforge/pmd/lang/jsp/ast/ParseException.java" />
<br> <jjtree target="etc/grammar/JspParser.jjt" outputdirectory="src/net/sourceforge/pmd/lang/jsp/ast/" javacchome="${javacc-home.path}" />
<br> <!-- Ensure generated using CharStream interface -->
<br>- <javacc static="false" usercharstream="true" target="src/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/lang/jsp/ast" javacchome="${javacc-home.path}" />
<br>+ <javacc static="false" usercharstream="true" unicodeinput="true" javaunicodeescape="false" target="src/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/lang/jsp/ast" javacchome="${javacc-home.path}" />
<br> <delete file="src/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" />
<br> <delete file="src/net/sourceforge/pmd/lang/jsp/ast/Node.java" />
<br> <delete file="src/net/sourceforge/pmd/lang/jsp/ast/SimpleNode.java" />
<br><br>Modified: trunk/pmd/etc/changelog.txt
<br>===================================================================
<br>--- trunk/pmd/etc/changelog.txt 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/etc/changelog.txt 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -472,6 +472,8 @@
<br> The JSP RuleSets are now in the 'jsp' language, and are 'jsp-basic', 'jsp-basic-jsf', 'rulesets/jsp/basic.xml' and 'rulesets/jsp/basic-jsp.xml'
<br> Enhanced logging in the ClassTypeResolver to provide more detailed messaging.
<br> AvoidUsingHardCodedIP modified to not use InetAddress.getByName(String), instead does better pattern analysis.
<br>+The JSP/JSF parser can now parse Unicode input.
<br>+The JSP/JSP parser can now handle <script>...</script> tags. The AST HtmlScript node contains the content.
<br>
<br> New Java rules:
<br>
<br>@@ -490,6 +492,9 @@
<br> New Java ruleset:
<br> android.xml: new rules specific to the Android platform
<br>
<br>+New JSP rules:
<br>+ Basic ruleset: NoInlineScript
<br>+
<br> New ECMAScript rules:
<br> Basic ruleset: AssignmentInOperand,ConsistentReturn,InnaccurateNumericLiteral,UnreachableCode
<br> Braces ruleset: ForLoopsMustUseBraces,IfStmtsMustUseBraces,IfElseStmtsMustUseBraces,WhileLoopsMustUseBraces
<br><br>Modified: trunk/pmd/etc/grammar/JspParser.jjt
<br>===================================================================
<br>--- trunk/pmd/etc/grammar/JspParser.jjt 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/etc/grammar/JspParser.jjt 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -3,11 +3,13 @@
<br> * The JSP Document style is supported, except for inline DTD.
<br> * The JSP Page style (<% ... %>) is supported.
<br> * Java code is not parsed.
<br>+ * Script code inside <script> ... </script> is not parsed.
<br> */
<br>
<br> options {
<br> USER_CHAR_STREAM = true;
<br> NODE_USES_PARSER=true;
<br>+ UNICODE_INPUT=true;
<br>
<br> IGNORE_CASE = true;
<br> STATIC = false;
<br>@@ -80,6 +82,7 @@
<br> * - JspExpressionState : inside an expression <%= ... %>
<br> * - JspDeclarationState : inside a declaration <%! ... %>
<br> * - JspCommentState : inside a comment <%-- ... --%>
<br>+ * - HtmlScriptContentState : inside an HTML script <script> ... </script>
<br> */
<br>
<br>
<br>@@ -265,6 +268,18 @@
<br> | < COMMENT_TEXT: (~[]) >
<br> }
<br>
<br>+<HtmlScriptContentState> TOKEN :
<br>+{
<br>+ <HTML_SCRIPT_CONTENT: (~[]) >
<br>+ | <HTML_SCRIPT_END_TAG : "</script" | "</Script" | "</SCRIPT">
<br>+ {
<br>+ // We've done a custom lookahead for the closing </script> and found it.
<br>+ // Put it back into the input stream, so it can be processed normally.
<br>+ input_stream.backup(8);
<br>+ image.setLength(image.length() - 8); // kill the "<script"
<br>+ matchedToken.image = image.toString();
<br>+ } : AfterTagState
<br>+}
<br>
<br> /** ******************************************************************** */
<br> /** ************************* JSP GRAMMAR **************************** */
<br>@@ -500,9 +515,20 @@
<br> (Attribute())*
<br> (
<br> (<TAG_END>
<br>- { jjtThis.setEmpty(false); }
<br>+ {
<br>+ jjtThis.setEmpty(false);
<br>+
<br>+ // Content in a <script> element needs special treatment (like a comment or CDataSection).
<br>+ // Tell the TokenManager to start looking for the body of a script element. In this
<br>+ // state all text will be consumed by the next token up to the closing </script> tag.
<br>+ // This is a context sensitive switch for the token manager, not something one can
<br>+ // express using normal JavaCC syntax. Hence the hoop jumping.
<br>+ if ("script".equalsIgnoreCase(startTagName.image)) {
<br>+ token_source.SwitchTo(HtmlScriptContentState);
<br>+ }
<br>+ }
<br>
<br>- (Content())?
<br>+ (HtmlScript() | Content())?
<br>
<br> <ENDTAG_START>
<br> endTagName = <TAG_NAME>
<br>@@ -647,3 +673,16 @@
<br> { jjtThis.setUri(quoteContent(systemLiteral.image)); }
<br> )
<br> }
<br>+
<br>+void HtmlScript() :
<br>+{
<br>+ StringBuffer content = new StringBuffer();
<br>+ Token t;
<br>+}
<br>+{
<br>+ (t = <HTML_SCRIPT_CONTENT> { content.append(t.image); })*
<br>+ <HTML_SCRIPT_END_TAG>
<br>+ {
<br>+ jjtThis.setImage(content.toString().trim());
<br>+ }
<br>+}
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -15,6 +15,7 @@
<br> import net.sourceforge.pmd.lang.jsp.ast.ASTDoctypeDeclaration;
<br> import net.sourceforge.pmd.lang.jsp.ast.ASTDoctypeExternalId;
<br> import net.sourceforge.pmd.lang.jsp.ast.ASTElement;
<br>+import net.sourceforge.pmd.lang.jsp.ast.ASTHtmlScript;
<br>
<br> import org.junit.Test;
<br> /**
<br>@@ -158,6 +159,17 @@
<br> assertEquals("Correct comment content expected!", "comment", comment.getImage());
<br> }
<br>
<br>+ /**
<br>+ * Test parsing of HTML <script> element.
<br>+ */
<br>+ @Test
<br>+ public void testHtmlScript() {
<br>+ Set scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
<br>+ assertEquals("One script expected!", 1, scripts.size());
<br>+ ASTHtmlScript script = (ASTHtmlScript) scripts.iterator().next();
<br>+ assertEquals("Correct script content expected!", "Script!", script.getImage());
<br>+ }
<br>+
<br> private static final String TEST_SIMPLEST_HTML = "<html/>";
<br>
<br> private static final String TEST_ELEMENT_AND_NAMESPACE = "<h:html MyNsPrefix:MyAttr='MyValue'/>";
<br>@@ -174,6 +186,9 @@
<br> private static final String TEST_ATTRIBUTE_VALUE_CONTAINING_HASH =
<br> "<tag:if something=\"#yes#\" foo=\"CREATE\"> <a href=\"#\">foo</a> </tag:if>";
<br>
<br>+ private static final String TEST_HTML_SCRIPT =
<br>+ "<html><head><script>Script!</script></head></html>";
<br>+
<br> public static junit.framework.Test suite() {
<br> return new junit.framework.JUnit4TestAdapter(JspDocStyleTest.class);
<br> }
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -18,6 +18,7 @@
<br> addRule(RULESET, "JspEncoding");
<br> addRule(RULESET, "NoClassAttribute");
<br> addRule(RULESET, "NoHtmlComments");
<br>+ addRule(RULESET, "NoInlineScript");
<br> addRule(RULESET, "NoInlineStyleInformation");
<br> addRule(RULESET, "NoJspForward");
<br> addRule(RULESET, "NoLongScripts");
<br><br>Added: trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml (rev 0)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -0,0 +1,53 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<test-data>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+A violation.
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script>Some script</script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+A violation.
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location">Some script</script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, no 'src' with empty body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script></script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, only 'src' with empty whitespace body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location"> </script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, only 'src' without body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location"/></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+</test-data>
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd/rulesets/jsp/basic.xml
<br>===================================================================
<br>--- trunk/pmd/rulesets/jsp/basic.xml 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/rulesets/jsp/basic.xml 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -262,4 +262,36 @@
<br> </example>
<br> </rule>
<br>
<br>+ <rule
<br>+ name="NoInlineScript" language="jsp"
<br>+ class="net.sourceforge.pmd.lang.rule.XPathRule"
<br>+ message="Avoiding inlining HTML script content"
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/basic-jsp.html#NoInlineScript" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/basic-jsp.html#NoInlineScript</a>">
<br>+ <description>
<br>+ <![CDATA[
<br>+Avoid inlining HTML script content. Consider externalizing the HTML script using the 'src' attribute on the <script> element.
<br>+Externalized script could be reused between pages. Browsers can also cache the script, reducing overall download bandwidth.
<br>+ ]]>
<br>+ </description>
<br>+ <priority>3</priority>
<br>+ <properties>
<br>+ <property name="xpath">
<br>+ <value>
<br>+ <![CDATA[
<br>+//HtmlScript[@Image != '']
<br>+ ]]>
<br>+ </value>
<br>+ </property>
<br>+ </properties>
<br>+ <example>
<br>+ <![CDATA[
<br>+ Most browsers should be able to interpret the following headers:
<br>+
<br>+ <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<br>+
<br>+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<br>+ ]]>
<br>+ </example>
<br>+ </rule>
<br>+
<br> </ruleset>
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/lang/jsp/JspParser.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/jsp/JspParser.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/jsp/JspParser.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -10,15 +10,16 @@
<br> import net.sourceforge.pmd.lang.AbstractParser;
<br> import net.sourceforge.pmd.lang.TokenManager;
<br> import net.sourceforge.pmd.lang.ast.AbstractTokenManager;
<br>-import net.sourceforge.pmd.lang.ast.JavaCharStream;
<br> import net.sourceforge.pmd.lang.ast.Node;
<br> import net.sourceforge.pmd.lang.ast.ParseException;
<br>+import net.sourceforge.pmd.lang.ast.SimpleCharStream;
<br>
<br> /**
<br> * Adapter for the JspParser.
<br> */
<br> public class JspParser extends AbstractParser {
<br>
<br>+ @Override
<br> public TokenManager createTokenManager(Reader source) {
<br> return new JspTokenManager(source);
<br> }
<br>@@ -29,7 +30,7 @@
<br>
<br> public Node parse(String fileName, Reader source) throws ParseException {
<br> AbstractTokenManager.setFileName(fileName);
<br>- return new net.sourceforge.pmd.lang.jsp.ast.JspParser(new JavaCharStream(source)).CompilationUnit();
<br>+ return new net.sourceforge.pmd.lang.jsp.ast.JspParser(new SimpleCharStream(source)).CompilationUnit();
<br> }
<br>
<br> public Map<Integer, String> getSuppressMap() {
<br><br>Added: trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/ASTHtmlScript.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/ASTHtmlScript.java (rev 0)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/ASTHtmlScript.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -0,0 +1,19 @@
<br>+/* Generated By:JJTree: Do not edit this line. ASTHtmlScript.java Version 4.1 */
<br>+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY= */
<br>+package net.sourceforge.pmd.lang.jsp.ast;
<br>+
<br>+public class ASTHtmlScript extends AbstractJspNode {
<br>+ public ASTHtmlScript(int id) {
<br>+ super(id);
<br>+ }
<br>+
<br>+ public ASTHtmlScript(JspParser p, int id) {
<br>+ super(p, id);
<br>+ }
<br>+
<br>+ /** Accept the visitor. **/
<br>+ @Override
<br>+ public Object jjtAccept(JspParserVisitor visitor, Object data) {
<br>+ return visitor.visit(this, data);
<br>+ }
<br>+}
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParser.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParser.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParser.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -630,7 +630,16 @@
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br> case TAG_END:
<br> jj_consume_token(TAG_END);
<br>- jjtn000.setEmpty(false);
<br>+ jjtn000.setEmpty(false);
<br>+
<br>+ // Content in a <script> element needs special treatment (like a comment or CDataSection).
<br>+ // Tell the TokenManager to start looking for the body of a script element. In this
<br>+ // state all text will be consumed by the next token up to the closing </script> tag.
<br>+ // This is a context sensitive switch for the token manager, not something one can
<br>+ // express using normal JavaCC syntax. Hence the hoop jumping.
<br>+ if ("script".equalsIgnoreCase(startTagName.image)) {
<br>+ token_source.SwitchTo(HtmlScriptContentState);
<br>+ }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br> case TAG_START:
<br> case COMMENT_START:
<br>@@ -642,10 +651,33 @@
<br> case JSP_DIRECTIVE_START:
<br> case EL_EXPRESSION:
<br> case UNPARSED_TEXT:
<br>- Content();
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ case HTML_SCRIPT_END_TAG:
<br>+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ case HTML_SCRIPT_END_TAG:
<br>+ HtmlScript();
<br>+ break;
<br>+ case TAG_START:
<br>+ case COMMENT_START:
<br>+ case CDATA_START:
<br>+ case JSP_COMMENT_START:
<br>+ case JSP_DECLARATION_START:
<br>+ case JSP_EXPRESSION_START:
<br>+ case JSP_SCRIPTLET_START:
<br>+ case JSP_DIRECTIVE_START:
<br>+ case EL_EXPRESSION:
<br>+ case UNPARSED_TEXT:
<br>+ Content();
<br>+ break;
<br>+ default:
<br>+ jj_la1[13] = jj_gen;
<br>+ jj_consume_token(-1);
<br>+ throw new ParseException();
<br>+ }
<br> break;
<br> default:
<br>- jj_la1[13] = jj_gen;
<br>+ jj_la1[14] = jj_gen;
<br> ;
<br> }
<br> jj_consume_token(ENDTAG_START);
<br>@@ -666,7 +698,7 @@
<br> jjtn000.setEmpty(true);
<br> break;
<br> default:
<br>- jj_la1[14] = jj_gen;
<br>+ jj_la1[15] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -748,7 +780,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[15] = jj_gen;
<br>+ jj_la1[16] = jj_gen;
<br> break label_8;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -761,7 +793,7 @@
<br> tmp = QuoteIndependentAttributeValueContent();
<br> break;
<br> default:
<br>- jj_la1[16] = jj_gen;
<br>+ jj_la1[17] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -776,7 +808,7 @@
<br> content.append(t.image.substring(0, 1));
<br> break;
<br> default:
<br>- jj_la1[17] = jj_gen;
<br>+ jj_la1[18] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -793,7 +825,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[18] = jj_gen;
<br>+ jj_la1[19] = jj_gen;
<br> break label_9;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -806,7 +838,7 @@
<br> tmp = QuoteIndependentAttributeValueContent();
<br> break;
<br> default:
<br>- jj_la1[19] = jj_gen;
<br>+ jj_la1[20] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -821,13 +853,13 @@
<br> content.append(t.image.substring(0, 1));
<br> break;
<br> default:
<br>- jj_la1[20] = jj_gen;
<br>+ jj_la1[21] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br> break;
<br> default:
<br>- jj_la1[21] = jj_gen;
<br>+ jj_la1[22] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -872,7 +904,7 @@
<br> tmp = JspExpressionInAttribute();
<br> break;
<br> default:
<br>- jj_la1[22] = jj_gen;
<br>+ jj_la1[23] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -914,7 +946,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[23] = jj_gen;
<br>+ jj_la1[24] = jj_gen;
<br> break label_10;
<br> }
<br> t = jj_consume_token(COMMENT_TEXT);
<br>@@ -947,7 +979,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[24] = jj_gen;
<br>+ jj_la1[25] = jj_gen;
<br> break label_11;
<br> }
<br> Attribute();
<br>@@ -989,7 +1021,7 @@
<br> jj_consume_token(WHITESPACES);
<br> break;
<br> default:
<br>- jj_la1[25] = jj_gen;
<br>+ jj_la1[26] = jj_gen;
<br> ;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -1001,12 +1033,12 @@
<br> jj_consume_token(WHITESPACES);
<br> break;
<br> default:
<br>- jj_la1[26] = jj_gen;
<br>+ jj_la1[27] = jj_gen;
<br> ;
<br> }
<br> break;
<br> default:
<br>- jj_la1[27] = jj_gen;
<br>+ jj_la1[28] = jj_gen;
<br> ;
<br> }
<br> jj_consume_token(DOCTYPE_DECL_END);
<br>@@ -1059,7 +1091,7 @@
<br> jjtn000.setUri(quoteContent(systemLiteral.image));
<br> break;
<br> default:
<br>- jj_la1[28] = jj_gen;
<br>+ jj_la1[29] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -1070,6 +1102,37 @@
<br> }
<br> }
<br>
<br>+ final public void HtmlScript() throws ParseException {
<br>+ /*@bgen(jjtree) HtmlScript */
<br>+ ASTHtmlScript jjtn000 = new ASTHtmlScript(this, JJTHTMLSCRIPT);
<br>+ boolean jjtc000 = true;
<br>+ jjtree.openNodeScope(jjtn000);StringBuffer content = new StringBuffer();
<br>+ Token t;
<br>+ try {
<br>+ label_12:
<br>+ while (true) {
<br>+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ ;
<br>+ break;
<br>+ default:
<br>+ jj_la1[30] = jj_gen;
<br>+ break label_12;
<br>+ }
<br>+ t = jj_consume_token(HTML_SCRIPT_CONTENT);
<br>+ content.append(t.image);
<br>+ }
<br>+ jj_consume_token(HTML_SCRIPT_END_TAG);
<br>+ jjtree.closeNodeScope(jjtn000, true);
<br>+ jjtc000 = false;
<br>+ jjtn000.setImage(content.toString().trim());
<br>+ } finally {
<br>+ if (jjtc000) {
<br>+ jjtree.closeNodeScope(jjtn000, true);
<br>+ }
<br>+ }
<br>+ }
<br>+
<br> private boolean jj_2_1(int xla) {
<br> jj_la = xla; jj_lastpos = jj_scanpos = token;
<br> try { return !jj_3_1(); }
<br>@@ -1084,102 +1147,79 @@
<br> finally { jj_save(1, xla); }
<br> }
<br>
<br>- private boolean jj_3R_30() {
<br>- if (jj_scan_token(DOUBLE_QUOTE)) return true;
<br>+ private boolean jj_3R_22() {
<br>+ if (jj_3R_26()) return true;
<br> Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_32()) { jj_scanpos = xsp; break; }
<br>- }
<br> xsp = jj_scanpos;
<br>- if (jj_scan_token(72)) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_33()) return true;
<br>- }
<br>+ if (jj_scan_token(48)) jj_scanpos = xsp;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_29() {
<br>- if (jj_scan_token(PUBLIC)) return true;
<br>+ private boolean jj_3R_16() {
<br>+ if (jj_scan_token(DOCTYPE_DECL_START)) return true;
<br> if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_47() {
<br>- if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_27() {
<br>+ if (jj_scan_token(NAME)) return true;
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_30()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_31()) return true;
<br>- }
<br>+ if (jj_scan_token(48)) jj_scanpos = xsp;
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_22()) jj_scanpos = xsp;
<br>+ if (jj_scan_token(DOCTYPE_DECL_END)) return true;
<br> return false;
<br> }
<br>
<br> private boolean jj_3R_25() {
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_28()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_29()) return true;
<br>- }
<br>+ if (jj_scan_token(ATTR_NAME)) return true;
<br>+ if (jj_scan_token(ATTR_EQ)) return true;
<br>+ if (jj_3R_28()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_28() {
<br>- if (jj_scan_token(SYSTEM)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>+ private boolean jj_3R_41() {
<br>+ if (jj_scan_token(UNPARSED_TEXT_NO_DOUBLE_QUOTES)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_21() {
<br>+ private boolean jj_3R_19() {
<br> if (jj_3R_25()) return true;
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_scan_token(48)) jj_scanpos = xsp;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_40() {
<br>- if (jj_scan_token(UNPARSED_TEXT_NO_DOUBLE_QUOTES)) return true;
<br>+ private boolean jj_3R_14() {
<br>+ if (jj_scan_token(DECL_START)) return true;
<br>+ if (jj_scan_token(TAG_NAME)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_19()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ if (jj_scan_token(DECL_END)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_15() {
<br>- if (jj_scan_token(DOCTYPE_DECL_START)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(NAME)) return true;
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_scan_token(48)) jj_scanpos = xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_21()) jj_scanpos = xsp;
<br>- if (jj_scan_token(DOCTYPE_DECL_END)) return true;
<br>+ private boolean jj_3R_21() {
<br>+ if (jj_3R_24()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_24() {
<br>- if (jj_scan_token(ATTR_NAME)) return true;
<br>- if (jj_scan_token(ATTR_EQ)) return true;
<br>- if (jj_3R_27()) return true;
<br>+ private boolean jj_3R_43() {
<br>+ if (jj_scan_token(UNPARSED_TEXT_NO_SINGLE_QUOTES)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_20() {
<br>- if (jj_3R_23()) return true;
<br>+ private boolean jj_3R_27() {
<br>+ if (jj_scan_token(COMMENT_TEXT)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_42() {
<br>- if (jj_scan_token(UNPARSED_TEXT_NO_SINGLE_QUOTES)) return true;
<br>+ private boolean jj_3R_23() {
<br>+ if (jj_scan_token(COMMENT_START)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_27()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ if (jj_scan_token(COMMENT_END)) return true;
<br> return false;
<br> }
<br>
<br>@@ -1188,51 +1228,43 @@
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_13() {
<br>- if (jj_scan_token(DECL_START)) return true;
<br>- if (jj_scan_token(TAG_NAME)) return true;
<br>- Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_18()) { jj_scanpos = xsp; break; }
<br>- }
<br>- if (jj_scan_token(DECL_END)) return true;
<br>+ private boolean jj_3R_49() {
<br>+ if (jj_scan_token(JSP_EXPRESSION_IN_ATTRIBUTE)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_17() {
<br>- if (jj_3R_23()) return true;
<br>+ private boolean jj_3R_46() {
<br>+ if (jj_3R_49()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_26() {
<br>- if (jj_scan_token(COMMENT_TEXT)) return true;
<br>+ private boolean jj_3R_45() {
<br>+ if (jj_3R_48()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_19() {
<br>- if (jj_3R_22()) return true;
<br>+ private boolean jj_3R_44() {
<br>+ if (jj_3R_47()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_14() {
<br>+ private boolean jj_3R_20() {
<br>+ if (jj_3R_23()) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_15() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_19()) {
<br>+ if (jj_3R_20()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_20()) return true;
<br>+ if (jj_3R_21()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_22() {
<br>- if (jj_scan_token(COMMENT_START)) return true;
<br>- Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_26()) { jj_scanpos = xsp; break; }
<br>- }
<br>- if (jj_scan_token(COMMENT_END)) return true;
<br>+ private boolean jj_3R_40() {
<br>+ if (jj_3R_42()) return true;
<br> return false;
<br> }
<br>
<br>@@ -1240,147 +1272,178 @@
<br> Token xsp;
<br> while (true) {
<br> xsp = jj_scanpos;
<br>- if (jj_3R_14()) { jj_scanpos = xsp; break; }
<br>+ if (jj_3R_15()) { jj_scanpos = xsp; break; }
<br> }
<br>- if (jj_3R_15()) return true;
<br>+ if (jj_3R_16()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_12() {
<br>+ private boolean jj_3R_36() {
<br>+ if (jj_scan_token(DOLLAR_OR_HASH_SINGLE_QUOTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_13() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_16()) {
<br>+ if (jj_3R_17()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_17()) return true;
<br>+ if (jj_3R_18()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_16() {
<br>- if (jj_3R_22()) return true;
<br>+ private boolean jj_3R_17() {
<br>+ if (jj_3R_23()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_48() {
<br>- if (jj_scan_token(JSP_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ private boolean jj_3R_39() {
<br>+ if (jj_3R_43()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_45() {
<br>- if (jj_3R_48()) return true;
<br>+ private boolean jj_3R_34() {
<br>+ if (jj_scan_token(DOLLAR_OR_HASH_DOUBLE_QUOTE)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3_1() {
<br>+ private boolean jj_3R_42() {
<br> Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_12()) { jj_scanpos = xsp; break; }
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_44()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_45()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_46()) return true;
<br> }
<br>- if (jj_3R_13()) return true;
<br>+ }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_44() {
<br>- if (jj_3R_47()) return true;
<br>+ private boolean jj_3R_35() {
<br>+ Token xsp;
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_39()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_40()) return true;
<br>+ }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_43() {
<br>- if (jj_3R_46()) return true;
<br>+ private boolean jj_3_1() {
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_13()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ if (jj_3R_14()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_39() {
<br>- if (jj_3R_41()) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_35() {
<br>- if (jj_scan_token(DOLLAR_OR_HASH_SINGLE_QUOTE)) return true;
<br>- return false;
<br>- }
<br>-
<br> private boolean jj_3R_38() {
<br> if (jj_3R_42()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_33() {
<br>- if (jj_scan_token(DOLLAR_OR_HASH_DOUBLE_QUOTE)) return true;
<br>+ private boolean jj_3R_37() {
<br>+ if (jj_3R_41()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_41() {
<br>+ private boolean jj_3R_33() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_43()) {
<br>+ if (jj_3R_37()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_44()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_45()) return true;
<br>+ if (jj_3R_38()) return true;
<br> }
<br>- }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_34() {
<br>+ private boolean jj_3R_32() {
<br>+ if (jj_scan_token(SINGLE_QUOTE)) return true;
<br> Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_35()) { jj_scanpos = xsp; break; }
<br>+ }
<br> xsp = jj_scanpos;
<br>- if (jj_3R_38()) {
<br>+ if (jj_scan_token(69)) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_39()) return true;
<br>+ if (jj_3R_36()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_37() {
<br>- if (jj_3R_41()) return true;
<br>+ private boolean jj_3R_24() {
<br>+ if (jj_scan_token(JSP_COMMENT_START)) return true;
<br>+ if (jj_scan_token(JSP_COMMENT_CONTENT)) return true;
<br>+ if (jj_scan_token(JSP_COMMENT_END)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_36() {
<br>- if (jj_3R_40()) return true;
<br>+ private boolean jj_3R_31() {
<br>+ if (jj_scan_token(DOUBLE_QUOTE)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_33()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ xsp = jj_scanpos;
<br>+ if (jj_scan_token(72)) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_34()) return true;
<br>+ }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_23() {
<br>- if (jj_scan_token(JSP_COMMENT_START)) return true;
<br>- if (jj_scan_token(JSP_COMMENT_CONTENT)) return true;
<br>- if (jj_scan_token(JSP_COMMENT_END)) return true;
<br>+ private boolean jj_3R_30() {
<br>+ if (jj_scan_token(PUBLIC)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_32() {
<br>+ private boolean jj_3R_47() {
<br>+ if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_28() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_36()) {
<br>+ if (jj_3R_31()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_37()) return true;
<br>+ if (jj_3R_32()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_31() {
<br>- if (jj_scan_token(SINGLE_QUOTE)) return true;
<br>+ private boolean jj_3R_26() {
<br> Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_34()) { jj_scanpos = xsp; break; }
<br>- }
<br> xsp = jj_scanpos;
<br>- if (jj_scan_token(69)) {
<br>+ if (jj_3R_29()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_35()) return true;
<br>+ if (jj_3R_30()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_46() {
<br>- if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ private boolean jj_3R_29() {
<br>+ if (jj_scan_token(SYSTEM)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br> return false;
<br> }
<br>
<br>+ private boolean jj_3R_48() {
<br>+ if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br> /** Generated Token Manager. */
<br> public JspParserTokenManager token_source;
<br> /** Current token. */
<br>@@ -1391,7 +1454,7 @@
<br> private Token jj_scanpos, jj_lastpos;
<br> private int jj_la;
<br> private int jj_gen;
<br>- final private int[] jj_la1 = new int[29];
<br>+ final private int[] jj_la1 = new int[31];
<br> static private int[] jj_la1_0;
<br> static private int[] jj_la1_1;
<br> static private int[] jj_la1_2;
<br>@@ -1401,13 +1464,13 @@
<br> jj_la1_init_2();
<br> }
<br> private static void jj_la1_init_0() {
<br>- jj_la1_0 = new int[] {0x11000000,0x11000000,0x11000000,0x11000000,0xf9400000,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
<br>+ jj_la1_0 = new int[] {0x11000000,0x11000000,0x11000000,0x11000000,0xf9400000,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
<br> }
<br> private static void jj_la1_init_1() {
<br>- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x7,0x1,0x1,0x6,0x10,0x6,0x6,0x400000,0x4000000,0x7,0x28000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x10000,0x10000,0xc0000,0xc0000,};
<br>+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x7,0x1,0x1,0x6,0x10,0x6,0x6,0x400000,0x4000000,0x7,0x7,0x28000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x10000,0x10000,0xc0000,0xc0000,0x0,};
<br> }
<br> private static void jj_la1_init_2() {
<br>- jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x21c,0x21c,0x500,0x5c,0x5c,0xa0,0x3,0x1c,0x1000,0x0,0x0,0x0,0x0,0x0,};
<br>+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0x0,0x21c,0x21c,0x500,0x5c,0x5c,0xa0,0x3,0x1c,0x1000,0x0,0x0,0x0,0x0,0x0,0x2000,};
<br> }
<br> final private JJCalls[] jj_2_rtns = new JJCalls[2];
<br> private boolean jj_rescan = false;
<br>@@ -1419,7 +1482,7 @@
<br> token = new Token();
<br> jj_ntk = -1;
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1430,7 +1493,7 @@
<br> jj_ntk = -1;
<br> jjtree.reset();
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1440,7 +1503,7 @@
<br> token = new Token();
<br> jj_ntk = -1;
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1451,7 +1514,7 @@
<br> jj_ntk = -1;
<br> jjtree.reset();
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1563,12 +1626,12 @@
<br> /** Generate ParseException. */
<br> public ParseException generateParseException() {
<br> jj_expentries.clear();
<br>- boolean[] la1tokens = new boolean[77];
<br>+ boolean[] la1tokens = new boolean[79];
<br> if (jj_kind >= 0) {
<br> la1tokens[jj_kind] = true;
<br> jj_kind = -1;
<br> }
<br>- for (int i = 0; i < 29; i++) {
<br>+ for (int i = 0; i < 31; i++) {
<br> if (jj_la1[i] == jj_gen) {
<br> for (int j = 0; j < 32; j++) {
<br> if ((jj_la1_0[i] & (1<<j)) != 0) {
<br>@@ -1583,7 +1646,7 @@
<br> }
<br> }
<br> }
<br>- for (int i = 0; i < 77; i++) {
<br>+ for (int i = 0; i < 79; i++) {
<br> if (la1tokens[i]) {
<br> jj_expentry = new int[1];
<br> jj_expentry[0] = i;
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -158,41 +158,47 @@
<br> int COMMENT_END = 75;
<br> /** RegularExpression Id. */
<br> int COMMENT_TEXT = 76;
<br>+ /** RegularExpression Id. */
<br>+ int HTML_SCRIPT_CONTENT = 77;
<br>+ /** RegularExpression Id. */
<br>+ int HTML_SCRIPT_END_TAG = 78;
<br>
<br> /** Lexical state. */
<br>- int CommentState = 0;
<br>+ int HtmlScriptContentState = 0;
<br> /** Lexical state. */
<br>- int AttrValueBetweenDoubleQuotesState = 1;
<br>+ int CommentState = 1;
<br> /** Lexical state. */
<br>- int AttrValueBetweenSingleQuotesState = 2;
<br>+ int AttrValueBetweenDoubleQuotesState = 2;
<br> /** Lexical state. */
<br>- int StartTagState = 3;
<br>+ int AttrValueBetweenSingleQuotesState = 3;
<br> /** Lexical state. */
<br>- int CDataState = 4;
<br>+ int StartTagState = 4;
<br> /** Lexical state. */
<br>- int DocTypeExternalIdState = 5;
<br>+ int CDataState = 5;
<br> /** Lexical state. */
<br>- int DocTypeState = 6;
<br>+ int DocTypeExternalIdState = 6;
<br> /** Lexical state. */
<br>- int JspCommentState = 7;
<br>+ int DocTypeState = 7;
<br> /** Lexical state. */
<br>- int JspDeclarationState = 8;
<br>+ int JspCommentState = 8;
<br> /** Lexical state. */
<br>- int JspExpressionState = 9;
<br>+ int JspDeclarationState = 9;
<br> /** Lexical state. */
<br>- int JspScriptletState = 10;
<br>+ int JspExpressionState = 10;
<br> /** Lexical state. */
<br>- int InTagState = 11;
<br>+ int JspScriptletState = 11;
<br> /** Lexical state. */
<br>- int AfterTagState = 12;
<br>+ int InTagState = 12;
<br> /** Lexical state. */
<br>- int AttrValueState = 13;
<br>+ int AfterTagState = 13;
<br> /** Lexical state. */
<br>- int JspDirectiveAttributesState = 14;
<br>+ int AttrValueState = 14;
<br> /** Lexical state. */
<br>- int JspDirectiveState = 15;
<br>+ int JspDirectiveAttributesState = 15;
<br> /** Lexical state. */
<br>- int DEFAULT = 16;
<br>+ int JspDirectiveState = 16;
<br>+ /** Lexical state. */
<br>+ int DEFAULT = 17;
<br>
<br> /** Literal token values. */
<br> String[] tokenImage = {
<br>@@ -273,6 +279,8 @@
<br> "<DOLLAR_OR_HASH_DOUBLE_QUOTE>",
<br> "<COMMENT_END>",
<br> "<COMMENT_TEXT>",
<br>+ "<HTML_SCRIPT_CONTENT>",
<br>+ "<HTML_SCRIPT_END_TAG>",
<br> };
<br>
<br> }
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java 2009-12-05 22:36:32 UTC (rev 7016)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java 2009-12-05 22:51:55 UTC (rev 7017)
<br>@@ -11,21 +11,17 @@
<br> public java.io.PrintStream debugStream = System.out;
<br> /** Set debug output. */
<br> public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
<br>-private final int jjStopStringLiteralDfa_9(int pos, long active0)
<br>+private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1)
<br> {
<br> switch (pos)
<br> {
<br>- case 0:
<br>- if ((active0 & 0x40000000000L) != 0L)
<br>- return 2;
<br>- return -1;
<br> default :
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_9(int pos, long active0)
<br>+private final int jjStartNfa_2(int pos, long active0, long active1)
<br> {
<br>- return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
<br>+ return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
<br> }
<br> private int jjStopAtPos(int pos, int kind)
<br> {
<br>@@ -33,483 +29,22 @@
<br> jjmatchedPos = pos;
<br> return pos + 1;
<br> }
<br>-private int jjMoveStringLiteralDfa0_9()
<br>+private int jjMoveStringLiteralDfa0_2()
<br> {
<br> switch(curChar)
<br> {
<br>- case 37:
<br>- return jjMoveStringLiteralDfa1_9(0x40000000000L);
<br>+ case 34:
<br>+ return jjStopAtPos(0, 72);
<br> default :
<br>- return jjMoveNfa_9(3, 0);
<br>+ return jjMoveNfa_2(9, 0);
<br> }
<br> }
<br>-private int jjMoveStringLiteralDfa1_9(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_9(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x40000000000L) != 0L)
<br>- return jjStopAtPos(1, 42);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_9(0, active0);
<br>-}
<br> static final long[] jjbitVec0 = {
<br>+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
<br>+};
<br>+static final long[] jjbitVec2 = {
<br> 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
<br> };
<br>-private int jjMoveNfa_9(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 3;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- if ((0xffffffdfffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- }
<br>- else if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 2;
<br>- break;
<br>- case 0:
<br>- if ((0xffffffdfffffffffL & l) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- case 1:
<br>- if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 2;
<br>- break;
<br>- case 2:
<br>- if ((0xbfffffffffffffffL & l) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- case 0:
<br>- case 2:
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- case 0:
<br>- case 2:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_4()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 93:
<br>- return jjMoveStringLiteralDfa1_4(0x80000000000000L);
<br>- default :
<br>- return 1;
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_4(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 93:
<br>- return jjMoveStringLiteralDfa2_4(active0, 0x80000000000000L);
<br>- default :
<br>- return 2;
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa2_4(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return 2;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x80000000000000L) != 0L)
<br>- return jjStopAtPos(2, 55);
<br>- break;
<br>- default :
<br>- return 3;
<br>- }
<br>- return 3;
<br>-}
<br>-private int jjMoveStringLiteralDfa0_6()
<br>-{
<br>- return jjMoveNfa_6(1, 0);
<br>-}
<br>-static final long[] jjbitVec1 = {
<br>- 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
<br>-};
<br>-private int jjMoveNfa_6(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 3;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- if ((0x100002600L & l) != 0L)
<br>- {
<br>- if (kind > 48)
<br>- kind = 48;
<br>- jjCheckNAdd(0);
<br>- }
<br>- else if ((0x400001000000000L & l) != 0L)
<br>- {
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- }
<br>- break;
<br>- case 0:
<br>- if ((0x100002600L & l) == 0L)
<br>- break;
<br>- kind = 48;
<br>- jjCheckNAdd(0);
<br>- break;
<br>- case 2:
<br>- if ((0x7ff601000000000L & l) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- case 2:
<br>- if ((0x7fffffe87fffffeL & l) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- case 2:
<br>- if ((jjbitVec1[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_3()
<br>-{
<br>- return jjMoveNfa_3(0, 0);
<br>-}
<br>-private int jjMoveNfa_3(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 2;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if (curChar != 36)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- case 1:
<br>- if ((0x7ff601000000000L & l) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- case 1:
<br>- if ((0x7fffffe87fffffeL & l) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- case 1:
<br>- if ((jjbitVec1[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_0()
<br>-{
<br>- return jjMoveNfa_0(0, 0);
<br>-}
<br>-private int jjMoveNfa_0(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 5;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if (curChar == 45)
<br>- jjAddStates(0, 1);
<br>- break;
<br>- case 1:
<br>- if (curChar == 45)
<br>- jjCheckNAddTwoStates(2, 3);
<br>- break;
<br>- case 2:
<br>- if (curChar == 32)
<br>- jjCheckNAddTwoStates(2, 3);
<br>- break;
<br>- case 3:
<br>- case 4:
<br>- if (curChar == 62 && kind > 75)
<br>- kind = 75;
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1)
<br>-{
<br>- switch (pos)
<br>- {
<br>- default :
<br>- return -1;
<br>- }
<br>-}
<br>-private final int jjStartNfa_2(int pos, long active0, long active1)
<br>-{
<br>- return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_2()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 39:
<br>- return jjStopAtPos(0, 69);
<br>- default :
<br>- return jjMoveNfa_2(9, 0);
<br>- }
<br>-}
<br> private int jjMoveNfa_2(int startState, int curPos)
<br> {
<br> int startsAt = 0;
<br>@@ -529,11 +64,11 @@
<br> switch(jjstateSet[--i])
<br> {
<br> case 9:
<br>- if ((0xffffff67ffffffffL & l) != 0L)
<br>+ if ((0xffffffe3ffffffffL & l) != 0L)
<br> {
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> }
<br> else if ((0x1800000000L & l) != 0L)
<br> jjCheckNAddTwoStates(30, 36);
<br>@@ -546,7 +81,7 @@
<br> break;
<br> case 1:
<br> if ((0xffffff7bffffffffL & l) != 0L)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 2:
<br> if (curChar == 34)
<br>@@ -558,7 +93,7 @@
<br> break;
<br> case 4:
<br> if (curChar == 34)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 5:
<br> if (curChar == 39)
<br>@@ -570,11 +105,11 @@
<br> break;
<br> case 7:
<br> if (curChar == 39)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 11:
<br> if ((0xffffff7bffffffffL & l) != 0L)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 12:
<br> if (curChar == 34)
<br>@@ -586,7 +121,7 @@
<br> break;
<br> case 14:
<br> if (curChar == 34)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 15:
<br> if (curChar == 39)
<br>@@ -598,7 +133,7 @@
<br> break;
<br> case 17:
<br> if (curChar == 39)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 19:
<br> if (curChar == 35)
<br>@@ -610,7 +145,7 @@
<br> break;
<br> case 21:
<br> if ((0xffffffdfffffffffL & l) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 22:
<br> if (curChar == 37)
<br>@@ -618,7 +153,7 @@
<br> break;
<br> case 23:
<br> if ((0xbfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 24:
<br> if (curChar == 62 && kind > 68)
<br>@@ -637,22 +172,22 @@
<br> jjstateSet[jjnewStateCnt++] = 26;
<br> break;
<br> case 28:
<br>- if ((0xffffff67ffffffffL & l) == 0L)
<br>+ if ((0xffffffe3ffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 29:
<br> if ((0x1800000000L & l) != 0L)
<br> jjCheckNAdd(30);
<br> break;
<br> case 30:
<br>- if ((0xffffff7fffffffffL & l) == 0L)
<br>+ if ((0xfffffffbffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 33:
<br> if (curChar == 35)
<br>@@ -667,8 +202,8 @@
<br> jjCheckNAddTwoStates(30, 36);
<br> break;
<br> case 36:
<br>- if (curChar == 39 && kind > 71)
<br>- kind = 71;
<br>+ if (curChar == 34 && kind > 74)
<br>+ kind = 74;
<br> break;
<br> default : break;
<br> }
<br>@@ -682,25 +217,25 @@
<br> switch(jjstateSet[--i])
<br> {
<br> case 9:
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> if (curChar == 92)
<br>- jjAddStates(16, 17);
<br>+ jjAddStates(14, 15);
<br> break;
<br> case 0:
<br> if (curChar == 123)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 1:
<br> if ((0xdfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 3:
<br>- jjAddStates(18, 19);
<br>+ jjAddStates(16, 17);
<br> break;
<br> case 6:
<br>- jjAddStates(20, 21);
<br>+ jjAddStates(18, 19);
<br> break;
<br> case 8:
<br> if (curChar == 125 && kind > 66)
<br>@@ -708,17 +243,17 @@
<br> break;
<br> case 10:
<br> if (curChar == 123)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 11:
<br> if ((0xdfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 13:
<br>- jjAddStates(22, 23);
<br>+ jjAddStates(20, 21);
<br> break;
<br> case 16:
<br>- jjAddStates(24, 25);
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 18:
<br> if (curChar == 125 && kind > 67)
<br>@@ -726,30 +261,30 @@
<br> break;
<br> case 21:
<br> case 23:
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 28:
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 30:
<br> if ((0xf7ffffffffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 31:
<br> if (curChar == 92)
<br>- jjAddStates(16, 17);
<br>+ jjAddStates(14, 15);
<br> break;
<br> case 32:
<br> if (curChar != 123)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> default : break;
<br> }
<br>@@ -757,6 +292,9 @@
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br>@@ -766,40 +304,40 @@
<br> case 9:
<br> case 28:
<br> case 30:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 1:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(5, 8);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(3, 6);
<br> break;
<br> case 3:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(18, 19);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(16, 17);
<br> break;
<br> case 6:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(20, 21);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(18, 19);
<br> break;
<br> case 11:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(9, 12);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(7, 10);
<br> break;
<br> case 13:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(22, 23);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(20, 21);
<br> break;
<br> case 16:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(24, 25);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 21:
<br> case 23:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> default : break;
<br> }
<br>@@ -818,98 +356,17 @@
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_7(int pos, long active0)
<br>+private int jjMoveStringLiteralDfa0_4()
<br> {
<br>- switch (pos)
<br>- {
<br>- case 0:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 3;
<br>- return -1;
<br>- case 1:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 4;
<br>- return -1;
<br>- case 2:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 6;
<br>- return -1;
<br>- default :
<br>- return -1;
<br>- }
<br>+ return jjMoveNfa_4(0, 0);
<br> }
<br>-private final int jjStartNfa_7(int pos, long active0)
<br>+static final long[] jjbitVec3 = {
<br>+ 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
<br>+};
<br>+private int jjMoveNfa_4(int startState, int curPos)
<br> {
<br>- return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_7()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 45:
<br>- return jjMoveStringLiteralDfa1_7(0x400000000000L);
<br>- default :
<br>- return jjMoveNfa_7(8, 0);
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_7(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 45:
<br>- return jjMoveStringLiteralDfa2_7(active0, 0x400000000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(0, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa2_7(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_7(0, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(1, active0);
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 37:
<br>- return jjMoveStringLiteralDfa3_7(active0, 0x400000000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(1, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa3_7(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_7(1, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(2, active0);
<br>- return 3;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return jjStopAtPos(3, 46);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(2, active0);
<br>-}
<br>-private int jjMoveNfa_7(int startState, int curPos)
<br>-{
<br> int startsAt = 0;
<br>- jjnewStateCnt = 8;
<br>+ jjnewStateCnt = 2;
<br> int i = 1;
<br> jjstateSet[0] = startState;
<br> int kind = 0x7fffffff;
<br>@@ -924,70 +381,20 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- if ((0xffffffdfffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 6;
<br>- break;
<br>- case 3:
<br>- if ((0xffffdfffffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 5;
<br>- if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 4;
<br>- break;
<br>- case 8:
<br>- if ((0xffffdfffffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 45)
<br>- jjAddStates(29, 30);
<br>- if (curChar == 45)
<br>- jjCheckNAdd(0);
<br>- break;
<br> case 0:
<br>- if ((0xffffdfffffffffffL & l) == 0L)
<br>+ if (curChar != 36)
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br> case 1:
<br>- if (curChar == 45)
<br>- jjCheckNAdd(0);
<br>- break;
<br>- case 2:
<br>- if (curChar == 45)
<br>- jjAddStates(29, 30);
<br>- break;
<br>- case 5:
<br>- if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 6;
<br>- break;
<br>- case 6:
<br>- if ((0xbfffffffffffffffL & l) == 0L)
<br>+ if ((0x7ff601000000000L & l) == 0L)
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 7:
<br>- if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 5;
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -999,58 +406,37 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- case 6:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br>- case 3:
<br> case 0:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ case 1:
<br>+ if ((0x7fffffe87fffffeL & l) == 0L)
<br>+ break;
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 8:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- case 6:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br>- case 3:
<br> case 0:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ case 1:
<br>+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 8:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1062,13 +448,13 @@
<br> kind = 0x7fffffff;
<br> }
<br> ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
<br>+ if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
<br> return curPos;
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_13(int pos, long active0, long active1)
<br>+private final int jjStopStringLiteralDfa_12(int pos, long active0)
<br> {
<br> switch (pos)
<br> {
<br>@@ -1076,320 +462,46 @@
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_13(int pos, long active0, long active1)
<br>+private final int jjStartNfa_12(int pos, long active0)
<br> {
<br>- return jjMoveNfa_13(jjStopStringLiteralDfa_13(pos, active0, active1), pos + 1);
<br>+ return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0), pos + 1);
<br> }
<br>-private int jjMoveStringLiteralDfa0_13()
<br>+private int jjMoveStringLiteralDfa0_12()
<br> {
<br> switch(curChar)
<br> {
<br>- case 34:
<br>- return jjStopAtPos(0, 65);
<br>- case 39:
<br>- return jjStopAtPos(0, 64);
<br>- default :
<br>- return jjMoveNfa_13(0, 0);
<br>- }
<br>-}
<br>-private int jjMoveNfa_13(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 1;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if ((0x100002600L & l) == 0L)
<br>- break;
<br>- kind = 21;
<br>- jjstateSet[jjnewStateCnt++] = 0;
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private final int jjStopStringLiteralDfa_16(int pos, long active0)
<br>-{
<br>- switch (pos)
<br>- {
<br>- default :
<br>- return -1;
<br>- }
<br>-}
<br>-private final int jjStartNfa_16(int pos, long active0)
<br>-{
<br>- return jjMoveNfa_16(jjStopStringLiteralDfa_16(pos, active0), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_16()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 60:
<br>- jjmatchedKind = 22;
<br>- return jjMoveStringLiteralDfa1_16(0x1ff800000L);
<br>- default :
<br>- return jjMoveNfa_16(0, 0);
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_16(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 33:
<br>- return jjMoveStringLiteralDfa2_16(active0, 0xd000000L);
<br>- case 37:
<br>- if ((active0 & 0x80000000L) != 0L)
<br>- {
<br>- jjmatchedKind = 31;
<br>- jjmatchedPos = 1;
<br>- }
<br>- return jjMoveStringLiteralDfa2_16(active0, 0x170000000L);
<br> case 47:
<br>- if ((active0 & 0x800000L) != 0L)
<br>- return jjStopAtPos(1, 23);
<br>- break;
<br>- case 63:
<br>- if ((active0 & 0x2000000L) != 0L)
<br>- return jjStopAtPos(1, 25);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(0, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa2_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(0, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(1, active0);
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 33:
<br>- if ((active0 & 0x20000000L) != 0L)
<br>- return jjStopAtPos(2, 29);
<br>- break;
<br>- case 45:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x11000000L);
<br>+ return jjMoveStringLiteralDfa1_12(0x2000000000000000L);
<br> case 61:
<br>- if ((active0 & 0x40000000L) != 0L)
<br>- return jjStopAtPos(2, 30);
<br>- break;
<br>- case 64:
<br>- if ((active0 & 0x100000000L) != 0L)
<br>- return jjStopAtPos(2, 32);
<br>- break;
<br>- case 91:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x8000000L);
<br>- case 68:
<br>- case 100:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x4000000L);
<br>+ return jjStopAtPos(0, 62);
<br>+ case 62:
<br>+ return jjStopAtPos(0, 59);
<br> default :
<br>- break;
<br>+ return jjMoveNfa_12(1, 0);
<br> }
<br>- return jjStartNfa_16(1, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa3_16(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa1_12(long active0)
<br> {
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(1, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(2, active0);
<br>- return 3;
<br>+ jjStopStringLiteralDfa_12(0, active0);
<br>+ return 1;
<br> }
<br> switch(curChar)
<br> {
<br>- case 45:
<br>- if ((active0 & 0x1000000L) != 0L)
<br>- return jjStopAtPos(3, 24);
<br>- else if ((active0 & 0x10000000L) != 0L)
<br>- return jjStopAtPos(3, 28);
<br>+ case 62:
<br>+ if ((active0 & 0x2000000000000000L) != 0L)
<br>+ return jjStopAtPos(1, 61);
<br> break;
<br>- case 67:
<br>- case 99:
<br>- return jjMoveStringLiteralDfa4_16(active0, 0x8000000L);
<br>- case 79:
<br>- case 111:
<br>- return jjMoveStringLiteralDfa4_16(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_16(2, active0);
<br>+ return jjStartNfa_12(0, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa4_16(long old0, long active0)
<br>+private int jjMoveNfa_12(int startState, int curPos)
<br> {
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(2, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(3, active0);
<br>- return 4;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 67:
<br>- case 99:
<br>- return jjMoveStringLiteralDfa5_16(active0, 0x4000000L);
<br>- case 68:
<br>- case 100:
<br>- return jjMoveStringLiteralDfa5_16(active0, 0x8000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(3, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa5_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(3, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(4, active0);
<br>- return 5;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 65:
<br>- case 97:
<br>- return jjMoveStringLiteralDfa6_16(active0, 0x8000000L);
<br>- case 84:
<br>- case 116:
<br>- return jjMoveStringLiteralDfa6_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(4, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa6_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(4, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(5, active0);
<br>- return 6;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 84:
<br>- case 116:
<br>- return jjMoveStringLiteralDfa7_16(active0, 0x8000000L);
<br>- case 89:
<br>- case 121:
<br>- return jjMoveStringLiteralDfa7_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(5, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa7_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(5, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(6, active0);
<br>- return 7;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 65:
<br>- case 97:
<br>- return jjMoveStringLiteralDfa8_16(active0, 0x8000000L);
<br>- case 80:
<br>- case 112:
<br>- return jjMoveStringLiteralDfa8_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(6, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa8_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(6, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(7, active0);
<br>- return 8;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 91:
<br>- if ((active0 & 0x8000000L) != 0L)
<br>- return jjStopAtPos(8, 27);
<br>- break;
<br>- case 69:
<br>- case 101:
<br>- if ((active0 & 0x4000000L) != 0L)
<br>- return jjStopAtPos(8, 26);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(7, active0);
<br>-}
<br>-private int jjMoveNfa_16(int startState, int curPos)
<br>-{
<br> int startsAt = 0;
<br>- jjnewStateCnt = 1;
<br>+ jjnewStateCnt = 6;
<br> int i = 1;
<br> jjstateSet[0] = startState;
<br> int kind = 0x7fffffff;
<br>@@ -1404,12 +516,49 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ if ((0x100002600L & l) != 0L)
<br>+ {
<br>+ if (kind > 21)
<br>+ kind = 21;
<br>+ jjCheckNAdd(0);
<br>+ }
<br>+ else if (curChar == 33)
<br>+ jjCheckNAdd(3);
<br>+ else if (curChar == 36)
<br>+ {
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ }
<br>+ else if (curChar == 63)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br> case 0:
<br> if ((0x100002600L & l) == 0L)
<br> break;
<br>- kind = 20;
<br>- jjstateSet[jjnewStateCnt++] = 0;
<br>+ kind = 21;
<br>+ jjCheckNAdd(0);
<br> break;
<br>+ case 2:
<br>+ if ((0x7ff601000000000L & l) == 0L)
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br>+ case 3:
<br>+ if (curChar == 62)
<br>+ kind = 60;
<br>+ break;
<br>+ case 4:
<br>+ if (curChar == 63)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br>+ case 5:
<br>+ if (curChar == 33)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1421,18 +570,37 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ case 2:
<br>+ if ((0x7fffffe87fffffeL & l) == 0L)
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ case 2:
<br>+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1444,13 +612,13 @@
<br> kind = 0x7fffffff;
<br> }
<br> ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
<br>+ if ((i = jjnewStateCnt) == (startsAt = 6 - (jjnewStateCnt = startsAt)))
<br> return curPos;
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_12(int pos, long active0)
<br>+private final int jjStopStringLiteralDfa_13(int pos, long active0)
<br> {
<br> switch (pos)
<br> {
<br>@@ -1458,39 +626,39 @@
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_12(int pos, long active0)
<br>+private final int jjStartNfa_13(int pos, long active0)
<br> {
<br>- return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0), pos + 1);
<br>+ return jjMoveNfa_13(jjStopStringLiteralDfa_13(pos, active0), pos + 1);
<br> }
<br>-private int jjMoveStringLiteralDfa0_12()
<br>+private int jjMoveStringLiteralDfa0_13()
<br> {
<br> switch(curChar)
<br> {
<br> case 60:
<br> jjmatchedKind = 22;
<br>- return jjMoveStringLiteralDfa1_12(0x1ff800000L);
<br>+ return jjMoveStringLiteralDfa1_13(0x1ff800000L);
<br> default :
<br>- return jjMoveNfa_12(10, 0);
<br>+ return jjMoveNfa_13(10, 0);
<br> }
<br> }
<br>-private int jjMoveStringLiteralDfa1_12(long active0)
<br>+private int jjMoveStringLiteralDfa1_13(long active0)
<br> {
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(0, active0);
<br>+ jjStopStringLiteralDfa_13(0, active0);
<br> return 1;
<br> }
<br> switch(curChar)
<br> {
<br> case 33:
<br>- return jjMoveStringLiteralDfa2_12(active0, 0xd000000L);
<br>+ return jjMoveStringLiteralDfa2_13(active0, 0xd000000L);
<br> case 37:
<br> if ((active0 & 0x80000000L) != 0L)
<br> {
<br> jjmatchedKind = 31;
<br> jjmatchedPos = 1;
<br> }
<br>- return jjMoveStringLiteralDfa2_12(active0, 0x170000000L);
<br>+ return jjMoveStringLiteralDfa2_13(active0, 0x170000000L);
<br> case 47:
<br> if ((active0 & 0x800000L) != 0L)
<br> return jjStopAtPos(1, 23);
<br>@@ -1502,15 +670,15 @@
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(0, active0);
<br>+ return jjStartNfa_13(0, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa2_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa2_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(0, old0);
<br>+ return jjStartNfa_13(0, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(1, active0);
<br>+ jjStopStringLiteralDfa_13(1, active0);
<br> return 2;
<br> }
<br> switch(curChar)
<br>@@ -1520,7 +688,7 @@
<br> return jjStopAtPos(2, 29);
<br> break;
<br> case 45:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x11000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x11000000L);
<br> case 61:
<br> if ((active0 & 0x40000000L) != 0L)
<br> return jjStopAtPos(2, 30);
<br>@@ -1530,22 +698,22 @@
<br> return jjStopAtPos(2, 32);
<br> break;
<br> case 91:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x8000000L);
<br> case 68:
<br> case 100:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(1, active0);
<br>+ return jjStartNfa_13(1, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa3_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa3_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(1, old0);
<br>+ return jjStartNfa_13(1, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(2, active0);
<br>+ jjStopStringLiteralDfa_13(2, active0);
<br> return 3;
<br> }
<br> switch(curChar)
<br>@@ -1558,110 +726,110 @@
<br> break;
<br> case 67:
<br> case 99:
<br>- return jjMoveStringLiteralDfa4_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa4_13(active0, 0x8000000L);
<br> case 79:
<br> case 111:
<br>- return jjMoveStringLiteralDfa4_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa4_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(2, active0);
<br>+ return jjStartNfa_13(2, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa4_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa4_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(2, old0);
<br>+ return jjStartNfa_13(2, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(3, active0);
<br>+ jjStopStringLiteralDfa_13(3, active0);
<br> return 4;
<br> }
<br> switch(curChar)
<br> {
<br> case 67:
<br> case 99:
<br>- return jjMoveStringLiteralDfa5_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa5_13(active0, 0x4000000L);
<br> case 68:
<br> case 100:
<br>- return jjMoveStringLiteralDfa5_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa5_13(active0, 0x8000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(3, active0);
<br>+ return jjStartNfa_13(3, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa5_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa5_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(3, old0);
<br>+ return jjStartNfa_13(3, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(4, active0);
<br>+ jjStopStringLiteralDfa_13(4, active0);
<br> return 5;
<br> }
<br> switch(curChar)
<br> {
<br> case 65:
<br> case 97:
<br>- return jjMoveStringLiteralDfa6_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa6_13(active0, 0x8000000L);
<br> case 84:
<br> case 116:
<br>- return jjMoveStringLiteralDfa6_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa6_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(4, active0);
<br>+ return jjStartNfa_13(4, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa6_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa6_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(4, old0);
<br>+ return jjStartNfa_13(4, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(5, active0);
<br>+ jjStopStringLiteralDfa_13(5, active0);
<br> return 6;
<br> }
<br> switch(curChar)
<br> {
<br> case 84:
<br> case 116:
<br>- return jjMoveStringLiteralDfa7_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa7_13(active0, 0x8000000L);
<br> case 89:
<br> case 121:
<br>- return jjMoveStringLiteralDfa7_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa7_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(5, active0);
<br>+ return jjStartNfa_13(5, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa7_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa7_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(5, old0);
<br>+ return jjStartNfa_13(5, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(6, active0);
<br>+ jjStopStringLiteralDfa_13(6, active0);
<br> return 7;
<br> }
<br> switch(curChar)
<br> {
<br> case 65:
<br> case 97:
<br>- return jjMoveStringLiteralDfa8_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa8_13(active0, 0x8000000L);
<br> case 80:
<br> case 112:
<br>- return jjMoveStringLiteralDfa8_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa8_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(6, active0);
<br>+ return jjStartNfa_13(6, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa8_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa8_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(6, old0);
<br>+ return jjStartNfa_13(6, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(7, active0);
<br>+ jjStopStringLiteralDfa_13(7, active0);
<br> return 8;
<br> }
<br> switch(curChar)
<br>@@ -1678,9 +846,9 @@
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(7, active0);
<br>+ return jjStartNfa_13(7, active0);
<br> }
<br>-private int jjMoveNfa_12(int startState, int curPos)
<br>+private int jjMoveNfa_13(int startState, int curPos)
<br> {
<br> int startsAt = 0;
<br> jjnewStateCnt = 18;
<br>@@ -1703,7 +871,7 @@
<br> {
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> }
<br> else if (curChar == 36)
<br> jjstateSet[jjnewStateCnt++] = 13;
<br>@@ -1725,7 +893,7 @@
<br> break;
<br> case 2:
<br> if ((0xffffff7bffffffffL & l) != 0L)
<br>- jjCheckNAddStates(34, 37);
<br>+ jjCheckNAddStates(27, 30);
<br> break;
<br> case 3:
<br> if (curChar == 34)
<br>@@ -1737,7 +905,7 @@
<br> break;
<br> case 5:
<br> if (curChar == 34)
<br>- jjCheckNAddStates(34, 37);
<br>+ jjCheckNAddStates(27, 30);
<br> break;
<br> case 6:
<br> if (curChar == 39)
<br>@@ -1749,14 +917,14 @@
<br> break;
<br> case 8:
<br> if (curChar == 39)
<br>- jjCheckNAddStates(34, 37);
<br>+ jjCheckNAddStates(27, 30);
<br> break;
<br> case 11:
<br> if ((0xefffffefffffffffL & l) == 0L)
<br> break;
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> case 12:
<br> if (curChar == 36)
<br>@@ -1767,7 +935,7 @@
<br> break;
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> case 16:
<br> if (curChar == 35)
<br>@@ -1791,23 +959,23 @@
<br> case 10:
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> if (curChar == 92)
<br>- jjAddStates(24, 25);
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 1:
<br> if (curChar == 123)
<br>- jjCheckNAddStates(34, 37);
<br>+ jjCheckNAddStates(27, 30);
<br> break;
<br> case 2:
<br> if ((0xdfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(34, 37);
<br>+ jjCheckNAddStates(27, 30);
<br> break;
<br> case 4:
<br>- jjAddStates(38, 39);
<br>+ jjAddStates(31, 32);
<br> break;
<br> case 7:
<br>- jjAddStates(40, 41);
<br>+ jjAddStates(33, 34);
<br> break;
<br> case 9:
<br> if (curChar == 125 && kind > 33)
<br>@@ -1816,25 +984,25 @@
<br> case 11:
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> case 13:
<br> if ((0xf7ffffffffffffffL & l) == 0L)
<br> break;
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> case 14:
<br> if (curChar == 92)
<br>- jjAddStates(24, 25);
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 15:
<br> if (curChar != 123)
<br> break;
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> default : break;
<br> }
<br>@@ -1842,6 +1010,9 @@
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br>@@ -1851,23 +1022,23 @@
<br> case 10:
<br> case 11:
<br> case 13:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
<br> break;
<br> if (kind > 34)
<br> kind = 34;
<br>- jjCheckNAddStates(31, 33);
<br>+ jjCheckNAddStates(24, 26);
<br> break;
<br> case 2:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(34, 37);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(27, 30);
<br> break;
<br> case 4:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(38, 39);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(31, 32);
<br> break;
<br> case 7:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(40, 41);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(33, 34);
<br> break;
<br> default : break;
<br> }
<br>@@ -1886,51 +1057,51 @@
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_8(int pos, long active0)
<br>+private final int jjStopStringLiteralDfa_10(int pos, long active0)
<br> {
<br> switch (pos)
<br> {
<br> case 0:
<br>- if ((active0 & 0x100000000000L) != 0L)
<br>+ if ((active0 & 0x40000000000L) != 0L)
<br> return 2;
<br> return -1;
<br> default :
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_8(int pos, long active0)
<br>+private final int jjStartNfa_10(int pos, long active0)
<br> {
<br>- return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
<br>+ return jjMoveNfa_10(jjStopStringLiteralDfa_10(pos, active0), pos + 1);
<br> }
<br>-private int jjMoveStringLiteralDfa0_8()
<br>+private int jjMoveStringLiteralDfa0_10()
<br> {
<br> switch(curChar)
<br> {
<br> case 37:
<br>- return jjMoveStringLiteralDfa1_8(0x100000000000L);
<br>+ return jjMoveStringLiteralDfa1_10(0x40000000000L);
<br> default :
<br>- return jjMoveNfa_8(3, 0);
<br>+ return jjMoveNfa_10(3, 0);
<br> }
<br> }
<br>-private int jjMoveStringLiteralDfa1_8(long active0)
<br>+private int jjMoveStringLiteralDfa1_10(long active0)
<br> {
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_8(0, active0);
<br>+ jjStopStringLiteralDfa_10(0, active0);
<br> return 1;
<br> }
<br> switch(curChar)
<br> {
<br> case 62:
<br>- if ((active0 & 0x100000000000L) != 0L)
<br>- return jjStopAtPos(1, 44);
<br>+ if ((active0 & 0x40000000000L) != 0L)
<br>+ return jjStopAtPos(1, 42);
<br> break;
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_8(0, active0);
<br>+ return jjStartNfa_10(0, active0);
<br> }
<br>-private int jjMoveNfa_8(int startState, int curPos)
<br>+private int jjMoveNfa_10(int startState, int curPos)
<br> {
<br> int startsAt = 0;
<br> jjnewStateCnt = 3;
<br>@@ -1951,8 +1122,8 @@
<br> case 3:
<br> if ((0xffffffdfffffffffL & l) != 0L)
<br> {
<br>- if (kind > 45)
<br>- kind = 45;
<br>+ if (kind > 43)
<br>+ kind = 43;
<br> jjCheckNAddTwoStates(0, 1);
<br> }
<br> else if (curChar == 37)
<br>@@ -1961,8 +1132,8 @@
<br> case 0:
<br> if ((0xffffffdfffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 45)
<br>- kind = 45;
<br>+ if (kind > 43)
<br>+ kind = 43;
<br> jjCheckNAddTwoStates(0, 1);
<br> break;
<br> case 1:
<br>@@ -1972,8 +1143,8 @@
<br> case 2:
<br> if ((0xbfffffffffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 45)
<br>- kind = 45;
<br>+ if (kind > 43)
<br>+ kind = 43;
<br> jjCheckNAddTwoStates(0, 1);
<br> break;
<br> default : break;
<br>@@ -1990,8 +1161,8 @@
<br> case 3:
<br> case 0:
<br> case 2:
<br>- if (kind > 45)
<br>- kind = 45;
<br>+ if (kind > 43)
<br>+ kind = 43;
<br> jjCheckNAddTwoStates(0, 1);
<br> break;
<br> default : break;
<br>@@ -2000,6 +1171,9 @@
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br>@@ -2009,10 +1183,10 @@
<br> case 3:
<br> case 0:
<br> case 2:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
<br> break;
<br>- if (kind > 45)
<br>- kind = 45;
<br>+ if (kind > 43)
<br>+ kind = 43;
<br> jjCheckNAddTwoStates(0, 1);
<br> break;
<br> default : break;
<br>@@ -2032,54 +1206,160 @@
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_11(int pos, long active0)
<br>+private int jjMoveStringLiteralDfa0_16()
<br> {
<br>+ return jjMoveNfa_16(1, 0);
<br>+}
<br>+private int jjMoveNfa_16(int startState, int curPos)
<br>+{
<br>+ int startsAt = 0;
<br>+ jjnewStateCnt = 3;
<br>+ int i = 1;
<br>+ jjstateSet[0] = startState;
<br>+ int kind = 0x7fffffff;
<br>+ for (;;)
<br>+ {
<br>+ if (++jjround == 0x7fffffff)
<br>+ ReInitRounds();
<br>+ if (curChar < 64)
<br>+ {
<br>+ long l = 1L << curChar;
<br>+ do
<br>+ {
<br>+ switch(jjstateSet[--i])
<br>+ {
<br>+ case 1:
<br>+ if ((0x100002600L & l) != 0L)
<br>+ {
<br>+ if (kind > 20)
<br>+ kind = 20;
<br>+ jjCheckNAdd(0);
<br>+ }
<br>+ else if (curChar == 36)
<br>+ {
<br>+ if (kind > 35)
<br>+ kind = 35;
<br>+ jjCheckNAdd(2);
<br>+ }
<br>+ break;
<br>+ case 0:
<br>+ if ((0x100002600L & l) == 0L)
<br>+ break;
<br>+ kind = 20;
<br>+ jjCheckNAdd(0);
<br>+ break;
<br>+ case 2:
<br>+ if ((0x7ff601000000000L & l) == 0L)
<br>+ break;
<br>+ if (kind > 35)
<br>+ kind = 35;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br>+ default : break;
<br>+ }
<br>+ } while(i != startsAt);
<br>+ }
<br>+ else if (curChar < 128)
<br>+ {
<br>+ long l = 1L << (curChar & 077);
<br>+ do
<br>+ {
<br>+ switch(jjstateSet[--i])
<br>+ {
<br>+ case 1:
<br>+ case 2:
<br>+ if ((0x7fffffe87fffffeL & l) == 0L)
<br>+ break;
<br>+ if (kind > 35)
<br>+ kind = 35;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br><br>@@ Diff output truncated at 100000 characters. @@
<br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660240&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26660118
SF.net SVN: pmd:[7016] branches/pmd/4.2.x/rulesets/basic-jsp.xml
2009-12-05T14:36:33Z
2009-12-05T14:36:33Z
rgustav
Revision: 7016
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7016&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7016&view=rev</a><br>Author: rgustav
<br>Date: 2009-12-05 22:36:32 +0000 (Sat, 05 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Fix url for new rule.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/rulesets/basic-jsp.xml
<br><br>Modified: branches/pmd/4.2.x/rulesets/basic-jsp.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/rulesets/basic-jsp.xml 2009-12-05 22:34:45 UTC (rev 7015)
<br>+++ branches/pmd/4.2.x/rulesets/basic-jsp.xml 2009-12-05 22:36:32 UTC (rev 7016)
<br>@@ -270,7 +270,7 @@
<br> name="NoInlineScript"
<br> class="net.sourceforge.pmd.rules.XPathRule"
<br> message="Avoiding inlining HTML script content"
<br>- externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/basic-jsp.html#JspEncoding" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/basic-jsp.html#JspEncoding</a>">
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/basic-jsp.html#NoInlineScript" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/basic-jsp.html#NoInlineScript</a>">
<br> <description>
<br> <![CDATA[
<br> Avoid inlining HTML script content. Consider externalizing the HTML script using the 'src' attribute on the <script> element.
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660118&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26660100
SF.net SVN: pmd:[7015] branches/pmd/4.2.x
2009-12-05T14:34:45Z
2009-12-05T14:34:45Z
rgustav
Revision: 7015
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7015&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7015&view=rev</a><br>Author: rgustav
<br>Date: 2009-12-05 22:34:45 +0000 (Sat, 05 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Add support for Unicode for JSP/JSF.
<br>Add support to not parse body of <script> for JSP/JSF.
<br>Add new NoInlineScript rule for JSP/JSF.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/bin/build.xml
<br> branches/pmd/4.2.x/etc/changelog.txt
<br> branches/pmd/4.2.x/etc/grammar/JspParser.jjt
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java
<br> branches/pmd/4.2.x/rulesets/basic-jsp.xml
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParser.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserTreeConstants.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserVisitor.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserVisitorAdapter.java
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/rules/AbstractJspRule.java
<br><br>Added Paths:
<br>-----------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineScriptTest.java
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineScript.xml
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/ASTHtmlScript.java
<br><br>Modified: branches/pmd/4.2.x/bin/build.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/bin/build.xml 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/bin/build.xml 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -392,8 +392,16 @@
<br> <delete file="src/net/sourceforge/pmd/jsp/ast/ParseException.java" />
<br> <delete file="src/net/sourceforge/pmd/jsp/ast/CharStream.java" />
<br> <jjtree target="etc/grammar/JspParser.jjt" outputdirectory="src/net/sourceforge/pmd/jsp/ast/" javacchome="${javacc-home.path}" />
<br>+
<br>+ <!-- Generate Unicode w/o Unicode Escapes CharStream implementation -->
<br>+ <javacc static="false" usercharstream="false" unicodeinput="true" javaunicodeescape="false" target="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/jsp/ast" javacchome="${javacc-home.path}" />
<br>+ <replace file="src/net/sourceforge/pmd/jsp/ast/SimpleCharStream.java" token="public class SimpleCharStream" value="public class JspCharStream implements CharStream" />
<br>+ <replace file="src/net/sourceforge/pmd/jsp/ast/SimpleCharStream.java" token="public SimpleCharStream" value="public JspCharStream" />
<br>+ <move file="src/net/sourceforge/pmd/jsp/ast/SimpleCharStream.java" tofile="src/net/sourceforge/pmd/jsp/ast/JspCharStream.java"/>
<br>+ <delete file="src/net/sourceforge/pmd/jsp/ast/JspParser.java" />
<br>+
<br> <!-- Ensure generated using CharStream interface -->
<br>- <javacc static="false" usercharstream="true" target="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/jsp/ast" javacchome="${javacc-home.path}" />
<br>+ <javacc static="false" usercharstream="true" unicodeinput="true" javaunicodeescape="false" target="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/jsp/ast" javacchome="${javacc-home.path}" />
<br>
<br> <delete file="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" />
<br> <replace file="src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java" token="throw new Error" value="throw new RuntimeException" />
<br><br>Modified: branches/pmd/4.2.x/etc/changelog.txt
<br>===================================================================
<br>--- branches/pmd/4.2.x/etc/changelog.txt 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/etc/changelog.txt 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -13,6 +13,8 @@
<br>
<br> Correct -benchmark reporting of Rule visits via the RuleChain
<br> Fix issue with Type Resolution incorrectly handling of Classes with same name as a java.lang Class.
<br>+The JSP/JSF parser can now parse Unicode input.
<br>+The JSP/JSP parser can now handle <script>...</script> tags. The AST HtmlScript node contains the content.
<br>
<br> Dependencies updates: asm updated to 3.2
<br>
<br>@@ -23,6 +25,7 @@
<br> Controversial : AvoidLiteralsInIfCondition (patch 2591627), UseConcurrentHashMap
<br> StrictExceptions : AvoidCatchingGenericException, AvoidLosingExceptionInformation
<br> Naming : GenericsNaming
<br>+ JSP: NoInlineScript
<br>
<br> February 08, 2009 - 4.2.5:
<br>
<br><br>Modified: branches/pmd/4.2.x/etc/grammar/JspParser.jjt
<br>===================================================================
<br>--- branches/pmd/4.2.x/etc/grammar/JspParser.jjt 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/etc/grammar/JspParser.jjt 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -1,13 +1,15 @@
<br>- /* JSP Parser for PMD.
<br>+/* JSP Parser for PMD.
<br> * It supports supports more-or-less well written JSP files.
<br> * The JSP Document style is supported, except for inline DTD.
<br> * The JSP Page style (<% ... %>) is supported.
<br> * Java code is not parsed.
<br>+ * Script code inside <script> ... </script> is not parsed.
<br> */
<br>
<br> options {
<br> USER_CHAR_STREAM = true;
<br> NODE_USES_PARSER=true;
<br>+ UNICODE_INPUT=true;
<br>
<br> IGNORE_CASE = true;
<br> STATIC = false;
<br>@@ -78,6 +80,7 @@
<br> * - JspExpressionState : inside an expression <%= ... %>
<br> * - JspDeclarationState : inside a declaration <%! ... %>
<br> * - JspCommentState : inside a comment <%-- ... --%>
<br>+ * - HtmlScriptContentState : inside an HTML script <script> ... </script>
<br> */
<br>
<br>
<br>@@ -263,6 +266,18 @@
<br> | < COMMENT_TEXT: (~[]) >
<br> }
<br>
<br>+<HtmlScriptContentState> TOKEN :
<br>+{
<br>+ <HTML_SCRIPT_CONTENT: (~[]) >
<br>+ | <HTML_SCRIPT_END_TAG : "</script" | "</Script" | "</SCRIPT">
<br>+ {
<br>+ // We've done a custom lookahead for the closing </script> and found it.
<br>+ // Put it back into the input stream, so it can be processed normally.
<br>+ input_stream.backup(8);
<br>+ image.setLength(image.length() - 8); // kill the "<script"
<br>+ matchedToken.image = image.toString();
<br>+ } : AfterTagState
<br>+}
<br>
<br> /** ******************************************************************** */
<br> /** ************************* JSP GRAMMAR **************************** */
<br>@@ -498,9 +513,20 @@
<br> (Attribute())*
<br> (
<br> (<TAG_END>
<br>- { jjtThis.setEmpty(false); }
<br>+ {
<br>+ jjtThis.setEmpty(false);
<br>+
<br>+ // Content in a <script> element needs special treatment (like a comment or CDataSection).
<br>+ // Tell the TokenManager to start looking for the body of a script element. In this
<br>+ // state all text will be consumed by the next token up to the closing </script> tag.
<br>+ // This is a context sensitive switch for the token manager, not something one can
<br>+ // express using normal JavaCC syntax. Hence the hoop jumping.
<br>+ if ("script".equalsIgnoreCase(startTagName.image)) {
<br>+ token_source.SwitchTo(HtmlScriptContentState);
<br>+ }
<br>+ }
<br>
<br>- (Content())?
<br>+ (HtmlScript() | Content())?
<br>
<br> <ENDTAG_START>
<br> endTagName = <TAG_NAME>
<br>@@ -645,3 +671,16 @@
<br> { jjtThis.setUri(quoteContent(systemLiteral.image)); }
<br> )
<br> }
<br>+
<br>+void HtmlScript() :
<br>+{
<br>+ StringBuffer content = new StringBuffer();
<br>+ Token t;
<br>+}
<br>+{
<br>+ (t = <HTML_SCRIPT_CONTENT> { content.append(t.image); })*
<br>+ <HTML_SCRIPT_END_TAG>
<br>+ {
<br>+ jjtThis.setImage(content.toString().trim());
<br>+ }
<br>+}
<br><br>Modified: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -1,6 +1,13 @@
<br> package test.net.sourceforge.pmd.jsp.ast;
<br>
<br> import static org.junit.Assert.assertEquals;
<br>+
<br>+import java.util.ArrayList;
<br>+import java.util.Collections;
<br>+import java.util.Comparator;
<br>+import java.util.List;
<br>+import java.util.Set;
<br>+
<br> import net.sourceforge.pmd.jsp.ast.ASTAttribute;
<br> import net.sourceforge.pmd.jsp.ast.ASTAttributeValue;
<br> import net.sourceforge.pmd.jsp.ast.ASTCData;
<br>@@ -8,14 +15,9 @@
<br> import net.sourceforge.pmd.jsp.ast.ASTDoctypeDeclaration;
<br> import net.sourceforge.pmd.jsp.ast.ASTDoctypeExternalId;
<br> import net.sourceforge.pmd.jsp.ast.ASTElement;
<br>+import net.sourceforge.pmd.jsp.ast.ASTHtmlScript;
<br>
<br> import org.junit.Test;
<br>-
<br>-import java.util.ArrayList;
<br>-import java.util.Collections;
<br>-import java.util.Comparator;
<br>-import java.util.List;
<br>-import java.util.Set;
<br> /**
<br> * Test parsing of a JSP in document style, by checking the generated AST.
<br> *
<br>@@ -156,6 +158,17 @@
<br> ASTCommentTag comment = (ASTCommentTag) comments.iterator().next();
<br> assertEquals("Correct comment content expected!", "comment", comment.getImage());
<br> }
<br>+
<br>+ /**
<br>+ * Test parsing of HTML <script> element.
<br>+ */
<br>+ @Test
<br>+ public void testHtmlScript() {
<br>+ Set scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
<br>+ assertEquals("One script expected!", 1, scripts.size());
<br>+ ASTHtmlScript script = (ASTHtmlScript) scripts.iterator().next();
<br>+ assertEquals("Correct script content expected!", "Script!", script.getImage());
<br>+ }
<br>
<br> private static final String TEST_SIMPLEST_HTML = "<html/>";
<br>
<br>@@ -173,6 +186,9 @@
<br> private static final String TEST_ATTRIBUTE_VALUE_CONTAINING_HASH =
<br> "<tag:if something=\"#yes#\" foo=\"CREATE\"> <a href=\"#\">foo</a> </tag:if>";
<br>
<br>+ private static final String TEST_HTML_SCRIPT =
<br>+ "<html><head><script>Script!</script></head></html>";
<br>+
<br> public static junit.framework.Test suite() {
<br> return new junit.framework.JUnit4TestAdapter(JspDocStyleTest.class);
<br> }
<br><br>Added: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineScriptTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineScriptTest.java (rev 0)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineScriptTest.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -0,0 +1,17 @@
<br>+package test.net.sourceforge.pmd.jsp.rules;
<br>+
<br>+import org.junit.Before;
<br>+
<br>+import test.net.sourceforge.pmd.testframework.SimpleAggregatorTst;
<br>+
<br>+public class NoInlineScriptTest extends SimpleAggregatorTst {
<br>+
<br>+ @Before
<br>+ public void setUp() {
<br>+ addRule("jsp", "NoInlineScript");
<br>+ }
<br>+
<br>+ public static junit.framework.Test suite() {
<br>+ return new junit.framework.JUnit4TestAdapter(NoInlineScriptTest.class);
<br>+ }
<br>+}
<br><br>Added: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineScript.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineScript.xml (rev 0)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineScript.xml 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -0,0 +1,53 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<test-data>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+A violation.
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script>Some script</script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+A violation.
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location">Some script</script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, no 'src' with empty body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script></script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, only 'src' with empty whitespace body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location"> </script></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+Ok, only 'src' without body.
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<html><head><script src="script location"/></head></html>
<br>+ ]]></code>
<br>+ <source-type>jsp</source-type>
<br>+ </test-code>
<br>+</test-data>
<br>\ No newline at end of file
<br><br>Modified: branches/pmd/4.2.x/rulesets/basic-jsp.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/rulesets/basic-jsp.xml 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/rulesets/basic-jsp.xml 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -265,5 +265,37 @@
<br> ]]>
<br> </example>
<br> </rule>
<br>+
<br>+ <rule
<br>+ name="NoInlineScript"
<br>+ class="net.sourceforge.pmd.rules.XPathRule"
<br>+ message="Avoiding inlining HTML script content"
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/basic-jsp.html#JspEncoding" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/basic-jsp.html#JspEncoding</a>">
<br>+ <description>
<br>+ <![CDATA[
<br>+Avoid inlining HTML script content. Consider externalizing the HTML script using the 'src' attribute on the <script> element.
<br>+Externalized script could be reused between pages. Browsers can also cache the script, reducing overall download bandwidth.
<br>+ ]]>
<br>+ </description>
<br>+ <priority>3</priority>
<br>+ <properties>
<br>+ <property name="xpath">
<br>+ <value>
<br>+ <![CDATA[
<br>+//HtmlScript[@Image != '']
<br>+ ]]>
<br>+ </value>
<br>+ </property>
<br>+ </properties>
<br>+ <example>
<br>+ <![CDATA[
<br>+ Most browsers should be able to interpret the following headers:
<br>+
<br>+ <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<br>+
<br>+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<br>+ ]]>
<br>+ </example>
<br>+ </rule>
<br>
<br> </ruleset>
<br><br>Added: branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/ASTHtmlScript.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/ASTHtmlScript.java (rev 0)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/ASTHtmlScript.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -0,0 +1,20 @@
<br>+/* Generated By:JJTree: Do not edit this line. ASTHtmlScript.java Version 4.1 */
<br>+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY= */
<br>+package net.sourceforge.pmd.jsp.ast;
<br>+
<br>+public class ASTHtmlScript extends SimpleNode {
<br>+ public ASTHtmlScript(int id) {
<br>+ super(id);
<br>+ }
<br>+
<br>+ public ASTHtmlScript(JspParser p, int id) {
<br>+ super(p, id);
<br>+ }
<br>+
<br>+
<br>+ /** Accept the visitor. **/
<br>+ public Object jjtAccept(JspParserVisitor visitor, Object data) {
<br>+ return visitor.visit(this, data);
<br>+ }
<br>+}
<br>+/* JavaCC - OriginalChecksum=8170f25fd45a522c3d56439f6d24e048 (do not edit this line) */
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspCharStream.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -1,40 +1,477 @@
<br>+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.1 */
<br>+/* JavaCCOptions:STATIC=false */
<br>+/**
<br>+ * JSP Parser for PMD.
<br>+ * @author Pieter � Application Engineers NV/SA � <a href="http://www.ae.be" target="_top" rel="nofollow">http://www.ae.be</a><br>+ */
<br>+
<br> package net.sourceforge.pmd.jsp.ast;
<br>
<br>-import net.sourceforge.pmd.ast.JavaCharStream;
<br>+/**
<br>+ * An implementation of interface CharStream, where the stream is assumed to
<br>+ * contain only ASCII characters (without unicode processing).
<br>+ */
<br>
<br>-import java.io.InputStream;
<br>-import java.io.Reader;
<br>+public class JspCharStream implements CharStream
<br>+{
<br>+/** Whether parser is static. */
<br>+ public static final boolean staticFlag = false;
<br>+ int bufsize;
<br>+ int available;
<br>+ int tokenBegin;
<br>+/** Position in buffer. */
<br>+ public int bufpos = -1;
<br>+ protected int bufline[];
<br>+ protected int bufcolumn[];
<br>
<br>-public class JspCharStream extends JavaCharStream implements CharStream {
<br>+ protected int column = 0;
<br>+ protected int line = 1;
<br>
<br>- public JspCharStream(InputStream dstream, int startline, int startcolumn, int buffersize) {
<br>- super(dstream, startline, startcolumn, buffersize);
<br>- // TODO Auto-generated constructor stub
<br>- }
<br>+ protected boolean prevCharIsCR = false;
<br>+ protected boolean prevCharIsLF = false;
<br>
<br>- public JspCharStream(InputStream dstream, int startline, int startcolumn) {
<br>- super(dstream, startline, startcolumn);
<br>- // TODO Auto-generated constructor stub
<br>- }
<br>+ protected java.io.Reader inputStream;
<br>
<br>- public JspCharStream(InputStream dstream) {
<br>- super(dstream);
<br>- // TODO Auto-generated constructor stub
<br>- }
<br>+ protected char[] buffer;
<br>+ protected int maxNextCharInd = 0;
<br>+ protected int inBuf = 0;
<br>+ protected int tabSize = 8;
<br>
<br>- public JspCharStream(Reader dstream, int startline, int startcolumn, int buffersize) {
<br>- super(dstream, startline, startcolumn, buffersize);
<br>- // TODO Auto-generated constructor stub
<br>- }
<br>+ protected void setTabSize(int i) { tabSize = i; }
<br>+ protected int getTabSize(int i) { return tabSize; }
<br>
<br>- public JspCharStream(Reader dstream, int startline, int startcolumn) {
<br>- super(dstream, startline, startcolumn);
<br>- // TODO Auto-generated constructor stub
<br>- }
<br>
<br>- public JspCharStream(Reader dstream) {
<br>- super(dstream);
<br>- // TODO Auto-generated constructor stub
<br>+ protected void ExpandBuff(boolean wrapAround)
<br>+ {
<br>+ char[] newbuffer = new char[bufsize + 2048];
<br>+ int newbufline[] = new int[bufsize + 2048];
<br>+ int newbufcolumn[] = new int[bufsize + 2048];
<br>+
<br>+ try
<br>+ {
<br>+ if (wrapAround)
<br>+ {
<br>+ System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
<br>+ System.arraycopy(buffer, 0, newbuffer,
<br>+ bufsize - tokenBegin, bufpos);
<br>+ buffer = newbuffer;
<br>+
<br>+ System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
<br>+ System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
<br>+ bufline = newbufline;
<br>+
<br>+ System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
<br>+ System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
<br>+ bufcolumn = newbufcolumn;
<br>+
<br>+ maxNextCharInd = (bufpos += (bufsize - tokenBegin));
<br>+ }
<br>+ else
<br>+ {
<br>+ System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
<br>+ buffer = newbuffer;
<br>+
<br>+ System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
<br>+ bufline = newbufline;
<br>+
<br>+ System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
<br>+ bufcolumn = newbufcolumn;
<br>+
<br>+ maxNextCharInd = (bufpos -= tokenBegin);
<br>+ }
<br>+ }
<br>+ catch (Throwable t)
<br>+ {
<br>+ throw new Error(t.getMessage());
<br>+ }
<br>+
<br>+
<br>+ bufsize += 2048;
<br>+ available = bufsize;
<br>+ tokenBegin = 0;
<br>+ }
<br>+
<br>+ protected void FillBuff() throws java.io.IOException
<br>+ {
<br>+ if (maxNextCharInd == available)
<br>+ {
<br>+ if (available == bufsize)
<br>+ {
<br>+ if (tokenBegin > 2048)
<br>+ {
<br>+ bufpos = maxNextCharInd = 0;
<br>+ available = tokenBegin;
<br>+ }
<br>+ else if (tokenBegin < 0)
<br>+ bufpos = maxNextCharInd = 0;
<br>+ else
<br>+ ExpandBuff(false);
<br>+ }
<br>+ else if (available > tokenBegin)
<br>+ available = bufsize;
<br>+ else if ((tokenBegin - available) < 2048)
<br>+ ExpandBuff(true);
<br>+ else
<br>+ available = tokenBegin;
<br>+ }
<br>+
<br>+ int i;
<br>+ try {
<br>+ if ((i = inputStream.read(buffer, maxNextCharInd,
<br>+ available - maxNextCharInd)) == -1)
<br>+ {
<br>+ inputStream.close();
<br>+ throw new java.io.IOException();
<br>+ }
<br>+ else
<br>+ maxNextCharInd += i;
<br>+ return;
<br>+ }
<br>+ catch(java.io.IOException e) {
<br>+ --bufpos;
<br>+ backup(0);
<br>+ if (tokenBegin == -1)
<br>+ tokenBegin = bufpos;
<br>+ throw e;
<br>+ }
<br>+ }
<br>+
<br>+/** Start. */
<br>+ public char BeginToken() throws java.io.IOException
<br>+ {
<br>+ tokenBegin = -1;
<br>+ char c = readChar();
<br>+ tokenBegin = bufpos;
<br>+
<br>+ return c;
<br>+ }
<br>+
<br>+ protected void UpdateLineColumn(char c)
<br>+ {
<br>+ column++;
<br>+
<br>+ if (prevCharIsLF)
<br>+ {
<br>+ prevCharIsLF = false;
<br>+ line += (column = 1);
<br>+ }
<br>+ else if (prevCharIsCR)
<br>+ {
<br>+ prevCharIsCR = false;
<br>+ if (c == '\n')
<br>+ {
<br>+ prevCharIsLF = true;
<br>+ }
<br>+ else
<br>+ line += (column = 1);
<br>+ }
<br>+
<br>+ switch (c)
<br>+ {
<br>+ case '\r' :
<br>+ prevCharIsCR = true;
<br>+ break;
<br>+ case '\n' :
<br>+ prevCharIsLF = true;
<br>+ break;
<br>+ case '\t' :
<br>+ column--;
<br>+ column += (tabSize - (column % tabSize));
<br>+ break;
<br>+ default :
<br>+ break;
<br>+ }
<br>+
<br>+ bufline[bufpos] = line;
<br>+ bufcolumn[bufpos] = column;
<br>+ }
<br>+
<br>+/** Read a character. */
<br>+ public char readChar() throws java.io.IOException
<br>+ {
<br>+ if (inBuf > 0)
<br>+ {
<br>+ --inBuf;
<br>+
<br>+ if (++bufpos == bufsize)
<br>+ bufpos = 0;
<br>+
<br>+ return buffer[bufpos];
<br>+ }
<br>+
<br>+ if (++bufpos >= maxNextCharInd)
<br>+ FillBuff();
<br>+
<br>+ char c = buffer[bufpos];
<br>+
<br>+ UpdateLineColumn(c);
<br>+ return c;
<br>+ }
<br>+
<br>+ /**
<br>+ * @deprecated
<br>+ * @see #getEndColumn
<br>+ */
<br>+
<br>+ public int getColumn() {
<br>+ return bufcolumn[bufpos];
<br>+ }
<br>+
<br>+ /**
<br>+ * @deprecated
<br>+ * @see #getEndLine
<br>+ */
<br>+
<br>+ public int getLine() {
<br>+ return bufline[bufpos];
<br>+ }
<br>+
<br>+ /** Get token end column number. */
<br>+ public int getEndColumn() {
<br>+ return bufcolumn[bufpos];
<br>+ }
<br>+
<br>+ /** Get token end line number. */
<br>+ public int getEndLine() {
<br>+ return bufline[bufpos];
<br>+ }
<br>+
<br>+ /** Get token beginning column number. */
<br>+ public int getBeginColumn() {
<br>+ return bufcolumn[tokenBegin];
<br>+ }
<br>+
<br>+ /** Get token beginning line number. */
<br>+ public int getBeginLine() {
<br>+ return bufline[tokenBegin];
<br>+ }
<br>+
<br>+/** Backup a number of characters. */
<br>+ public void backup(int amount) {
<br>+
<br>+ inBuf += amount;
<br>+ if ((bufpos -= amount) < 0)
<br>+ bufpos += bufsize;
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.Reader dstream, int startline,
<br>+ int startcolumn, int buffersize)
<br>+ {
<br>+ inputStream = dstream;
<br>+ line = startline;
<br>+ column = startcolumn - 1;
<br>+
<br>+ available = bufsize = buffersize;
<br>+ buffer = new char[buffersize];
<br>+ bufline = new int[buffersize];
<br>+ bufcolumn = new int[buffersize];
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.Reader dstream, int startline,
<br>+ int startcolumn)
<br>+ {
<br>+ this(dstream, startline, startcolumn, 4096);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.Reader dstream)
<br>+ {
<br>+ this(dstream, 1, 1, 4096);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.Reader dstream, int startline,
<br>+ int startcolumn, int buffersize)
<br>+ {
<br>+ inputStream = dstream;
<br>+ line = startline;
<br>+ column = startcolumn - 1;
<br>+
<br>+ if (buffer == null || buffersize != buffer.length)
<br>+ {
<br>+ available = bufsize = buffersize;
<br>+ buffer = new char[buffersize];
<br>+ bufline = new int[buffersize];
<br>+ bufcolumn = new int[buffersize];
<br> }
<br>+ prevCharIsLF = prevCharIsCR = false;
<br>+ tokenBegin = inBuf = maxNextCharInd = 0;
<br>+ bufpos = -1;
<br>+ }
<br>
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.Reader dstream, int startline,
<br>+ int startcolumn)
<br>+ {
<br>+ ReInit(dstream, startline, startcolumn, 4096);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.Reader dstream)
<br>+ {
<br>+ ReInit(dstream, 1, 1, 4096);
<br>+ }
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream, String encoding, int startline,
<br>+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream, int startline,
<br>+ int startcolumn, int buffersize)
<br>+ {
<br>+ this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream, String encoding, int startline,
<br>+ int startcolumn) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ this(dstream, encoding, startline, startcolumn, 4096);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream, int startline,
<br>+ int startcolumn)
<br>+ {
<br>+ this(dstream, startline, startcolumn, 4096);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ this(dstream, encoding, 1, 1, 4096);
<br>+ }
<br>+
<br>+ /** Constructor. */
<br>+ public JspCharStream(java.io.InputStream dstream)
<br>+ {
<br>+ this(dstream, 1, 1, 4096);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
<br>+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream, int startline,
<br>+ int startcolumn, int buffersize)
<br>+ {
<br>+ ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ ReInit(dstream, encoding, 1, 1, 4096);
<br>+ }
<br>+
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream)
<br>+ {
<br>+ ReInit(dstream, 1, 1, 4096);
<br>+ }
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
<br>+ int startcolumn) throws java.io.UnsupportedEncodingException
<br>+ {
<br>+ ReInit(dstream, encoding, startline, startcolumn, 4096);
<br>+ }
<br>+ /** Reinitialise. */
<br>+ public void ReInit(java.io.InputStream dstream, int startline,
<br>+ int startcolumn)
<br>+ {
<br>+ ReInit(dstream, startline, startcolumn, 4096);
<br>+ }
<br>+ /** Get token literal value. */
<br>+ public String GetImage()
<br>+ {
<br>+ if (bufpos >= tokenBegin)
<br>+ return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
<br>+ else
<br>+ return new String(buffer, tokenBegin, bufsize - tokenBegin) +
<br>+ new String(buffer, 0, bufpos + 1);
<br>+ }
<br>+
<br>+ /** Get the suffix. */
<br>+ public char[] GetSuffix(int len)
<br>+ {
<br>+ char[] ret = new char[len];
<br>+
<br>+ if ((bufpos + 1) >= len)
<br>+ System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
<br>+ else
<br>+ {
<br>+ System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
<br>+ len - bufpos - 1);
<br>+ System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
<br>+ }
<br>+
<br>+ return ret;
<br>+ }
<br>+
<br>+ /** Reset buffer when finished. */
<br>+ public void Done()
<br>+ {
<br>+ buffer = null;
<br>+ bufline = null;
<br>+ bufcolumn = null;
<br>+ }
<br>+
<br>+ /**
<br>+ * Method to adjust line and column numbers for the start of a token.
<br>+ */
<br>+ public void adjustBeginLineColumn(int newLine, int newCol)
<br>+ {
<br>+ int start = tokenBegin;
<br>+ int len;
<br>+
<br>+ if (bufpos >= tokenBegin)
<br>+ {
<br>+ len = bufpos - tokenBegin + inBuf + 1;
<br>+ }
<br>+ else
<br>+ {
<br>+ len = bufsize - tokenBegin + bufpos + 1 + inBuf;
<br>+ }
<br>+
<br>+ int i = 0, j = 0, k = 0;
<br>+ int nextColDiff = 0, columnDiff = 0;
<br>+
<br>+ while (i < len &&
<br>+ bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
<br>+ {
<br>+ bufline[j] = newLine;
<br>+ nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
<br>+ bufcolumn[j] = newCol + columnDiff;
<br>+ columnDiff = nextColDiff;
<br>+ i++;
<br>+ }
<br>+
<br>+ if (i < len)
<br>+ {
<br>+ bufline[j] = newLine++;
<br>+ bufcolumn[j] = newCol + columnDiff;
<br>+
<br>+ while (i++ < len)
<br>+ {
<br>+ if (bufline[j = start % bufsize] != bufline[++start % bufsize])
<br>+ bufline[j] = newLine++;
<br>+ else
<br>+ bufline[j] = newLine;
<br>+ }
<br>+ }
<br>+
<br>+ line = bufline[j];
<br>+ column = bufcolumn[j];
<br>+ }
<br>+
<br> }
<br>+/* JavaCC - OriginalChecksum=0cfeecb717597c69bc2c1c86633e8048 (do not edit this line) */
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParser.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParser.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParser.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -628,7 +628,16 @@
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br> case TAG_END:
<br> jj_consume_token(TAG_END);
<br>- jjtn000.setEmpty(false);
<br>+ jjtn000.setEmpty(false);
<br>+
<br>+ // Content in a <script> element needs special treatment (like a comment or CDataSection).
<br>+ // Tell the TokenManager to start looking for the body of a script element. In this
<br>+ // state all text will be consumed by the next token up to the closing </script> tag.
<br>+ // This is a context sensitive switch for the token manager, not something one can
<br>+ // express using normal JavaCC syntax. Hence the hoop jumping.
<br>+ if ("script".equalsIgnoreCase(startTagName.image)) {
<br>+ token_source.SwitchTo(HtmlScriptContentState);
<br>+ }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br> case TAG_START:
<br> case COMMENT_START:
<br>@@ -640,10 +649,33 @@
<br> case JSP_DIRECTIVE_START:
<br> case EL_EXPRESSION:
<br> case UNPARSED_TEXT:
<br>- Content();
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ case HTML_SCRIPT_END_TAG:
<br>+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ case HTML_SCRIPT_END_TAG:
<br>+ HtmlScript();
<br>+ break;
<br>+ case TAG_START:
<br>+ case COMMENT_START:
<br>+ case CDATA_START:
<br>+ case JSP_COMMENT_START:
<br>+ case JSP_DECLARATION_START:
<br>+ case JSP_EXPRESSION_START:
<br>+ case JSP_SCRIPTLET_START:
<br>+ case JSP_DIRECTIVE_START:
<br>+ case EL_EXPRESSION:
<br>+ case UNPARSED_TEXT:
<br>+ Content();
<br>+ break;
<br>+ default:
<br>+ jj_la1[13] = jj_gen;
<br>+ jj_consume_token(-1);
<br>+ throw new ParseException();
<br>+ }
<br> break;
<br> default:
<br>- jj_la1[13] = jj_gen;
<br>+ jj_la1[14] = jj_gen;
<br> ;
<br> }
<br> jj_consume_token(ENDTAG_START);
<br>@@ -664,7 +696,7 @@
<br> jjtn000.setEmpty(true);
<br> break;
<br> default:
<br>- jj_la1[14] = jj_gen;
<br>+ jj_la1[15] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -746,7 +778,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[15] = jj_gen;
<br>+ jj_la1[16] = jj_gen;
<br> break label_8;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -759,7 +791,7 @@
<br> tmp = QuoteIndependentAttributeValueContent();
<br> break;
<br> default:
<br>- jj_la1[16] = jj_gen;
<br>+ jj_la1[17] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -774,7 +806,7 @@
<br> content.append(t.image.substring(0, 1));
<br> break;
<br> default:
<br>- jj_la1[17] = jj_gen;
<br>+ jj_la1[18] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -791,7 +823,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[18] = jj_gen;
<br>+ jj_la1[19] = jj_gen;
<br> break label_9;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -804,7 +836,7 @@
<br> tmp = QuoteIndependentAttributeValueContent();
<br> break;
<br> default:
<br>- jj_la1[19] = jj_gen;
<br>+ jj_la1[20] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -819,13 +851,13 @@
<br> content.append(t.image.substring(0, 1));
<br> break;
<br> default:
<br>- jj_la1[20] = jj_gen;
<br>+ jj_la1[21] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br> break;
<br> default:
<br>- jj_la1[21] = jj_gen;
<br>+ jj_la1[22] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -870,7 +902,7 @@
<br> tmp = JspExpressionInAttribute();
<br> break;
<br> default:
<br>- jj_la1[22] = jj_gen;
<br>+ jj_la1[23] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -912,7 +944,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[23] = jj_gen;
<br>+ jj_la1[24] = jj_gen;
<br> break label_10;
<br> }
<br> t = jj_consume_token(COMMENT_TEXT);
<br>@@ -945,7 +977,7 @@
<br> ;
<br> break;
<br> default:
<br>- jj_la1[24] = jj_gen;
<br>+ jj_la1[25] = jj_gen;
<br> break label_11;
<br> }
<br> Attribute();
<br>@@ -987,7 +1019,7 @@
<br> jj_consume_token(WHITESPACES);
<br> break;
<br> default:
<br>- jj_la1[25] = jj_gen;
<br>+ jj_la1[26] = jj_gen;
<br> ;
<br> }
<br> switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>@@ -999,12 +1031,12 @@
<br> jj_consume_token(WHITESPACES);
<br> break;
<br> default:
<br>- jj_la1[26] = jj_gen;
<br>+ jj_la1[27] = jj_gen;
<br> ;
<br> }
<br> break;
<br> default:
<br>- jj_la1[27] = jj_gen;
<br>+ jj_la1[28] = jj_gen;
<br> ;
<br> }
<br> jj_consume_token(DOCTYPE_DECL_END);
<br>@@ -1057,7 +1089,7 @@
<br> jjtn000.setUri(quoteContent(systemLiteral.image));
<br> break;
<br> default:
<br>- jj_la1[28] = jj_gen;
<br>+ jj_la1[29] = jj_gen;
<br> jj_consume_token(-1);
<br> throw new ParseException();
<br> }
<br>@@ -1068,6 +1100,37 @@
<br> }
<br> }
<br>
<br>+ final public void HtmlScript() throws ParseException {
<br>+ /*@bgen(jjtree) HtmlScript */
<br>+ ASTHtmlScript jjtn000 = new ASTHtmlScript(this, JJTHTMLSCRIPT);
<br>+ boolean jjtc000 = true;
<br>+ jjtree.openNodeScope(jjtn000);StringBuffer content = new StringBuffer();
<br>+ Token t;
<br>+ try {
<br>+ label_12:
<br>+ while (true) {
<br>+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
<br>+ case HTML_SCRIPT_CONTENT:
<br>+ ;
<br>+ break;
<br>+ default:
<br>+ jj_la1[30] = jj_gen;
<br>+ break label_12;
<br>+ }
<br>+ t = jj_consume_token(HTML_SCRIPT_CONTENT);
<br>+ content.append(t.image);
<br>+ }
<br>+ jj_consume_token(HTML_SCRIPT_END_TAG);
<br>+ jjtree.closeNodeScope(jjtn000, true);
<br>+ jjtc000 = false;
<br>+ jjtn000.setImage(content.toString().trim());
<br>+ } finally {
<br>+ if (jjtc000) {
<br>+ jjtree.closeNodeScope(jjtn000, true);
<br>+ }
<br>+ }
<br>+ }
<br>+
<br> private boolean jj_2_1(int xla) {
<br> jj_la = xla; jj_lastpos = jj_scanpos = token;
<br> try { return !jj_3_1(); }
<br>@@ -1082,102 +1145,79 @@
<br> finally { jj_save(1, xla); }
<br> }
<br>
<br>- private boolean jj_3R_30() {
<br>- if (jj_scan_token(DOUBLE_QUOTE)) return true;
<br>+ private boolean jj_3R_22() {
<br>+ if (jj_3R_26()) return true;
<br> Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_32()) { jj_scanpos = xsp; break; }
<br>- }
<br> xsp = jj_scanpos;
<br>- if (jj_scan_token(72)) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_33()) return true;
<br>- }
<br>+ if (jj_scan_token(48)) jj_scanpos = xsp;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_29() {
<br>- if (jj_scan_token(PUBLIC)) return true;
<br>+ private boolean jj_3R_16() {
<br>+ if (jj_scan_token(DOCTYPE_DECL_START)) return true;
<br> if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_47() {
<br>- if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_27() {
<br>+ if (jj_scan_token(NAME)) return true;
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_30()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_31()) return true;
<br>- }
<br>+ if (jj_scan_token(48)) jj_scanpos = xsp;
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_22()) jj_scanpos = xsp;
<br>+ if (jj_scan_token(DOCTYPE_DECL_END)) return true;
<br> return false;
<br> }
<br>
<br> private boolean jj_3R_25() {
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_28()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_29()) return true;
<br>- }
<br>+ if (jj_scan_token(ATTR_NAME)) return true;
<br>+ if (jj_scan_token(ATTR_EQ)) return true;
<br>+ if (jj_3R_28()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_28() {
<br>- if (jj_scan_token(SYSTEM)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>+ private boolean jj_3R_41() {
<br>+ if (jj_scan_token(UNPARSED_TEXT_NO_DOUBLE_QUOTES)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_21() {
<br>+ private boolean jj_3R_19() {
<br> if (jj_3R_25()) return true;
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_scan_token(48)) jj_scanpos = xsp;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_40() {
<br>- if (jj_scan_token(UNPARSED_TEXT_NO_DOUBLE_QUOTES)) return true;
<br>+ private boolean jj_3R_14() {
<br>+ if (jj_scan_token(DECL_START)) return true;
<br>+ if (jj_scan_token(TAG_NAME)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_19()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ if (jj_scan_token(DECL_END)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_15() {
<br>- if (jj_scan_token(DOCTYPE_DECL_START)) return true;
<br>- if (jj_scan_token(WHITESPACES)) return true;
<br>- if (jj_scan_token(NAME)) return true;
<br>- Token xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_scan_token(48)) jj_scanpos = xsp;
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_21()) jj_scanpos = xsp;
<br>- if (jj_scan_token(DOCTYPE_DECL_END)) return true;
<br>+ private boolean jj_3R_21() {
<br>+ if (jj_3R_24()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_24() {
<br>- if (jj_scan_token(ATTR_NAME)) return true;
<br>- if (jj_scan_token(ATTR_EQ)) return true;
<br>- if (jj_3R_27()) return true;
<br>+ private boolean jj_3R_43() {
<br>+ if (jj_scan_token(UNPARSED_TEXT_NO_SINGLE_QUOTES)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_20() {
<br>- if (jj_3R_23()) return true;
<br>+ private boolean jj_3R_27() {
<br>+ if (jj_scan_token(COMMENT_TEXT)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_42() {
<br>- if (jj_scan_token(UNPARSED_TEXT_NO_SINGLE_QUOTES)) return true;
<br>+ private boolean jj_3R_23() {
<br>+ if (jj_scan_token(COMMENT_START)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_27()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ if (jj_scan_token(COMMENT_END)) return true;
<br> return false;
<br> }
<br>
<br>@@ -1186,51 +1226,43 @@
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_13() {
<br>- if (jj_scan_token(DECL_START)) return true;
<br>- if (jj_scan_token(TAG_NAME)) return true;
<br>- Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_18()) { jj_scanpos = xsp; break; }
<br>- }
<br>- if (jj_scan_token(DECL_END)) return true;
<br>+ private boolean jj_3R_49() {
<br>+ if (jj_scan_token(JSP_EXPRESSION_IN_ATTRIBUTE)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_17() {
<br>- if (jj_3R_23()) return true;
<br>+ private boolean jj_3R_46() {
<br>+ if (jj_3R_49()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_26() {
<br>- if (jj_scan_token(COMMENT_TEXT)) return true;
<br>+ private boolean jj_3R_45() {
<br>+ if (jj_3R_48()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_19() {
<br>- if (jj_3R_22()) return true;
<br>+ private boolean jj_3R_44() {
<br>+ if (jj_3R_47()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_14() {
<br>+ private boolean jj_3R_20() {
<br>+ if (jj_3R_23()) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_15() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_19()) {
<br>+ if (jj_3R_20()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_20()) return true;
<br>+ if (jj_3R_21()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_22() {
<br>- if (jj_scan_token(COMMENT_START)) return true;
<br>- Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_26()) { jj_scanpos = xsp; break; }
<br>- }
<br>- if (jj_scan_token(COMMENT_END)) return true;
<br>+ private boolean jj_3R_40() {
<br>+ if (jj_3R_42()) return true;
<br> return false;
<br> }
<br>
<br>@@ -1238,34 +1270,52 @@
<br> Token xsp;
<br> while (true) {
<br> xsp = jj_scanpos;
<br>- if (jj_3R_14()) { jj_scanpos = xsp; break; }
<br>+ if (jj_3R_15()) { jj_scanpos = xsp; break; }
<br> }
<br>- if (jj_3R_15()) return true;
<br>+ if (jj_3R_16()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_12() {
<br>+ private boolean jj_3R_36() {
<br>+ if (jj_scan_token(DOLLAR_OR_HASH_SINGLE_QUOTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_39() {
<br>+ if (jj_3R_43()) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_13() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_16()) {
<br>+ if (jj_3R_17()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_17()) return true;
<br>+ if (jj_3R_18()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_16() {
<br>- if (jj_3R_22()) return true;
<br>+ private boolean jj_3R_17() {
<br>+ if (jj_3R_23()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_48() {
<br>- if (jj_scan_token(JSP_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ private boolean jj_3R_34() {
<br>+ if (jj_scan_token(DOLLAR_OR_HASH_DOUBLE_QUOTE)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_45() {
<br>- if (jj_3R_48()) return true;
<br>+ private boolean jj_3R_42() {
<br>+ Token xsp;
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_44()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_45()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_46()) return true;
<br>+ }
<br>+ }
<br> return false;
<br> }
<br>
<br>@@ -1273,29 +1323,19 @@
<br> Token xsp;
<br> while (true) {
<br> xsp = jj_scanpos;
<br>- if (jj_3R_12()) { jj_scanpos = xsp; break; }
<br>+ if (jj_3R_13()) { jj_scanpos = xsp; break; }
<br> }
<br>- if (jj_3R_13()) return true;
<br>+ if (jj_3R_14()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_44() {
<br>- if (jj_3R_47()) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_43() {
<br>- if (jj_3R_46()) return true;
<br>- return false;
<br>- }
<br>-
<br>- private boolean jj_3R_39() {
<br>- if (jj_3R_41()) return true;
<br>- return false;
<br>- }
<br>-
<br> private boolean jj_3R_35() {
<br>- if (jj_scan_token(DOLLAR_OR_HASH_SINGLE_QUOTE)) return true;
<br>+ Token xsp;
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_39()) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_40()) return true;
<br>+ }
<br> return false;
<br> }
<br>
<br>@@ -1304,81 +1344,104 @@
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_33() {
<br>- if (jj_scan_token(DOLLAR_OR_HASH_DOUBLE_QUOTE)) return true;
<br>+ private boolean jj_3R_37() {
<br>+ if (jj_3R_41()) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_41() {
<br>+ private boolean jj_3R_33() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_43()) {
<br>+ if (jj_3R_37()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_44()) {
<br>- jj_scanpos = xsp;
<br>- if (jj_3R_45()) return true;
<br>+ if (jj_3R_38()) return true;
<br> }
<br>- }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_34() {
<br>+ private boolean jj_3R_32() {
<br>+ if (jj_scan_token(SINGLE_QUOTE)) return true;
<br> Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_35()) { jj_scanpos = xsp; break; }
<br>+ }
<br> xsp = jj_scanpos;
<br>- if (jj_3R_38()) {
<br>+ if (jj_scan_token(69)) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_39()) return true;
<br>+ if (jj_3R_36()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_37() {
<br>- if (jj_3R_41()) return true;
<br>+ private boolean jj_3R_24() {
<br>+ if (jj_scan_token(JSP_COMMENT_START)) return true;
<br>+ if (jj_scan_token(JSP_COMMENT_CONTENT)) return true;
<br>+ if (jj_scan_token(JSP_COMMENT_END)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_36() {
<br>- if (jj_3R_40()) return true;
<br>+ private boolean jj_3R_31() {
<br>+ if (jj_scan_token(DOUBLE_QUOTE)) return true;
<br>+ Token xsp;
<br>+ while (true) {
<br>+ xsp = jj_scanpos;
<br>+ if (jj_3R_33()) { jj_scanpos = xsp; break; }
<br>+ }
<br>+ xsp = jj_scanpos;
<br>+ if (jj_scan_token(72)) {
<br>+ jj_scanpos = xsp;
<br>+ if (jj_3R_34()) return true;
<br>+ }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_23() {
<br>- if (jj_scan_token(JSP_COMMENT_START)) return true;
<br>- if (jj_scan_token(JSP_COMMENT_CONTENT)) return true;
<br>- if (jj_scan_token(JSP_COMMENT_END)) return true;
<br>+ private boolean jj_3R_30() {
<br>+ if (jj_scan_token(PUBLIC)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_32() {
<br>+ private boolean jj_3R_47() {
<br>+ if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br>+ private boolean jj_3R_28() {
<br> Token xsp;
<br> xsp = jj_scanpos;
<br>- if (jj_3R_36()) {
<br>+ if (jj_3R_31()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_37()) return true;
<br>+ if (jj_3R_32()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_31() {
<br>- if (jj_scan_token(SINGLE_QUOTE)) return true;
<br>+ private boolean jj_3R_26() {
<br> Token xsp;
<br>- while (true) {
<br>- xsp = jj_scanpos;
<br>- if (jj_3R_34()) { jj_scanpos = xsp; break; }
<br>- }
<br> xsp = jj_scanpos;
<br>- if (jj_scan_token(69)) {
<br>+ if (jj_3R_29()) {
<br> jj_scanpos = xsp;
<br>- if (jj_3R_35()) return true;
<br>+ if (jj_3R_30()) return true;
<br> }
<br> return false;
<br> }
<br>
<br>- private boolean jj_3R_46() {
<br>- if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
<br>+ private boolean jj_3R_29() {
<br>+ if (jj_scan_token(SYSTEM)) return true;
<br>+ if (jj_scan_token(WHITESPACES)) return true;
<br>+ if (jj_scan_token(QUOTED_LITERAL)) return true;
<br> return false;
<br> }
<br>
<br>+ private boolean jj_3R_48() {
<br>+ if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
<br>+ return false;
<br>+ }
<br>+
<br> /** Generated Token Manager. */
<br> public JspParserTokenManager token_source;
<br> /** Current token. */
<br>@@ -1389,7 +1452,7 @@
<br> private Token jj_scanpos, jj_lastpos;
<br> private int jj_la;
<br> private int jj_gen;
<br>- final private int[] jj_la1 = new int[29];
<br>+ final private int[] jj_la1 = new int[31];
<br> static private int[] jj_la1_0;
<br> static private int[] jj_la1_1;
<br> static private int[] jj_la1_2;
<br>@@ -1399,13 +1462,13 @@
<br> jj_la1_init_2();
<br> }
<br> private static void jj_la1_init_0() {
<br>- jj_la1_0 = new int[] {0x11000000,0x11000000,0x11000000,0x11000000,0xf9400000,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
<br>+ jj_la1_0 = new int[] {0x11000000,0x11000000,0x11000000,0x11000000,0xf9400000,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9400000,0xf9400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
<br> }
<br> private static void jj_la1_init_1() {
<br>- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x7,0x1,0x1,0x6,0x10,0x6,0x6,0x400000,0x4000000,0x7,0x28000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x10000,0x10000,0xc0000,0xc0000,};
<br>+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x7,0x1,0x1,0x6,0x10,0x6,0x6,0x400000,0x4000000,0x7,0x7,0x28000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x10000,0x10000,0xc0000,0xc0000,0x0,};
<br> }
<br> private static void jj_la1_init_2() {
<br>- jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x21c,0x21c,0x500,0x5c,0x5c,0xa0,0x3,0x1c,0x1000,0x0,0x0,0x0,0x0,0x0,};
<br>+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0x0,0x21c,0x21c,0x500,0x5c,0x5c,0xa0,0x3,0x1c,0x1000,0x0,0x0,0x0,0x0,0x0,0x2000,};
<br> }
<br> final private JJCalls[] jj_2_rtns = new JJCalls[2];
<br> private boolean jj_rescan = false;
<br>@@ -1417,7 +1480,7 @@
<br> token = new Token();
<br> jj_ntk = -1;
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1428,7 +1491,7 @@
<br> jj_ntk = -1;
<br> jjtree.reset();
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1438,7 +1501,7 @@
<br> token = new Token();
<br> jj_ntk = -1;
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1449,7 +1512,7 @@
<br> jj_ntk = -1;
<br> jjtree.reset();
<br> jj_gen = 0;
<br>- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
<br>+ for (int i = 0; i < 31; i++) jj_la1[i] = -1;
<br> for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
<br> }
<br>
<br>@@ -1561,12 +1624,12 @@
<br> /** Generate ParseException. */
<br> public ParseException generateParseException() {
<br> jj_expentries.clear();
<br>- boolean[] la1tokens = new boolean[77];
<br>+ boolean[] la1tokens = new boolean[79];
<br> if (jj_kind >= 0) {
<br> la1tokens[jj_kind] = true;
<br> jj_kind = -1;
<br> }
<br>- for (int i = 0; i < 29; i++) {
<br>+ for (int i = 0; i < 31; i++) {
<br> if (jj_la1[i] == jj_gen) {
<br> for (int j = 0; j < 32; j++) {
<br> if ((jj_la1_0[i] & (1<<j)) != 0) {
<br>@@ -1581,7 +1644,7 @@
<br> }
<br> }
<br> }
<br>- for (int i = 0; i < 77; i++) {
<br>+ for (int i = 0; i < 79; i++) {
<br> if (la1tokens[i]) {
<br> jj_expentry = new int[1];
<br> jj_expentry[0] = i;
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -1,7 +1,7 @@
<br> /* Generated By:JJTree&JavaCC: Do not edit this line. JspParserConstants.java */
<br> /**
<br> * JSP Parser for PMD.
<br>- * @author Pieter � Application Engineers NV/SA � <a href="http://www.ae.be" target="_top" rel="nofollow">http://www.ae.be</a><br>+ * @author Pieter \x96 Application Engineers NV/SA \x96 <a href="http://www.ae.be" target="_top" rel="nofollow">http://www.ae.be</a><br> */
<br>
<br> package net.sourceforge.pmd.jsp.ast;
<br>@@ -163,41 +163,47 @@
<br> int COMMENT_END = 75;
<br> /** RegularExpression Id. */
<br> int COMMENT_TEXT = 76;
<br>+ /** RegularExpression Id. */
<br>+ int HTML_SCRIPT_CONTENT = 77;
<br>+ /** RegularExpression Id. */
<br>+ int HTML_SCRIPT_END_TAG = 78;
<br>
<br> /** Lexical state. */
<br>- int CommentState = 0;
<br>+ int HtmlScriptContentState = 0;
<br> /** Lexical state. */
<br>- int AttrValueBetweenDoubleQuotesState = 1;
<br>+ int CommentState = 1;
<br> /** Lexical state. */
<br>- int AttrValueBetweenSingleQuotesState = 2;
<br>+ int AttrValueBetweenDoubleQuotesState = 2;
<br> /** Lexical state. */
<br>- int StartTagState = 3;
<br>+ int AttrValueBetweenSingleQuotesState = 3;
<br> /** Lexical state. */
<br>- int CDataState = 4;
<br>+ int StartTagState = 4;
<br> /** Lexical state. */
<br>- int DocTypeExternalIdState = 5;
<br>+ int CDataState = 5;
<br> /** Lexical state. */
<br>- int DocTypeState = 6;
<br>+ int DocTypeExternalIdState = 6;
<br> /** Lexical state. */
<br>- int JspCommentState = 7;
<br>+ int DocTypeState = 7;
<br> /** Lexical state. */
<br>- int JspDeclarationState = 8;
<br>+ int JspCommentState = 8;
<br> /** Lexical state. */
<br>- int JspExpressionState = 9;
<br>+ int JspDeclarationState = 9;
<br> /** Lexical state. */
<br>- int JspScriptletState = 10;
<br>+ int JspExpressionState = 10;
<br> /** Lexical state. */
<br>- int InTagState = 11;
<br>+ int JspScriptletState = 11;
<br> /** Lexical state. */
<br>- int AfterTagState = 12;
<br>+ int InTagState = 12;
<br> /** Lexical state. */
<br>- int AttrValueState = 13;
<br>+ int AfterTagState = 13;
<br> /** Lexical state. */
<br>- int JspDirectiveAttributesState = 14;
<br>+ int AttrValueState = 14;
<br> /** Lexical state. */
<br>- int JspDirectiveState = 15;
<br>+ int JspDirectiveAttributesState = 15;
<br> /** Lexical state. */
<br>- int DEFAULT = 16;
<br>+ int JspDirectiveState = 16;
<br>+ /** Lexical state. */
<br>+ int DEFAULT = 17;
<br>
<br> /** Literal token values. */
<br> String[] tokenImage = {
<br>@@ -278,6 +284,8 @@
<br> "<DOLLAR_OR_HASH_DOUBLE_QUOTE>",
<br> "<COMMENT_END>",
<br> "<COMMENT_TEXT>",
<br>+ "<HTML_SCRIPT_CONTENT>",
<br>+ "<HTML_SCRIPT_END_TAG>",
<br> };
<br>
<br> }
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java 2009-12-05 22:34:45 UTC (rev 7015)
<br>@@ -1,7 +1,7 @@
<br> /* Generated By:JJTree&JavaCC: Do not edit this line. JspParserTokenManager.java */
<br> /**
<br> * JSP Parser for PMD.
<br>- * @author Pieter � Application Engineers NV/SA � <a href="http://www.ae.be" target="_top" rel="nofollow">http://www.ae.be</a><br>+ * @author Pieter \x96 Application Engineers NV/SA \x96 <a href="http://www.ae.be" target="_top" rel="nofollow">http://www.ae.be</a><br> */
<br>
<br> package net.sourceforge.pmd.jsp.ast;
<br>@@ -14,21 +14,17 @@
<br> public java.io.PrintStream debugStream = System.out;
<br> /** Set debug output. */
<br> public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
<br>-private final int jjStopStringLiteralDfa_9(int pos, long active0)
<br>+private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1)
<br> {
<br> switch (pos)
<br> {
<br>- case 0:
<br>- if ((active0 & 0x40000000000L) != 0L)
<br>- return 2;
<br>- return -1;
<br> default :
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_9(int pos, long active0)
<br>+private final int jjStartNfa_2(int pos, long active0, long active1)
<br> {
<br>- return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
<br>+ return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
<br> }
<br> private int jjStopAtPos(int pos, int kind)
<br> {
<br>@@ -36,483 +32,22 @@
<br> jjmatchedPos = pos;
<br> return pos + 1;
<br> }
<br>-private int jjMoveStringLiteralDfa0_9()
<br>+private int jjMoveStringLiteralDfa0_2()
<br> {
<br> switch(curChar)
<br> {
<br>- case 37:
<br>- return jjMoveStringLiteralDfa1_9(0x40000000000L);
<br>+ case 34:
<br>+ return jjStopAtPos(0, 72);
<br> default :
<br>- return jjMoveNfa_9(3, 0);
<br>+ return jjMoveNfa_2(9, 0);
<br> }
<br> }
<br>-private int jjMoveStringLiteralDfa1_9(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_9(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x40000000000L) != 0L)
<br>- return jjStopAtPos(1, 42);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_9(0, active0);
<br>-}
<br> static final long[] jjbitVec0 = {
<br>+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
<br>+};
<br>+static final long[] jjbitVec2 = {
<br> 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
<br> };
<br>-private int jjMoveNfa_9(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 3;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- if ((0xffffffdfffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- }
<br>- else if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 2;
<br>- break;
<br>- case 0:
<br>- if ((0xffffffdfffffffffL & l) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- case 1:
<br>- if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 2;
<br>- break;
<br>- case 2:
<br>- if ((0xbfffffffffffffffL & l) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- case 0:
<br>- case 2:
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 3:
<br>- case 0:
<br>- case 2:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 43)
<br>- kind = 43;
<br>- jjCheckNAddTwoStates(0, 1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_4()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 93:
<br>- return jjMoveStringLiteralDfa1_4(0x80000000000000L);
<br>- default :
<br>- return 1;
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_4(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 93:
<br>- return jjMoveStringLiteralDfa2_4(active0, 0x80000000000000L);
<br>- default :
<br>- return 2;
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa2_4(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return 2;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x80000000000000L) != 0L)
<br>- return jjStopAtPos(2, 55);
<br>- break;
<br>- default :
<br>- return 3;
<br>- }
<br>- return 3;
<br>-}
<br>-private int jjMoveStringLiteralDfa0_6()
<br>-{
<br>- return jjMoveNfa_6(1, 0);
<br>-}
<br>-static final long[] jjbitVec1 = {
<br>- 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
<br>-};
<br>-private int jjMoveNfa_6(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 3;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- if ((0x100002600L & l) != 0L)
<br>- {
<br>- if (kind > 48)
<br>- kind = 48;
<br>- jjCheckNAdd(0);
<br>- }
<br>- else if ((0x400001000000000L & l) != 0L)
<br>- {
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- }
<br>- break;
<br>- case 0:
<br>- if ((0x100002600L & l) == 0L)
<br>- break;
<br>- kind = 48;
<br>- jjCheckNAdd(0);
<br>- break;
<br>- case 2:
<br>- if ((0x7ff601000000000L & l) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- case 2:
<br>- if ((0x7fffffe87fffffeL & l) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 1:
<br>- case 2:
<br>- if ((jjbitVec1[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 49)
<br>- kind = 49;
<br>- jjCheckNAdd(2);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_3()
<br>-{
<br>- return jjMoveNfa_3(0, 0);
<br>-}
<br>-private int jjMoveNfa_3(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 2;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if (curChar != 36)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- case 1:
<br>- if ((0x7ff601000000000L & l) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- case 1:
<br>- if ((0x7fffffe87fffffeL & l) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- case 1:
<br>- if ((jjbitVec1[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 56)
<br>- kind = 56;
<br>- jjCheckNAdd(1);
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa0_0()
<br>-{
<br>- return jjMoveNfa_0(0, 0);
<br>-}
<br>-private int jjMoveNfa_0(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 5;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if (curChar == 45)
<br>- jjAddStates(0, 1);
<br>- break;
<br>- case 1:
<br>- if (curChar == 45)
<br>- jjCheckNAddTwoStates(2, 3);
<br>- break;
<br>- case 2:
<br>- if (curChar == 32)
<br>- jjCheckNAddTwoStates(2, 3);
<br>- break;
<br>- case 3:
<br>- case 4:
<br>- if (curChar == 62 && kind > 75)
<br>- kind = 75;
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1)
<br>-{
<br>- switch (pos)
<br>- {
<br>- default :
<br>- return -1;
<br>- }
<br>-}
<br>-private final int jjStartNfa_2(int pos, long active0, long active1)
<br>-{
<br>- return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_2()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 39:
<br>- return jjStopAtPos(0, 69);
<br>- default :
<br>- return jjMoveNfa_2(9, 0);
<br>- }
<br>-}
<br> private int jjMoveNfa_2(int startState, int curPos)
<br> {
<br> int startsAt = 0;
<br>@@ -532,11 +67,11 @@
<br> switch(jjstateSet[--i])
<br> {
<br> case 9:
<br>- if ((0xffffff67ffffffffL & l) != 0L)
<br>+ if ((0xffffffe3ffffffffL & l) != 0L)
<br> {
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> }
<br> else if ((0x1800000000L & l) != 0L)
<br> jjCheckNAddTwoStates(30, 36);
<br>@@ -549,7 +84,7 @@
<br> break;
<br> case 1:
<br> if ((0xffffff7bffffffffL & l) != 0L)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 2:
<br> if (curChar == 34)
<br>@@ -561,7 +96,7 @@
<br> break;
<br> case 4:
<br> if (curChar == 34)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 5:
<br> if (curChar == 39)
<br>@@ -573,11 +108,11 @@
<br> break;
<br> case 7:
<br> if (curChar == 39)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 11:
<br> if ((0xffffff7bffffffffL & l) != 0L)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 12:
<br> if (curChar == 34)
<br>@@ -589,7 +124,7 @@
<br> break;
<br> case 14:
<br> if (curChar == 34)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 15:
<br> if (curChar == 39)
<br>@@ -601,7 +136,7 @@
<br> break;
<br> case 17:
<br> if (curChar == 39)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 19:
<br> if (curChar == 35)
<br>@@ -613,7 +148,7 @@
<br> break;
<br> case 21:
<br> if ((0xffffffdfffffffffL & l) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 22:
<br> if (curChar == 37)
<br>@@ -621,7 +156,7 @@
<br> break;
<br> case 23:
<br> if ((0xbfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 24:
<br> if (curChar == 62 && kind > 68)
<br>@@ -640,22 +175,22 @@
<br> jjstateSet[jjnewStateCnt++] = 26;
<br> break;
<br> case 28:
<br>- if ((0xffffff67ffffffffL & l) == 0L)
<br>+ if ((0xffffffe3ffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 29:
<br> if ((0x1800000000L & l) != 0L)
<br> jjCheckNAdd(30);
<br> break;
<br> case 30:
<br>- if ((0xffffff7fffffffffL & l) == 0L)
<br>+ if ((0xfffffffbffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 33:
<br> if (curChar == 35)
<br>@@ -670,8 +205,8 @@
<br> jjCheckNAddTwoStates(30, 36);
<br> break;
<br> case 36:
<br>- if (curChar == 39 && kind > 71)
<br>- kind = 71;
<br>+ if (curChar == 34 && kind > 74)
<br>+ kind = 74;
<br> break;
<br> default : break;
<br> }
<br>@@ -685,25 +220,25 @@
<br> switch(jjstateSet[--i])
<br> {
<br> case 9:
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> if (curChar == 92)
<br>- jjAddStates(16, 17);
<br>+ jjAddStates(14, 15);
<br> break;
<br> case 0:
<br> if (curChar == 123)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 1:
<br> if ((0xdfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(5, 8);
<br>+ jjCheckNAddStates(3, 6);
<br> break;
<br> case 3:
<br>- jjAddStates(18, 19);
<br>+ jjAddStates(16, 17);
<br> break;
<br> case 6:
<br>- jjAddStates(20, 21);
<br>+ jjAddStates(18, 19);
<br> break;
<br> case 8:
<br> if (curChar == 125 && kind > 66)
<br>@@ -711,17 +246,17 @@
<br> break;
<br> case 10:
<br> if (curChar == 123)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 11:
<br> if ((0xdfffffffffffffffL & l) != 0L)
<br>- jjCheckNAddStates(9, 12);
<br>+ jjCheckNAddStates(7, 10);
<br> break;
<br> case 13:
<br>- jjAddStates(22, 23);
<br>+ jjAddStates(20, 21);
<br> break;
<br> case 16:
<br>- jjAddStates(24, 25);
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 18:
<br> if (curChar == 125 && kind > 67)
<br>@@ -729,30 +264,30 @@
<br> break;
<br> case 21:
<br> case 23:
<br>- jjCheckNAddStates(13, 15);
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> case 28:
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 30:
<br> if ((0xf7ffffffffffffffL & l) == 0L)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 31:
<br> if (curChar == 92)
<br>- jjAddStates(16, 17);
<br>+ jjAddStates(14, 15);
<br> break;
<br> case 32:
<br> if (curChar != 123)
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> default : break;
<br> }
<br>@@ -760,6 +295,9 @@
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br>@@ -769,40 +307,40 @@
<br> case 9:
<br> case 28:
<br> case 30:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
<br> break;
<br>- if (kind > 70)
<br>- kind = 70;
<br>- jjCheckNAddStates(2, 4);
<br>+ if (kind > 73)
<br>+ kind = 73;
<br>+ jjCheckNAddStates(0, 2);
<br> break;
<br> case 1:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(5, 8);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(3, 6);
<br> break;
<br> case 3:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(18, 19);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(16, 17);
<br> break;
<br> case 6:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(20, 21);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(18, 19);
<br> break;
<br> case 11:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(9, 12);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(7, 10);
<br> break;
<br> case 13:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(22, 23);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(20, 21);
<br> break;
<br> case 16:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjAddStates(24, 25);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjAddStates(22, 23);
<br> break;
<br> case 21:
<br> case 23:
<br>- if ((jjbitVec0[i2] & l2) != 0L)
<br>- jjCheckNAddStates(13, 15);
<br>+ if (jjCanMove_0(hiByte, i1, i2, l1, l2))
<br>+ jjCheckNAddStates(11, 13);
<br> break;
<br> default : break;
<br> }
<br>@@ -821,98 +359,17 @@
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_7(int pos, long active0)
<br>+private int jjMoveStringLiteralDfa0_4()
<br> {
<br>- switch (pos)
<br>- {
<br>- case 0:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 3;
<br>- return -1;
<br>- case 1:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 4;
<br>- return -1;
<br>- case 2:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return 6;
<br>- return -1;
<br>- default :
<br>- return -1;
<br>- }
<br>+ return jjMoveNfa_4(0, 0);
<br> }
<br>-private final int jjStartNfa_7(int pos, long active0)
<br>+static final long[] jjbitVec3 = {
<br>+ 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL
<br>+};
<br>+private int jjMoveNfa_4(int startState, int curPos)
<br> {
<br>- return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_7()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 45:
<br>- return jjMoveStringLiteralDfa1_7(0x400000000000L);
<br>- default :
<br>- return jjMoveNfa_7(8, 0);
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_7(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 45:
<br>- return jjMoveStringLiteralDfa2_7(active0, 0x400000000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(0, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa2_7(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_7(0, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(1, active0);
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 37:
<br>- return jjMoveStringLiteralDfa3_7(active0, 0x400000000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(1, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa3_7(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_7(1, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_7(2, active0);
<br>- return 3;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 62:
<br>- if ((active0 & 0x400000000000L) != 0L)
<br>- return jjStopAtPos(3, 46);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_7(2, active0);
<br>-}
<br>-private int jjMoveNfa_7(int startState, int curPos)
<br>-{
<br> int startsAt = 0;
<br>- jjnewStateCnt = 8;
<br>+ jjnewStateCnt = 2;
<br> int i = 1;
<br> jjstateSet[0] = startState;
<br> int kind = 0x7fffffff;
<br>@@ -927,70 +384,20 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- if ((0xffffffdfffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 6;
<br>- break;
<br>- case 3:
<br>- if ((0xffffdfffffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 5;
<br>- if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 4;
<br>- break;
<br>- case 8:
<br>- if ((0xffffdfffffffffffL & l) != 0L)
<br>- {
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- }
<br>- else if (curChar == 45)
<br>- jjAddStates(29, 30);
<br>- if (curChar == 45)
<br>- jjCheckNAdd(0);
<br>- break;
<br> case 0:
<br>- if ((0xffffdfffffffffffL & l) == 0L)
<br>+ if (curChar != 36)
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br> case 1:
<br>- if (curChar == 45)
<br>- jjCheckNAdd(0);
<br>- break;
<br>- case 2:
<br>- if (curChar == 45)
<br>- jjAddStates(29, 30);
<br>- break;
<br>- case 5:
<br>- if (curChar == 37)
<br>- jjstateSet[jjnewStateCnt++] = 6;
<br>- break;
<br>- case 6:
<br>- if ((0xbfffffffffffffffL & l) == 0L)
<br>+ if ((0x7ff601000000000L & l) == 0L)
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 7:
<br>- if (curChar == 45)
<br>- jjstateSet[jjnewStateCnt++] = 5;
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1002,58 +409,37 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- case 6:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br>- case 3:
<br> case 0:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ case 1:
<br>+ if ((0x7fffffe87fffffeL & l) == 0L)
<br>+ break;
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 8:
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>- case 4:
<br>- case 6:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br>- case 3:
<br> case 0:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>+ case 1:
<br>+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
<br> break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>+ if (kind > 56)
<br>+ kind = 56;
<br>+ jjCheckNAdd(1);
<br> break;
<br>- case 8:
<br>- if ((jjbitVec0[i2] & l2) == 0L)
<br>- break;
<br>- if (kind > 47)
<br>- kind = 47;
<br>- jjCheckNAddStates(26, 28);
<br>- break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1065,13 +451,13 @@
<br> kind = 0x7fffffff;
<br> }
<br> ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
<br>+ if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
<br> return curPos;
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_13(int pos, long active0, long active1)
<br>+private final int jjStopStringLiteralDfa_12(int pos, long active0)
<br> {
<br> switch (pos)
<br> {
<br>@@ -1079,320 +465,46 @@
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_13(int pos, long active0, long active1)
<br>+private final int jjStartNfa_12(int pos, long active0)
<br> {
<br>- return jjMoveNfa_13(jjStopStringLiteralDfa_13(pos, active0, active1), pos + 1);
<br>+ return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0), pos + 1);
<br> }
<br>-private int jjMoveStringLiteralDfa0_13()
<br>+private int jjMoveStringLiteralDfa0_12()
<br> {
<br> switch(curChar)
<br> {
<br>- case 34:
<br>- return jjStopAtPos(0, 65);
<br>- case 39:
<br>- return jjStopAtPos(0, 64);
<br>- default :
<br>- return jjMoveNfa_13(0, 0);
<br>- }
<br>-}
<br>-private int jjMoveNfa_13(int startState, int curPos)
<br>-{
<br>- int startsAt = 0;
<br>- jjnewStateCnt = 1;
<br>- int i = 1;
<br>- jjstateSet[0] = startState;
<br>- int kind = 0x7fffffff;
<br>- for (;;)
<br>- {
<br>- if (++jjround == 0x7fffffff)
<br>- ReInitRounds();
<br>- if (curChar < 64)
<br>- {
<br>- long l = 1L << curChar;
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- case 0:
<br>- if ((0x100002600L & l) == 0L)
<br>- break;
<br>- kind = 21;
<br>- jjstateSet[jjnewStateCnt++] = 0;
<br>- break;
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else if (curChar < 128)
<br>- {
<br>- long l = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- else
<br>- {
<br>- int i2 = (curChar & 0xff) >> 6;
<br>- long l2 = 1L << (curChar & 077);
<br>- do
<br>- {
<br>- switch(jjstateSet[--i])
<br>- {
<br>- default : break;
<br>- }
<br>- } while(i != startsAt);
<br>- }
<br>- if (kind != 0x7fffffff)
<br>- {
<br>- jjmatchedKind = kind;
<br>- jjmatchedPos = curPos;
<br>- kind = 0x7fffffff;
<br>- }
<br>- ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
<br>- return curPos;
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) { return curPos; }
<br>- }
<br>-}
<br>-private final int jjStopStringLiteralDfa_16(int pos, long active0)
<br>-{
<br>- switch (pos)
<br>- {
<br>- default :
<br>- return -1;
<br>- }
<br>-}
<br>-private final int jjStartNfa_16(int pos, long active0)
<br>-{
<br>- return jjMoveNfa_16(jjStopStringLiteralDfa_16(pos, active0), pos + 1);
<br>-}
<br>-private int jjMoveStringLiteralDfa0_16()
<br>-{
<br>- switch(curChar)
<br>- {
<br>- case 60:
<br>- jjmatchedKind = 22;
<br>- return jjMoveStringLiteralDfa1_16(0x1ff800000L);
<br>- default :
<br>- return jjMoveNfa_16(0, 0);
<br>- }
<br>-}
<br>-private int jjMoveStringLiteralDfa1_16(long active0)
<br>-{
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(0, active0);
<br>- return 1;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 33:
<br>- return jjMoveStringLiteralDfa2_16(active0, 0xd000000L);
<br>- case 37:
<br>- if ((active0 & 0x80000000L) != 0L)
<br>- {
<br>- jjmatchedKind = 31;
<br>- jjmatchedPos = 1;
<br>- }
<br>- return jjMoveStringLiteralDfa2_16(active0, 0x170000000L);
<br> case 47:
<br>- if ((active0 & 0x800000L) != 0L)
<br>- return jjStopAtPos(1, 23);
<br>- break;
<br>- case 63:
<br>- if ((active0 & 0x2000000L) != 0L)
<br>- return jjStopAtPos(1, 25);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(0, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa2_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(0, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(1, active0);
<br>- return 2;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 33:
<br>- if ((active0 & 0x20000000L) != 0L)
<br>- return jjStopAtPos(2, 29);
<br>- break;
<br>- case 45:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x11000000L);
<br>+ return jjMoveStringLiteralDfa1_12(0x2000000000000000L);
<br> case 61:
<br>- if ((active0 & 0x40000000L) != 0L)
<br>- return jjStopAtPos(2, 30);
<br>- break;
<br>- case 64:
<br>- if ((active0 & 0x100000000L) != 0L)
<br>- return jjStopAtPos(2, 32);
<br>- break;
<br>- case 91:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x8000000L);
<br>- case 68:
<br>- case 100:
<br>- return jjMoveStringLiteralDfa3_16(active0, 0x4000000L);
<br>+ return jjStopAtPos(0, 62);
<br>+ case 62:
<br>+ return jjStopAtPos(0, 59);
<br> default :
<br>- break;
<br>+ return jjMoveNfa_12(1, 0);
<br> }
<br>- return jjStartNfa_16(1, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa3_16(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa1_12(long active0)
<br> {
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(1, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(2, active0);
<br>- return 3;
<br>+ jjStopStringLiteralDfa_12(0, active0);
<br>+ return 1;
<br> }
<br> switch(curChar)
<br> {
<br>- case 45:
<br>- if ((active0 & 0x1000000L) != 0L)
<br>- return jjStopAtPos(3, 24);
<br>- else if ((active0 & 0x10000000L) != 0L)
<br>- return jjStopAtPos(3, 28);
<br>+ case 62:
<br>+ if ((active0 & 0x2000000000000000L) != 0L)
<br>+ return jjStopAtPos(1, 61);
<br> break;
<br>- case 67:
<br>- case 99:
<br>- return jjMoveStringLiteralDfa4_16(active0, 0x8000000L);
<br>- case 79:
<br>- case 111:
<br>- return jjMoveStringLiteralDfa4_16(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_16(2, active0);
<br>+ return jjStartNfa_12(0, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa4_16(long old0, long active0)
<br>+private int jjMoveNfa_12(int startState, int curPos)
<br> {
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(2, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(3, active0);
<br>- return 4;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 67:
<br>- case 99:
<br>- return jjMoveStringLiteralDfa5_16(active0, 0x4000000L);
<br>- case 68:
<br>- case 100:
<br>- return jjMoveStringLiteralDfa5_16(active0, 0x8000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(3, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa5_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(3, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(4, active0);
<br>- return 5;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 65:
<br>- case 97:
<br>- return jjMoveStringLiteralDfa6_16(active0, 0x8000000L);
<br>- case 84:
<br>- case 116:
<br>- return jjMoveStringLiteralDfa6_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(4, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa6_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(4, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(5, active0);
<br>- return 6;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 84:
<br>- case 116:
<br>- return jjMoveStringLiteralDfa7_16(active0, 0x8000000L);
<br>- case 89:
<br>- case 121:
<br>- return jjMoveStringLiteralDfa7_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(5, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa7_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(5, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(6, active0);
<br>- return 7;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 65:
<br>- case 97:
<br>- return jjMoveStringLiteralDfa8_16(active0, 0x8000000L);
<br>- case 80:
<br>- case 112:
<br>- return jjMoveStringLiteralDfa8_16(active0, 0x4000000L);
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(6, active0);
<br>-}
<br>-private int jjMoveStringLiteralDfa8_16(long old0, long active0)
<br>-{
<br>- if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_16(6, old0);
<br>- try { curChar = input_stream.readChar(); }
<br>- catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_16(7, active0);
<br>- return 8;
<br>- }
<br>- switch(curChar)
<br>- {
<br>- case 91:
<br>- if ((active0 & 0x8000000L) != 0L)
<br>- return jjStopAtPos(8, 27);
<br>- break;
<br>- case 69:
<br>- case 101:
<br>- if ((active0 & 0x4000000L) != 0L)
<br>- return jjStopAtPos(8, 26);
<br>- break;
<br>- default :
<br>- break;
<br>- }
<br>- return jjStartNfa_16(7, active0);
<br>-}
<br>-private int jjMoveNfa_16(int startState, int curPos)
<br>-{
<br> int startsAt = 0;
<br>- jjnewStateCnt = 1;
<br>+ jjnewStateCnt = 6;
<br> int i = 1;
<br> jjstateSet[0] = startState;
<br> int kind = 0x7fffffff;
<br>@@ -1407,12 +519,49 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ if ((0x100002600L & l) != 0L)
<br>+ {
<br>+ if (kind > 21)
<br>+ kind = 21;
<br>+ jjCheckNAdd(0);
<br>+ }
<br>+ else if (curChar == 33)
<br>+ jjCheckNAdd(3);
<br>+ else if (curChar == 36)
<br>+ {
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ }
<br>+ else if (curChar == 63)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br> case 0:
<br> if ((0x100002600L & l) == 0L)
<br> break;
<br>- kind = 20;
<br>- jjstateSet[jjnewStateCnt++] = 0;
<br>+ kind = 21;
<br>+ jjCheckNAdd(0);
<br> break;
<br>+ case 2:
<br>+ if ((0x7ff601000000000L & l) == 0L)
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br>+ case 3:
<br>+ if (curChar == 62)
<br>+ kind = 60;
<br>+ break;
<br>+ case 4:
<br>+ if (curChar == 63)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br>+ case 5:
<br>+ if (curChar == 33)
<br>+ jjCheckNAdd(3);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1424,18 +573,37 @@
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ case 2:
<br>+ if ((0x7fffffe87fffffeL & l) == 0L)
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br> }
<br> else
<br> {
<br>+ int hiByte = (int)(curChar >> 8);
<br>+ int i1 = hiByte >> 6;
<br>+ long l1 = 1L << (hiByte & 077);
<br> int i2 = (curChar & 0xff) >> 6;
<br> long l2 = 1L << (curChar & 077);
<br> do
<br> {
<br> switch(jjstateSet[--i])
<br> {
<br>+ case 1:
<br>+ case 2:
<br>+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
<br>+ break;
<br>+ if (kind > 58)
<br>+ kind = 58;
<br>+ jjCheckNAdd(2);
<br>+ break;
<br> default : break;
<br> }
<br> } while(i != startsAt);
<br>@@ -1447,13 +615,13 @@
<br> kind = 0x7fffffff;
<br> }
<br> ++curPos;
<br>- if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
<br>+ if ((i = jjnewStateCnt) == (startsAt = 6 - (jjnewStateCnt = startsAt)))
<br> return curPos;
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) { return curPos; }
<br> }
<br> }
<br>-private final int jjStopStringLiteralDfa_12(int pos, long active0)
<br>+private final int jjStopStringLiteralDfa_13(int pos, long active0)
<br> {
<br> switch (pos)
<br> {
<br>@@ -1461,39 +629,39 @@
<br> return -1;
<br> }
<br> }
<br>-private final int jjStartNfa_12(int pos, long active0)
<br>+private final int jjStartNfa_13(int pos, long active0)
<br> {
<br>- return jjMoveNfa_12(jjStopStringLiteralDfa_12(pos, active0), pos + 1);
<br>+ return jjMoveNfa_13(jjStopStringLiteralDfa_13(pos, active0), pos + 1);
<br> }
<br>-private int jjMoveStringLiteralDfa0_12()
<br>+private int jjMoveStringLiteralDfa0_13()
<br> {
<br> switch(curChar)
<br> {
<br> case 60:
<br> jjmatchedKind = 22;
<br>- return jjMoveStringLiteralDfa1_12(0x1ff800000L);
<br>+ return jjMoveStringLiteralDfa1_13(0x1ff800000L);
<br> default :
<br>- return jjMoveNfa_12(10, 0);
<br>+ return jjMoveNfa_13(10, 0);
<br> }
<br> }
<br>-private int jjMoveStringLiteralDfa1_12(long active0)
<br>+private int jjMoveStringLiteralDfa1_13(long active0)
<br> {
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(0, active0);
<br>+ jjStopStringLiteralDfa_13(0, active0);
<br> return 1;
<br> }
<br> switch(curChar)
<br> {
<br> case 33:
<br>- return jjMoveStringLiteralDfa2_12(active0, 0xd000000L);
<br>+ return jjMoveStringLiteralDfa2_13(active0, 0xd000000L);
<br> case 37:
<br> if ((active0 & 0x80000000L) != 0L)
<br> {
<br> jjmatchedKind = 31;
<br> jjmatchedPos = 1;
<br> }
<br>- return jjMoveStringLiteralDfa2_12(active0, 0x170000000L);
<br>+ return jjMoveStringLiteralDfa2_13(active0, 0x170000000L);
<br> case 47:
<br> if ((active0 & 0x800000L) != 0L)
<br> return jjStopAtPos(1, 23);
<br>@@ -1505,15 +673,15 @@
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(0, active0);
<br>+ return jjStartNfa_13(0, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa2_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa2_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(0, old0);
<br>+ return jjStartNfa_13(0, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(1, active0);
<br>+ jjStopStringLiteralDfa_13(1, active0);
<br> return 2;
<br> }
<br> switch(curChar)
<br>@@ -1523,7 +691,7 @@
<br> return jjStopAtPos(2, 29);
<br> break;
<br> case 45:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x11000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x11000000L);
<br> case 61:
<br> if ((active0 & 0x40000000L) != 0L)
<br> return jjStopAtPos(2, 30);
<br>@@ -1533,22 +701,22 @@
<br> return jjStopAtPos(2, 32);
<br> break;
<br> case 91:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x8000000L);
<br> case 68:
<br> case 100:
<br>- return jjMoveStringLiteralDfa3_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa3_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(1, active0);
<br>+ return jjStartNfa_13(1, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa3_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa3_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(1, old0);
<br>+ return jjStartNfa_13(1, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(2, active0);
<br>+ jjStopStringLiteralDfa_13(2, active0);
<br> return 3;
<br> }
<br> switch(curChar)
<br>@@ -1561,110 +729,110 @@
<br> break;
<br> case 67:
<br> case 99:
<br>- return jjMoveStringLiteralDfa4_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa4_13(active0, 0x8000000L);
<br> case 79:
<br> case 111:
<br>- return jjMoveStringLiteralDfa4_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa4_13(active0, 0x4000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(2, active0);
<br>+ return jjStartNfa_13(2, active0);
<br> }
<br>-private int jjMoveStringLiteralDfa4_12(long old0, long active0)
<br>+private int jjMoveStringLiteralDfa4_13(long old0, long active0)
<br> {
<br> if (((active0 &= old0)) == 0L)
<br>- return jjStartNfa_12(2, old0);
<br>+ return jjStartNfa_13(2, old0);
<br> try { curChar = input_stream.readChar(); }
<br> catch(java.io.IOException e) {
<br>- jjStopStringLiteralDfa_12(3, active0);
<br>+ jjStopStringLiteralDfa_13(3, active0);
<br> return 4;
<br> }
<br> switch(curChar)
<br> {
<br> case 67:
<br> case 99:
<br>- return jjMoveStringLiteralDfa5_12(active0, 0x4000000L);
<br>+ return jjMoveStringLiteralDfa5_13(active0, 0x4000000L);
<br> case 68:
<br> case 100:
<br>- return jjMoveStringLiteralDfa5_12(active0, 0x8000000L);
<br>+ return jjMoveStringLiteralDfa5_13(active0, 0x8000000L);
<br> default :
<br> break;
<br> }
<br>- return jjStartNfa_12(3, active0);
<br><br>@@ Diff output truncated at 100000 characters. @@
<br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660100&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26657484
SF.net SVN: pmd:[7014] trunk/pmd-jedit/PMDPlugin
2009-12-05T09:25:19Z
2009-12-05T09:25:19Z
daleanson
Revision: 7014
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7014&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7014&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-05 17:25:18 +0000 (Sat, 05 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Put hard-coded strings in properties file so they can be localized.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd-jedit/PMDPlugin/PMDPlugin.props
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDDuplicateCodeViewer.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDGeneralOptionPane.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDRulesOptionPane.java
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/SelectedRules.java
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/PMDPlugin.props
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/PMDPlugin.props 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/PMDPlugin.props 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -8,8 +8,11 @@
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.0=jdk 1.5
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.1=jedit 04.03.18.00
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.2=plugin errorlist.ErrorListPlugin 1.8
<br>+plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.depend.3=plugin CommonControlsPlugin 1.1
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.jars=pmd-4.2.5.jar jaxen-1.1.1.jar asm-3.1.jar
<br> plugin.net.sourceforge.pmd.jedit.PMDJEditPlugin.description=The PMD plugin is a Java source code analysis tool.
<br>+
<br>+
<br> #
<br> # Menu properties
<br> #
<br>@@ -71,4 +74,41 @@
<br>
<br>
<br>
<br>+# various strings
<br>+net.sf.pmd.CPD,_Select_File_Type=CPD, Select File Type
<br>+net.sf.pmd.CPD_does_not_yet_support_this_file_type>_=CPD does not yet support this file type:
<br>+net.sf.pmd.Cannot_run_CPD_on_Invalid_directory/files.=Cannot run CPD on Invalid directory/files.
<br>+net.sf.pmd.Copy/Paste_Detector=Copy/Paste Detector
<br>+net.sf.pmd.Copy/Paste_detection_can_not_be_performed_on_this_file\nbecause_the_mode_can_not_be_determined.=Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined.
<br>+net.sf.pmd.Description=Description
<br>+net.sf.pmd.Error_Loading_Custom_Ruleset=Error Loading Custom Ruleset
<br>+net.sf.pmd.Error_Loading_Rules=Error Loading Rules
<br>+net.sf.pmd.Error_loading_rules._Check_any_custom_rulesets_for_errors.=Error loading rules. Check any custom rulesets for errors.
<br>+net.sf.pmd.Error_while_processing_=Error while processing
<br>+net.sf.pmd.Example=Example
<br>+net.sf.pmd.Export_Output_as_=Export Output as
<br>+net.sf.pmd.Ignore_Literals_&_identifiers_when_detecting_Duplicate_Code=Ignore Literals & identifiers when detecting Duplicate Code
<br>+net.sf.pmd.Invalid_Renderer=Invalid Renderer
<br>+net.sf.pmd.Minimum_Tile_Size>=Minimum Tile Size:
<br>+net.sf.pmd.Minimum_Tile_size_>=Minimum Tile size :
<br>+net.sf.pmd.No_duplicates_found.=No duplicates found.
<br>+net.sf.pmd.No_problems_found=No problems found
<br>+net.sf.pmd.One_Directory_has_to_be_selected_in_which_to_detect_duplicate_code.=One Directory has to be selected in which to detect duplicate code.
<br>+net.sf.pmd.One_file_must_be_selected=One file must be selected
<br>+net.sf.pmd.PMD_Check_in_Progress=PMD Check in Progress
<br>+net.sf.pmd.PMD_General_Options=PMD General Options
<br>+net.sf.pmd.Please_see_http>//pmd.sf.net/_for_more_information=Please see <a href="http://pmd.sf.net/" target="_top" rel="nofollow">http://pmd.sf.net/</a> for more information
<br>+net.sf.pmd.Print_Rulename_in_ErrorList=Print Rulename in ErrorList
<br>+net.sf.pmd.Recursive=Recursive
<br>+net.sf.pmd.Rules=Rules
<br>+net.sf.pmd.Run_PMD_on_Save=Run PMD on Save
<br>+net.sf.pmd.Select_default_rules=Select default rules
<br>+net.sf.pmd.Select_type_of_files_to_check>=Select type of files to check:
<br>+net.sf.pmd.Selected_file_cannot_be_a_Directory.=Selected file cannot be a Directory.
<br>+net.sf.pmd.Selected_file_must_be_a_Directory.=Selected file must be a Directory.
<br>+net.sf.pmd.Selection_must_be_a_directory=Selection must be a directory
<br>+net.sf.pmd.Selection_not_a_directory.=Selection not a directory.
<br>+net.sf.pmd.Show_PMD_Progress_Bar=Show PMD Progress Bar
<br>+net.sf.pmd.There_was_an_error_loading_one_or_more_custom_rulesets,_so_no_custom_rulesets_were_loaded=There was an error loading one or more custom rulesets, so no custom rulesets were loaded
<br>+net.sf.pmd.Unable_to_find_rulesets,_halting_PMD=Unable to find rulesets, halting PMD
<br>
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDDuplicateCodeViewer.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDDuplicateCodeViewer.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDDuplicateCodeViewer.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -26,167 +26,141 @@
<br> *
<br> */
<br>
<br>-public class CPDDuplicateCodeViewer extends JPanel
<br>-{
<br>- JTree tree;
<br>- DefaultTreeModel treeModel = new DefaultTreeModel(new DefaultMutableTreeNode("CPD Results",true));
<br>- View view;
<br>+public class CPDDuplicateCodeViewer extends JPanel {
<br>+ JTree tree;
<br>+ DefaultTreeModel treeModel = new DefaultTreeModel( new DefaultMutableTreeNode( "CPD Results", true ) );
<br>+ View view;
<br>
<br>- public CPDDuplicateCodeViewer(View view)
<br>- {
<br>- this.view = view;
<br>- setLayout(new BorderLayout());
<br>- tree = new JTree(treeModel);
<br>- tree.getSelectionModel().setSelectionMode
<br>- (TreeSelectionModel.SINGLE_TREE_SELECTION);
<br>- tree.addTreeSelectionListener(new TreeSelectionListener()
<br>- {
<br>- public void valueChanged(TreeSelectionEvent e)
<br>- {
<br>- DefaultMutableTreeNode node = (DefaultMutableTreeNode)tree.getLastSelectedPathComponent();
<br>- if (node != null)
<br>- {
<br>- //System.out.println("Node is " + node +" class "+ node.getClass());
<br>- if (node.isLeaf() && node instanceof Duplicate)
<br>- {
<br>- Duplicate duplicate = (Duplicate)node;
<br>- gotoDuplicate(duplicate);
<br>- //System.out.println("Got!! " + duplicate);
<br>- }
<br>- }
<br>- }
<br>- });
<br>+ public CPDDuplicateCodeViewer( View view ) {
<br>+ this.view = view;
<br>+ setLayout( new BorderLayout() );
<br>+ tree = new JTree( treeModel );
<br>+ tree.getSelectionModel().setSelectionMode
<br>+ ( TreeSelectionModel.SINGLE_TREE_SELECTION );
<br>+ tree.addTreeSelectionListener(
<br>+ new TreeSelectionListener() {
<br>+ public void valueChanged( TreeSelectionEvent e ) {
<br>+ DefaultMutableTreeNode node = ( DefaultMutableTreeNode ) tree.getLastSelectedPathComponent();
<br>+ if ( node != null ) {
<br>+ //System.out.println("Node is " + node +" class "+ node.getClass());
<br>+ if ( node.isLeaf() && node instanceof Duplicate ) {
<br>+ Duplicate duplicate = ( Duplicate ) node;
<br>+ gotoDuplicate( duplicate );
<br>+ //System.out.println("Got!! " + duplicate);
<br>+ }
<br>+ }
<br>+ }
<br>+ }
<br>+ );
<br>
<br>
<br>- add(new JScrollPane(tree));
<br>+ add( new JScrollPane( tree ) );
<br>
<br>- }//End of CPDDuplicateCodeViewer constructor
<br>+ } //End of CPDDuplicateCodeViewer constructor
<br>
<br>
<br>- public void refreshTree()
<br>- {
<br>- treeModel.reload();
<br>- }
<br>+ public void refreshTree() {
<br>+ treeModel.reload();
<br>+ }
<br>
<br>- public void gotoDuplicate(final Duplicate duplicate)
<br>- {
<br>- if(duplicate != null)
<br>- {
<br>- final Buffer buffer = jEdit.openFile(view,duplicate.getFilename());
<br>+ public void gotoDuplicate( final Duplicate duplicate ) {
<br>+ if ( duplicate != null ) {
<br>+ final Buffer buffer = jEdit.openFile( view, duplicate.getFilename() );
<br>
<br>- VFSManager.runInAWTThread(new Runnable()
<br>- {
<br>- public void run()
<br>- {
<br>- view.setBuffer(buffer);
<br>+ VFSManager.runInAWTThread(
<br>+ new Runnable() {
<br>+ public void run() {
<br>+ view.setBuffer( buffer );
<br>
<br>- int start = buffer.getLineStartOffset(duplicate.getBeginLine()-1);
<br>- int end = buffer.getLineEndOffset(duplicate.getEndLine());
<br>- //Log.log(Log.DEBUG, this.getClass(), "Start Line "+ duplicate.getBeginLine() + " End Line "+ duplicate.getEndLine() + " Start " + start + " End "+ end);
<br>- //Since an AIOOB Exception is thrown if the end is the end of file. we do a -1 from end to fix it.
<br>- view.getTextArea().setSelection(new Selection.Range(start,end-1));
<br>- view.getTextArea().moveCaretPosition(start);
<br>- }
<br>- });
<br>- }
<br>- }
<br>+ int start = buffer.getLineStartOffset( duplicate.getBeginLine() - 1 );
<br>+ int end = buffer.getLineEndOffset( duplicate.getEndLine() );
<br>+ //Log.log(Log.DEBUG, this.getClass(), "Start Line "+ duplicate.getBeginLine() + " End Line "+ duplicate.getEndLine() + " Start " + start + " End "+ end);
<br>+ //Since an AIOOB Exception is thrown if the end is the end of file. we do a -1 from end to fix it.
<br>+ view.getTextArea().setSelection( new Selection.Range( start, end - 1 ) );
<br>+ view.getTextArea().moveCaretPosition( start );
<br>+ }
<br>+ }
<br>+ );
<br>+ }
<br>+ }
<br>
<br>- public DefaultMutableTreeNode getRoot()
<br>- {
<br>- return (DefaultMutableTreeNode)treeModel.getRoot();
<br>- }
<br>+ public DefaultMutableTreeNode getRoot() {
<br>+ return ( DefaultMutableTreeNode ) treeModel.getRoot();
<br>+ }
<br>
<br>- public void addDuplicates(Duplicates duplicates)
<br>- {
<br>- //System.out.println("Inside addDuplicates " + duplicates +" Root child count "+ treeModel.getChildCount(treeModel.getRoot()));
<br>- getRoot().add(duplicates);
<br>- //vecDuplicates.addElement(duplicates);
<br>- }
<br>+ public void addDuplicates( Duplicates duplicates ) {
<br>+ //System.out.println("Inside addDuplicates " + duplicates +" Root child count "+ treeModel.getChildCount(treeModel.getRoot()));
<br>+ getRoot().add( duplicates );
<br>+ //vecDuplicates.addElement(duplicates);
<br>+ }
<br>
<br>- public class Duplicates extends DefaultMutableTreeNode
<br>- {
<br>- //List vecduplicate = new ArrayList();
<br>- String message, sourcecode;
<br>+ public class Duplicates extends DefaultMutableTreeNode {
<br>+ //List vecduplicate = new ArrayList();
<br>+ String message, sourcecode;
<br>
<br>- public Duplicates(String message, String sourcecode)
<br>- {
<br>- this.message = message;
<br>- this.sourcecode = sourcecode;
<br>- }
<br>+ public Duplicates( String message, String sourcecode ) {
<br>+ this.message = message;
<br>+ this.sourcecode = sourcecode;
<br>+ }
<br>
<br>- public String getSourceCode()
<br>- {
<br>- return sourcecode;
<br>- }
<br>+ public String getSourceCode() {
<br>+ return sourcecode;
<br>+ }
<br>
<br>- public void addDuplicate(Duplicate duplicate)
<br>- {
<br>- add(duplicate);
<br>- //vecduplicate.addElement(duplicate);
<br>- }
<br>+ public void addDuplicate( Duplicate duplicate ) {
<br>+ add( duplicate );
<br>+ //vecduplicate.addElement(duplicate);
<br>+ }
<br>
<br>- public String toString()
<br>- {
<br>- return message;
<br>- }
<br>- }
<br>+ public String toString() {
<br>+ return message;
<br>+ }
<br>+ }
<br>
<br>- public class Duplicate extends DefaultMutableTreeNode
<br>- {
<br>- private final String filename;
<br>- private final int beginLine, endLine;
<br>+ public class Duplicate extends DefaultMutableTreeNode {
<br>+ private final String filename;
<br>+ private final int beginLine, endLine;
<br>
<br>- public Duplicate(String filename,int beginLine, int endLine)
<br>- {
<br>- this.filename = filename;
<br>- this.beginLine = beginLine;
<br>- this.endLine = endLine;
<br>- }
<br>+ public Duplicate( String filename, int beginLine, int endLine ) {
<br>+ this.filename = filename;
<br>+ this.beginLine = beginLine;
<br>+ this.endLine = endLine;
<br>+ }
<br>
<br>- public String getFilename()
<br>- {
<br>- return filename;
<br>- }
<br>+ public String getFilename() {
<br>+ return filename;
<br>+ }
<br>
<br>- public int getBeginLine()
<br>- {
<br>- return beginLine;
<br>- }
<br>+ public int getBeginLine() {
<br>+ return beginLine;
<br>+ }
<br>
<br>- public int getEndLine()
<br>- {
<br>- return endLine;
<br>- }
<br>+ public int getEndLine() {
<br>+ return endLine;
<br>+ }
<br>
<br>- public String toString()
<br>- {
<br>- return filename + ":"+ (getBeginLine())+"-"+(getEndLine());
<br>- }
<br>- }
<br>+ public String toString() {
<br>+ return filename + ":" + ( getBeginLine() ) + "-" + ( getEndLine() );
<br>+ }
<br>+ }
<br>
<br>- public void expandAll()
<br>- {
<br>- int row = 0;
<br>- while (row < tree.getRowCount())
<br>- {
<br>- tree.expandRow(row);
<br>- row++;
<br>- }
<br>- }
<br>+ public void expandAll() {
<br>+ int row = 0;
<br>+ while ( row < tree.getRowCount() ) {
<br>+ tree.expandRow( row );
<br>+ row++;
<br>+ }
<br>+ }
<br>
<br>- public void collapseAll()
<br>- {
<br>- int row = tree.getRowCount() - 1;
<br>- while (row >= 0) {
<br>- tree.collapseRow(row);
<br>- row--;
<br>- }
<br>- }
<br>+ public void collapseAll() {
<br>+ int row = tree.getRowCount() - 1;
<br>+ while ( row >= 0 ) {
<br>+ tree.collapseRow( row );
<br>+ row--;
<br>+ }
<br>+ }
<br>
<br>- public void clearDuplicates()
<br>- {
<br>- getRoot().removeAllChildren();
<br>- }
<br>-
<br>-}//End of class CPDDuplicateCodeViewer
<br>-
<br>+ public void clearDuplicates() {
<br>+ getRoot().removeAllChildren();
<br>+ }
<br>+}
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/CPDFileFilter.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -44,7 +44,7 @@
<br>
<br> // get the file name extension
<br> String name = f.getName();
<br>- int index = name.lastIndexOf(".");
<br>+ int index = name.lastIndexOf('.');
<br> if (index == -1) {
<br> return false;
<br> }
<br>@@ -71,4 +71,8 @@
<br> public String getMode() {
<br> return mode;
<br> }
<br>+
<br>+ public String toString() {
<br>+ return description;
<br>+ }
<br> }
<br>\ No newline at end of file
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDGeneralOptionPane.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDGeneralOptionPane.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDGeneralOptionPane.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -44,16 +44,16 @@
<br>
<br> javaVersionBox = new JComboBox( PMDJEditPlugin.sourceTypes );
<br>
<br>- chkRunPMDOnSave = new JCheckBox( "Run PMD on Save", jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE ) );
<br>- chkShowProgressBar = new JCheckBox( "Show PMD Progress Bar", jEdit.getBooleanProperty( PMDJEditPlugin.SHOW_PROGRESS ) );
<br>- chkIgnoreLiterals = new JCheckBox( "Ignore Literals & identifiers when detecting Duplicate Code", jEdit.getBooleanProperty( PMDJEditPlugin.IGNORE_LITERALS ) );
<br>- chkPrintRule = new JCheckBox( "Print Rulename in ErrorList", jEdit.getBooleanProperty( PMDJEditPlugin.PRINT_RULE ) );
<br>+ chkRunPMDOnSave = new JCheckBox( jEdit.getProperty("net.sf.pmd.Run_PMD_on_Save", "Run PMD on Save"), jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE ) );
<br>+ chkShowProgressBar = new JCheckBox( jEdit.getProperty("net.sf.pmd.Show_PMD_Progress_Bar", "Show PMD Progress Bar"), jEdit.getBooleanProperty( PMDJEditPlugin.SHOW_PROGRESS ) );
<br>+ chkIgnoreLiterals = new JCheckBox( jEdit.getProperty("net.sf.pmd.Ignore_Literals_&_identifiers_when_detecting_Duplicate_Code", "Ignore Literals & identifiers when detecting Duplicate Code"), jEdit.getBooleanProperty( PMDJEditPlugin.IGNORE_LITERALS ) );
<br>+ chkPrintRule = new JCheckBox( jEdit.getProperty("net.sf.pmd.Print_Rulename_in_ErrorList", "Print Rulename in ErrorList"), jEdit.getBooleanProperty( PMDJEditPlugin.PRINT_RULE ) );
<br>
<br> JPanel pnlSouth = new JPanel( new GridLayout( 0, 1 ) );
<br>
<br> JPanel pnlTileSize = new JPanel();
<br> ( ( FlowLayout ) pnlTileSize.getLayout() ).setAlignment( FlowLayout.LEFT );
<br>- JLabel lblMinTileSize = new JLabel( "Minimum Tile Size :" );
<br>+ JLabel lblMinTileSize = new JLabel( jEdit.getProperty("net.sf.pmd.Minimum_Tile_Size>", "Minimum Tile Size:") );
<br> txtMinTileSize = new JTextField( jEdit.getProperty( PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY, "100" ), 5 );
<br> pnlTileSize.add( lblMinTileSize );
<br> pnlTileSize.add( txtMinTileSize );
<br>@@ -62,7 +62,7 @@
<br> }
<br> );
<br> comboRenderer.setSelectedItem( jEdit.getProperty( PMDJEditPlugin.RENDERER ) );
<br>- JLabel lblRenderer = new JLabel( "Export Output as " );
<br>+ JLabel lblRenderer = new JLabel( jEdit.getProperty("net.sf.pmd.Export_Output_as_", "Export Output as ") );
<br>
<br> pnlTileSize.add( lblRenderer );
<br> pnlTileSize.add( comboRenderer );
<br>@@ -74,7 +74,7 @@
<br>
<br> JPanel mainPanel = new JPanel();
<br> mainPanel.setLayout( new BorderLayout() );
<br>- mainPanel.add(new JLabel("PMD General Options"), BorderLayout.NORTH);
<br>+ mainPanel.add(new JLabel(jEdit.getProperty("net.sf.pmd.PMD_General_Options", "PMD General Options")), BorderLayout.NORTH);
<br>
<br> pnlSouth.add( javaVersionBox );
<br> pnlSouth.add( chkRunPMDOnSave );
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -128,7 +128,7 @@
<br> chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
<br>
<br> JPanel pnlAccessory = new JPanel();
<br>- JCheckBox chkRecursive = new JCheckBox( "Recursive", jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty("net.sf.pmd.Recursive", "Recursive"), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br> pnlAccessory.add( chkRecursive );
<br> chooser.setAccessory( pnlAccessory );
<br>
<br>@@ -141,7 +141,7 @@
<br> selectedFile = chooser.getSelectedFile();
<br>
<br> if ( !selectedFile.isDirectory() ) {
<br>- JOptionPane.showMessageDialog( view, "Selection not a directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_not_a_directory.", "Selection not a directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -213,7 +213,7 @@
<br> // only show popup if run on save is NOT selected, otherwise it is annoying
<br> boolean run_on_save = jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE );
<br> if ( !run_on_save ) {
<br>- JOptionPane.showMessageDialog( view, "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.No_problems_found", "No problems found"), NAME, JOptionPane.INFORMATION_MESSAGE );
<br> }
<br> errorSource.clear();
<br> }
<br>@@ -238,7 +238,7 @@
<br> Log.log( Log.ERROR, this, "RuleSet not found", rsne );
<br> }
<br> catch ( PMDException pmde ) {
<br>- String msg = "Error while processing " + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br>+ String msg = jEdit.getProperty("net.sf.pmd.Error_while_processing_", "Error while processing ") + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br> Log.log( Log.ERROR, this, msg, pmde );
<br> JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>@@ -285,7 +285,7 @@
<br> catch ( RuleSetNotFoundException rsne ) {
<br> // should never happen since rulesets are fetched via getRegisteredRuleSet, nonetheless:
<br> Log.log( Log.ERROR, this, "PMD ERROR: Couldn't find a ruleset", rsne );
<br>- JOptionPane.showMessageDialog( jEdit.getFirstView(), "Unable to find rulesets, halting PMD", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty("net.sf.pmd.Unable_to_find_rulesets,_halting_PMD", "Unable to find rulesets, halting PMD"), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -314,7 +314,7 @@
<br> Log.log( Log.ERROR, this, "PMD ERROR: Unable to open file " + file.getAbsolutePath(), fnfe );
<br> }
<br> catch ( PMDException pmde ) {
<br>- String msg = "Error while processing " + file.getAbsolutePath() + ":\n" + pmde.getMessage();
<br>+ String msg = jEdit.getProperty("net.sf.pmd.Error_while_processing_", "Error while processing ") + file.getAbsolutePath() + ":\n" + pmde.getMessage();
<br> Log.log( Log.ERROR, this, msg, pmde );
<br> JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>@@ -325,7 +325,7 @@
<br> }
<br>
<br> if ( !foundProblems ) {
<br>- JOptionPane.showMessageDialog( jEdit.getFirstView(), "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), jEdit.getProperty("net.sf.pmd.No_problems_found", "No problems found"), NAME, JOptionPane.INFORMATION_MESSAGE );
<br> errorSource.clear();
<br> }
<br> else {
<br>@@ -353,7 +353,9 @@
<br> public static void cpdCurrentFile( View view ) throws IOException {
<br> String modeName = getFileType( view.getBuffer().getMode().getName() );
<br> if ( modeName == null ) {
<br>- JOptionPane.showMessageDialog( view, "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined.", "Copy/Paste Detector", JOptionPane.INFORMATION_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view,
<br>+ jEdit.getProperty("net.sf.pmd.Copy/Paste_detection_can_not_be_performed_on_this_file\nbecause_the_mode_can_not_be_determined.", "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined."),
<br>+ jEdit.getProperty("net.sf.pmd.Copy/Paste_Detector", "Copy/Paste Detector"), JOptionPane.INFORMATION_MESSAGE );
<br> return ;
<br> }
<br> instance.instanceCPDCurrentFile( view, view.getBuffer().getPath(), modeName );
<br>@@ -363,12 +365,12 @@
<br> VFSFile selectedFile[] = browser.getSelectedFiles();
<br>
<br> if ( selectedFile == null || selectedFile.length == 0 ) {
<br>- JOptionPane.showMessageDialog( view, "One file must be selected", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.One_file_must_be_selected", "One file must be selected"), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br> if ( selectedFile[ 0 ].getType() == VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, "Selected file cannot be a Directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selected_file_cannot_be_a_Directory.", "Selected file cannot be a Directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br> String path = selectedFile[ 0 ].getPath();
<br>@@ -400,7 +402,7 @@
<br> view.getDockableWindowManager().showDockableWindow( "cpd-viewer" );
<br> }
<br> else {
<br>- view.getStatus().setMessageAndClear( "CPD does not yet support this file type: " + fileType );
<br>+ view.getStatus().setMessageAndClear( jEdit.getProperty("net.sf.pmd.CPD_does_not_yet_support_this_file_type>_", "CPD does not yet support this file type: ") + fileType );
<br> return ;
<br> }
<br> }
<br>@@ -413,11 +415,11 @@
<br> JPanel pnlAccessory = new JPanel();
<br> pnlAccessory.setLayout(new KappaLayout());
<br>
<br>- JLabel lblMinTileSize = new JLabel( "Minimum Tile size :" );
<br>+ JLabel lblMinTileSize = new JLabel( jEdit.getProperty("net.sf.pmd.Minimum_Tile_size_>", "Minimum Tile size :") );
<br> JTextField txttilesize = new JTextField( 3 );
<br> txttilesize.setText( jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ) + "" );
<br>
<br>- JCheckBox chkRecursive = new JCheckBox( "Recursive", jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ JCheckBox chkRecursive = new JCheckBox( jEdit.getProperty("net.sf.pmd.Recursive", "Recursive"), jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>
<br> JComboBox fileTypeSelector = new JComboBox();
<br> fileTypeSelector.setEditable( false );
<br>@@ -448,7 +450,7 @@
<br> mode = ( ( CPDFileFilter ) fileTypeSelector.getSelectedItem() ).getMode();
<br>
<br> if ( !selectedFile.isDirectory() ) {
<br>- JOptionPane.showMessageDialog( view, "Selection not a directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_not_a_directory.", "Selection not a directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -482,12 +484,12 @@
<br> if ( view != null && browser != null ) {
<br> VFSFile selectedDir[] = browser.getSelectedFiles();
<br> if ( selectedDir == null || selectedDir.length == 0 ) {
<br>- JOptionPane.showMessageDialog( view, "One Directory has to be selected in which to detect duplicate code.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.One_Directory_has_to_be_selected_in_which_to_detect_duplicate_code.", "One Directory has to be selected in which to detect duplicate code."), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br> if ( selectedDir[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, "Selected file must be a Directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selected_file_must_be_a_Directory.", "Selected file must be a Directory."), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -502,7 +504,10 @@
<br> choices[6] = new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" );
<br> choices[7] = new CPDFileFilter( "any", "All", "*" );
<br>
<br>- Object choice = JOptionPane.showInputDialog(view, "Select type of files to check:", "CPD, Select File Type", JOptionPane.OK_CANCEL_OPTION, null, choices, choices[0]);
<br>+ Object choice = JOptionPane.showInputDialog(view,
<br>+ jEdit.getProperty("net.sf.pmd.Select_type_of_files_to_check>", "Select type of files to check:"),
<br>+ jEdit.getProperty("net.sf.pmd.CPD,_Select_File_Type", "CPD, Select File Type"),
<br>+ JOptionPane.OK_CANCEL_OPTION, null, choices, choices[0]);
<br> if ( choice == null ) {
<br> return;
<br> }
<br>@@ -531,7 +536,7 @@
<br> instance.processDuplicates( cpd, view );
<br> }
<br> else {
<br>- view.getStatus().setMessageAndClear( "Cannot run CPD on Invalid directory/files." );
<br>+ view.getStatus().setMessageAndClear( jEdit.getProperty("net.sf.pmd.Cannot_run_CPD_on_Invalid_directory/files.", "Cannot run CPD on Invalid directory/files.") );
<br> return ;
<br> }
<br> }
<br>@@ -567,7 +572,7 @@
<br> }
<br>
<br> if ( !foundDuplicates ) {
<br>- dv.getRoot().add( new DefaultMutableTreeNode( "No duplicates found.", false ) );
<br>+ dv.getRoot().add( new DefaultMutableTreeNode( jEdit.getProperty("net.sf.pmd.No_duplicates_found.", "No duplicates found."), false ) );
<br> }
<br>
<br> dv.refreshTree();
<br>@@ -603,7 +608,7 @@
<br> VFSFile de[] = browser.getSelectedFiles();
<br>
<br> if ( de == null || de.length == 0 || de[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>- JOptionPane.showMessageDialog( view, "Selection must be a directory", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Selection_must_be_a_directory", "Selection must be a directory"), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -644,7 +649,7 @@
<br> renderer = new TextRenderer();
<br> }
<br> else {
<br>- JOptionPane.showMessageDialog( view, "Invalid Renderer", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( view, jEdit.getProperty("net.sf.pmd.Invalid_Renderer", "Invalid Renderer"), NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>
<br>@@ -693,7 +698,7 @@
<br>
<br> );
<br> pBar.setBorder( new EtchedBorder( EtchedBorder.RAISED ) );
<br>- pBar.setToolTipText( "PMD Check in Progress" );
<br>+ pBar.setToolTipText( jEdit.getProperty("net.sf.pmd.PMD_Check_in_Progress", "PMD Check in Progress") );
<br> pBar.setForeground( jEdit.getColorProperty( "pmd.progressbar.background" ) );
<br> pBar.setBackground( jEdit.getColorProperty( "view.status.background" ) );
<br>
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDRulesOptionPane.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDRulesOptionPane.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDRulesOptionPane.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -49,8 +49,8 @@
<br>
<br> setLayout( new KappaLayout() );
<br>
<br>- JLabel rules_label = new JLabel( "Rules" );
<br>- useDefaultRules = new JCheckBox( "Select default rules" );
<br>+ JLabel rules_label = new JLabel( jEdit.getProperty("net.sf.pmd.Rules", "Rules") );
<br>+ useDefaultRules = new JCheckBox( jEdit.getProperty("net.sf.pmd.Select_default_rules", "Select default rules") );
<br> useDefaultRules.setSelected( jEdit.getBooleanProperty( USE_DEFAULT_RULES_KEY, false ) );
<br>
<br> // use a checkbox tree for displaying the rules. This lets the rules be
<br>@@ -62,7 +62,10 @@
<br> // is checked.
<br> JScrollPane rules_pane = null;
<br> if ( rules == null ) {
<br>- JOptionPane.showMessageDialog( null, "Error loading rules. Check any custom rulesets for errors.", "Error Loading Rules", JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( null,
<br>+ jEdit.getProperty("net.sf.pmd.Error_loading_rules._Check_any_custom_rulesets_for_errors.", "Error loading rules. Check any custom rulesets for errors."),
<br>+ jEdit.getProperty("net.sf.pmd.Error_Loading_Rules", "Error Loading Rules"),
<br>+ JOptionPane.ERROR_MESSAGE );
<br> }
<br> else {
<br> if ( jEdit.getBooleanProperty( USE_DEFAULT_RULES_KEY, false ) ) {
<br>@@ -109,10 +112,10 @@
<br> rulesPanel.add( pnlCustomRules, BorderLayout.SOUTH );
<br> */
<br>
<br>- exampleLabel = new JLabel( "Example" );
<br>+ exampleLabel = new JLabel( jEdit.getProperty("net.sf.pmd.Example", "Example") );
<br> JScrollPane example_pane = new JScrollPane( exampleTextArea );
<br>
<br>- JLabel more_info_label = new JLabel( "Please see <a href="http://pmd.sf.net/" target="_top" rel="nofollow">http://pmd.sf.net/</a> for more information" );
<br>+ JLabel more_info_label = new JLabel( jEdit.getProperty("net.sf.pmd.Please_see_http>//pmd.sf.net/_for_more_information", "Please see <a href="http://pmd.sf.net/" target="_top" rel="nofollow">http://pmd.sf.net/</a> for more information") );
<br>
<br> setBorder( BorderFactory.createEmptyBorder( 12, 11, 11, 12 ) );
<br> add( "0, 0, 1, 1, W, w, 3", rules_label );
<br>@@ -143,7 +146,7 @@
<br> if ( node != null ) {
<br> Object userObject = node.getUserObject();
<br> if ( userObject instanceof RuleNode ) {
<br>- changeExampleLabel( "Example" );
<br>+ changeExampleLabel( jEdit.getProperty("net.sf.pmd.Example", "Example") );
<br> String description = ( ( RuleNode ) userObject ).getRule().getDescription();
<br> description = description.trim();
<br> List<String> examples = ( ( RuleNode ) userObject ).getRule().getExamples();
<br>@@ -153,7 +156,7 @@
<br> exampleTextArea.setCaretPosition( 0 );
<br> }
<br> else if ( userObject instanceof RuleSetNode ) {
<br>- changeExampleLabel( "Description" );
<br>+ changeExampleLabel( jEdit.getProperty("net.sf.pmd.Description", "Description") );
<br> String description = ( ( RuleSetNode ) userObject ).getRuleSet().getDescription();
<br> description = description.trim();
<br> description = description.replaceAll( "\n", " " );
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/SelectedRules.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/SelectedRules.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/SelectedRules.java 2009-12-05 17:25:18 UTC (rev 7014)
<br>@@ -146,7 +146,10 @@
<br> }
<br> }
<br> catch ( RuleSetNotFoundException e ) {
<br>- JOptionPane.showMessageDialog( null, "There was an error loading one or more custom rulesets, so no custom rulesets were loaded", "Error Loading Custom Ruleset", JOptionPane.ERROR_MESSAGE );
<br>+ JOptionPane.showMessageDialog( null,
<br>+ jEdit.getProperty("net.sf.pmd.There_was_an_error_loading_one_or_more_custom_rulesets,_so_no_custom_rulesets_were_loaded", "There was an error loading one or more custom rulesets, so no custom rulesets were loaded"),
<br>+ jEdit.getProperty("net.sf.pmd.Error_Loading_Custom_Ruleset", "Error Loading Custom Ruleset"),
<br>+ JOptionPane.ERROR_MESSAGE );
<br> }
<br> return rulesets;
<br> }
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26657484&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26657324
SF.net SVN: pmd:[7013] trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/ jedit/PMDJEditPlugin.java
2009-12-05T09:03:29Z
2009-12-05T09:03:29Z
daleanson
Revision: 7013
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7013&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7013&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-05 17:03:29 +0000 (Sat, 05 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Added dialog to let the user choose the types of files to run CPD against from the VFSBrowser.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-04 17:13:12 UTC (rev 7012)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-05 17:03:29 UTC (rev 7013)
<br>@@ -7,7 +7,6 @@
<br>
<br> import java.awt.BorderLayout;
<br> import java.awt.Color;
<br>-import java.awt.FlowLayout;
<br> import java.io.File;
<br> import java.io.FileInputStream;
<br> import java.io.FileNotFoundException;
<br>@@ -17,13 +16,7 @@
<br> import java.util.List;
<br> import java.util.Properties;
<br>
<br>-import javax.swing.JCheckBox;
<br>-import javax.swing.JFileChooser;
<br>-import javax.swing.JLabel;
<br>-import javax.swing.JOptionPane;
<br>-import javax.swing.JPanel;
<br>-import javax.swing.JProgressBar;
<br>-import javax.swing.JTextField;
<br>+import javax.swing.*;
<br> import javax.swing.border.EtchedBorder;
<br> import javax.swing.plaf.basic.BasicProgressBarUI;
<br> import javax.swing.tree.DefaultMutableTreeNode;
<br>@@ -64,6 +57,8 @@
<br> import errorlist.DefaultErrorSource;
<br> import errorlist.ErrorSource;
<br>
<br>+import ise.java.awt.KappaLayout;
<br>+
<br> /** jEdit plugin for PMD
<br> @version $Id$
<br>
<br>@@ -300,7 +295,7 @@
<br> boolean foundProblems = false;
<br>
<br> for ( File file : files ) {
<br>- ctx.setReport( new Report() );
<br>+ ctx.setReport( new Report() );
<br> ctx.setSourceCodeFilename( file.getAbsolutePath() );
<br>
<br> try {
<br>@@ -413,33 +408,35 @@
<br>
<br> public static void cpdDir( View view ) {
<br> JFileChooser chooser = new JFileChooser( jEdit.getProperty( LAST_DIRECTORY ) );
<br>- chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES );
<br>+ chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
<br>
<br>- // TODO: need to figure out how to create these filters dynamically
<br>- // TODO: check on the AnyLanguage and AnyTokenizer, can they be used for file types that are not specifically supported?
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "javascript", "Javascript files", "js" ) );
<br>- chooser.addChoosableFileFilter( new CPDFileFilter( "java", "Java files", "java" ) );
<br>+ JPanel pnlAccessory = new JPanel();
<br>+ pnlAccessory.setLayout(new KappaLayout());
<br>
<br>- JPanel pnlAccessory = new JPanel( new BorderLayout() );
<br>-
<br>- JPanel pnlTile = new JPanel( new FlowLayout( FlowLayout.LEFT ) );
<br> JLabel lblMinTileSize = new JLabel( "Minimum Tile size :" );
<br> JTextField txttilesize = new JTextField( 3 );
<br> txttilesize.setText( jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ) + "" );
<br>- pnlTile.add( lblMinTileSize );
<br>- pnlTile.add( txttilesize );
<br>- pnlAccessory.add( BorderLayout.NORTH, pnlTile );
<br>
<br>- JPanel pnlRecursive = new JPanel( new FlowLayout( FlowLayout.LEFT ) );
<br> JCheckBox chkRecursive = new JCheckBox( "Recursive", jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>- pnlRecursive.add( chkRecursive );
<br>- pnlAccessory.add( BorderLayout.CENTER, pnlRecursive );
<br>
<br>+ JComboBox fileTypeSelector = new JComboBox();
<br>+ fileTypeSelector.setEditable( false );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "java", "Java files", "java" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "javascript", "Javascript files", "js" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" ) );
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" ) );
<br>+
<br>+ // TODO: the "any" tokenizer doesn't seem to work
<br>+ fileTypeSelector.addItem( new CPDFileFilter( "any", "All", "*" ) );
<br>+
<br>+ pnlAccessory.add( lblMinTileSize, "0, 0, 1, 1, W, , 3" );
<br>+ pnlAccessory.add( txttilesize, "1, 0, 1, 1, W, , 3");
<br>+ pnlAccessory.add( chkRecursive, "0, 1, 2, 1, W, , 3" );
<br>+ pnlAccessory.add( fileTypeSelector,"0, 2, 2, 1, W, , 3" );
<br>+
<br> chooser.setAccessory( pnlAccessory );
<br>
<br> int returnVal = chooser.showOpenDialog( view );
<br>@@ -448,7 +445,7 @@
<br>
<br> if ( returnVal == JFileChooser.APPROVE_OPTION ) {
<br> selectedFile = chooser.getSelectedFile();
<br>- mode = ( ( CPDFileFilter ) chooser.getFileFilter() ).getMode();
<br>+ mode = ( ( CPDFileFilter ) fileTypeSelector.getSelectedItem() ).getMode();
<br>
<br> if ( !selectedFile.isDirectory() ) {
<br> JOptionPane.showMessageDialog( view, "Selection not a directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>@@ -464,7 +461,6 @@
<br> tilesize = jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 );
<br> }
<br>
<br>-
<br> try {
<br> jEdit.setBooleanProperty( CHECK_DIR_RECURSIVE, chkRecursive.isSelected() );
<br> instance.instanceCPDDir( view, selectedFile.getCanonicalPath(), tilesize, chkRecursive.isSelected(), mode );
<br>@@ -474,7 +470,14 @@
<br> }
<br> }
<br> }
<br>-
<br>+
<br>+ /**
<br>+ * Run CPD on a directory selected from the File System Browser.
<br>+ * @param view The current view.
<br>+ * @param browser The file system browser supplying the user selecte directory to check.
<br>+ * @param recursive If true, check all files in the selected directory and all child
<br>+ * directories, otherwise, just check the files in the selected directory only.
<br>+ */
<br> public static void cpdDir( View view, VFSBrowser browser, boolean recursive ) throws IOException {
<br> if ( view != null && browser != null ) {
<br> VFSFile selectedDir[] = browser.getSelectedFiles();
<br>@@ -487,7 +490,27 @@
<br> JOptionPane.showMessageDialog( view, "Selected file must be a Directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br> return ;
<br> }
<br>- instance.instanceCPDDir( view, selectedDir[ 0 ].getPath(), jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ), recursive, "java" );
<br>+
<br>+ // display chooser for type of files to check
<br>+ Object[] choices = new Object[8];
<br>+ choices[0] = new CPDFileFilter( "java", "Java files", "java" );
<br>+ choices[1] = new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" );
<br>+ choices[2] = new CPDFileFilter( "javascript", "Javascript files", "js" );
<br>+ choices[3] = new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" );
<br>+ choices[4] = new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" );
<br>+ choices[5] = new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" );
<br>+ choices[6] = new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" );
<br>+ choices[7] = new CPDFileFilter( "any", "All", "*" );
<br>+
<br>+ Object choice = JOptionPane.showInputDialog(view, "Select type of files to check:", "CPD, Select File Type", JOptionPane.OK_CANCEL_OPTION, null, choices, choices[0]);
<br>+ if ( choice == null ) {
<br>+ return;
<br>+ }
<br>+ String mode = ((CPDFileFilter)choice).getMode();
<br>+
<br>+ instance.instanceCPDDir( view, selectedDir[ 0 ].getPath(),
<br>+ jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ),
<br>+ recursive, mode );
<br> }
<br> }
<br>
<br>@@ -511,7 +534,7 @@
<br> view.getStatus().setMessageAndClear( "Cannot run CPD on Invalid directory/files." );
<br> return ;
<br> }
<br>- }
<br>+ }
<br> }
<br>
<br> private void processDuplicates( CPD cpd, View view ) {
<br>@@ -538,7 +561,7 @@
<br> CPDDuplicateCodeViewer.Duplicate duplicate = dv.new Duplicate( mark.getTokenSrcID(), mark.getBeginLine(), lastLine ); //NOPMD
<br>
<br> duplicates.addDuplicate( duplicate );
<br>- }
<br>+ }
<br>
<br> dv.addDuplicates( duplicates );
<br> }
<br>@@ -549,7 +572,7 @@
<br>
<br> dv.refreshTree();
<br> dv.expandAll();
<br>- }
<br>+ }
<br>
<br>
<br> public CPDDuplicateCodeViewer getCPDDuplicateCodeViewer( View view ) {
<br>@@ -566,9 +589,9 @@
<br> if ( view != null && de != null ) {
<br> List<File> files = new ArrayList<File>();
<br>
<br>- for (VFSFile file : de) {
<br>+ for ( VFSFile file : de ) {
<br> if ( file.getType() == VFSFile.FILE ) {
<br>- files.add( new File( file.getPath() ) );
<br>+ files.add( new File( file.getPath() ) );
<br> }
<br> }
<br>
<br>@@ -672,7 +695,7 @@
<br> pBar.setBorder( new EtchedBorder( EtchedBorder.RAISED ) );
<br> pBar.setToolTipText( "PMD Check in Progress" );
<br> pBar.setForeground( jEdit.getColorProperty( "pmd.progressbar.background" ) );
<br>- pBar.setBackground( jEdit.getColorProperty( "view.status.background" ) );
<br>+ pBar.setBackground( jEdit.getColorProperty( "view.status.background" ) );
<br>
<br> pBar.setStringPainted( true );
<br> add( pBar, BorderLayout.CENTER );
<br>@@ -695,16 +718,16 @@
<br> private CPD getCPD( int tileSize, String fileType ) {
<br> Language lang;
<br> LanguageFactory lf = new LanguageFactory();
<br>-
<br>+
<br>+ Properties props = new Properties();
<br> if ( "java".equals( fileType ) ) {
<br>- Properties props = new Properties();
<br> props.setProperty( JavaTokenizer.IGNORE_LITERALS, String.valueOf( jEdit.getBooleanProperty( PMDJEditPlugin.IGNORE_LITERALS ) ) );
<br>- lang = lf.createLanguage( "java", props );
<br> }
<br>- else {
<br>- lang = lf.createLanguage( fileType );
<br>+ lang = lf.createLanguage( fileType, props );
<br>+ // TODO: the "any" tokenizer doesn't seem to work
<br>+ if ( lang == null ) {
<br>+ lang = lf.createLanguage( "any", props );
<br> }
<br>-
<br> return lang == null ? null : new CPD( tileSize, lang );
<br> }
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26657324&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26645842
SF.net SVN: pmd:[7012] trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/ jedit/PMDJEditPlugin.java
2009-12-04T09:13:12Z
2009-12-04T09:13:12Z
daleanson
Revision: 7012
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7012&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7012&view=rev</a><br>Author: daleanson
<br>Date: 2009-12-04 17:13:12 +0000 (Fri, 04 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Code clean up.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br><br>Modified: trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
<br>===================================================================
<br>--- trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-04 14:54:59 UTC (rev 7011)
<br>+++ trunk/pmd-jedit/PMDPlugin/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java 2009-12-04 17:13:12 UTC (rev 7012)
<br>@@ -1,8 +1,8 @@
<br> /*
<br>- * User: tom
<br>- * Date: Jul 3, 2002
<br>- * Time: 2:33:24 PM
<br>- */
<br>+* User: tom
<br>+* Date: Jul 3, 2002
<br>+* Time: 2:33:24 PM
<br>+*/
<br> package net.sourceforge.pmd.jedit;
<br>
<br> import java.awt.BorderLayout;
<br>@@ -66,12 +66,13 @@
<br>
<br> /** jEdit plugin for PMD
<br> @version $Id$
<br>+
<br>+ TODO: move strings to property file so they can be localized.
<br> **/
<br>-public class PMDJEditPlugin extends EBPlugin
<br>-{
<br>+public class PMDJEditPlugin extends EBPlugin {
<br>
<br> public static final SourceType[] sourceTypes =
<br>- new SourceType[]{SourceType.JAVA_14, SourceType.JAVA_15, SourceType.JAVA_16};
<br>+ new SourceType[] {SourceType.JAVA_14, SourceType.JAVA_15, SourceType.JAVA_16};
<br> public static final String NAME = "PMD";
<br> public static final String OPTION_RULES_PREFIX = "options.pmd.rules.";
<br> public static final String DEFAULT_TILE_MINSIZE_PROPERTY = "pmd.cpd.defMinTileSize";
<br>@@ -84,285 +85,213 @@
<br> public static final String LAST_DIRECTORY = "pmd.cpd.lastDirectory";
<br> public static final String CHECK_DIR_RECURSIVE = "pmd.checkDirRecursive";
<br>
<br>- //private static RE re = new UncheckedRE("Starting at line ([0-9]*) of (\\S*)");
<br>-
<br> private static PMDJEditPlugin instance;
<br>
<br>- /* static {
<br>- instance = new PMDJEditPlugin();
<br>- instance.start();
<br>- }
<br>- */
<br> private DefaultErrorSource errorSource;
<br> public static final String RENDERER = "pmd.renderer";
<br>
<br>- // boilerplate JEdit code
<br>- public void start()
<br>- {
<br>+ public void start() {
<br> instance = this;
<br> //Log.log(Log.DEBUG,this,"Instance created.");
<br>- errorSource = new DefaultErrorSource(NAME);
<br>- //ErrorSource.registerErrorSource(errorSource);
<br>+ errorSource = new DefaultErrorSource( NAME );
<br> }
<br>
<br>- public void stop()
<br>- {
<br>+ public void stop() {
<br> instance = null;
<br> unRegisterErrorSource();
<br> }
<br>
<br>-
<br>- /* public void createMenuItems(Vector menuItems) {
<br>- menuItems.addElement(GUIUtilities.loadMenu("pmd-menu"));
<br>- }
<br>-
<br>- public void createOptionPanes(OptionsDialog optionsDialog) {
<br>- optionsDialog.addOptionPane(new PMDOptionPane());
<br>- } */
<br>- // boilerplate JEdit code
<br>-
<br>- public static void checkDirectory(View view)
<br>- {
<br>- instance.instanceCheckDirectory(view);
<br>+ public static void checkDirectory( View view ) {
<br>+ instance.instanceCheckDirectory( view );
<br> }
<br>
<br>- public void handleMessage(EBMessage ebmess)
<br>- {
<br>- if (ebmess instanceof BufferUpdate && jEdit.getBooleanProperty(PMDJEditPlugin.RUN_PMD_ON_SAVE))
<br>- {
<br>- BufferUpdate bu = (BufferUpdate)ebmess;
<br>-
<br>- if (bu.getWhat() == BufferUpdate.SAVED)
<br>- {
<br>- if(bu.getBuffer().getMode().getName().equals("java")) //NOPMD
<br>- {
<br>- check(bu.getBuffer(),bu.getView());
<br>- }
<br>+ public void handleMessage( EBMessage ebmess ) {
<br>+ // maybe run PMD on buffer save
<br>+ if ( ebmess instanceof BufferUpdate && jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE ) ) {
<br>+ BufferUpdate bu = ( BufferUpdate ) ebmess;
<br>+ if ( bu.getWhat() == BufferUpdate.SAVED && "java".equals( bu.getBuffer().getMode().getName() ) ) {
<br>+ check( bu.getBuffer(), bu.getView() );
<br> }
<br> }
<br> }
<br>
<br> // check all open buffers
<br>- public static void checkAllOpenBuffers(View view)
<br>- {
<br>- instance.instanceCheckAllOpenBuffers(view);
<br>+ public static void checkAllOpenBuffers( View view ) {
<br>+ instance.instanceCheckAllOpenBuffers( view );
<br> }
<br>
<br>- public static void clearErrorList()
<br>- {
<br>+ public static void clearErrorList() {
<br> instance.instanceClearErrorList();
<br> }
<br>
<br>- public void instanceClearErrorList()
<br>- {
<br>+ public void instanceClearErrorList() {
<br> errorSource.clear();
<br> }
<br>
<br>- public void instanceCheckDirectory(View view)
<br>- {
<br>- JFileChooser chooser = new JFileChooser(jEdit.getProperty(LAST_DIRECTORY));
<br>- chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
<br>+ public void instanceCheckDirectory( View view ) {
<br>+ JFileChooser chooser = new JFileChooser( jEdit.getProperty( LAST_DIRECTORY ) );
<br>+ chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
<br>
<br> JPanel pnlAccessory = new JPanel();
<br>- JCheckBox chkRecursive = new JCheckBox("Recursive", jEdit.getBooleanProperty(CHECK_DIR_RECURSIVE));
<br>- pnlAccessory.add(chkRecursive);
<br>- chooser.setAccessory(pnlAccessory);
<br>+ JCheckBox chkRecursive = new JCheckBox( "Recursive", jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ pnlAccessory.add( chkRecursive );
<br>+ chooser.setAccessory( pnlAccessory );
<br>
<br>- int returnVal = chooser.showOpenDialog(view);
<br>+ int returnVal = chooser.showOpenDialog( view );
<br>
<br>- try
<br>- {
<br>+ try {
<br> File selectedFile = null;
<br>
<br>- if(returnVal == JFileChooser.APPROVE_OPTION)
<br>- {
<br>+ if ( returnVal == JFileChooser.APPROVE_OPTION ) {
<br> selectedFile = chooser.getSelectedFile();
<br>
<br>- if(!selectedFile.isDirectory())
<br>- {
<br>- JOptionPane.showMessageDialog(view,"Selection not a directory.",NAME,JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( !selectedFile.isDirectory() ) {
<br>+ JOptionPane.showMessageDialog( view, "Selection not a directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br>- jEdit.setProperty(LAST_DIRECTORY,selectedFile.getCanonicalPath());
<br>- jEdit.setBooleanProperty(CHECK_DIR_RECURSIVE,chkRecursive.isSelected());
<br>- process(findFiles(selectedFile.getCanonicalPath(), chkRecursive.isSelected()), view);
<br>+ jEdit.setProperty( LAST_DIRECTORY, selectedFile.getCanonicalPath() );
<br>+ jEdit.setBooleanProperty( CHECK_DIR_RECURSIVE, chkRecursive.isSelected() );
<br>+ process( findFiles( selectedFile.getCanonicalPath(), chkRecursive.isSelected() ), view );
<br> }
<br>- else
<br>- {
<br>- return; //Incase the user presses cancel or escape.
<br>+ else {
<br>+ return ; // In case the user presses cancel or escape.
<br> }
<br>-
<br> }
<br>- catch(IOException e)
<br>- {
<br>- Log.log(Log.DEBUG,this,e);
<br>+ catch ( IOException e ) {
<br>+ Log.log( Log.DEBUG, this, e );
<br> }
<br>- }//End of instanceCheckDirectory
<br>+ }
<br>
<br>- public void instanceCheckAllOpenBuffers(View view)
<br>- {
<br>+ public void instanceCheckAllOpenBuffers( View view ) {
<br> // I'm putting the files in a Set to work around some
<br> // odd behavior in jEdit - the buffer.getNext()
<br> // seems to iterate over the files twice.
<br> Buffer buffers[] = jEdit.getBuffers();
<br>
<br>- if(buffers != null)
<br>- {
<br>+ if ( buffers != null ) {
<br> ProgressBar pbd = null;
<br>
<br>- if(jEdit.getBooleanProperty(SHOW_PROGRESS))
<br>- {
<br>- pbd = startProgressBarDisplay(view,0,buffers.length);
<br>+ if ( jEdit.getBooleanProperty( SHOW_PROGRESS ) ) {
<br>+ pbd = startProgressBarDisplay( view, 0, buffers.length );
<br> }
<br>
<br>- for (int i=0; i<buffers.length; i++ )
<br>- {
<br>- if (buffers[i].getName().endsWith(".java"))
<br>- {
<br>- //fileSet.add(buffer.getFile());
<br>- Log.log(Log.DEBUG,this,"checking = " + buffers[i].getPath());
<br>- instanceCheck(buffers[i],view, false);
<br>+ for ( Buffer buffer : buffers ) {
<br>+ if ( buffer.getName().endsWith( ".java" ) ) { // TODO: check mode rather than filename
<br>+ Log.log( Log.DEBUG, this, "checking = " + buffer.getPath() );
<br>+ instanceCheck( buffer, view, false );
<br> }
<br>
<br>- if(pbd != null)
<br>- {
<br>- pbd.increment(1);
<br>+ if ( pbd != null ) {
<br>+ pbd.increment( 1 );
<br> }
<br> }
<br>
<br>- endProgressBarDisplay(pbd);
<br>+ endProgressBarDisplay( pbd );
<br> }
<br>-
<br>- //List files = new ArrayList();
<br>- //files.addAll(fileSet);
<br>- //process(files);
<br> }
<br>
<br>- public void instanceCheck(Buffer buffer, View view, boolean clearErrorList)
<br>- {
<br>- try
<br>- {
<br>+ public void instanceCheck( Buffer buffer, View view, boolean clearErrorList ) {
<br>+ try {
<br> unRegisterErrorSource();
<br>
<br>- if(clearErrorList)
<br>- {
<br>+ if ( clearErrorList ) {
<br> errorSource.clear();
<br> }
<br>
<br> PMD pmd = new PMD();
<br>- int jvidx = jEdit.getIntegerProperty(JAVA_VERSION_PROPERTY, 1);
<br>- pmd.setJavaVersion(sourceTypes[jvidx]);
<br>+ int jvidx = jEdit.getIntegerProperty( JAVA_VERSION_PROPERTY, 1 );
<br>+ pmd.setJavaVersion( sourceTypes[ jvidx ] );
<br> SelectedRules selectedRuleSets = new SelectedRules();
<br> RuleContext ctx = new RuleContext();
<br>- ctx.setReport(new Report());
<br>+ ctx.setReport( new Report() );
<br> String path = buffer.getPath();
<br>- ctx.setSourceCodeFilename(path);
<br>+ ctx.setSourceCodeFilename( path );
<br> VFS vfs = buffer.getVFS();
<br>
<br>- pmd.processFile(vfs._createInputStream(vfs.createVFSSession(path, view), path, false, view),
<br>- System.getProperty("file.encoding"),
<br>+ pmd.processFile( vfs._createInputStream( vfs.createVFSSession( path, view ), path, false, view ),
<br>+ System.getProperty( "file.encoding" ),
<br> selectedRuleSets.getSelectedRules(),
<br>- ctx);
<br>+ ctx );
<br>
<br>- if (ctx.getReport().isEmpty())
<br>- {
<br>- /// danson, this is annoying if 'Run PMD on Save' is checked
<br>+ if ( ctx.getReport().isEmpty() ) {
<br>+ // only show popup if run on save is NOT selected, otherwise it is annoying
<br> boolean run_on_save = jEdit.getBooleanProperty( PMDJEditPlugin.RUN_PMD_ON_SAVE );
<br>- if (!run_on_save) {
<br>- // TODO: put string in properties file
<br>- JOptionPane.showMessageDialog(view, "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE);
<br>+ if ( !run_on_save ) {
<br>+ JOptionPane.showMessageDialog( view, "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE );
<br> }
<br> errorSource.clear();
<br> }
<br>+ else {
<br>+ String rulename = "";
<br>
<br>- else
<br>- {
<br>- String rulename="";
<br>+ final boolean isPrintRule = jEdit.getBooleanProperty( PMDJEditPlugin.PRINT_RULE );
<br>
<br>- final boolean isPrintRule = jEdit.getBooleanProperty(PMDJEditPlugin.PRINT_RULE);
<br>-
<br>- for (Iterator<IRuleViolation> i = ctx.getReport().iterator(); i.hasNext();)
<br>- {
<br>+ for ( Iterator<IRuleViolation> i = ctx.getReport().iterator(); i.hasNext(); ) {
<br> IRuleViolation rv = i.next();
<br>- if(isPrintRule)
<br>- {
<br>- rulename = rv.getRule().getName() +"->";
<br>+ if ( isPrintRule ) {
<br>+ rulename = rv.getRule().getName() + "->";
<br> }
<br>
<br>- errorSource.addError(new DefaultErrorSource.DefaultError(errorSource, ErrorSource.WARNING, path, rv.getBeginLine()-1,0,0,rulename + rv.getDescription())); //NOPMD
<br>+ errorSource.addError( new DefaultErrorSource.DefaultError( errorSource, ErrorSource.WARNING, path, rv.getBeginLine() - 1, 0, 0, rulename + rv.getDescription() ) ); //NOPMD
<br> }
<br>
<br> registerErrorSource();
<br> }
<br> }
<br>-
<br>- catch (RuleSetNotFoundException rsne)
<br>- {
<br>- Log.log(Log.ERROR, this, "RuleSet not found", rsne);
<br>+ catch ( RuleSetNotFoundException rsne ) {
<br>+ Log.log( Log.ERROR, this, "RuleSet not found", rsne );
<br> }
<br>-
<br>- catch (PMDException pmde)
<br>- {
<br>- String msg="Error while processing " + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br>- Log.log(Log.ERROR, this, msg, pmde);
<br>- JOptionPane.showMessageDialog(view, msg, "PMD", JOptionPane.ERROR_MESSAGE);
<br>+ catch ( PMDException pmde ) {
<br>+ String msg = "Error while processing " + buffer.getPath() + ":\n" + pmde.getMessage() + "\n\n" + pmde.getCause();
<br>+ Log.log( Log.ERROR, this, msg, pmde );
<br>+ JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>-
<br>- catch(Exception e)
<br>- {
<br>+ catch ( Exception e ) {
<br> // TODO: is this useful to log?
<br>- Log.log(Log.ERROR, this, "Exception processing file "+ buffer.getPath(), e);
<br>+ Log.log( Log.ERROR, this, "Exception processing file " + buffer.getPath(), e );
<br> }
<br>- }// check current buffer
<br>+ }
<br>
<br>- public void process(final List<File> files, final View view)
<br>- {
<br>- new Thread(new Runnable ()
<br>- {
<br>- public void run()
<br>- {
<br>- processFiles(files, view);
<br>- }
<br>- }
<br>-
<br>- ).start();
<br>+ public void process( final List<File> files, final View view ) {
<br>+ // TODO: use SwingWorker?
<br>+ new Thread(
<br>+ new Runnable () {
<br>+ public void run() {
<br>+ processFiles( files, view );
<br>+ }
<br>+ }
<br>+ ).start();
<br> }
<br>
<br> // check current buffer
<br>- public static void check(Buffer buffer, View view)
<br>- {
<br>- instance.instanceCheck(buffer, view, true);
<br>+ public static void check( Buffer buffer, View view ) {
<br>+ instance.instanceCheck( buffer, view, true );
<br> }
<br>
<br>- void processFiles(List<File> files, View view)
<br>- {
<br>+ void processFiles( List<File> files, View view ) {
<br> unRegisterErrorSource();
<br> errorSource.clear();
<br>
<br> ProgressBar pbd = null;
<br>
<br>- if(jEdit.getBooleanProperty(SHOW_PROGRESS))
<br>- {
<br>- pbd = startProgressBarDisplay(view,0,files.size());
<br>+ if ( jEdit.getBooleanProperty( SHOW_PROGRESS ) ) {
<br>+ pbd = startProgressBarDisplay( view, 0, files.size() );
<br> }
<br>
<br> PMD pmd = new PMD();
<br>- int jvidx = jEdit.getIntegerProperty(JAVA_VERSION_PROPERTY, 1);
<br>- pmd.setJavaVersion(sourceTypes[jvidx]);
<br>+ int jvidx = jEdit.getIntegerProperty( JAVA_VERSION_PROPERTY, 1 );
<br>+ pmd.setJavaVersion( sourceTypes[ jvidx ] );
<br> SelectedRules selectedRuleSets = null;
<br>
<br>- try
<br>- {
<br>+ try {
<br> selectedRuleSets = new SelectedRules();
<br> }
<br>-
<br>- catch (RuleSetNotFoundException rsne)
<br>- {
<br>+ catch ( RuleSetNotFoundException rsne ) {
<br> // should never happen since rulesets are fetched via getRegisteredRuleSet, nonetheless:
<br>- Log.log(Log.ERROR, this, "PMD ERROR: Couldn't find a ruleset", rsne);
<br>- JOptionPane.showMessageDialog(jEdit.getFirstView(), "Unable to find rulesets, halting PMD", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ Log.log( Log.ERROR, this, "PMD ERROR: Couldn't find a ruleset", rsne );
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), "Unable to find rulesets, halting PMD", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br> RuleContext ctx = new RuleContext();
<br>@@ -370,518 +299,424 @@
<br> List<Report> reports = new ArrayList<Report>();
<br> boolean foundProblems = false;
<br>
<br>- Iterator<File> iter = files.iterator();
<br>- while(iter.hasNext())
<br>- {
<br>- File file = iter.next();
<br>- //ctx.setReport(new Report());
<br>- ctx.setReport(new Report()); //NOPMD
<br>- ctx.setSourceCodeFilename(file.getAbsolutePath());
<br>+ for ( File file : files ) {
<br>+ ctx.setReport( new Report() );
<br>+ ctx.setSourceCodeFilename( file.getAbsolutePath() );
<br>
<br>- try
<br>- {
<br>- pmd.processFile(new FileInputStream(file), System.getProperty("file.encoding"), selectedRuleSets.getSelectedRules(), ctx); //NOPMD
<br>- for (Iterator<IRuleViolation> j = ctx.getReport().iterator(); j.hasNext();)
<br>- {
<br>+ try {
<br>+ pmd.processFile( new FileInputStream( file ), System.getProperty( "file.encoding" ), selectedRuleSets.getSelectedRules(), ctx ); //NOPMD
<br>+ for ( Iterator<IRuleViolation> j = ctx.getReport().iterator(); j.hasNext(); ) {
<br> foundProblems = true;
<br> IRuleViolation rv = j.next();
<br>- errorSource.addError(new DefaultErrorSource.DefaultError(errorSource, ErrorSource.ERROR, file.getAbsolutePath(), rv.getBeginLine()-1,0,0,rv.getDescription())); //NOPMD
<br>+ errorSource.addError( new DefaultErrorSource.DefaultError( errorSource, ErrorSource.ERROR, file.getAbsolutePath(), rv.getBeginLine() - 1, 0, 0, rv.getDescription() ) ); //NOPMD
<br> }
<br>- if(!ctx.getReport().isEmpty())//That means Report contains some violations, so only cache such reports.
<br>- {
<br>- reports.add(ctx.getReport());
<br>+ if ( !ctx.getReport().isEmpty() ) { // That means Report contains some violations, so only cache such reports.
<br>+ reports.add( ctx.getReport() );
<br> }
<br> }
<br>- catch (FileNotFoundException fnfe)
<br>- {
<br>+ catch ( FileNotFoundException fnfe ) {
<br> // should never happen, but if it does, carry on to the next file
<br>- Log.log(Log.ERROR, this, "PMD ERROR: Unable to open file " + file.getAbsolutePath(), fnfe);
<br>+ Log.log( Log.ERROR, this, "PMD ERROR: Unable to open file " + file.getAbsolutePath(), fnfe );
<br> }
<br>- catch (PMDException pmde)
<br>- {
<br>+ catch ( PMDException pmde ) {
<br> String msg = "Error while processing " + file.getAbsolutePath() + ":\n" + pmde.getMessage();
<br>- Log.log(Log.ERROR, this, msg, pmde);
<br>- JOptionPane.showMessageDialog(view, msg, "PMD", JOptionPane.ERROR_MESSAGE);
<br>+ Log.log( Log.ERROR, this, msg, pmde );
<br>+ JOptionPane.showMessageDialog( view, msg, "PMD", JOptionPane.ERROR_MESSAGE );
<br> }
<br>
<br>- if(jEdit.getBooleanProperty(SHOW_PROGRESS))
<br>- {
<br>- pbd.increment(1);
<br>+ if ( jEdit.getBooleanProperty( SHOW_PROGRESS ) ) {
<br>+ pbd.increment( 1 );
<br> }
<br>- }//End of for
<br>+ }
<br>
<br>- if (!foundProblems)
<br>- {
<br>- JOptionPane.showMessageDialog(jEdit.getFirstView(), "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE);
<br>+ if ( !foundProblems ) {
<br>+ JOptionPane.showMessageDialog( jEdit.getFirstView(), "No problems found", NAME, JOptionPane.INFORMATION_MESSAGE );
<br> errorSource.clear();
<br> }
<br>- else
<br>- {
<br>+ else {
<br> registerErrorSource();
<br>- exportErrorAsReport(view, reports.toArray(new Report[reports.size()]));
<br>+ exportErrorAsReport( view, reports.toArray( new Report[ reports.size() ] ) );
<br> }
<br>
<br>- endProgressBarDisplay(pbd);
<br>+ endProgressBarDisplay( pbd );
<br> pbd = null;
<br> }
<br>
<br>- private List<File> findFiles(String dir, boolean recurse)
<br>- {
<br>- FileFinder f = new FileFinder();
<br>- return f.findFilesFrom(dir, new net.sourceforge.pmd.cpd.SourceFileOrDirectoryFilter(new SourceFileSelector()), recurse);
<br>+ private List<File> findFiles( String dir, boolean recurse ) {
<br>+ FileFinder f = new FileFinder();
<br>+ return f.findFilesFrom( dir, new net.sourceforge.pmd.cpd.SourceFileOrDirectoryFilter( new SourceFileSelector() ), recurse );
<br> }
<br>
<br>- private void registerErrorSource()
<br>- {
<br>- //Log.log(Log.DEBUG,this,"Registering ErrorSource of PMD");
<br>- ErrorSource.registerErrorSource(errorSource);
<br>+ private void registerErrorSource() {
<br>+ ErrorSource.registerErrorSource( errorSource );
<br> }
<br>
<br>- private void unRegisterErrorSource()
<br>- {
<br>- //Log.log(Log.DEBUG,this,"Unregistering ErrorSource of PMD");
<br>- ErrorSource.unregisterErrorSource(errorSource);
<br>+ private void unRegisterErrorSource() {
<br>+ ErrorSource.unregisterErrorSource( errorSource );
<br> }
<br>
<br>- public static void cpdCurrentFile(View view) throws IOException
<br>- {
<br>- String modeName = getFileType(view.getBuffer().getMode().getName());
<br>- if (modeName == null) {
<br>- JOptionPane.showMessageDialog(view, "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined.", "Copy/Paste Detector", JOptionPane.INFORMATION_MESSAGE);
<br>- return;
<br>+ public static void cpdCurrentFile( View view ) throws IOException {
<br>+ String modeName = getFileType( view.getBuffer().getMode().getName() );
<br>+ if ( modeName == null ) {
<br>+ JOptionPane.showMessageDialog( view, "Copy/Paste detection can not be performed on this file\nbecause the mode can not be determined.", "Copy/Paste Detector", JOptionPane.INFORMATION_MESSAGE );
<br>+ return ;
<br> }
<br>- instance.instanceCPDCurrentFile(view, view.getBuffer().getPath(), modeName);
<br>+ instance.instanceCPDCurrentFile( view, view.getBuffer().getPath(), modeName );
<br> }
<br>
<br>- public static void cpdCurrentFile(View view, VFSBrowser browser) throws IOException
<br>- {
<br>+ public static void cpdCurrentFile( View view, VFSBrowser browser ) throws IOException {
<br> VFSFile selectedFile[] = browser.getSelectedFiles();
<br>
<br>- if(selectedFile == null || selectedFile.length == 0)
<br>- {
<br>- JOptionPane.showMessageDialog(view, "One file must be selected", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( selectedFile == null || selectedFile.length == 0 ) {
<br>+ JOptionPane.showMessageDialog( view, "One file must be selected", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br>- if(selectedFile[0].getType() == VFSFile.DIRECTORY)
<br>- {
<br>- JOptionPane.showMessageDialog(view, "Selected file cannot be a Directory.", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( selectedFile[ 0 ].getType() == VFSFile.DIRECTORY ) {
<br>+ JOptionPane.showMessageDialog( view, "Selected file cannot be a Directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>- String path = selectedFile[0].getPath();
<br>- instance.instanceCPDCurrentFile(view, path, getFileType(path));
<br>+ String path = selectedFile[ 0 ].getPath();
<br>+ instance.instanceCPDCurrentFile( view, path, getFileType( path ) );
<br> }
<br>
<br>- //TODO: Replace this method with a smart file type/mode detector.
<br>- private static String getFileType(String name)
<br>- {
<br>- if(name != null)
<br>- {
<br>- for (String lang : LanguageFactory.supportedLanguages) {
<br>- if (name.endsWith(lang)) return lang;
<br>+ // TODO: Replace this method with a smart file type/mode detector.
<br>+ private static String getFileType( String name ) {
<br>+ if ( name != null ) {
<br>+ for ( String lang : LanguageFactory.supportedLanguages ) {
<br>+ if ( name.endsWith( lang ) )
<br>+ return lang;
<br> }
<br>- if(name.endsWith("h") || name.endsWith("cxx") || name.endsWith("c++"))
<br>- {
<br>+ if ( name.endsWith( "h" ) || name.endsWith( "cxx" ) || name.endsWith( "c++" ) ) {
<br> return "cpp";
<br> }
<br> }
<br> return null;
<br> }
<br>
<br>- private void instanceCPDCurrentFile(View view, String filename, String fileType) throws IOException
<br>- {
<br>- CPD cpd = getCPD(fileType, view);
<br>+ private void instanceCPDCurrentFile( View view, String filename, String fileType ) throws IOException {
<br>+ CPD cpd = getCPD( fileType );
<br> //Log.log(Log.DEBUG, PMDJEditPlugin.class , "See mode " + view.getBuffer().getMode().getName());
<br>
<br>- if(cpd != null)
<br>- {
<br>- cpd.add(new File(filename));
<br>+ if ( cpd != null ) {
<br>+ cpd.add( new File( filename ) );
<br> cpd.go();
<br>- instance.processDuplicates(cpd, view);
<br>- view.getDockableWindowManager().showDockableWindow("cpd-viewer");
<br>+ instance.processDuplicates( cpd, view );
<br>+ view.getDockableWindowManager().showDockableWindow( "cpd-viewer" );
<br> }
<br>- else
<br>- {
<br>- view.getStatus().setMessageAndClear("CPD does not yet support this file type: " + fileType);
<br>- return;
<br>+ else {
<br>+ view.getStatus().setMessageAndClear( "CPD does not yet support this file type: " + fileType );
<br>+ return ;
<br> }
<br> }
<br>
<br>
<br>- public static void cpdDir(View view)
<br>- {
<br>- JFileChooser chooser = new JFileChooser(jEdit.getProperty(LAST_DIRECTORY));
<br>- chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
<br>+ public static void cpdDir( View view ) {
<br>+ JFileChooser chooser = new JFileChooser( jEdit.getProperty( LAST_DIRECTORY ) );
<br>+ chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES );
<br>
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("ruby", "Ruby files", "rb", "rbw"));
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("php", "PHP files", "php", "php3", "php4", "phtml", "inc"));
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("jsp", "JSP files", "jsp", "jsf", "jspf"));
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("fortran", "Fortran files", "for", "fort", "f77", "f90"));
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("cpp", "C/C++ files", "c", "cc", "cpp"));
<br>- chooser.addChoosableFileFilter(new CPDFileFilter("java", "Java files", "java"));
<br>-
<br>- JPanel pnlAccessory = new JPanel(new BorderLayout());
<br>+ // TODO: need to figure out how to create these filters dynamically
<br>+ // TODO: check on the AnyLanguage and AnyTokenizer, can they be used for file types that are not specifically supported?
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "ruby", "Ruby files", "rb", "rbw" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "php", "PHP files", "php", "php3", "php4", "phtml", "inc" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "jsp", "JSP files", "jsp", "jsf", "jspf" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "fortran", "Fortran files", "for", "fort", "f77", "f90" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "cpp", "C/C++ files", "c", "cc", "cpp" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "javascript", "Javascript files", "js" ) );
<br>+ chooser.addChoosableFileFilter( new CPDFileFilter( "java", "Java files", "java" ) );
<br>
<br>- JPanel pnlTile = new JPanel(new FlowLayout(FlowLayout.LEFT));
<br>- JLabel lblMinTileSize = new JLabel("Minimum Tile size :");
<br>- JTextField txttilesize = new JTextField(3);
<br>- txttilesize.setText(jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100)+"");
<br>- pnlTile.add(lblMinTileSize);
<br>- pnlTile.add(txttilesize);
<br>- pnlAccessory.add(BorderLayout.NORTH, pnlTile);
<br>+ JPanel pnlAccessory = new JPanel( new BorderLayout() );
<br>
<br>- JPanel pnlRecursive = new JPanel(new FlowLayout(FlowLayout.LEFT));
<br>- JCheckBox chkRecursive = new JCheckBox("Recursive", jEdit.getBooleanProperty(CHECK_DIR_RECURSIVE));
<br>- pnlRecursive.add(chkRecursive);
<br>- pnlAccessory.add(BorderLayout.CENTER, pnlRecursive);
<br>+ JPanel pnlTile = new JPanel( new FlowLayout( FlowLayout.LEFT ) );
<br>+ JLabel lblMinTileSize = new JLabel( "Minimum Tile size :" );
<br>+ JTextField txttilesize = new JTextField( 3 );
<br>+ txttilesize.setText( jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ) + "" );
<br>+ pnlTile.add( lblMinTileSize );
<br>+ pnlTile.add( txttilesize );
<br>+ pnlAccessory.add( BorderLayout.NORTH, pnlTile );
<br>
<br>- chooser.setAccessory(pnlAccessory);
<br>+ JPanel pnlRecursive = new JPanel( new FlowLayout( FlowLayout.LEFT ) );
<br>+ JCheckBox chkRecursive = new JCheckBox( "Recursive", jEdit.getBooleanProperty( CHECK_DIR_RECURSIVE ) );
<br>+ pnlRecursive.add( chkRecursive );
<br>+ pnlAccessory.add( BorderLayout.CENTER, pnlRecursive );
<br>
<br>- int returnVal = chooser.showOpenDialog(view);
<br>+ chooser.setAccessory( pnlAccessory );
<br>+
<br>+ int returnVal = chooser.showOpenDialog( view );
<br> File selectedFile = null;
<br> String mode = null;
<br>
<br>- if(returnVal == JFileChooser.APPROVE_OPTION)
<br>- {
<br>+ if ( returnVal == JFileChooser.APPROVE_OPTION ) {
<br> selectedFile = chooser.getSelectedFile();
<br>- mode = ((CPDFileFilter)chooser.getFileFilter()).getMode();
<br>+ mode = ( ( CPDFileFilter ) chooser.getFileFilter() ).getMode();
<br>
<br>- if(!selectedFile.isDirectory())
<br>- {
<br>- JOptionPane.showMessageDialog(view,"Selection not a directory.",NAME,JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( !selectedFile.isDirectory() ) {
<br>+ JOptionPane.showMessageDialog( view, "Selection not a directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br> int tilesize = 100;
<br>- try
<br>- {
<br>- tilesize = Integer.parseInt(txttilesize.getText());
<br>+ try {
<br>+ tilesize = Integer.parseInt( txttilesize.getText() );
<br> }
<br>- catch(NumberFormatException e)
<br>- {
<br>+ catch ( NumberFormatException e ) {
<br> //use the default.
<br>- tilesize = jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100);
<br>+ tilesize = jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 );
<br> }
<br>
<br>
<br>- try
<br>- {
<br>- jEdit.setBooleanProperty(CHECK_DIR_RECURSIVE,chkRecursive.isSelected());
<br>- instance.instanceCPDDir(view, selectedFile.getCanonicalPath(), tilesize, chkRecursive.isSelected(), mode);
<br>+ try {
<br>+ jEdit.setBooleanProperty( CHECK_DIR_RECURSIVE, chkRecursive.isSelected() );
<br>+ instance.instanceCPDDir( view, selectedFile.getCanonicalPath(), tilesize, chkRecursive.isSelected(), mode );
<br> }
<br>- catch(IOException e)
<br>- {
<br>- Log.log(Log.ERROR, instance, "PMD ERROR: Unable to open file " + selectedFile, e);
<br>+ catch ( IOException e ) {
<br>+ Log.log( Log.ERROR, instance, "PMD ERROR: Unable to open file " + selectedFile, e );
<br> }
<br> }
<br> }
<br>
<br>- public static void cpdDir(View view, VFSBrowser browser, boolean recursive) throws IOException
<br>- {
<br>- if(view != null && browser != null)
<br>- {
<br>+ public static void cpdDir( View view, VFSBrowser browser, boolean recursive ) throws IOException {
<br>+ if ( view != null && browser != null ) {
<br> VFSFile selectedDir[] = browser.getSelectedFiles();
<br>- if(selectedDir == null || selectedDir.length == 0)
<br>- {
<br>- JOptionPane.showMessageDialog(view, "One Directory has to be selected in which to detect duplicate code.", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( selectedDir == null || selectedDir.length == 0 ) {
<br>+ JOptionPane.showMessageDialog( view, "One Directory has to be selected in which to detect duplicate code.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br>- if(selectedDir[0].getType() != VFSFile.DIRECTORY)
<br>- {
<br>- JOptionPane.showMessageDialog(view, "Selected file must be a Directory.", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( selectedDir[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>+ JOptionPane.showMessageDialog( view, "Selected file must be a Directory.", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>- instance.instanceCPDDir(view, selectedDir[0].getPath(), jEdit.getIntegerProperty(DEFAULT_TILE_MINSIZE_PROPERTY,100), recursive, "java");
<br>+ instance.instanceCPDDir( view, selectedDir[ 0 ].getPath(), jEdit.getIntegerProperty( DEFAULT_TILE_MINSIZE_PROPERTY, 100 ), recursive, "java" );
<br> }
<br> }
<br>
<br>- private void instanceCPDDir(View view, String dir, int tileSize, boolean recursive, String mode) throws IOException
<br>- {
<br>- if(dir != null)
<br>- {
<br>- jEdit.setProperty(LAST_DIRECTORY,dir);
<br>+ private void instanceCPDDir( View view, String dir, int tileSize, boolean recursive, String mode ) throws IOException {
<br>+ if ( dir != null ) {
<br>+ jEdit.setProperty( LAST_DIRECTORY, dir );
<br> instance.errorSource.clear();
<br>- CPD cpd = getCPD(tileSize, mode, view);
<br>+ CPD cpd = getCPD( tileSize, mode );
<br>
<br>- if(cpd != null)
<br>- {
<br>- if(recursive)
<br>- {
<br>- cpd.addRecursively(dir);
<br>+ if ( cpd != null ) {
<br>+ if ( recursive ) {
<br>+ cpd.addRecursively( dir );
<br> }
<br>- else
<br>- {
<br>- cpd.addAllInDirectory(dir);
<br>+ else {
<br>+ cpd.addAllInDirectory( dir );
<br> }
<br> cpd.go();
<br>- instance.processDuplicates(cpd, view);
<br>+ instance.processDuplicates( cpd, view );
<br> }
<br>- else
<br>- {
<br>- view.getStatus().setMessageAndClear("Cannot run CPD on Invalid directory/files.");
<br>- return;
<br>+ else {
<br>+ view.getStatus().setMessageAndClear( "Cannot run CPD on Invalid directory/files." );
<br>+ return ;
<br> }
<br>- }//End of if(dir != null)
<br>+ }
<br> }
<br>
<br>- private void processDuplicates(CPD cpd, View view)
<br>- {
<br>- //StringBuffer report = new StringBuffer();
<br>- CPDDuplicateCodeViewer dv = getCPDDuplicateCodeViewer(view);
<br>+ private void processDuplicates( CPD cpd, View view ) {
<br>+ CPDDuplicateCodeViewer dv = getCPDDuplicateCodeViewer( view );
<br>
<br> dv.clearDuplicates();
<br> boolean foundDuplicates = false;
<br>
<br>- for (Iterator<Match> i = cpd.getMatches(); i.hasNext();)
<br>- {
<br>- if(!foundDuplicates) //Set foundDuplicates to true and that too only once.
<br>- {
<br>+ for ( Iterator<Match> i = cpd.getMatches(); i.hasNext(); ) {
<br>+ if ( !foundDuplicates ) { // Set foundDuplicates to true and that too only once.
<br> foundDuplicates = true;
<br> }
<br>
<br> Match match = i.next();
<br>
<br>- CPDDuplicateCodeViewer.Duplicates duplicates = dv.new Duplicates(match.getLineCount() + " duplicate lines", match.getSourceCodeSlice()); //NOPMD
<br>+ CPDDuplicateCodeViewer.Duplicates duplicates = dv.new Duplicates( match.getLineCount() + " duplicate lines", match.getSourceCodeSlice() ); //NOPMD
<br>
<br>- for (Iterator<TokenEntry> occurrences = match.iterator(); occurrences.hasNext();)
<br>- {
<br>+ for ( Iterator<TokenEntry> occurrences = match.iterator(); occurrences.hasNext(); ) {
<br> TokenEntry mark = occurrences.next();
<br>
<br>- int lastLine = mark.getBeginLine()+match.getLineCount();
<br>- Log.log(Log.DEBUG, this, "Begin line " + mark.getBeginLine() +" of file "+ mark.getTokenSrcID() +" Line Count "+ match.getLineCount() +" last line "+ lastLine);
<br>+ int lastLine = mark.getBeginLine() + match.getLineCount();
<br>+ Log.log( Log.DEBUG, this, "Begin line " + mark.getBeginLine() + " of file " + mark.getTokenSrcID() + " Line Count " + match.getLineCount() + " last line " + lastLine );
<br>
<br>- CPDDuplicateCodeViewer.Duplicate duplicate = dv.new Duplicate(mark.getTokenSrcID(),mark.getBeginLine(),lastLine); //NOPMD
<br>+ CPDDuplicateCodeViewer.Duplicate duplicate = dv.new Duplicate( mark.getTokenSrcID(), mark.getBeginLine(), lastLine ); //NOPMD
<br>
<br>- //System.out.println("Adding Duplicate " + duplicate +" to Duplicates "+ duplicates);
<br>- duplicates.addDuplicate(duplicate);
<br>- }//End of inner for
<br>+ duplicates.addDuplicate( duplicate );
<br>+ }
<br>
<br>- dv.addDuplicates(duplicates);
<br>- }//End of outer for
<br>+ dv.addDuplicates( duplicates );
<br>+ }
<br>
<br>- if(!foundDuplicates)
<br>- {
<br>- dv.getRoot().add(new DefaultMutableTreeNode("No Duplicates found.",false));
<br>+ if ( !foundDuplicates ) {
<br>+ dv.getRoot().add( new DefaultMutableTreeNode( "No duplicates found.", false ) );
<br> }
<br>
<br> dv.refreshTree();
<br> dv.expandAll();
<br>- }//End of processDuplicates
<br>+ }
<br>
<br>
<br>- public CPDDuplicateCodeViewer getCPDDuplicateCodeViewer(View view)
<br>- {
<br>- view.getDockableWindowManager().showDockableWindow("cpd-viewer");
<br>- return (CPDDuplicateCodeViewer)view.getDockableWindowManager().getDockableWindow("cpd-viewer");
<br>+ public CPDDuplicateCodeViewer getCPDDuplicateCodeViewer( View view ) {
<br>+ view.getDockableWindowManager().showDockableWindow( "cpd-viewer" );
<br>+ return ( CPDDuplicateCodeViewer ) view.getDockableWindowManager().getDockableWindow( "cpd-viewer" );
<br>
<br> }
<br>
<br>- public static void checkFile(View view, VFSBrowser browser)
<br>- {
<br>- instance.checkFile(view, browser.getSelectedFiles());
<br>+ public static void checkFile( View view, VFSBrowser browser ) {
<br>+ instance.checkFile( view, browser.getSelectedFiles() );
<br> }
<br>
<br>- public void checkFile(View view, VFSFile de[])
<br>- {
<br>- if(view != null && de != null)
<br>- {
<br>+ public void checkFile( View view, VFSFile de[] ) {
<br>+ if ( view != null && de != null ) {
<br> List<File> files = new ArrayList<File>();
<br>
<br>- for(int i=0;i<de.length;i++)
<br>- {
<br>- if(de[i].getType() == VFSFile.FILE)
<br>- {
<br>- files.add(new File(de[i].getPath())); //NOPMD
<br>+ for (VFSFile file : de) {
<br>+ if ( file.getType() == VFSFile.FILE ) {
<br>+ files.add( new File( file.getPath() ) );
<br> }
<br> }
<br>
<br>- process(files, view);
<br>+ process( files, view );
<br> }
<br> }
<br>
<br>- public static void checkDirectory(View view, VFSBrowser browser, boolean recursive)
<br>- {
<br>+ public static void checkDirectory( View view, VFSBrowser browser, boolean recursive ) {
<br> VFSFile de[] = browser.getSelectedFiles();
<br>
<br>- if(de == null || de.length == 0 || de[0].getType() != VFSFile.DIRECTORY)
<br>- {
<br>- JOptionPane.showMessageDialog(view, "Selection must be a directory",NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ if ( de == null || de.length == 0 || de[ 0 ].getType() != VFSFile.DIRECTORY ) {
<br>+ JOptionPane.showMessageDialog( view, "Selection must be a directory", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br>- instance.process(instance.findFiles(de[0].getPath(), recursive),view);
<br>+ instance.process( instance.findFiles( de[ 0 ].getPath(), recursive ), view );
<br> }
<br>
<br>- public ProgressBar startProgressBarDisplay(View view, int min, int max)
<br>- {
<br>- ProgressBar pbd = new ProgressBar(view,min,max);
<br>- pbd.setVisible(true);
<br>+ public ProgressBar startProgressBarDisplay( View view, int min, int max ) {
<br>+ ProgressBar pbd = new ProgressBar( view, min, max );
<br>+ pbd.setVisible( true );
<br> return pbd;
<br> }
<br>
<br>- public void endProgressBarDisplay(ProgressBar pbd)
<br>- {
<br>- if(pbd != null)
<br>- {
<br>+ public void endProgressBarDisplay( ProgressBar pbd ) {
<br>+ if ( pbd != null ) {
<br> pbd.completeBar();
<br>- pbd.setVisible(false);
<br>+ pbd.setVisible( false );
<br> }
<br> }
<br>
<br>- public void exportErrorAsReport(final View view, Report reports[])
<br>- {
<br>+ public void exportErrorAsReport( final View view, Report reports[] ) {
<br>
<br>- String format = jEdit.getProperty(PMDJEditPlugin.RENDERER);
<br>+ String format = jEdit.getProperty( PMDJEditPlugin.RENDERER );
<br>
<br>- //"None", "Text", "Html", "XML", "CSV"
<br>- if(format != null && !format.equals("None"))
<br>- {
<br>+ // "None", "Text", "Html", "XML", "CSV"
<br>+ if ( format != null && !format.equals( "None" ) ) {
<br> net.sourceforge.pmd.renderers.Renderer renderer = null;
<br>
<br>- if ("XML".equals(format))
<br>- {
<br>+ if ( "XML".equals( format ) ) {
<br> renderer = new XMLRenderer();
<br> }
<br>- else if ("Html".equals(format))
<br>- {
<br>+ else if ( "Html".equals( format ) ) {
<br> renderer = new HTMLRenderer();
<br> }
<br>- else if ("CSV".equals(format))
<br>- {
<br>+ else if ( "CSV".equals( format ) ) {
<br> renderer = new CSVRenderer();
<br> }
<br>- else if ("Text".equals(format))
<br>- {
<br>+ else if ( "Text".equals( format ) ) {
<br> renderer = new TextRenderer();
<br> }
<br>- else
<br>- {
<br>- JOptionPane.showMessageDialog(view, "Invalid Renderer", NAME, JOptionPane.ERROR_MESSAGE);
<br>- return;
<br>+ else {
<br>+ JOptionPane.showMessageDialog( view, "Invalid Renderer", NAME, JOptionPane.ERROR_MESSAGE );
<br>+ return ;
<br> }
<br>
<br>- if(reports != null)
<br>- {
<br>+ if ( reports != null ) {
<br> final StringBuffer strbuf = new StringBuffer();
<br>- // String output = null;
<br> try {
<br> renderer.start();
<br>- for(int i=0;i<reports.length;i++)
<br>- renderer.renderFileReport(reports[i]);
<br>+ for ( int i = 0;i < reports.length;i++ )
<br>+ renderer.renderFileReport( reports[ i ] );
<br> renderer.end();
<br> }
<br>- catch (IOException ioe) {
<br>- Log.log(Log.ERROR, this, "Renderer can't report.", ioe );
<br>+ catch ( IOException ioe ) {
<br>+ Log.log( Log.ERROR, this, "Renderer can't report.", ioe );
<br> }
<br>- view.setBuffer(jEdit.newFile(view));
<br>+ view.setBuffer( jEdit.newFile( view ) );
<br> VFSManager.runInAWTThread(
<br>- new Runnable()
<br>- {
<br>- public void run()
<br>- {
<br>- view.getTextArea().setText(strbuf.toString());
<br>+ new Runnable() {
<br>+ public void run() {
<br>+ view.getTextArea().setText( strbuf.toString() );
<br> }
<br> }
<br> );
<br>- }//End of if
<br>- }//End of exportErrorAsReport
<br>+ }
<br>+ }
<br> }
<br>
<br>
<br>- class ProgressBar extends JPanel
<br>- {
<br>+ class ProgressBar extends JPanel {
<br> private JProgressBar pBar;
<br> private View view;
<br>
<br>- public ProgressBar(View view, int min,int max)
<br>- {
<br>+ public ProgressBar( View view, int min, int max ) {
<br> super();
<br> this.view = view;
<br>- setLayout(new BorderLayout());
<br>- pBar = new JProgressBar(min,max);
<br>- pBar.setUI(new BasicProgressBarUI()
<br>- {
<br>- public Color getSelectionBackground()
<br>- {
<br>- return jEdit.getColorProperty("pmd.progressbar.foreground");
<br>- }
<br>+ setLayout( new BorderLayout() );
<br>+ pBar = new JProgressBar( min, max );
<br>+ pBar.setUI( new BasicProgressBarUI() {
<br>+ public Color getSelectionBackground() {
<br>+ return jEdit.getColorProperty( "pmd.progressbar.foreground" );
<br>+ }
<br>
<br>- public Color getSelectionForeground()
<br>- {
<br>- return jEdit.getColorProperty("pmd.progressbar.foreground");
<br>- }
<br>- }
<br>+ public Color getSelectionForeground() {
<br>+ return jEdit.getColorProperty( "pmd.progressbar.foreground" );
<br>+ }
<br>+ }
<br>
<br> );
<br>- //pBar.addNotify();
<br>- pBar.setBorder(new EtchedBorder(EtchedBorder.RAISED));
<br>- pBar.setToolTipText("PMD Check in Progress");
<br>- pBar.setForeground(jEdit.getColorProperty("pmd.progressbar.background")); //Color of the ProgressBar flow
<br>- pBar.setBackground(jEdit.getColorProperty("view.status.background")); //Color of the ProgressBar Background
<br>+ pBar.setBorder( new EtchedBorder( EtchedBorder.RAISED ) );
<br>+ pBar.setToolTipText( "PMD Check in Progress" );
<br>+ pBar.setForeground( jEdit.getColorProperty( "pmd.progressbar.background" ) );
<br>+ pBar.setBackground( jEdit.getColorProperty( "view.status.background" ) );
<br>
<br>- pBar.setStringPainted(true);
<br>- add(pBar, BorderLayout.CENTER);
<br>- view.getStatus().add(pBar, BorderLayout.EAST);
<br>+ pBar.setStringPainted( true );
<br>+ add( pBar, BorderLayout.CENTER );
<br>+ view.getStatus().add( pBar, BorderLayout.EAST );
<br> }
<br>
<br>- public void increment(int num)
<br>- {
<br>- pBar.setValue(pBar.getValue()+num);
<br>+ public void increment( int num ) {
<br>+ pBar.setValue( pBar.getValue() + num );
<br> }
<br>
<br>- public void completeBar()
<br>- {
<br>- pBar.setValue(pBar.getMaximum());
<br>- view.getStatus().remove(pBar);
<br>+ public void completeBar() {
<br>+ pBar.setValue( pBar.getMaximum() );
<br>+ view.getStatus().remove( pBar );
<br> view = null;
<br> pBar = null;
<br> }
<br> }
<br>
<br>
<br>- private CPD getCPD(int tileSize, String fileType, View view)
<br>- {
<br>+ private CPD getCPD( int tileSize, String fileType ) {
<br> Language lang;
<br> LanguageFactory lf = new LanguageFactory();
<br>- StringBuilder sb = new StringBuilder();
<br>- boolean supported = false;
<br>- for (String s : lf.supportedLanguages) {
<br>- sb.append(s).append(", ");
<br>- if (s.equals(fileType)) {
<br>- supported = true;
<br>- }
<br>- }
<br>- if (!supported) {
<br>- JOptionPane.showMessageDialog(view,"Copy/Paste detection can only be performed on " + sb.toString().substring(0, sb.length() - 2) + " code.","Copy/Paste Detector",JOptionPane.INFORMATION_MESSAGE);
<br>- return null;
<br>- }
<br>
<br>- if ("java".equals(fileType))
<br>- {
<br>- //Log.log(Log.DEBUG, PMDJEditPlugin.class, "Doing java");
<br>+ if ( "java".equals( fileType ) ) {
<br> Properties props = new Properties();
<br>- props.setProperty(JavaTokenizer.IGNORE_LITERALS, String.valueOf(jEdit.getBooleanProperty(PMDJEditPlugin.IGNORE_LITERALS)));
<br>- lang = lf.createLanguage("java", props);
<br>+ props.setProperty( JavaTokenizer.IGNORE_LITERALS, String.valueOf( jEdit.getBooleanProperty( PMDJEditPlugin.IGNORE_LITERALS ) ) );
<br>+ lang = lf.createLanguage( "java", props );
<br> }
<br> else {
<br>- lang = lf.createLanguage(fileType);
<br>+ lang = lf.createLanguage( fileType );
<br> }
<br>- return new CPD(tileSize,lang);
<br>+
<br>+ return lang == null ? null : new CPD( tileSize, lang );
<br> }
<br>
<br>- private CPD getCPD(String fileType, View view)
<br>- {
<br>- return getCPD(jEdit.getIntegerProperty(PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY,100), fileType, view);
<br>+ private CPD getCPD( String fileType ) {
<br>+ return getCPD( jEdit.getIntegerProperty( PMDJEditPlugin.DEFAULT_TILE_MINSIZE_PROPERTY, 100 ), fileType );
<br> }
<br>
<br> /**
<br> * Run the PMD rule designer.
<br> */
<br> public static void runDesigner() {
<br>- String[] args = new String[]{"-noexitonclose"};
<br>- new Designer(args);
<br>+ String[] args = new String[] {"-noexitonclose"};
<br>+ new Designer( args );
<br> }
<br>-}
<br>-
<br>-
<br>+}
<br>\ No newline at end of file
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26645842&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26643680
SF.net SVN: pmd:[7011] trunk/pmd
2009-12-04T06:55:00Z
2009-12-04T06:55:00Z
rpelisse-2
Revision: 7011
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7011&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7011&view=rev</a><br>Author: rpelisse
<br>Date: 2009-12-04 14:54:59 +0000 (Fri, 04 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>fixing performance issue on PreserveStackTrace by removing use of descendant:: axis. See bug 1808110
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/etc/changelog.txt
<br> trunk/pmd/src/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java
<br><br>Modified: trunk/pmd/etc/changelog.txt
<br>===================================================================
<br>--- trunk/pmd/etc/changelog.txt 2009-12-04 14:37:46 UTC (rev 7010)
<br>+++ trunk/pmd/etc/changelog.txt 2009-12-04 14:54:59 UTC (rev 7011)
<br>@@ -405,7 +405,8 @@
<br> * UselessParentheses
<br> Basic rulesets still includes a reference to those rules.
<br>
<br>-Fixed bug 2832322 - cpd.xml file tag path attribute should be entity-encoded
<br>+Fixed bug 1808110 - Fixed performance issues on PreserveStackTrace
<br>+Fixed bug 2832322 - cpd.xml file tag path attribute should be entity-encoded
<br> Fixed bug 2826119 - False +: DoubleCheckedLocking warning with volatile field
<br> Fixed bug 2835074 - False -: DoubleCheckedLocking with reversed null check
<br> Fixed bug 1932242 - EmptyMethodInAbstractClassShouldBeAbstract false +
<br><br>Modified: trunk/pmd/src/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java
<br>===================================================================
<br>--- trunk/pmd/src/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java 2009-12-04 14:37:46 UTC (rev 7010)
<br>+++ trunk/pmd/src/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java 2009-12-04 14:54:59 UTC (rev 7011)
<br>@@ -123,7 +123,7 @@
<br> // In case of NPE...
<br> if ( node != null && node.getImage() != null )
<br> {
<br>- return catchStmt.hasDescendantMatchingXPath("descendant::StatementExpression/PrimaryExpression/PrimaryPrefix/Name[@Image = '" + node.getImage() + ".initCause']");
<br>+ return catchStmt.hasDescendantMatchingXPath("./Block/BlockStatement/Statement/StatementExpression/PrimaryExpression/PrimaryPrefix/Name[@Image = '" + node.getImage() + ".initCause']");
<br> }
<br> return false;
<br> }
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643680&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26643652
[ pmd-Bugs-1808110 ] PreserveStackTrace shoud check use of initCause method
2009-12-04T06:53:38Z
2009-12-04T06:53:38Z
SourceForge.net
Bugs item #1808110, was opened at 2007-10-05 16:33
<br>Message generated for change (Comment added) made by rpelisse
<br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=1808110&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=1808110&group_id=56262</a><br><br>Please note that this message will contain a full copy of the comment thread,
<br>including the initial issue submission, for this request,
<br>not just the latest update.
<br>Category: pmd
<br>Group: None
<br>>Status: Closed
<br>>Resolution: Fixed
<br>Priority: 5
<br>Private: No
<br>Submitted By: sanjeev (sanjeevrjha)
<br>Assigned to: Romain PELISSE (rpelisse)
<br>Summary: PreserveStackTrace shoud check use of initCause method
<br><br>Initial Comment:
<br>PreserveStackTrace rule is only checking if you throw new exception without using original exception. It is ignoring thrown exception if exception is a local variable. More ever, if “initCause” is called, it should not be reported. IllegalStateException does not have any constructor which takes original exception.
<br><br>Case 1:
<br>Violations reported by PreserveStackTrace Rule
<br>
<br>} catch (Exception e) {
<br> throw new IllegalStateException();
<br>}
<br><br>Case 2:
<br>No violations reported by PreserveStackTrace Rule
<br><br>} catch (Exception e) {
<br> IllegalStateException ex = new IllegalStateException();
<br> throw ex;
<br>}
<br><br>Case 3:
<br>PreserveStackTrace Rule should exclude this as initCause is used.
<br><br>} catch (Exception e) {
<br> IllegalStateException ex = new IllegalStateException();
<br> ex.initCause(e);
<br> throw ex;
<br>}
<br><br><br>----------------------------------------------------------------------
<br><br>>Comment By: Romain PELISSE (rpelisse)
<br>Date: 2009-12-04 15:53
<br><br>Message:
<br>@burdoche:
<br><br>There is a test case called "17, PreserveStackTrace Rule should exclude
<br>this as initCause is used." that reproduce the Case 3 of this bug entry.
<br>When I run it does not seems to be an issue.
<br><br>(check the file
<br>regress/test/net/sourceforge/pmd/rules/design/xml/PreserveStackTrace.xml)
<br><br>Unless you can provide us a failure example, I have to consider case 3 as
<br>closed. If you still have an issue with this, please create a new bug
<br>entry, this one has too much history, it's confusing.
<br><br>Regarding the performance issue, I removed the use of descendant:: in the
<br>rule. Obviously, it may trigger more false positive, as the rule will no
<br>longer look "everywhere" but I confident it should be ok nonetheless.
<br><br>Therefore, I closed this bug.
<br><br>Fix will be available in 4.2.6 and 5.0
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Romain PELISSE (rpelisse)
<br>Date: 2009-11-28 00:37
<br><br>Message:
<br>Arg, this fix of mine is the cause of the performance issue on
<br>PreseverStackTrace :/
<br><br>I'll see to it as soon as possible....
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ryan Gustafson (rgustav)
<br>Date: 2009-11-27 18:37
<br><br>Message:
<br>The XPath searches in this Rule are too expensive, using the
<br>descendant-or-self axis. In some case this single rule can easily take up
<br>to 20% of the time.
<br><br>Closed 2827319 as this is a performance regression on this bug fix.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Romain PELISSE (rpelisse)
<br>Date: 2009-02-14 00:55
<br><br>Message:
<br>Damned i did completly forgot about this ! it's a shame i may have been
<br>able to fix it for 4.2.5 ! :(
<br><br>Well, i'll work on it. Thanks for noticing this.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Ernst de Haan (znerd)
<br>Date: 2009-02-13 18:27
<br><br>Message:
<br>This is still a problem with PMD 4.2.5.
<br><br>Please reopen this bug report.
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Thomas B (burdoche)
<br>Date: 2008-11-05 11:04
<br><br>Message:
<br>I can confirm that Case 3 is not OK, PMD 4.2.4 on
<br><br>try{
<br>...
<br>} catch (Exception e) {
<br> _logger.fatal("Fatal error with xml parser declared.", e);
<br> XNIException ex = new XNIException(e.getMessage());
<br> ex.initCause(e);
<br> throw ex;
<br>}
<br><br><br>----------------------------------------------------------------------
<br><br>Comment By: Rupert Smith (rupertlssmith)
<br>Date: 2008-08-28 10:52
<br><br>Message:
<br>Logged In: YES
<br>user_id=1288539
<br>Originator: NO
<br><br>Case 3 still seems to be broken, running version 4.2.2 on this code:
<br><br>try
<br>{
<br>return source.available();
<br>}
<br>catch (RemoteException e)
<br>{
<br>IOException ioe = new IOException("There was a Remote Exception.");
<br>ioe.initCause(e);
<br>throw ioe;
<br>}
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Romain PELISSE (rpelisse)
<br>Date: 2008-04-11 19:50
<br><br>Message:
<br>Logged In: YES
<br>user_id=1679130
<br>Originator: NO
<br><br>I fixed those 3 issues. Fix should be available in 4.2.1 (to be release
<br>very soon).
<br><br>----------------------------------------------------------------------
<br><br>Comment By: Romain PELISSE (rpelisse)
<br>Date: 2008-03-24 04:56
<br><br>Message:
<br>Logged In: YES
<br>user_id=1679130
<br>Originator: NO
<br><br>Thanks for the report.
<br><br>I reproduce the 3 cases. I'll try to fix each of them, but it won't be for
<br>the 4.2 release (If i fix, i'll let you know, so if you really need, you'll
<br>be able to have this fix).
<br><br><br><br>----------------------------------------------------------------------
<br><br>You can respond by visiting:
<br><a href="https://sourceforge.net/tracker/?func=detail&atid=479921&aid=1808110&group_id=56262" target="_top" rel="nofollow">https://sourceforge.net/tracker/?func=detail&atid=479921&aid=1808110&group_id=56262</a><br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643652&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26643433
SF.net SVN: pmd:[7010] branches/pmd/4.2.x
2009-12-04T06:37:48Z
2009-12-04T06:37:48Z
rpelisse-2
Revision: 7010
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7010&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7010&view=rev</a><br>Author: rpelisse
<br>Date: 2009-12-04 14:37:46 +0000 (Fri, 04 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>fixing performance issue on PreserveStackTrace by removing use of descendant:: axis. See bug 1808110
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/etc/changelog.txt
<br> branches/pmd/4.2.x/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java
<br><br>Modified: branches/pmd/4.2.x/etc/changelog.txt
<br>===================================================================
<br>--- branches/pmd/4.2.x/etc/changelog.txt 2009-12-04 13:37:26 UTC (rev 7009)
<br>+++ branches/pmd/4.2.x/etc/changelog.txt 2009-12-04 14:37:46 UTC (rev 7010)
<br>@@ -1,5 +1,6 @@
<br> ???? - 4.2.6:
<br>
<br>+Fixed bug 1808110 - Fixed performance issue on PreserveStackTrace
<br> Fixed bug 2832322 - cpd.xml file tag path attribute should be entity-encoded
<br> Fixed bug 2590258 - NPE with nicerhtml output
<br> Fixed bug 2317099 - False + in SimplifyCondition
<br><br>Modified: branches/pmd/4.2.x/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java 2009-12-04 13:37:26 UTC (rev 7009)
<br>+++ branches/pmd/4.2.x/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java 2009-12-04 14:37:46 UTC (rev 7010)
<br>@@ -128,7 +128,7 @@
<br> // In case of NPE...
<br> if ( node != null && node.getImage() != null )
<br> {
<br>- List <Node> nodes = catchStmt.findChildNodesWithXPath("descendant::StatementExpression/PrimaryExpression/PrimaryPrefix/Name[@Image = '" + node.getImage() + ".initCause']");
<br>+ List <Node> nodes = catchStmt.findChildNodesWithXPath("./Block/BlockStatement/Statement/StatementExpression/PrimaryExpression/PrimaryPrefix/Name[@Image = '" + node.getImage() + ".initCause']");
<br> if ( nodes != null && nodes.size() > 0 )
<br> {
<br> return true;
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643433&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26642605
SF.net SVN: pmd:[7009] branches/pmd/4.2.x
2009-12-04T05:37:26Z
2009-12-04T05:37:26Z
rpelisse-2
Revision: 7009
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7009&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7009&view=rev</a><br>Author: rpelisse
<br>Date: 2009-12-04 13:37:26 +0000 (Fri, 04 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Adding a new rule : GenericsNaming
<br>Thanks to Nicolas Dordet for his inputs on this one.
<br><br>Modified Paths:
<br>--------------
<br> branches/pmd/4.2.x/etc/changelog.txt
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java
<br> branches/pmd/4.2.x/rulesets/naming.xml
<br><br>Added Paths:
<br>-----------
<br> branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/xml/GenericsNaming.xml
<br><br>Modified: branches/pmd/4.2.x/etc/changelog.txt
<br>===================================================================
<br>--- branches/pmd/4.2.x/etc/changelog.txt 2009-12-04 13:32:51 UTC (rev 7008)
<br>+++ branches/pmd/4.2.x/etc/changelog.txt 2009-12-04 13:37:26 UTC (rev 7009)
<br>@@ -21,6 +21,7 @@
<br> Android: DoNotHardCodeSDCard
<br> Controversial : AvoidLiteralsInIfCondition (patch 2591627), UseConcurrentHashMap
<br> StrictExceptions : AvoidCatchingGenericException, AvoidLosingExceptionInformation
<br>+ Naming : GenericsNaming
<br>
<br> February 08, 2009 - 4.2.5:
<br>
<br><br>Modified: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java 2009-12-04 13:32:51 UTC (rev 7008)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java 2009-12-04 13:37:26 UTC (rev 7009)
<br>@@ -26,6 +26,7 @@
<br> addRule("naming", "SuspiciousEqualsMethodName");
<br> addRule("naming", "SuspiciousHashcodeMethodName");
<br> addRule("naming", "VariableNamingConventions");
<br>+ addRule("naming", "GenericsNaming");
<br> }
<br>
<br> public static junit.framework.Test suite() {
<br><br>Added: branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/xml/GenericsNaming.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/xml/GenericsNaming.xml (rev 0)
<br>+++ branches/pmd/4.2.x/regress/test/net/sourceforge/pmd/rules/naming/xml/GenericsNaming.xml 2009-12-04 13:37:26 UTC (rev 7009)
<br>@@ -0,0 +1,47 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<test-data>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 upper case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <B extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+2 upper case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <B extends Bar, C extends Car>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 lower Case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <b extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 lower case/multiple letter
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <BA extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+</test-data>
<br><br>Modified: branches/pmd/4.2.x/rulesets/naming.xml
<br>===================================================================
<br>--- branches/pmd/4.2.x/rulesets/naming.xml 2009-12-04 13:32:51 UTC (rev 7008)
<br>+++ branches/pmd/4.2.x/rulesets/naming.xml 2009-12-04 13:37:26 UTC (rev 7009)
<br>@@ -507,4 +507,53 @@
<br> ]]></example>
<br> </rule>
<br>
<br>+ <rule name="GenericsNaming"
<br>+ since="4.2.6"
<br>+ message="Generics names should be a one letter long and upper case."
<br>+ class="net.sourceforge.pmd.rules.XPathRule"
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/naming.html#GenericsNaming" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/naming.html#GenericsNaming</a>">
<br>+ <description>
<br>+Generics names should be a one letter long and upper case.
<br>+ </description>
<br>+ <priority>4</priority>
<br>+ <properties>
<br>+ <property name="xpath">
<br>+ <value>
<br>+ <![CDATA[
<br>+//TypeDeclaration/ClassOrInterfaceDeclaration/TypeParameters/TypeParameter[
<br>+ string-length(@Image) > 1
<br>+ or
<br>+ string:upper-case(@Image) != @Image
<br>+]
<br>+]]>
<br>+ </value>
<br>+ </property>
<br>+ </properties>
<br>+ <example>
<br>+ <![CDATA[
<br>+public interface GenericDao<E extends BaseModel, K extends Serializable> extends BaseDao
<br>+{
<br>+ // This is ok...
<br>+}
<br>+
<br>+public interface GenericDao<E extends BaseModel, K extends Serializable>
<br>+{
<br>+ // Also this
<br>+}
<br>+
<br>+public interface GenericDao<e extends BaseModel, K extends Serializable>
<br>+{
<br>+ // 'e' should be an 'E'
<br>+}
<br>+
<br>+public interface GenericDao<EF extends BaseModel, K extends Serializable>
<br>+{
<br>+ // 'EF' is not ok.
<br>+}
<br>+
<br>+
<br>+
<br>+ ]]></example>
<br>+ </rule>
<br>+
<br> </ruleset>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642605&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26642555
SF.net SVN: pmd:[7008] trunk/pmd
2009-12-04T05:32:52Z
2009-12-04T05:32:52Z
rpelisse-2
Revision: 7008
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7008&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7008&view=rev</a><br>Author: rpelisse
<br>Date: 2009-12-04 13:32:51 +0000 (Fri, 04 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Adding a new rule : GenericsNaming
<br>Thanks to Nicolas Dordet for his inputs on this one.
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/etc/changelog.txt
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml
<br> trunk/pmd/rulesets/java/naming.xml
<br> trunk/pmd/rulesets/xsl/xpath.xml
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml
<br><br>Modified: trunk/pmd/etc/changelog.txt
<br>===================================================================
<br>--- trunk/pmd/etc/changelog.txt 2009-12-03 23:50:29 UTC (rev 7007)
<br>+++ trunk/pmd/etc/changelog.txt 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -481,7 +481,7 @@
<br> Empty ruleset: EmptyInitializer,EmptyStatementBlock
<br> Import ruleset: UnnecessaryFullyQualifiedName
<br> Optimization ruleset: RedundantFieldInitializer
<br>- Naming ruleset: ShortClassName
<br>+ Naming ruleset: ShortClassName, GenericsNaming
<br> StrictException ruleset: AvoidThrowingNewInstanceOfSameException, AvoidCatchingGenericException, AvoidLosingExceptionInformation
<br> Unnecessary ruleset: UselessParentheses
<br> JUnit ruleset: JUnitTestContainsTooManyAsserts, UseAssertTrueInsteadOfAssertEquals
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java 2009-12-03 23:50:29 UTC (rev 7007)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -29,6 +29,7 @@
<br> addRule(RULESET, "SuspiciousEqualsMethodName");
<br> addRule(RULESET, "SuspiciousHashcodeMethodName");
<br> addRule(RULESET, "VariableNamingConventions");
<br>+ addRule(RULESET, "GenericsNaming");
<br> }
<br>
<br> public static junit.framework.Test suite() {
<br><br>Added: trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml (rev 0)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -0,0 +1,47 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<test-data>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 upper case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <B extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+2 upper case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <B extends Bar, C extends Car>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 lower Case/single letter
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <b extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description><![CDATA[
<br>+1 lower case/multiple letter
<br>+ ]]></description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <code><![CDATA[
<br>+public interface Foo <BA extends Bar>
<br>+{
<br>+}
<br>+ ]]></code>
<br>+ </test-code>
<br>+</test-data>
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml 2009-12-03 23:50:29 UTC (rev 7007)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -14,7 +14,7 @@
<br> <source-type>xsl</source-type>
<br> </test-code>
<br> <test-code>
<br>- <description>Valid use of concat()</description>
<br>+ <description>using an axis name as an node name</description>
<br> <expected-problems>0</expected-problems>
<br> <code><![CDATA[
<br> <xsl:stylesheet version="1.0"
<br>@@ -25,4 +25,16 @@
<br> ]]></code>
<br> <source-type>xsl</source-type>
<br> </test-code>
<br>+ <test-code>
<br>+ <description>using an axis descendant::self abreviation with checkSelfDescendantAbreviation @true</description>
<br>+ <expected-problems>1</expected-problems>
<br>+ <rule-property name="checkSelfDescendantAbreviation">true</rule-property>
<br>+ <code><![CDATA[
<br>+<xsl:stylesheet version="1.0"
<br>+ xmlns:xsl="<a href="http://www.w3.org/1999/XSL/Transform" target="_top" rel="nofollow">http://www.w3.org/1999/XSL/Transform</a>">
<br>+ <xsl:variable name="var" select="//child"/>
<br>+</xsl:stylesheet>
<br>+ ]]></code>
<br>+ <source-type>xsl</source-type>
<br>+ </test-code>
<br> </test-data>
<br><br>Modified: trunk/pmd/rulesets/java/naming.xml
<br>===================================================================
<br>--- trunk/pmd/rulesets/java/naming.xml 2009-12-03 23:50:29 UTC (rev 7007)
<br>+++ trunk/pmd/rulesets/java/naming.xml 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -536,4 +536,54 @@
<br> </example>
<br> </rule>
<br>
<br>+ <rule name="GenericsNaming"
<br>+ language="java"
<br>+ since="4.2.6"
<br>+ message="Generics names should be a one letter long and upper case."
<br>+ class="net.sourceforge.pmd.lang.rule.XPathRule"
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/java/naming.html#GenericsNaming" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/java/naming.html#GenericsNaming</a>">
<br>+ <description>
<br>+Generics names should be a one letter long and upper case.
<br>+ </description>
<br>+ <priority>4</priority>
<br>+ <properties>
<br>+ <property name="xpath">
<br>+ <value>
<br>+ <![CDATA[
<br>+//TypeDeclaration/ClassOrInterfaceDeclaration/TypeParameters/TypeParameter[
<br>+ string-length(@Image) > 1
<br>+ or
<br>+ string:upper-case(@Image) != @Image
<br>+]
<br>+]]>
<br>+ </value>
<br>+ </property>
<br>+ </properties>
<br>+ <example>
<br>+ <![CDATA[
<br>+public interface GenericDao<E extends BaseModel, K extends Serializable> extends BaseDao
<br>+{
<br>+ // This is ok...
<br>+}
<br>+
<br>+public interface GenericDao<E extends BaseModel, K extends Serializable>
<br>+{
<br>+ // Also this
<br>+}
<br>+
<br>+public interface GenericDao<e extends BaseModel, K extends Serializable>
<br>+{
<br>+ // 'e' should be an 'E'
<br>+}
<br>+
<br>+public interface GenericDao<EF extends BaseModel, K extends Serializable>
<br>+{
<br>+ // 'EF' is not ok.
<br>+}
<br>+
<br>+
<br>+
<br>+ ]]></example>
<br>+ </rule>
<br>+
<br> </ruleset>
<br><br>Modified: trunk/pmd/rulesets/xsl/xpath.xml
<br>===================================================================
<br>--- trunk/pmd/rulesets/xsl/xpath.xml 2009-12-03 23:50:29 UTC (rev 7007)
<br>+++ trunk/pmd/rulesets/xsl/xpath.xml 2009-12-04 13:32:51 UTC (rev 7008)
<br>@@ -60,6 +60,11 @@
<br> contains(@select,'descendant::')
<br> or
<br> contains(@select,'descendant-self::')
<br>+ or (
<br>+ ($checkSelfDescendantAbreviation = 'true' )
<br>+ and
<br>+ contains(@select,'//')
<br>+ )
<br> ]
<br> ]]>
<br> <!-- the use of node() allow to target any node with an select attribute
<br>@@ -67,6 +72,7 @@
<br> node name.-->
<br> </value>
<br> </property>
<br>+ <property name="checkSelfDescendantAbreviation" type="Boolean" description="descendant::self abreviation, '//', will also trigger this rule."><value>false</value></property>
<br> </properties>
<br> <example>
<br> <![CDATA[
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>Pmd-devel mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642555&i=0" target="_top" rel="nofollow">Pmd-devel@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/pmd-devel" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/pmd-devel</a><br><p>From forum: <a href="http://old.nabble.com/Java-PMD---Dev-f2382.html" embed="fixTarget[2382]" target="_top" >Java PMD - Dev</a></p>
tag:old.nabble.com,2006:post-26635384
SF.net SVN: pmd:[7007] trunk/pmd
2009-12-03T15:50:29Z
2009-12-03T15:50:29Z
rpelisse-2
Revision: 7007
<br> <a href="http://pmd.svn.sourceforge.net/pmd/?rev=7007&view=rev" target="_top" rel="nofollow">http://pmd.svn.sourceforge.net/pmd/?rev=7007&view=rev</a><br>Author: rpelisse
<br>Date: 2009-12-03 23:50:29 +0000 (Thu, 03 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>adding a new XPath rule : AvoidAxisNavigation.
<br>(Note that the description of the rule is from an email sent to me by Ryan Gustavson)
<br><br>Modified Paths:
<br>--------------
<br> trunk/pmd/etc/changelog.txt
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/XPathRulesTest.java
<br> trunk/pmd/rulesets/xsl/xpath.xml
<br><br>Added Paths:
<br>-----------
<br> trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml
<br><br>Modified: trunk/pmd/etc/changelog.txt
<br>===================================================================
<br>--- trunk/pmd/etc/changelog.txt 2009-12-03 06:19:27 UTC (rev 7006)
<br>+++ trunk/pmd/etc/changelog.txt 2009-12-03 23:50:29 UTC (rev 7007)
<br>@@ -356,6 +356,7 @@
<br>
<br> New Language 'ecmascript' added, for writing XPathRule and Java Rules against ECMAScript/JavaScript documents (must be standalone, not embedded in HTML). Many thanks to Rhino!
<br> New Language 'xml' added, for writing XPathRules against XML documents
<br>+New Language 'xsl' added, as a derivative from XML.
<br> Rules can now define a 'violationSuppressRegex' property to universally suppress violations with messages matching the given regular expression
<br> Rules can now define a 'violationSuppressXPath' property to universally suppress violations on nodes which match the given relative XPath expression
<br> Rules are now directly associated with a corresponding Language, and a can also be associated with a specific Language Version range if desired.
<br><br>Modified: trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/XPathRulesTest.java
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/XPathRulesTest.java 2009-12-03 06:19:27 UTC (rev 7006)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/XPathRulesTest.java 2009-12-03 23:50:29 UTC (rev 7007)
<br>@@ -14,6 +14,7 @@
<br> @Before
<br> public void setUp() {
<br> addRule(RULESET, "UseConcatOnce");
<br>+ addRule(RULESET, "AvoidAxisNavigation");
<br> }
<br>
<br> public static junit.framework.Test suite() {
<br><br>Added: trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml
<br>===================================================================
<br>--- trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml (rev 0)
<br>+++ trunk/pmd/regress/test/net/sourceforge/pmd/lang/xsl/rule/xpath/xml/AvoidAxisNavigation.xml 2009-12-03 23:50:29 UTC (rev 7007)
<br>@@ -0,0 +1,28 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<test-data>
<br>+ <test-code>
<br>+ <description>Basic scenario</description>
<br>+ <expected-problems>3</expected-problems>
<br>+ <code><![CDATA[
<br>+<xsl:stylesheet version="1.0"
<br>+ xmlns:xsl="<a href="http://www.w3.org/1999/XSL/Transform" target="_top" rel="nofollow">http://www.w3.org/1999/XSL/Transform</a>">
<br>+<xsl:variable select="descendant::book"/>
<br>+<xsl:variable select="following::book"/>
<br>+<xsl:variable select="preceeding::book"/>
<br>+</xsl:stylesheet>
<br>+ ]]></code>
<br>+ <source-type>xsl</source-type>
<br>+ </test-code>
<br>+ <test-code>
<br>+ <description>Valid use of concat()</description>
<br>+ <expected-problems>0</expected-problems>
<br>+ <code><![CDATA[
<br>+<xsl:stylesheet version="1.0"
<br>+ xmlns:xsl="<a href="http://www.w3.org/1999/XSL/Transform" target="_top" rel="nofollow">http://www.w3.org/1999/XSL/Transform</a>">
<br>+<!-- a node called 'descendant', probably a bad idea but shouldn't be a problem -->
<br>+ <xsl:variable name="var" select="//descendant"/>
<br>+</xsl:stylesheet>
<br>+ ]]></code>
<br>+ <source-type>xsl</source-type>
<br>+ </test-code>
<br>+</test-data>
<br><br>Modified: trunk/pmd/rulesets/xsl/xpath.xml
<br>===================================================================
<br>--- trunk/pmd/rulesets/xsl/xpath.xml 2009-12-03 06:19:27 UTC (rev 7006)
<br>+++ trunk/pmd/rulesets/xsl/xpath.xml 2009-12-03 23:50:29 UTC (rev 7007)
<br>@@ -38,4 +38,40 @@
<br> ]]>
<br> </example>
<br> </rule>
<br>+ <rule name="AvoidAxisNavigation"
<br>+ language="xsl"
<br>+ since="5.0"
<br>+ message="Axis navigation has the largest impact when writing an XPath query."
<br>+ class="net.sourceforge.pmd.lang.rule.XPathRule"
<br>+ externalInfoUrl="<a href="http://pmd.sourceforge.net/rules/xml/basic.html#AvoidAxisNavigation" target="_top" rel="nofollow">http://pmd.sourceforge.net/rules/xml/basic.html#AvoidAxisNavigation</a>">
<br>+ <description>
<br>+Avoid using the 'following' or 'preceeding' axes whenever possible, as these can cut through 100% of the document in the worst case. Also, try to avoid using 'descendant' or 'descendant-self' axes, as if you're at the top of the Document, it necessarily means cutting through 100% of the document.
<br>+ </description>
<br>+ <priority>3</priority>
<br>+ <properties>
<br>+ <property name="xpath">
<br>+ <value>
<br>+ <![CDATA[
<br>+//node()[
<br>+ contains(@select,'preceeding::')
<br>+ or
<br>+ contains(@select,'following::')
<br>+ or
<br>+ contains(@select,'descendant::')
<br>+ or
<br>+ contains(@select,'descendant-self::')
<br>+]
<br>+]]>
<br>+<!-- the use of node() allow to target any node with an select attribute
<br>+ but also workaround the ambiguity of having the xsl