removed deprecated in Idea 6 method FlexLexer.reset(CharSequence, int)

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/src/org/intellij/lang/regexp/_RegExLexer.java
index 18df5cb3c149da7da4aede51a19af2852d769fed..adc8fd993c63b07cd992436a6d6e801bebdba7e3 100644 (file)
--- a/RegExpSupport/src/org/intellij/lang/regexp/_RegExLexer.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/_RegExLexer.java
@@ -441,18 +441,6 @@ class _RegExLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/java/java-impl/src/com/intellij/lexer/_JavaLexer.java b/java/java-impl/src/com/intellij/lexer/_JavaLexer.java
index 4c4df7f4699c64c625298536731d7840d18ca184..256ef3bb1b46284848fe2fe512c3308d4c1ab34f 100644 (file)
--- a/java/java-impl/src/com/intellij/lexer/_JavaLexer.java
+++ b/java/java-impl/src/com/intellij/lexer/_JavaLexer.java
@@ -826,10 +826,6 @@ class _JavaLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  public void reset(CharSequence buffer, int initialState){
-    reset(buffer, 0, buffer.length(), initialState);
-  }
-  
   /**
    * Refills the input buffer.
    *

diff --git a/platform/lang-api/src/com/intellij/lexer/FlexAdapter.java b/platform/lang-api/src/com/intellij/lexer/FlexAdapter.java
index bfbee4d1be194fb20e8eea5b3530ebfae00a9075..9a37e830e4c3a1c8e956a34787a266a11318ae54 100644 (file)
--- a/platform/lang-api/src/com/intellij/lexer/FlexAdapter.java
+++ b/platform/lang-api/src/com/intellij/lexer/FlexAdapter.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.lexer;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.tree.IElementType;
 
 import java.io.IOException;
@@ -42,12 +41,7 @@ public class FlexAdapter extends LexerBase {
   public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
     myText = buffer;
     myEnd = endOffset;
-    try {
-      myFlex.reset(myText, startOffset, endOffset, initialState);
-    } catch(AbstractMethodError ame) {
-      // Demetra compatibility
-      myFlex.reset(myText.subSequence(startOffset, endOffset), initialState);
-    }
+    myFlex.reset(myText, startOffset, endOffset, initialState);    
     myTokenType = null;
   }
 

diff --git a/platform/lang-api/src/com/intellij/lexer/FlexLexer.java b/platform/lang-api/src/com/intellij/lexer/FlexLexer.java
index 21f9de6ec64eca2eb7582d796f9777c4174cc98d..a0d60301e42628cac96c14142adf114b62033eeb 100644 (file)
--- a/platform/lang-api/src/com/intellij/lexer/FlexLexer.java
+++ b/platform/lang-api/src/com/intellij/lexer/FlexLexer.java
@@ -30,10 +30,4 @@ import java.io.IOException;
   int getTokenEnd();
   IElementType advance() throws IOException;
   void reset(CharSequence buf, int start, int end, int initialState);
-
-  /**
-   * Method left for Demetra compatibility
-   */
-  @Deprecated
-  void reset(CharSequence buf, int initialState);
 }

