From 79ef48672463944e364e7431b6c43878f6599f74 Mon Sep 17 00:00:00 2001 From: Dale Anson Date: Wed, 9 Dec 2009 17:10:47 +0000 Subject: [PATCH] Changed javascript to ecmascript. git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@7024 51baf565-9d33-0410-a72c-fc3788e3496d --- .../sourceforge/pmd/cpd/EcmascriptTokenizerTest.java | 10 +++++----- .../net/sourceforge/pmd/cpd/EcmascriptLanguage.java | 6 +++--- .../net/sourceforge/pmd/cpd/EcmascriptTokenizer.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java b/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java index 32e4ded411..5749389e39 100644 --- a/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java @@ -5,18 +5,18 @@ package test.net.sourceforge.pmd.cpd; import static org.junit.Assert.assertEquals; import net.sourceforge.pmd.PMD; -import net.sourceforge.pmd.cpd.JavascriptTokenizer; +import net.sourceforge.pmd.cpd.EcmascriptTokenizer; import net.sourceforge.pmd.cpd.SourceCode; import net.sourceforge.pmd.cpd.Tokenizer; import net.sourceforge.pmd.cpd.Tokens; import org.junit.Test; -public class JavascriptTokenizerTest { +public class EcmascriptTokenizerTest { @Test public void test1() throws Throwable { - Tokenizer tokenizer = new JavascriptTokenizer(); + Tokenizer tokenizer = new EcmascriptTokenizer(); SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode1() ) ); Tokens tokens = new Tokens(); tokenizer.tokenize( sourceCode, tokens ); @@ -25,7 +25,7 @@ public class JavascriptTokenizerTest { @Test public void test2() throws Throwable { - Tokenizer t = new JavascriptTokenizer(); + Tokenizer t = new EcmascriptTokenizer(); SourceCode sourceCode = new SourceCode( new SourceCode.StringCodeLoader( getCode2() ) ); Tokens tokens = new Tokens(); t.tokenize( sourceCode, tokens ); @@ -59,6 +59,6 @@ public class JavascriptTokenizerTest { } public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter( JavascriptTokenizerTest.class ); + return new junit.framework.JUnit4TestAdapter( EcmascriptTokenizerTest.class ); } } \ No newline at end of file diff --git a/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java b/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java index 17bda4d604..896ed84bf1 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java +++ b/pmd/src/net/sourceforge/pmd/cpd/EcmascriptLanguage.java @@ -4,8 +4,8 @@ */ package net.sourceforge.pmd.cpd; -public class JavascriptLanguage extends AbstractLanguage { - public JavascriptLanguage() { - super(new JavascriptTokenizer(), ".js"); +public class EcmascriptLanguage extends AbstractLanguage { + public EcmascriptLanguage() { + super(new EcmascriptTokenizer(), ".js"); } } diff --git a/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java b/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java index 020f0a1043..8b6697ad6a 100644 --- a/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java +++ b/pmd/src/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -public class JavascriptTokenizer extends AbstractTokenizer { - public JavascriptTokenizer() { +public class EcmascriptTokenizer extends AbstractTokenizer { + public EcmascriptTokenizer() { // setting markers for "string" in javascript this.stringToken = new ArrayList(); this.stringToken.add( "\'" );