diff --git a/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java b/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java
index adab34502764ddf474c78a90c60214d36a7fe1c9..41485efc5462901838878770e82cecb599846146 100644 (file)
--- a/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java
+++ b/platform/lang-api/src/com/intellij/lexer/_JavaDocLexer.java
@@ -380,18 +380,6 @@ class _JavaDocLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.java
index f6ed1b4e8fb143c43a88a7918ff90022f3c524fd..5f747c3b845e4acd3910045d6f7753afc127ec8f 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_MacroLexer.java
@@ -359,18 +359,6 @@ class _MacroLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_TemplateTextLexer.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_TemplateTextLexer.java
index 11077d1c5dfca7d300ea79d6927a2d98f62bfd86..bce798428c5db545bcc14e2b86bddc005f94de15 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_TemplateTextLexer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/_TemplateTextLexer.java
@@ -265,10 +265,6 @@ class _TemplateTextLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  public void reset(CharSequence buffer, int initialState){
-    reset(buffer, 0, buffer.length(), initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.java
index ee4b82b5e17f617b575e1013d83de9be72617626..b1617cffe0c4c082439e7b4e962faf2f15712dc9 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.java
@@ -268,10 +268,6 @@ class FileTemplateTextLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  public void reset(CharSequence buffer, int initialState){
-    reset(buffer, 0, buffer.length(), initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.java b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.java
index 6d9f5905fad2d73516cb6862d3a985e83a6db4db..a1b21a9bc84bc5abf0d2fe8a676c8c3e18044535 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/lexer/_ScopesLexer.java
@@ -365,18 +365,6 @@ class _ScopesLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/_GroovyDocLexer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/_GroovyDocLexer.java
index 44be6f5f67f2dc29a9b55a508af9fe2da40ad56e..c89e7dfe2a359f13e310021feb5e5388cc5807a9 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/_GroovyDocLexer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/_GroovyDocLexer.java
@@ -377,18 +377,6 @@ public class _GroovyDocLexer implements FlexLexer, GroovyDocTokenTypes {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
index ae423df04f45c07b382e6915a69969d240c550a6..253404bbf5202e99bb4e6eeb8938a851ad7481ae 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
@@ -931,24 +931,6 @@ public class _GroovyLexer implements FlexLexer, GroovyTokenTypes {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    clearStacks();
-    braceCount.clear();
-    afterComment = YYINITIAL;
-
-    zzBuffer = buffer;
-    zzBufferArray = null;
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    java.util.Arrays.fill(zzFin, false);
-
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
index 21b18bd9c157e710eefb2d42872057ed8fa63b2f..079a7785eeb6e5c3d6e40f9c41e93701ce00419b 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
@@ -86,24 +86,6 @@
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    clearStacks();
-    braceCount.clear();
-    afterComment = YYINITIAL;
-
-    zzBuffer = buffer;
-    zzBufferArray = null;
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    java.util.Arrays.fill(zzFin, false);
-
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/plugins/properties/src/com/intellij/lang/properties/parsing/_PropertiesLexer.java b/plugins/properties/src/com/intellij/lang/properties/parsing/_PropertiesLexer.java
index 4e5b3b869da46e338c15cf234df3fd0231ee2459..64f8f3e3f1dcceb239618817db1cb2f67dc0cec4 100644 (file)
--- a/plugins/properties/src/com/intellij/lang/properties/parsing/_PropertiesLexer.java
+++ b/plugins/properties/src/com/intellij/lang/properties/parsing/_PropertiesLexer.java
@@ -279,10 +279,6 @@ class _PropertiesLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  public void reset(CharSequence buffer, int initialState){
-    reset(buffer, 0, buffer.length(), initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/_XPathLexer.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/_XPathLexer.java
index 2188dbc9f049f780f81ef65cf0d2465f027075bc..e95bf5830c74e5005c25b73e930db4de3ef82567 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/_XPathLexer.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/_XPathLexer.java
@@ -967,11 +967,6 @@ class _XPathLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    reset(buffer, 0, buffer.length(), initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/tools/lexer/idea-flex.skeleton b/tools/lexer/idea-flex.skeleton
index a91ec0c8685960911c8a73f8ec35ae3e121527d4..234a62c41a5567765948bc449b4bc8200574d2b9 100644 (file)
--- a/tools/lexer/idea-flex.skeleton
+++ b/tools/lexer/idea-flex.skeleton
@@ -80,18 +80,6 @@
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/xml/impl/src/com/intellij/lexer/_HtmlLexer.java b/xml/impl/src/com/intellij/lexer/_HtmlLexer.java
index a614d25daf697e8c0b0cd077e6276f33c680d3f3..e35b5b91c50211c8a8210891a490f7e3b7c567df 100644 (file)
--- a/xml/impl/src/com/intellij/lexer/_HtmlLexer.java
+++ b/xml/impl/src/com/intellij/lexer/_HtmlLexer.java
@@ -458,18 +458,6 @@ public class _HtmlLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java b/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java
index b25c00b3fd9518d73a39e57b78a861b87b6228da..673aac6edc4ef1cd2b22f770f8e159e143300c4b 100644 (file)
--- a/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java
+++ b/xml/impl/src/com/intellij/lexer/_OldXmlLexer.java
@@ -615,18 +615,6 @@ public class _OldXmlLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *

diff --git a/xml/impl/src/com/intellij/lexer/__XmlLexer.java b/xml/impl/src/com/intellij/lexer/__XmlLexer.java
index b173839647b180a4fc307e07b8105271ffc9b678..d26f0f5f01cd7017259640469607733c9da97719 100644 (file)
--- a/xml/impl/src/com/intellij/lexer/__XmlLexer.java
+++ b/xml/impl/src/com/intellij/lexer/__XmlLexer.java
@@ -493,18 +493,6 @@ public class __XmlLexer implements FlexLexer {
     yybegin(initialState);
   }
 
-  // For Demetra compatibility
-  public void reset(CharSequence buffer, int initialState){
-    zzBuffer = buffer;
-    zzBufferArray = null; 
-    zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-    zzPushbackPos = 0;
-    zzAtEOF = false;
-    zzAtBOL = true;
-    zzEndRead = buffer.length();
-    yybegin(initialState);
-  }
-
   /**
    * Refills the input buffer.
    *