From 20480f3d34e76a10fc1309f499aa85cb64398722 Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 5 Mar 2004 17:09:38 +0000
Subject: [PATCH 01/16] misc parser changes

---
 .../phpdt/internal/compiler/parser/Parser.java     |   56 ++++++++++++++++++-
 .../phpdt/internal/compiler/parser/Scanner.java    |    2 +-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 271c3d6..7369a24 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -1410,10 +1410,10 @@ public class Parser //extends PHPParserSuperclass
         typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
         getNextToken();
       } else {
-        throwSyntaxError("'}' expected at end of interface body.");
+        throwSyntaxError("'}' expected at end of class body.");
       }
     } else {
-      throwSyntaxError("'{' expected at start of interface body.");
+      throwSyntaxError("'{' expected at start of class body.");
     }
   }
   private void class_entry_type() {
@@ -1492,7 +1492,14 @@ public class Parser //extends PHPParserSuperclass
   private void class_statement_list() {
     do {
       class_statement();
-    } while (token == TokenNamefunction || token == TokenNamevar);
+    } while (token == TokenNamepublic || 
+        token == TokenNameprotected || 
+        token == TokenNameprivate || 
+        token == TokenNamestatic || 
+        token == TokenNameabstract || 
+        token == TokenNamefinal || 
+        token == TokenNamefunction || 
+        token == TokenNamevar);
   }
   private void class_statement() {
     //    class_statement:
@@ -2185,6 +2192,26 @@ public class Parser //extends PHPParserSuperclass
           getNextToken();
         }
         break;
+      case TokenNamearray :
+    //    T_ARRAY '(' array_pair_list ')'
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+          if (token == TokenNameRPAREN) {
+            getNextToken();
+            break;
+          }
+          array_pair_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after keyword 'array'"
+                + "(Found token: " + scanner.toStringAction(token) + ")");
+          }
+          getNextToken();
+        } else {
+          throwSyntaxError("'(' expected after keyword 'array'"
+              + "(Found token: " + scanner.toStringAction(token) + ")");
+        }
+        break;
       case TokenNameprint :
         getNextToken();
         expr();
@@ -2358,6 +2385,29 @@ public class Parser //extends PHPParserSuperclass
       }
     } while (while_flag);
   }
+  private void array_pair_list() {
+//  array_pair_list:
+//	/* empty */  
+//|	non_empty_array_pair_list possible_comma	
+    non_empty_array_pair_list();
+    if (token == TokenNameCOMMA) {
+      getNextToken();
+    }
+  }
+ 
+ 
+  private void non_empty_array_pair_list() {
+//non_empty_array_pair_list:
+//	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr	 
+//|	non_empty_array_pair_list ',' expr			 
+//|	expr T_DOUBLE_ARROW expr 
+//|	expr 				 
+//|	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable 
+//|	non_empty_array_pair_list ',' '&' w_variable  
+//|	expr T_DOUBLE_ARROW '&' w_variable 
+//|	'&' w_variable 			 
+  }
+  
   private void unaryExpression() {
     switch (token) {
       case TokenNamePLUS_PLUS :
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index 83ca372..a9520dd 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -160,7 +160,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public char[][] taskTags = null;
   public char[][] taskPriorities = null;
 
-  public static final boolean DEBUG = false;
+  public static final boolean DEBUG = true;
 
   public Scanner() {
     this(false, false);
-- 
1.7.1


From 7a53c30e2ecce051aec50b1bab3fd5bca5f71b5b Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 5 Mar 2004 17:14:44 +0000
Subject: [PATCH 02/16] misc parser changes

---
 net.sourceforge.phpeclipse.tests/plugin.xml        |    6 +
 .../php/test/DualParseSyntaxErrorTest.java         |   25 +-
 .../phpeclipse/tests/parser/PHPManualTestCase.java |  345 +++++++-------------
 .../phpeclipse/tests/parser/PHPParserTestCase.java |  101 ++----
 4 files changed, 175 insertions(+), 302 deletions(-)

diff --git a/net.sourceforge.phpeclipse.tests/plugin.xml b/net.sourceforge.phpeclipse.tests/plugin.xml
index 7cbb00e..1a70b25 100644
--- a/net.sourceforge.phpeclipse.tests/plugin.xml
+++ b/net.sourceforge.phpeclipse.tests/plugin.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.tests"
    name="Core Tests"
@@ -9,6 +10,11 @@
       <library name="coretests.jar"/>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.junit"/>
       <import plugin="net.sourceforge.phpeclipse"/>
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
index 088c75a..09830f3 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
@@ -95,7 +95,16 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 	}
 	public void test01() {
 		String s = 
-			" "; 	
+			"final class test {\n" + 
+			"\n" + 
+			"private function f1() {\n" + 
+			"\n" + 
+			"}\n" + 
+			"public function f2() {\n" + 
+			"\n" +
+			"  \n" + 
+			"}  \n" + 
+			"}"; 	
 
 		String expectedSyntaxErrorDiagnosis =
 			"";
@@ -126,24 +135,14 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 	
 	public void test97() {
 		String s = 
-			"class class {							    \n"+
+			"class momo {							    \n"+
 			"	function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n"+
 			"	{   							        \n"+
 			"	}			  							\n"+
 			"}											\n"; 	
 
 		String expectedSyntaxErrorDiagnosis =
-			"----------\n" + 
-			"1. ERROR in <test1> (at line 1)\n" + 
-			"	class class {							    \n" + 
-			"	      ^^^^^\n" + 
-			"Parse error \"Don\'t use keyword for class declaration [class].\"\n" + 
-			"----------\n" + 
-			"2. ERROR in <test1> (at line 1)\n" + 
-			"	class class {							    \n" + 
-			"	            ^\n" + 
-			"Parse error \"Class name expected after keyword \'class\'.\"\n" + 
-			"----------\n";
+			"";
 
 		checkParse(
 			s.toCharArray(),
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
index 6ab02e7..56d3697 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
@@ -1,215 +1,158 @@
 package net.sourceforge.phpeclipse.tests.parser;
-/**********************************************************************
-Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
+/*******************************************************************************
+ * Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de All rights
+ * reserved. This program and the accompanying materials are made available
+ * under the terms of the Common Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
+ ******************************************************************************/
+import junit.framework.TestCase;
 import net.sourceforge.phpdt.internal.compiler.parser.Parser;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
-
-import org.eclipse.core.runtime.CoreException;
-import junit.framework.TestCase;
-
 /**
- *  Tests the php parser
+ * Tests the php parser
  */
 public class PHPManualTestCase extends TestCase {
-
   Parser parser;
-
   public PHPManualTestCase(String name) {
     super(name);
   }
-
   /**
-   *  Test the PHP Parser with different PHP snippets
+   * Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
-    checkPHP("function foo()" +
    	"{" +
    	"    echo \"In foo()<br>\\n\";" +
    	"}" +
    	"" +
    	"function bar($arg = '')" +
    	"{" +
    	"    echo \"In bar(); argument was '$arg'.<br>\\n\";" +
    	"}" +
    	"" +
    	"// This is a wrapper function around echo" +
    	"function echoit($string)" +
    	"{" +
    	"    echo $string;" +
    	"}" +
    	"" +
    	"$func = 'foo';" +
    	"$func();        // This calls foo()" +
    	"" +
    	"$func = 'bar';" +
    	"$func('test');  // This calls bar()" +
    	"" +
    	"$func = 'echoit';" +
    	"$func('test');  // This calls echoit()" +
    	"");
-    checkPHP("class Foo" +
    	"{" +
    	"    function Vari()" +
    	"    {" +
    	"        $name = 'Bar';" +
    	"        $this->$name(); // This calls the Bar() method\n" +
    	"    }" +
    	"    " +
    	"    function Bar()" +
    	"    {" +
    	"        echo \"This is Bar\";" +
    	"    }" +
    	"}" +
    	"" +
    	"$foo = new Foo();" +
    	"$funcname = \"Var\";" +
    	"$foo->$varname();   // This calls $foo->Var()\n" +
    	"");
-    checkPHP("function square ($num)" +
    	"{" +
    	"    return $num * $num;" +
    	"}" +
    	"echo square (4);   // outputs '16'." +
    	"");
-    checkPHP("function small_numbers()" +
    	"{" +
    	"    return array (0, 1, 2);" +
    	"}" +
    	"list ($zero, $one, $two) = small_numbers();" +
    	"");
-    checkPHP("function &returns_reference()" +
    	"{" +
    	"    return $someref;" +
    	"}" +
    	"" +
    	"$newref =& returns_reference();" +
    	" " +
    	"");
-    checkPHP("function add_some_extra(&$string)" +
    	"{" +
    	"    $string .= 'and something extra.';" +
    	"}" +
    	"$str = 'This is a string, ';" +
    	"add_some_extra($str);" +
    	"echo $str;    ");
-    checkPHP("function makecoffee ($type = \"cappuccino\")\n" +
    	"{\n" +
    	"    return \"Making a cup of $type.\\n\";\n" +
    	"}" +
    	"echo makecoffee ();" +
    	"echo makecoffee (\"espresso\");" +
    	"");
-    checkPHP("$makefoo = true;" +
    	"" +
    	"/* We can't call foo() from here " +
    	"   since it doesn't exist yet," +
    	"   but we can call bar() */" +
    	"" +
    	"bar();" +
    	"" +
    	"if ($makefoo) {" +
    	"  function foo ()" +
    	"  {" +
    	"    echo \"I don't exist until program execution reaches me.\\n\";" +
    	"  }" +
    	"}" +
    	"" +
    	"/* Now we can safely call foo()" +
    	"   since $makefoo evaluated to true */" +
    	"" +
    	"if ($makefoo) foo();" +
    	"" +
    	"function bar() " +
    	"{" +
    	"  echo \"I exist immediately upon program start.\\n\";" +
    	"}" +
    	"" +
    	"");
-    checkPHP(
-    "function foo() " +
    "{" +
    "  function bar() " +
    "  {" +
    "    echo \"I don't exist until foo() is called.\\n\";" +
    "  }" +
    "}" +
    "" +
    "/* We can't call bar() yet" +
    "   since it doesn't exist. */" +
    "" +
    "foo();\n" +
    "" +
    "/* Now we can call bar()," +
    "   foo()'s processesing has" +
    "   made it accessable. */" +
    "" +
    "bar();" +
    "");
+    checkPHP("function foo()" + "{" + "    echo \"In foo()<br>\\n\";" + "}"
+        + "" + "function bar($arg = '')" + "{"
+        + "    echo \"In bar(); argument was '$arg'.<br>\\n\";" + "}" + ""
+        + "// This is a wrapper function around echo"
+        + "function echoit($string)" + "{" + "    echo $string;" + "}" + ""
+        + "$func = 'foo';" + "$func();        // This calls foo()" + ""
+        + "$func = 'bar';" + "$func('test');  // This calls bar()" + ""
+        + "$func = 'echoit';" + "$func('test');  // This calls echoit()" + "");
+    checkPHP("class Foo" + "{" + "    function Vari()" + "    {"
+        + "        $name = 'Bar';"
+        + "        $this->$name(); // This calls the Bar() method\n" + "    }"
+        + "    " + "    function Bar()" + "    {"
+        + "        echo \"This is Bar\";" + "    }" + "}" + ""
+        + "$foo = new Foo();" + "$funcname = \"Var\";"
+        + "$foo->$varname();   // This calls $foo->Var()\n" + "");
+    checkPHP("function square ($num)" + "{" + "    return $num * $num;" + "}"
+        + "echo square (4);   // outputs '16'." + "");
+    checkPHP("function small_numbers()" + "{" + "    return array (0, 1, 2);"
+        + "}" + "list ($zero, $one, $two) = small_numbers();" + "");
+    checkPHP("function &returns_reference()" + "{" + "    return $someref;"
+        + "}" + "" + "$newref =& returns_reference();" + " " + "");
+    checkPHP("function add_some_extra(&$string)" + "{"
+        + "    $string .= 'and something extra.';" + "}"
+        + "$str = 'This is a string, ';" + "add_some_extra($str);"
+        + "echo $str;    ");
+    checkPHP("function makecoffee ($type = \"cappuccino\")\n" + "{\n"
+        + "    return \"Making a cup of $type.\\n\";\n" + "}"
+        + "echo makecoffee ();" + "echo makecoffee (\"espresso\");" + "");
+    checkPHP("$makefoo = true;" + "" + "/* We can't call foo() from here "
+        + "   since it doesn't exist yet," + "   but we can call bar() */" + ""
+        + "bar();" + "" + "if ($makefoo) {" + "  function foo ()" + "  {"
+        + "    echo \"I don't exist until program execution reaches me.\\n\";"
+        + "  }" + "}" + "" + "/* Now we can safely call foo()"
+        + "   since $makefoo evaluated to true */" + ""
+        + "if ($makefoo) foo();" + "" + "function bar() " + "{"
+        + "  echo \"I exist immediately upon program start.\\n\";" + "}" + ""
+        + "");
+    checkPHP("function foo() " + "{" + "  function bar() " + "  {"
+        + "    echo \"I don't exist until foo() is called.\\n\";" + "  }" + "}"
+        + "" + "/* We can't call bar() yet" + "   since it doesn't exist. */"
+        + "" + "foo();\n" + "" + "/* Now we can call bar(),"
+        + "   foo()'s processesing has" + "   made it accessable. */" + ""
+        + "bar();" + "");
     // Bugs item #690938
-    checkPHP(
-      "    echo \"This is a test\"; // This is a one-line c++ style comment\n"
+    checkPHP("    echo \"This is a test\"; // This is a one-line c++ style comment\n"
         + "    /* This is a multi line comment\n"
         + "       yet another line of comment */\n"
         + "    echo \"This is yet another test\";\n"
         + "    echo \"One Final Test\"; # This is shell-style style comment \n");
-    checkPHP(
-      "$bool = TRUE;   // a boolean\n"
-        + "$str  = \"foo\";  // a string\n"
-        + "$int  = 12;     // an integer\n"
-        + "\n"
-        + "echo gettype($bool); // prints out \"boolean\"\n"
-        + "echo gettype($str);  // prints out \"string\"\n"
-        + ""
+    checkPHP("$bool = TRUE;   // a boolean\n"
+        + "$str  = \"foo\";  // a string\n" + "$int  = 12;     // an integer\n"
+        + "\n" + "echo gettype($bool); // prints out \"boolean\"\n"
+        + "echo gettype($str);  // prints out \"string\"\n" + ""
         + "// If this is an integer, increment it by four\n"
-        + "if (is_int($int)) {\n"
-        + "    $int += 4;\n"
-        + "}\n"
-        + "\n"
+        + "if (is_int($int)) {\n" + "    $int += 4;\n" + "}\n" + "\n"
         + "// If $bool is a string, print it out\n"
-        + "// (does not print out anything)\n"
-        + "if (is_string($bool)) {\n"
-        + "    echo \"String: $bool\";\n"
-        + "}\n");
-
+        + "// (does not print out anything)\n" + "if (is_string($bool)) {\n"
+        + "    echo \"String: $bool\";\n" + "}\n");
     checkPHP("$foo = True; // assign the value TRUE to $foo");
-
-    checkPHP(
-      "// == is an operator which test\n"
+    checkPHP("// == is an operator which test\n"
         + "// equality and returns a boolean\n"
         + "if ($action == \"show_version\") {\n"
-        + "    echo \"The version is 1.23\";\n"
-        + "}\n"
-        + "\n"
-        + "// this is not necessary...\n"
-        + "if ($show_separators == TRUE) {\n"
-        + "    echo \"<hr>\\n\";\n"
-        + "}\n"
-        + "\n"
-        + "// ...because you can simply type\n"
-        + "if ($show_separators) {\n"
-        + "    echo \"<hr>\\n\";\n"
-        + "}");
-
-    checkPHP(
-      "echo gettype((bool) \"\");        // bool(false)\n"
+        + "    echo \"The version is 1.23\";\n" + "}\n" + "\n"
+        + "// this is not necessary...\n" + "if ($show_separators == TRUE) {\n"
+        + "    echo \"<hr>\\n\";\n" + "}\n" + "\n"
+        + "// ...because you can simply type\n" + "if ($show_separators) {\n"
+        + "    echo \"<hr>\\n\";\n" + "}");
+    checkPHP("echo gettype((bool) \"\");        // bool(false)\n"
         + "echo gettype((bool) 1);         // bool(true)\n"
         + "echo gettype((bool) -2);        // bool(true)\n"
         + "echo gettype((bool) \"foo\");     // bool(true)\n"
         + "echo gettype((bool) 2.3e5);     // bool(true)\n"
         + "echo gettype((bool) array(12)); // bool(true)\n"
         + "echo gettype((bool) array());   // bool(false)\n");
-
-    checkPHP(
-      "$a = 1234; # decimal number\n"
+    checkPHP("$a = 1234; # decimal number\n"
         + "$a = -123; # a negative number\n"
         + "$a = 0123; # octal number (equivalent to 83 decimal)\n"
         + "$a = 0x1A; # hexadecimal number (equivalent to 26 decimal)\n");
-
-    checkPHP(
-      "$large_number =  2147483647;\n"
-        + "var_dump($large_number);\n"
-        + "// output: int(2147483647)\n"
-        + "\n"
-        + "$large_number =  2147483648;\n"
-        + "var_dump($large_number);\n"
-        + "// output: float(2147483648)\n"
-        + ""
+    checkPHP("$large_number =  2147483647;\n" + "var_dump($large_number);\n"
+        + "// output: int(2147483647)\n" + "\n"
+        + "$large_number =  2147483648;\n" + "var_dump($large_number);\n"
+        + "// output: float(2147483648)\n" + ""
         + "// this goes also for hexadecimal specified integers:\n"
-        + "var_dump( 0x80000000 );\n"
-        + "// output: float(2147483648)\n"
-        + "\n"
-        + "$million = 1000000;\n"
-        + "$large_number =  50000 * $million;\n"
-        + "var_dump($large_number);\n"
-        + "// output: float(50000000000)\n");
-
-    checkPHP(
-      "var_dump(25/7);         // float(3.5714285714286)\n"
+        + "var_dump( 0x80000000 );\n" + "// output: float(2147483648)\n" + "\n"
+        + "$million = 1000000;\n" + "$large_number =  50000 * $million;\n"
+        + "var_dump($large_number);\n" + "// output: float(50000000000)\n");
+    checkPHP("var_dump(25/7);         // float(3.5714285714286)\n"
         + "var_dump((int) (25/7)); // int(3)\n"
         + "var_dump(round(25/7));  // float(4)");
-
     checkPHP("echo (int) ( (0.1+0.7) * 10 ); // echoes 7!");
-
     checkPHP("$a = 1.234; " + "$b = 1.2e3; " + "$c = 7E-10;");
-
-    checkPHP(
-      "echo 'this is a simple string';\n"
-        + "\n"
+    checkPHP("echo 'this is a simple string';\n" + "\n"
         + "echo 'You can also have embedded newlines in \n"
-        + "strings this way as it is\n"
-        + "okay to do';\n"
-        + "\n"
+        + "strings this way as it is\n" + "okay to do';\n" + "\n"
         + "// Outputs: \"I'll be back\"\n"
-        + "echo 'Arnold once said: \"I\\'ll be back\"';\n"
-        + "\n"
+        + "echo 'Arnold once said: \"I\\'ll be back\"';\n" + "\n"
         + "// Outputs: You deleted C:\\*.*?\n"
-        + "echo 'You deleted C:\\\\*.*?';\n"
-        + "\n"
+        + "echo 'You deleted C:\\\\*.*?';\n" + "\n"
         + "// Outputs: You deleted C:\\*.*?\n"
-        + "echo 'You deleted C:\\\\*.*?';\n"
-        + "\n"
+        + "echo 'You deleted C:\\\\*.*?';\n" + "\n"
         + "// Outputs: This will not expand: \\n a newline\n"
-        + "echo 'This will not expand: \\n a newline';\n"
-        + "\n"
+        + "echo 'This will not expand: \\n a newline';\n" + "\n"
         + "// Outputs: Variables do not $expand $either\n"
         + "echo 'Variables do not $expand $either';\n");
-
-    checkPHP(
-      "$str = <<<EOD\n"
-        + "Example of string\n"
-        + "spanning multiple lines\n"
-        + "using heredoc syntax.\n"
-        + "EOD;\n"
-        + "\n"
-        + "/* More complex example, with variables. */\n"
-        + "class foo\n"
-        + "{\n"
-        + "    var $foo;\n"
-        + "    var $bar;\n"
-        + "\n"
-        + "    function foo()\n"
-        + "    {\n"
-        + "        $this->foo = 'Foo';\n"
-        + "        $this->bar = array('Bar1', 'Bar2', 'Bar3');\n"
-        + "    }\n"
-        + "}\n"
-        + "\n"
-        + "$foo = new foo();\n"
-        + "$name = 'MyName';\n"
-        + "\n"
+    checkPHP("$str = <<<EOD\n" + "Example of string\n"
+        + "spanning multiple lines\n" + "using heredoc syntax.\n" + "EOD;\n"
+        + "\n" + "/* More complex example, with variables. */\n"
+        + "class foo\n" + "{\n" + "    var $foo;\n" + "    var $bar;\n" + "\n"
+        + "    function foo()\n" + "    {\n" + "        $this->foo = 'Foo';\n"
+        + "        $this->bar = array('Bar1', 'Bar2', 'Bar3');\n" + "    }\n"
+        + "}\n" + "\n" + "$foo = new foo();\n" + "$name = 'MyName';\n" + "\n"
         + "echo <<<EOT\n"
         + "My name is \"$name\". I am printing some $foo->foo.\n"
         + "Now, I am printing some {$foo->bar[1]}.\n"
-        + "This should print a capital 'A': \\x41\n"
-        + "EOT;\n");
-
+        + "This should print a capital 'A': \\x41\n" + "EOT;\n");
     checkPHP("echo \"This works: \" . $arr['foo'][3];");
-
     checkPHP("echo \"\\$foo==$foo; type is \" . gettype ($foo) . \"<br />\\n\";");
-
-    checkPHP(
-      "$arr = array(\"foo\" => \"bar\", 12 => true);\n"
-        + "\n"
-        + "echo $arr[\"foo\"]; // bar\n"
-        + "echo $arr[12];    // 1\n");
-
-    checkPHP(
-      "// This array is the same as ...\n"
-        + "array(5 => 43, 32, 56, \"b\" => 12);\n"
-        + "\n"
+    checkPHP("$arr = array(\"foo\" => \"bar\", 12 => true);\n" + "\n"
+        + "echo $arr[\"foo\"]; // bar\n" + "echo $arr[12];    // 1\n");
+    checkPHP("// This array is the same as ...\n"
+        + "array(5 => 43, 32, 56, \"b\" => 12);\n" + "\n"
         + "// ...this array\n"
         + "array(5 => 43, 6 => 32, 7 => 56, \"b\" => 12);\n");
-
-    checkPHP(
-      "$arr = array(5 => 1, 12 => 2);\n"
-        + "\n"
+    checkPHP("$arr = array(5 => 1, 12 => 2);\n" + "\n"
         + "$arr[] = 56;    // This is the same as $arr[13] = 56;\n"
-        + "                // at this point of the script\n"
-        + "\n"
+        + "                // at this point of the script\n" + "\n"
         + "$arr[\"x\"] = 42; // This adds a new element to\n"
         + "                // the array with key \"x\"\n"
         + "                \n"
-        + "unset($arr[5]); // This removes the element from the array\n"
-        + "\n"
+        + "unset($arr[5]); // This removes the element from the array\n" + "\n"
         + "unset($arr);    // This deletes the whole array\n");
-
     checkPHP("$foo[bar] = 'enemy';\n" + "echo $foo[bar];");
-
-    checkPHP(
-      "$a = array( 'color' => 'red',\n"
+    checkPHP("$a = array( 'color' => 'red',\n"
         + "            'taste' => 'sweet',\n"
         + "            'shape' => 'round',\n"
         + "            'name'  => 'apple',\n"
@@ -228,19 +171,11 @@ public class PHPManualTestCase extends TestCase {
         + "$b[] = 'c';\n"
         + "// will result in the array array(0 => 'a' , 1 => 'b' , 2 => 'c'),\n"
         + "// or simply array('a', 'b', 'c')\n");
-
-    checkPHP(
-      "foreach ($colors as $key => $color) {\n"
-        + "    // won't work:\n"
-        + "    //$color = strtoupper($color);\n"
-        + "    \n"
-        + "    // works:\n"
-        + "    $colors[$key] = strtoupper($color);\n"
-        + "}\n"
+    checkPHP("foreach ($colors as $key => $color) {\n" + "    // won't work:\n"
+        + "    //$color = strtoupper($color);\n" + "    \n" + "    // works:\n"
+        + "    $colors[$key] = strtoupper($color);\n" + "}\n"
         + "print_r($colors);\n");
-
-    checkPHP(
-      "$fruits = array ( \"fruits\"  => array ( \"a\" => \"orange\",\n"
+    checkPHP("$fruits = array ( \"fruits\"  => array ( \"a\" => \"orange\",\n"
         + "                                       \"b\" => \"banana\",\n"
         + "                                       \"c\" => \"apple\"\n"
         + "                                     ),\n"
@@ -254,79 +189,47 @@ public class PHPManualTestCase extends TestCase {
         + "                  \"holes\"   => array (      \"first\",\n"
         + "                                       5 => \"second\",\n"
         + "                                            \"third\"\n"
-        + "                                     )\n"
-        + "                );\n"
-        + "\n"
-        + "// Some examples to address values in the array above \n"
+        + "                                     )\n" + "                );\n"
+        + "\n" + "// Some examples to address values in the array above \n"
         + "echo $fruits[\"holes\"][5];    // prints \"second\"\n"
         + "echo $fruits[\"fruits\"][\"a\"]; // prints \"orange\"\n"
-        + "unset($fruits[\"holes\"][0]);  // remove \"first\"\n"
-        + "\n"
+        + "unset($fruits[\"holes\"][0]);  // remove \"first\"\n" + "\n"
         + "// Create a new multi-dimensional array\n"
         + "$juices[\"apple\"][\"green\"] = \"good\"; \n");
-
     checkPHP("$arr3 = &$arr1;");
-
-    checkPHP(
-      "class foo\n"
-        + "{\n"
-        + "    function do_foo()\n"
-        + "    {\n"
-        + "        echo \"Doing foo.\"; \n"
-        + "    }\n"
-        + "}\n"
-        + "\n"
-        + "$bar = new foo;\n"
-        + "$bar->do_foo();\n");
-
-    checkPHP(
-      "$obj = (object) 'ciao';\n" + 
-      "echo $obj->scalar;  // outputs 'ciao'");
-
+    checkPHP("class foo\n" + "{\n" + "    function do_foo()\n" + "    {\n"
+        + "        echo \"Doing foo.\"; \n" + "    }\n" + "}\n" + "\n"
+        + "$bar = new foo;\n" + "$bar->do_foo();\n");
+    checkPHP("$obj = (object) 'ciao';\n"
+        + "echo $obj->scalar;  // outputs 'ciao'");
     checkPHP("$var = NULL;");
-
-    checkPHP("$var = \"Bob\";\n" +
-    	"$Var = \"Joe\";\n" +
-    	"echo \"$var, $Var\";      // outputs \"Bob, Joe\"\n" +
-    	"\n" +
-   // 	"$4site = 'not yet';     // invalid; starts with a number\n" +
-    	"$_4site = 'not yet';    // valid; starts with an underscore\n" +
-    	"$täyte = 'mansikka';  \n");
-
+    checkPHP("$var = \"Bob\";\n" + "$Var = \"Joe\";\n"
+        + "echo \"$var, $Var\";      // outputs \"Bob, Joe\"\n" + "\n" + 
+        // 	"$4site = 'not yet'; // invalid; starts with a number\n" +
+        "$_4site = 'not yet';    // valid; starts with an underscore\n"
+        + "$täyte = 'mansikka';  \n");
     checkPHP("");
-
     checkPHP("");
-
     checkPHP("");
   }
-
   private void checkPHP(String strEval) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.phpParserTester(strEval, 1);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    parser.phpParserTester(strEval, 1);
   }
-
   private void checkHTML(String strEval) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.parse(strEval);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    parser.parse(strEval);
   }
-
   /**
-   *  The JUnit setup method
+   * The JUnit setup method
    */
   protected void setUp() {
     parser = new Parser(null);
   }
-
 }
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
index 1122579..f0c034a 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
@@ -1,47 +1,34 @@
 package net.sourceforge.phpeclipse.tests.parser;
-/**********************************************************************
-Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import junit.framework.*;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
-
-import org.eclipse.core.runtime.*;
-
+/*******************************************************************************
+ * Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de All rights
+ * reserved. This program and the accompanying materials are made available
+ * under the terms of the Common Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
+ ******************************************************************************/
+import junit.framework.TestCase;
+import net.sourceforge.phpdt.internal.compiler.parser.Parser;
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 /**
- *  Tests the php parser
+ * Tests the php parser
  */
 public class PHPParserTestCase extends TestCase {
-
   Parser parser;
-
   public PHPParserTestCase(String name) {
     super(name);
   }
-
   /**
-   *  Test the PHP Parser with different PHP snippets
+   * Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
-  	 //  checkPHP("if(!$result = mysql_query($sql)) return(array());");
+    //  checkPHP("if(!$result = mysql_query($sql)) return(array());");
     checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }");
-
     // Bugs item #690938
-    checkPHP(
-      "$ebus_sql['sel_url_list'] = <<<EOS\n"
-        + "select rtrim(URL_NAME) as url_name\n"
-        + "	, rtrim(URL) as url\n"
-        + "	, rtrim(URL_DESC) as url_desc\n"
-        + "from appl_url\n"
+    checkPHP("$ebus_sql['sel_url_list'] = <<<EOS\n"
+        + "select rtrim(URL_NAME) as url_name\n" + "	, rtrim(URL) as url\n"
+        + "	, rtrim(URL_DESC) as url_desc\n" + "from appl_url\n"
         + "where appl_instnc_sk = <<INSTNC>>\n"
-        + "and appl_sect_deftn_sk = <<SECT>>\n"
-        + "order by url_ord\n"
+        + "and appl_sect_deftn_sk = <<SECT>>\n" + "order by url_ord\n"
         + "EOS;\n");
-
     checkPHP("foreach ($HTTP_GET_VARS as $secvalue) { }");
     checkPHP("\"\\\"\";");
     checkPHP("\"\\[addsig]\"");
@@ -79,21 +66,12 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("class Cmd extends PEAR { var $arrSetting     = array(), $i=10; }");
     checkPHP("if (isset($test)) { } elseif (isset($lang)) { }");
     checkPHP("require_once(\"mainfile.php\");  ");
-    checkPHP(
-      "if (eregi(\"footer.php\",$PHP_SELF)) {\n"
-        + "Header(\"Location: index.php\");\n"
-        + "die();\n"
-        + "}\n");
-    checkPHP(
-      "while (eregi(\"footer.php\",$PHP_SELF)) {\n"
-        + "Header(\"Location: index.php\");\n"
-        + "die();\n"
-        + "}\n");
-    checkPHP(
-      "while (eregi(\"footer.php\",$PHP_SELF)) :\n"
-        + "Header(\"Location: index.php\");\n"
-        + "die();\n"
-        + "endwhile;\n");
+    checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n"
+        + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
+    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n"
+        + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
+    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n"
+        + "Header(\"Location: index.php\");\n" + "die();\n" + "endwhile;\n");
     checkPHP("$tipath = \"images/topics/\";");
     checkPHP("$reasons = array(\"1\", \"2\",\"test\");");
     checkPHP("if ($home == 1) { message_box(); blocks(Center);}");
@@ -107,16 +85,14 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("if (!empty($pass) AND $pass==$passwd) { }");
     checkPHP("$AllowableHTML = array(\"b\"=>1,\n \"i\"=>1);");
     checkPHP("if ($term{0}!=$firstChar) {}");
-    checkPHP(
-      "echo \"<center><b>\"._NOADMINYET.\"</b></center><br><br>\"\n"
+    checkPHP("echo \"<center><b>\"._NOADMINYET.\"</b></center><br><br>\"\n"
         + ".\"<form action=\\\"admin.php\\\" method=\\\"post\\\">\"\n"
         + ".\"<tr><td><b>\"._NICKNAME.\":</b></td><td><input type=\\\"text\\\" name=\\\"name\\\" size=\\\"30\\\" maxlength=\\\"25\\\"></td></tr>\"\n"
         + ";");
     checkPHP("/* \n overLib is from Eric Bosrup (http://www.bosrup.com/web/overlib/) \n */");
     checkPHP("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){  } ");
     checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; ");
-    checkPHP(
-      "if (!isset($message)){ \n"
+    checkPHP("if (!isset($message)){ \n"
         + "$message = $myrow[post_text];\n"
         + "$message = eregi_replace(\"\\[addsig]\", \"\\n-----------------\\n\" .    $myrow[user_sig], $message); \n"
         + "$message = str_replace(\"<BR>\", \"\\n\", $message); \n"
@@ -124,7 +100,6 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));");
     checkPHP("$ol = new Overlib();");
     checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
-
     checkHTML("\n\n\n\n  <?php print \"Hello world\" ?>");
     checkHTML("<?php phpinfo(); ?>");
     checkHTML("<?php phpinfo()?>");
@@ -132,34 +107,24 @@ public class PHPParserTestCase extends TestCase {
     checkHTML(" <?php //this is a line comment ?>");
     checkHTML("<?php echo $module_name ?>");
   }
-
   private void checkPHP(String strEval) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.phpParserTester(strEval, 1);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    parser.phpParserTester(strEval, 1);
   }
-
   private void checkHTML(String strEval) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.parse(strEval);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    parser.parse(strEval);
   }
-
   /**
-   *  The JUnit setup method
+   * The JUnit setup method
    */
   protected void setUp() {
     parser = new Parser(null);
   }
-
 }
-- 
1.7.1


From 8dea0852fb960db1f239c6ea439b134addbb846c Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 5 Mar 2004 21:11:46 +0000
Subject: [PATCH 03/16] misc parser changes

---
 .../sourceforge/phpdt/core/compiler/IProblem.java  |    2 +
 .../phpdt/core/compiler/ITerminalSymbols.java      |   14 +-
 .../phpdt/internal/compiler/parser/Parser.java     |  355 +-
 .../phpdt/internal/compiler/parser/Scanner.java    | 1425 +++---
 .../internal/compiler/problem/ProblemHandler.java  |    5 +-
 .../internal/compiler/problem/ProblemReporter.java | 5476 ++++++++++----------
 .../internal/compiler/problem/messages.properties  |    5 +-
 .../phpdt/internal/formatter/CodeFormatter.java    |    2 +-
 8 files changed, 3574 insertions(+), 3710 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/IProblem.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/IProblem.java
index b6241ef..5674266 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/IProblem.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/IProblem.java
@@ -365,6 +365,8 @@ public interface IProblem {
 	int ParsingErrorOnKeyword = Syntax + Internal + 209;	
 	int ParsingErrorOnKeywordNoSuggestion = Syntax + Internal + 210;
 	int PHPParsingError = Syntax + Internal + 211;
+	int PHPParsingWarning = Syntax + Internal + 212;
+	int PHPVarDeprecatedWarning = Syntax + Internal + 213;
 	
 	int UnmatchedBracket = Syntax + Internal + 220;
 	int NoFieldOnBaseType = FieldRelated + 221;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index d9e97af..cc27c47 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -77,7 +77,7 @@ public interface ITerminalSymbols {
   final static int TokenNameAND_EQUAL = 60;
   final static int TokenNameOR_EQUAL = 61;
   final static int TokenNameQUESTION = 62;
-  final static int TokenNameCOLON_COLON = 63;
+  final static int TokenNamePAAMAYIM_NEKUDOTAYIM = 63;
   final static int TokenNameAT = 64;
 
   final static int TokenNameDOLLAR_LBRACE = 127;
@@ -155,9 +155,9 @@ public interface ITerminalSymbols {
   // public final static int TokenNameor = 1041;
   // public final static int TokenNamexor = 1042;
   public final static int TokenNamelist = 1043;
-  public final static int TokenNamenull = 1044;
-  public final static int TokenNamefalse = 1045;
-  public final static int TokenNametrue = 1046;
+//  public final static int TokenNamenull = 1044;
+//  public final static int TokenNamefalse = 1045;
+//  public final static int TokenNametrue = 1046;
 	public final static int TokenNamethis = 1047;
 	//
 	public final static int TokenNameabstract = 1050;
@@ -180,4 +180,10 @@ public interface ITerminalSymbols {
 	public final static int TokenNameuse = 1066;
 	public final static int TokenNameisset = 1066;
 	public final static int TokenNamefinal = 1067;
+	
+	public final static int TokenNameLINE = 1070;					 
+	public final static int TokenNameFILE = 1071;			 
+	public final static int TokenNameCLASS_C = 1072;			 
+	public final static int TokenNameMETHOD_C = 1073;			 
+	public final static int TokenNameFUNC_C = 1074;
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 7369a24..f389faa 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -165,6 +165,12 @@ public class Parser //extends PHPParserSuperclass
             problemEndPosition, referenceContext,
             compilationUnit.compilationResult);
   }
+  private void reportSyntaxWarning(String error, int problemStartPosition,
+      int problemEndPosition) {
+    problemReporter.phpParsingWarning(new String[]{error},
+        problemStartPosition, problemEndPosition, referenceContext,
+        compilationUnit.compilationResult);
+  }
   /**
    * Method Declaration.
    * 
@@ -1222,38 +1228,38 @@ public class Parser //extends PHPParserSuperclass
       //          getNextToken();
       //        }
       //        return;
-//    } else if (token == TokenNamedefine) {
-//      getNextToken();
-//      if (token == TokenNameLPAREN) {
-//        getNextToken();
-//      } else {
-//        throwSyntaxError("'(' expected after 'define' keyword.");
-//      }
-//      expr();
-//      if (token == TokenNameCOMMA) {
-//        getNextToken();
-//      } else {
-//        throwSyntaxError("',' expected after first 'define' constant.");
-//      }
-//      expr();
-//      if (token == TokenNameCOMMA) {
-//        getNextToken();
-//        expr();
-//      }
-//      if (token == TokenNameRPAREN) {
-//        getNextToken();
-//      } else {
-//        throwSyntaxError("')' expected after 'define' statement.");
-//      }
-//      if (token == TokenNameSEMICOLON) {
-//        getNextToken();
-//      } else {
-//        if (token != TokenNameStopPHP) {
-//          throwSyntaxError("';' expected after 'define' statement.");
-//        }
-//        getNextToken();
-//      }
-//      return;
+      //    } else if (token == TokenNamedefine) {
+      //      getNextToken();
+      //      if (token == TokenNameLPAREN) {
+      //        getNextToken();
+      //      } else {
+      //        throwSyntaxError("'(' expected after 'define' keyword.");
+      //      }
+      //      expr();
+      //      if (token == TokenNameCOMMA) {
+      //        getNextToken();
+      //      } else {
+      //        throwSyntaxError("',' expected after first 'define' constant.");
+      //      }
+      //      expr();
+      //      if (token == TokenNameCOMMA) {
+      //        getNextToken();
+      //        expr();
+      //      }
+      //      if (token == TokenNameRPAREN) {
+      //        getNextToken();
+      //      } else {
+      //        throwSyntaxError("')' expected after 'define' statement.");
+      //      }
+      //      if (token == TokenNameSEMICOLON) {
+      //        getNextToken();
+      //      } else {
+      //        if (token != TokenNameStopPHP) {
+      //          throwSyntaxError("';' expected after 'define' statement.");
+      //        }
+      //        getNextToken();
+      //      }
+      //      return;
     } else if (token == TokenNamefunction) {
       MethodDeclaration methodDecl = new MethodDeclaration(
           this.compilationUnit.compilationResult);
@@ -1437,7 +1443,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     } else {
-        throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
+      throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
     }
   }
   private void interface_extends_list() {
@@ -1492,14 +1498,10 @@ public class Parser //extends PHPParserSuperclass
   private void class_statement_list() {
     do {
       class_statement();
-    } while (token == TokenNamepublic || 
-        token == TokenNameprotected || 
-        token == TokenNameprivate || 
-        token == TokenNamestatic || 
-        token == TokenNameabstract || 
-        token == TokenNamefinal || 
-        token == TokenNamefunction || 
-        token == TokenNamevar);
+    } while (token == TokenNamepublic || token == TokenNameprotected
+        || token == TokenNameprivate || token == TokenNamestatic
+        || token == TokenNameabstract || token == TokenNamefinal
+        || token == TokenNamefunction || token == TokenNamevar);
   }
   private void class_statement() {
     //    class_statement:
@@ -1510,12 +1512,12 @@ public class Parser //extends PHPParserSuperclass
     initializeModifiers();
     if (token == TokenNamevar) {
       checkAndSetModifiers(AccPublic);
-      reportSyntaxError(
-          "Keyword 'var' is deprecated. Please use 'public' 'private' or 'protected' modifier for field declarations.",
-          scanner.getCurrentTokenStartPosition(), scanner
-              .getCurrentTokenEndPosition());
+      problemReporter.phpVarDeprecatedWarning(scanner
+          .getCurrentTokenStartPosition(),
+          scanner.getCurrentTokenEndPosition(), referenceContext,
+          compilationUnit.compilationResult);
       getNextToken();
-      classProperty();
+      class_variable_declaration();
     } else {
       boolean hasModifiers = member_modifiers();
       if (token == TokenNamefunction) {
@@ -1533,7 +1535,7 @@ public class Parser //extends PHPParserSuperclass
         if (!hasModifiers) {
           throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
         }
-        classProperty();
+        class_variable_declaration();
       }
     }
     //    if (token == TokenNamefunction) {
@@ -1618,32 +1620,34 @@ public class Parser //extends PHPParserSuperclass
     }
     return foundToken;
   }
-  private void classProperty() {
-    //'var' variable ';'
-    //'var' variable '=' constant ';'
+  private void class_variable_declaration() {
+    //    class_variable_declaration:
+    //		class_variable_declaration ',' T_VARIABLE
+    //	| class_variable_declaration ',' T_VARIABLE '=' static_scalar
+    //	| T_VARIABLE
+    //	| T_VARIABLE '=' static_scalar
     do {
       if (token == TokenNameVariable) {
         getNextToken();
         if (token == TokenNameEQUAL) {
           getNextToken();
-          constant();
+          static_scalar();
         }
       } else {
         if (token == TokenNamethis) {
-          throwSyntaxError("Reserved word '$this' not allowed after keyword 'var'.");
+          throwSyntaxError("'$this' not allowed after keyword 'public' 'protected' 'private' 'var'.");
         }
-        throwSyntaxError("Variable expected after keyword 'var'.");
+        throwSyntaxError("Variable expected keyword 'public' 'protected' 'private' 'var'.");
       }
       if (token != TokenNameCOMMA) {
         break;
       }
       getNextToken();
     } while (true);
-    if (token == TokenNameSEMICOLON) {
-      getNextToken();
-    } else {
-      throwSyntaxError("';' expected after variable declaration.");
+    if (token != TokenNameSEMICOLON) {
+      throwSyntaxError("';' expected after field declaration.");
     }
+    getNextToken();
   }
   private void functionDefinition(MethodDeclaration methodDecl) {
     if (astPtr == 0) {
@@ -1730,7 +1734,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
       if (token == TokenNameEQUAL) {
         getNextToken();
-        constant();
+        static_scalar();
       }
       return;
     }
@@ -2077,15 +2081,16 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
         expr();
         break;
-      case TokenNamenull :
-        getNextToken();
-        break;
-      case TokenNamefalse :
-        getNextToken();
-        break;
-      case TokenNametrue :
-        getNextToken();
-        break;
+      //        
+      //      case TokenNamenull :
+      //        getNextToken();
+      //        break;
+      //      case TokenNamefalse :
+      //        getNextToken();
+      //        break;
+      //      case TokenNametrue :
+      //        getNextToken();
+      //        break;
       case TokenNameStringConstant :
         getNextToken();
         break;
@@ -2193,7 +2198,7 @@ public class Parser //extends PHPParserSuperclass
         }
         break;
       case TokenNamearray :
-    //    T_ARRAY '(' array_pair_list ')'
+        //    T_ARRAY '(' array_pair_list ')'
         getNextToken();
         if (token == TokenNameLPAREN) {
           getNextToken();
@@ -2299,7 +2304,7 @@ public class Parser //extends PHPParserSuperclass
           }
           getNextToken();
           break;
-        case TokenNameCOLON_COLON :
+        case TokenNamePAAMAYIM_NEKUDOTAYIM :
         // ::
         case TokenNameMINUS_GREATER :
           // ->
@@ -2386,28 +2391,48 @@ public class Parser //extends PHPParserSuperclass
     } while (while_flag);
   }
   private void array_pair_list() {
-//  array_pair_list:
-//	/* empty */  
-//|	non_empty_array_pair_list possible_comma	
+    //  array_pair_list:
+    //	/* empty */
+    //| non_empty_array_pair_list possible_comma
     non_empty_array_pair_list();
     if (token == TokenNameCOMMA) {
       getNextToken();
     }
   }
- 
- 
   private void non_empty_array_pair_list() {
-//non_empty_array_pair_list:
-//	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr	 
-//|	non_empty_array_pair_list ',' expr			 
-//|	expr T_DOUBLE_ARROW expr 
-//|	expr 				 
-//|	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable 
-//|	non_empty_array_pair_list ',' '&' w_variable  
-//|	expr T_DOUBLE_ARROW '&' w_variable 
-//|	'&' w_variable 			 
-  }
-  
+    //non_empty_array_pair_list:
+    //	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr
+    //| non_empty_array_pair_list ',' expr
+    //| expr T_DOUBLE_ARROW expr
+    //| expr
+    //| non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable
+    //| non_empty_array_pair_list ',' '&' w_variable
+    //| expr T_DOUBLE_ARROW '&' w_variable
+    //| '&' w_variable
+    while (true) {
+      expr();
+      if (token == TokenNameAND) {
+        getNextToken();
+        variable();
+        return;
+      } else if (token == TokenNameEQUAL_GREATER) {
+        getNextToken();
+        if (token == TokenNameAND) {
+          getNextToken();
+          variable();
+        } else {
+          expr();
+        }
+      }
+      if (token != TokenNameCOMMA) {
+        return;
+      }
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        return;
+      }
+    }
+  }
   private void unaryExpression() {
     switch (token) {
       case TokenNamePLUS_PLUS :
@@ -2706,7 +2731,7 @@ public class Parser //extends PHPParserSuperclass
           getNextToken();
         } else if (token == TokenNameEQUAL) {
           getNextToken();
-          constant();
+          static_scalar();
         }
       } else {
         throwSyntaxError("$-variable expected in variable-list.");
@@ -2809,80 +2834,132 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
-  /**
-   * It will look for a value (after a '=' for example) @
-   */
-  private void constant() {
-    //   String ident;
+  private boolean common_scalar() {
+    //  common_scalar:
+    //	T_LNUMBER
+    //	| T_DNUMBER
+    //	| T_CONSTANT_ENCAPSED_STRING
+    //	| T_LINE
+    //	| T_FILE
+    //	| T_CLASS_C
+    //	| T_METHOD_C
+    //	| T_FUNC_C
     switch (token) {
-      case TokenNamePLUS :
+      case TokenNameIntegerLiteral :
         getNextToken();
-        switch (token) {
-          case TokenNameDoubleLiteral :
-            getNextToken();
-            break;
-          case TokenNameIntegerLiteral :
-            getNextToken();
-            break;
-          default :
-            throwSyntaxError("Constant expected after '+' presign.");
-        }
-        break;
-      case TokenNameMINUS :
+        return true;
+      case TokenNameDoubleLiteral :
         getNextToken();
-        switch (token) {
-          case TokenNameDoubleLiteral :
-            getNextToken();
-            break;
-          case TokenNameIntegerLiteral :
-            getNextToken();
-            break;
-          default :
-            throwSyntaxError("Constant expected after '-' presign.");
-        }
-        break;
-      case TokenNamenull :
+        return true;
+      case TokenNameStringLiteral :
         getNextToken();
-        break;
-      case TokenNamefalse :
+        return true;
+      case TokenNameStringConstant :
         getNextToken();
-        break;
-      case TokenNametrue :
+        return true;
+      case TokenNameStringInterpolated :
         getNextToken();
-        break;
+        return true;
+      case TokenNameFILE :
+        getNextToken();
+        return true;
+      case TokenNameLINE :
+        getNextToken();
+        return true;
+      case TokenNameCLASS_C :
+        getNextToken();
+        return true;
+      case TokenNameMETHOD_C :
+        getNextToken();
+        return true;
+      case TokenNameFUNC_C :
+        getNextToken();
+        return true;
+    }
+    return false;
+  }
+  private void static_scalar() {
+    //    static_scalar: /* compile-time evaluated scalars */
+    //		common_scalar
+    //	| T_STRING
+    //	| '+' static_scalar
+    //	| '-' static_scalar
+    //	| T_ARRAY '(' static_array_pair_list ')'
+    //	| static_class_constant
+    if (common_scalar()) {
+      return;
+    }
+    switch (token) {
       case TokenNameIdentifier :
-        //   ident = identifier;
-        char[] ident = scanner.getCurrentIdentifierSource();
         getNextToken();
-        if (token == TokenNameLPAREN) {
+        //        static_class_constant:
+        //  		T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
+        if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
           getNextToken();
-          if (token != TokenNameRPAREN) {
-            expressionList();
-            if (token != TokenNameRPAREN) {
-              throwSyntaxError("')' expected after identifier '"
-                  + new String(ident) + "' in postfix-expression.");
-            }
+          if (token == TokenNameIdentifier) {
+            getNextToken();
+          } else {
+            throwSyntaxError("Identifier expected after '::' operator.");
           }
-          getNextToken();
         }
         break;
-      case TokenNameStringLiteral :
+      case TokenNamePLUS :
         getNextToken();
+        static_scalar();
         break;
-      case TokenNameStringConstant :
+      case TokenNameMINUS :
         getNextToken();
+        static_scalar();
         break;
-      case TokenNameStringInterpolated :
+      case TokenNamearray :
         getNextToken();
-        break;
-      case TokenNameDoubleLiteral :
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'array'");
+        }
         getNextToken();
-        break;
-      case TokenNameIntegerLiteral :
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+          break;
+        }
+        non_empty_static_array_pair_list();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'array'");
+        }
         getNextToken();
         break;
+      //      case TokenNamenull :
+      //        getNextToken();
+      //        break;
+      //      case TokenNamefalse :
+      //        getNextToken();
+      //        break;
+      //      case TokenNametrue :
+      //        getNextToken();
+      //        break;
       default :
-        throwSyntaxError("Constant expected.");
+        throwSyntaxError("Static scalar/constant expected.");
+    }
+  }
+  private void non_empty_static_array_pair_list() {
+    //  non_empty_static_array_pair_list:
+    //	non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW
+    // static_scalar
+    //| non_empty_static_array_pair_list ',' static_scalar
+    //| static_scalar T_DOUBLE_ARROW static_scalar
+    //| static_scalar
+    while (true) {
+      static_scalar();
+      if (token == TokenNameEQUAL_GREATER) {
+        getNextToken();
+        static_scalar();
+      }
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+      if (token != TokenNameRPAREN) {
+        break;
+      }
     }
   }
   public void reportSyntaxError() { //int act, int currentKind, int
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index a9520dd..bef873a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -9,72 +9,59 @@
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.IScanner;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
-
 public class Scanner implements IScanner, ITerminalSymbols {
-
   /*
-   * APIs ares - getNextToken() which return the current type of the token (this value is not memorized by the scanner) -
-   * getCurrentTokenSource() which provides with the token "REAL" source (aka all unicode have been transformed into a correct
-   * char) - sourceStart gives the position into the stream - currentPosition-1 gives the sourceEnd position into the stream
+   * APIs ares - getNextToken() which return the current type of the token
+   * (this value is not memorized by the scanner) - getCurrentTokenSource()
+   * which provides with the token "REAL" source (aka all unicode have been
+   * transformed into a correct char) - sourceStart gives the position into the
+   * stream - currentPosition-1 gives the sourceEnd position into the stream
    */
-
   // 1.4 feature
   private boolean assertMode;
   public boolean useAssertAsAnIndentifier = false;
   //flag indicating if processed source contains occurrences of keyword assert
   public boolean containsAssertKeyword = false;
-
   public boolean recordLineSeparator;
   public boolean phpMode = false;
-
   public char currentCharacter;
   public int startPosition;
   public int currentPosition;
   public int initialPosition, eofPosition;
-  // after this position eof are generated instead of real token from the source
-
+  // after this position eof are generated instead of real token from the
+  // source
   public boolean tokenizeComments;
   public boolean tokenizeWhiteSpace;
-
   //source should be viewed as a window (aka a part)
   //of a entire very large stream
   public char source[];
-
   //unicode support
   public char[] withoutUnicodeBuffer;
   public int withoutUnicodePtr;
   //when == 0 ==> no unicode in the current token
   public boolean unicodeAsBackSlash = false;
-
   public boolean scanningFloatLiteral = false;
-
   //support for /** comments
   //public char[][] comments = new char[10][];
   public int[] commentStops = new int[10];
   public int[] commentStarts = new int[10];
   public int commentPtr = -1; // no comment test with commentPtr value -1
-
   //diet parsing support - jump over some method body when requested
   public boolean diet = false;
-
   //support for the poor-line-debuggers ....
   //remember the position of the cr/lf
   public int[] lineEnds = new int[250];
   public int linePtr = -1;
   public boolean wasAcr = false;
-
   public static final String END_OF_SOURCE = "End_Of_Source"; //$NON-NLS-1$
-
   public static final String INVALID_HEXA = "Invalid_Hexa_Literal"; //$NON-NLS-1$
   public static final String INVALID_OCTAL = "Invalid_Octal_Literal"; //$NON-NLS-1$
   public static final String INVALID_CHARACTER_CONSTANT = "Invalid_Character_Constant"; //$NON-NLS-1$
@@ -82,45 +69,31 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public static final String INVALID_INPUT = "Invalid_Input"; //$NON-NLS-1$
   public static final String INVALID_UNICODE_ESCAPE = "Invalid_Unicode_Escape"; //$NON-NLS-1$
   public static final String INVALID_FLOAT = "Invalid_Float_Literal"; //$NON-NLS-1$
-
   public static final String NULL_SOURCE_STRING = "Null_Source_String"; //$NON-NLS-1$
   public static final String UNTERMINATED_STRING = "Unterminated_String"; //$NON-NLS-1$
   public static final String UNTERMINATED_COMMENT = "Unterminated_Comment"; //$NON-NLS-1$
   public static final String INVALID_CHAR_IN_STRING = "Invalid_Char_In_String"; //$NON-NLS-1$
-
   //----------------optimized identifier managment------------------
-  static final char[] charArray_a = new char[] { 'a' },
-    charArray_b = new char[] { 'b' },
-    charArray_c = new char[] { 'c' },
-    charArray_d = new char[] { 'd' },
-    charArray_e = new char[] { 'e' },
-    charArray_f = new char[] { 'f' },
-    charArray_g = new char[] { 'g' },
-    charArray_h = new char[] { 'h' },
-    charArray_i = new char[] { 'i' },
-    charArray_j = new char[] { 'j' },
-    charArray_k = new char[] { 'k' },
-    charArray_l = new char[] { 'l' },
-    charArray_m = new char[] { 'm' },
-    charArray_n = new char[] { 'n' },
-    charArray_o = new char[] { 'o' },
-    charArray_p = new char[] { 'p' },
-    charArray_q = new char[] { 'q' },
-    charArray_r = new char[] { 'r' },
-    charArray_s = new char[] { 's' },
-    charArray_t = new char[] { 't' },
-    charArray_u = new char[] { 'u' },
-    charArray_v = new char[] { 'v' },
-    charArray_w = new char[] { 'w' },
-    charArray_x = new char[] { 'x' },
-    charArray_y = new char[] { 'y' },
-    charArray_z = new char[] { 'z' };
-
-  static final char[] initCharArray = new char[] { '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000' };
+  static final char[] charArray_a = new char[]{'a'},
+      charArray_b = new char[]{'b'}, charArray_c = new char[]{'c'},
+      charArray_d = new char[]{'d'}, charArray_e = new char[]{'e'},
+      charArray_f = new char[]{'f'}, charArray_g = new char[]{'g'},
+      charArray_h = new char[]{'h'}, charArray_i = new char[]{'i'},
+      charArray_j = new char[]{'j'}, charArray_k = new char[]{'k'},
+      charArray_l = new char[]{'l'}, charArray_m = new char[]{'m'},
+      charArray_n = new char[]{'n'}, charArray_o = new char[]{'o'},
+      charArray_p = new char[]{'p'}, charArray_q = new char[]{'q'},
+      charArray_r = new char[]{'r'}, charArray_s = new char[]{'s'},
+      charArray_t = new char[]{'t'}, charArray_u = new char[]{'u'},
+      charArray_v = new char[]{'v'}, charArray_w = new char[]{'w'},
+      charArray_x = new char[]{'x'}, charArray_y = new char[]{'y'},
+      charArray_z = new char[]{'z'};
+  static final char[] initCharArray = new char[]{'\u0000', '\u0000', '\u0000',
+      '\u0000', '\u0000', '\u0000'};
   static final int TableSize = 30, InternalTableSize = 6;
   //30*6 = 180 entries
   public static final int OptimizedLength = 6;
-  public /* static */
+  public/* static */
   final char[][][][] charArray_length = new char[OptimizedLength][TableSize][InternalTableSize][];
   // support for detecting non-externalized string literals
   int currentLineNr = -1;
@@ -134,8 +107,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public StringLiteral[] nonNLSStrings = null;
   public boolean checkNonExternalizedStringLiterals = true;
   public boolean wasNonExternalizedStringLiteral = false;
-
-  /* static */ {
+  /* static */{
     for (int i = 0; i < 6; i++) {
       for (int j = 0; j < TableSize; j++) {
         for (int k = 0; k < InternalTableSize; k++) {
@@ -144,13 +116,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
     }
   }
-  static int newEntry2 = 0, newEntry3 = 0, newEntry4 = 0, newEntry5 = 0, newEntry6 = 0;
-
+  static int newEntry2 = 0, newEntry3 = 0, newEntry4 = 0, newEntry5 = 0,
+      newEntry6 = 0;
   public static final int RoundBracket = 0;
   public static final int SquareBracket = 1;
   public static final int CurlyBracket = 2;
   public static final int BracketKinds = 3;
-
   // task tag support
   public char[][] foundTaskTags = null;
   public char[][] foundTaskMessages;
@@ -159,39 +130,35 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public int foundTaskCount = 0;
   public char[][] taskTags = null;
   public char[][] taskPriorities = null;
-
-  public static final boolean DEBUG = true;
-
+  public static final boolean DEBUG = false;
   public Scanner() {
     this(false, false);
   }
   public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace) {
     this(tokenizeComments, tokenizeWhiteSpace, false);
   }
-
   /**
-   * Determines if the specified character is permissible as the first character in a PHP identifier
+   * Determines if the specified character is permissible as the first
+   * character in a PHP identifier
    */
   public static boolean isPHPIdentifierStart(char ch) {
     return Character.isLetter(ch) || (ch == '_') || (0x7F <= ch && ch <= 0xFF);
   }
-
   /**
-   * Determines if the specified character may be part of a PHP identifier as other than the first character
+   * Determines if the specified character may be part of a PHP identifier as
+   * other than the first character
    */
   public static boolean isPHPIdentifierPart(char ch) {
-    return Character.isLetterOrDigit(ch) || (ch == '_') || (0x7F <= ch && ch <= 0xFF);
+    return Character.isLetterOrDigit(ch) || (ch == '_')
+        || (0x7F <= ch && ch <= 0xFF);
   }
-
   public final boolean atEnd() {
     // This code is not relevant if source is
     // Only a part of the real stream input
-
     return source.length == currentPosition;
   }
   public char[] getCurrentIdentifierSource() {
     //return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
     //    if (withoutUnicodePtr != 0)
     //      //0 is used as a fast test flag so the real first char is in position 1
@@ -218,17 +185,16 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return optimizedCurrentTokenSource6();
     }
     //no optimization
-    System.arraycopy(source, startPosition, result = new char[length], 0, length);
+    System.arraycopy(source, startPosition, result = new char[length], 0,
+        length);
     //   }
     return result;
   }
   public int getCurrentTokenEndPosition() {
     return this.currentPosition - 1;
   }
-
   public final char[] getCurrentTokenSource() {
     // Return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
     //    if (withoutUnicodePtr != 0)
     //      // 0 is used as a fast test flag so the real first char is in position 1
@@ -240,14 +206,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
     //        withoutUnicodePtr);
     //    else {
     int length;
-    System.arraycopy(source, startPosition, result = new char[length = currentPosition - startPosition], 0, length);
+    System.arraycopy(source, startPosition,
+        result = new char[length = currentPosition - startPosition], 0, length);
     //    }
     return result;
   }
-
   public final char[] getCurrentTokenSource(int startPos) {
     // Return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
     //    if (withoutUnicodePtr != 0)
     //      // 0 is used as a fast test flag so the real first char is in position 1
@@ -259,81 +224,79 @@ public class Scanner implements IScanner, ITerminalSymbols {
     //        withoutUnicodePtr);
     //    else {
     int length;
-    System.arraycopy(source, startPos, result = new char[length = currentPosition - startPos], 0, length);
+    System.arraycopy(source, startPos,
+        result = new char[length = currentPosition - startPos], 0, length);
     //  }
     return result;
   }
-
   public final char[] getCurrentTokenSourceString() {
     //return the token REAL source (aka unicodes are precomputed).
     //REMOVE the two " that are at the beginning and the end.
-
     char[] result;
     if (withoutUnicodePtr != 0)
       //0 is used as a fast test flag so the real first char is in position 1
-      System.arraycopy(withoutUnicodeBuffer, 2,
+      System.arraycopy(withoutUnicodeBuffer, 2, 
       //2 is 1 (real start) + 1 (to jump over the ")
-      result = new char[withoutUnicodePtr - 2], 0, withoutUnicodePtr - 2);
+          result = new char[withoutUnicodePtr - 2], 0, withoutUnicodePtr - 2);
     else {
       int length;
-      System.arraycopy(source, startPosition + 1, result = new char[length = currentPosition - startPosition - 2], 0, length);
+      System.arraycopy(source, startPosition + 1,
+          result = new char[length = currentPosition - startPosition - 2], 0,
+          length);
     }
     return result;
   }
   public int getCurrentTokenStartPosition() {
     return this.startPosition;
   }
-
   public final char[] getCurrentStringLiteralSource() {
     // Return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
-
     int length;
-    System.arraycopy(source, startPosition + 1, result = new char[length = currentPosition - startPosition - 2], 0, length);
+    System.arraycopy(source, startPosition + 1,
+        result = new char[length = currentPosition - startPosition - 2], 0,
+        length);
     //    }
     return result;
   }
-
   /*
    * Search the source position corresponding to the end of a given line number
    * 
-   * Line numbers are 1-based, and relative to the scanner initialPosition. Character positions are 0-based.
+   * Line numbers are 1-based, and relative to the scanner initialPosition.
+   * Character positions are 0-based.
    * 
    * In case the given line number is inconsistent, answers -1.
    */
   public final int getLineEnd(int lineNumber) {
-
     if (lineEnds == null)
       return -1;
     if (lineNumber >= lineEnds.length)
       return -1;
     if (lineNumber <= 0)
       return -1;
-
     if (lineNumber == lineEnds.length - 1)
       return eofPosition;
     return lineEnds[lineNumber - 1];
     // next line start one character behind the lineEnd of the previous line
   }
   /**
-   * Search the source position corresponding to the beginning of a given line number
+   * Search the source position corresponding to the beginning of a given line
+   * number
    * 
-   * Line numbers are 1-based, and relative to the scanner initialPosition. Character positions are 0-based.
+   * Line numbers are 1-based, and relative to the scanner initialPosition.
+   * Character positions are 0-based.
    * 
    * e.g. getLineStart(1) --> 0 i.e. first line starts at character 0.
    * 
    * In case the given line number is inconsistent, answers -1.
    */
   public final int getLineStart(int lineNumber) {
-
     if (lineEnds == null)
       return -1;
     if (lineNumber >= lineEnds.length)
       return -1;
     if (lineNumber <= 0)
       return -1;
-
     if (lineNumber == 1)
       return initialPosition;
     return lineEnds[lineNumber - 2] + 1;
@@ -342,14 +305,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextChar(char testedChar) {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is == to the testedChar
+    //Both previous lines are true if the currentCharacter is == to the
+    // testedChar
     //On false, no side effect has occured.
-
     //ALL getNextChar.... ARE OPTIMIZED COPIES
-
     int temp = currentPosition;
     try {
       currentCharacter = source[currentPosition++];
@@ -419,14 +382,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
     //INT 0 : testChar1 \\\\///\\\\ 1 : testedChar2 \\\\///\\\\ -1 : others
     //test can be done with (x==0) for the first and (x>0) for the second
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is == to the testedChar1/2
+    //Both previous lines are true if the currentCharacter is == to the
+    // testedChar1/2
     //On false, no side effect has occured.
-
     //ALL getNextChar.... ARE OPTIMIZED COPIES
-
     int temp = currentPosition;
     try {
       int result;
@@ -488,7 +451,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         currentPosition = temp;
         return -1;
       }
-
       //        if (withoutUnicodePtr != 0)
       //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
       return result;
@@ -501,14 +463,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextCharAsDigit() {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
     //Both previous lines are true if the currentCharacter is a digit
     //On false, no side effect has occured.
-
     //ALL getNextChar.... ARE OPTIMIZED COPIES
-
     int temp = currentPosition;
     try {
       currentCharacter = source[currentPosition++];
@@ -573,14 +534,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextCharAsDigit(int radix) {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is a digit base on radix
+    //Both previous lines are true if the currentCharacter is a digit base on
+    // radix
     //On false, no side effect has occured.
-
     //ALL getNextChar.... ARE OPTIMIZED COPIES
-
     int temp = currentPosition;
     try {
       currentCharacter = source[currentPosition++];
@@ -645,14 +606,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public boolean getNextCharAsJavaIdentifierPart() {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is a JavaIdentifierPart
+    //Both previous lines are true if the currentCharacter is a
+    // JavaIdentifierPart
     //On false, no side effect has occured.
-
     //ALL getNextChar.... ARE OPTIMIZED COPIES
-
     int temp = currentPosition;
     try {
       currentCharacter = source[currentPosition++];
@@ -705,7 +666,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         currentPosition = temp;
         return false;
       }
-
       //        if (withoutUnicodePtr != 0)
       //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
       return true;
@@ -715,7 +675,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
       return false;
     }
   }
-
   public int getNextToken() throws InvalidInputException {
     int htmlPosition = currentPosition;
     try {
@@ -724,18 +683,21 @@ public class Scanner implements IScanner, ITerminalSymbols {
         if (currentCharacter == '<') {
           if (getNextChar('?')) {
             currentCharacter = source[currentPosition++];
-            if ((currentCharacter == ' ') || Character.isWhitespace(currentCharacter)) {
+            if ((currentCharacter == ' ')
+                || Character.isWhitespace(currentCharacter)) {
               // <?
               startPosition = currentPosition;
               phpMode = true;
               if (tokenizeWhiteSpace) {
                 // && (whiteStart != currentPosition - 1)) {
-                // reposition scanner in case we are interested by spaces as tokens
+                // reposition scanner in case we are interested by spaces as
+                // tokens
                 startPosition = htmlPosition;
                 return TokenNameHTML;
               }
             } else {
-              boolean phpStart = (currentCharacter == 'P') || (currentCharacter == 'p');
+              boolean phpStart = (currentCharacter == 'P')
+                  || (currentCharacter == 'p');
               if (phpStart) {
                 int test = getNextChar('H', 'h');
                 if (test >= 0) {
@@ -744,10 +706,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     // <?PHP <?php
                     startPosition = currentPosition;
                     phpMode = true;
-
                     if (tokenizeWhiteSpace) {
                       // && (whiteStart != currentPosition - 1)) {
-                      // reposition scanner in case we are interested by spaces as tokens
+                      // reposition scanner in case we are interested by spaces
+                      // as tokens
                       startPosition = htmlPosition;
                       return TokenNameHTML;
                     }
@@ -757,7 +719,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
             }
           }
         }
-
         if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
           if (recordLineSeparator) {
             pushLineSeparator();
@@ -775,7 +736,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
       return TokenNameEOF;
     }
-
     if (phpMode) {
       this.wasAcr = false;
       if (diet) {
@@ -787,7 +747,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         while (true) { //loop for jumping over comments
           withoutUnicodePtr = 0;
           //start with a new token (even comment written with unicode )
-
           // ---------Consume white space and handles startPosition---------
           int whiteStart = currentPosition;
           boolean isWhiteSpace;
@@ -806,7 +765,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 currentLine = null;
               }
             }
-            isWhiteSpace = (currentCharacter == ' ') || Character.isWhitespace(currentCharacter);
+            isWhiteSpace = (currentCharacter == ' ')
+                || Character.isWhitespace(currentCharacter);
             //            }
           } while (isWhiteSpace);
           if (tokenizeWhiteSpace && (whiteStart != currentPosition - 1)) {
@@ -818,9 +778,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
           //little trick to get out in the middle of a source compuation
           if (currentPosition > eofPosition)
             return TokenNameEOF;
-
           // ---------Identify the next token-------------
-
           switch (currentCharacter) {
             case '(' :
               return TokenNameLPAREN;
@@ -838,7 +796,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNameSEMICOLON;
             case ',' :
               return TokenNameCOMMA;
-
             case '.' :
               if (getNextCharAsDigit())
                 return scanNumber(true);
@@ -861,7 +818,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   return TokenNameMINUS_EQUAL;
                 if (getNextChar('>'))
                   return TokenNameMINUS_GREATER;
-
                 return TokenNameMINUS;
               }
             case '~' :
@@ -904,9 +860,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     while (isPHPIdentifierPart(currentCharacter)) {
                       currentCharacter = source[currentPosition++];
                     }
-
                     heredocLength = currentPosition - heredocStart - 1;
-
                     // heredoc end-tag determination
                     boolean endTag = true;
                     char ch;
@@ -919,7 +873,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                           currentLine = null;
                         }
                         for (int i = 0; i < heredocLength; i++) {
-                          if (source[currentPosition + i] != source[heredocStart + i]) {
+                          if (source[currentPosition + i] != source[heredocStart
+                              + i]) {
                             endTag = false;
                             break;
                           }
@@ -932,9 +887,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                           endTag = true;
                         }
                       }
-
                     } while (true);
-
                     return TokenNameHEREDOC;
                   }
                   return TokenNameLEFT_SHIFT;
@@ -993,84 +946,87 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNameQUESTION;
             case ':' :
               if (getNextChar(':'))
-                return TokenNameCOLON_COLON;
+                return TokenNamePAAMAYIM_NEKUDOTAYIM;
               return TokenNameCOLON;
             case '@' :
               return TokenNameAT;
-              //					case '\'' :
-              //						{
-              //							int test;
-              //							if ((test = getNextChar('\n', '\r')) == 0) {
-              //								throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //							}
-              //							if (test > 0) {
-              //								// relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //								for (int lookAhead = 0;
-              //									lookAhead < 3;
-              //									lookAhead++) {
-              //									if (currentPosition + lookAhead
-              //										== source.length)
-              //										break;
-              //									if (source[currentPosition + lookAhead]
-              //										== '\n')
-              //										break;
-              //									if (source[currentPosition + lookAhead]
-              //										== '\'') {
-              //										currentPosition += lookAhead + 1;
-              //										break;
-              //									}
-              //								}
-              //								throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //							}
-              //						}
-              //						if (getNextChar('\'')) {
-              //							// relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //							for (int lookAhead = 0;
-              //								lookAhead < 3;
-              //								lookAhead++) {
-              //								if (currentPosition + lookAhead
-              //									== source.length)
-              //									break;
-              //								if (source[currentPosition + lookAhead]
-              //									== '\n')
-              //									break;
-              //								if (source[currentPosition + lookAhead]
-              //									== '\'') {
-              //									currentPosition += lookAhead + 1;
-              //									break;
-              //								}
-              //							}
-              //							throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //						}
-              //						if (getNextChar('\\'))
-              //							scanEscapeCharacter();
-              //						else { // consume next character
-              //							unicodeAsBackSlash = false;
-              //							if (((currentCharacter = source[currentPosition++])
-              //								== '\\')
-              //								&& (source[currentPosition] == 'u')) {
-              //								getNextUnicodeChar();
-              //							} else {
-              //								if (withoutUnicodePtr != 0) {
-              //									withoutUnicodeBuffer[++withoutUnicodePtr] =
-              //										currentCharacter;
-              //								}
-              //							}
-              //						}
-              //						// if (getNextChar('\''))
-              //						// return TokenNameCharacterLiteral;
-              //						// relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //						for (int lookAhead = 0; lookAhead < 20; lookAhead++) {
-              //							if (currentPosition + lookAhead == source.length)
-              //								break;
-              //							if (source[currentPosition + lookAhead] == '\n')
-              //								break;
-              //							if (source[currentPosition + lookAhead] == '\'') {
-              //								currentPosition += lookAhead + 1;
-              //								break;
-              //							}
-              //						}
-              //						throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
+            //					case '\'' :
+            //						{
+            //							int test;
+            //							if ((test = getNextChar('\n', '\r')) == 0) {
+            //								throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
+            //							}
+            //							if (test > 0) {
+            //								// relocate if finding another quote fairly close: thus unicode
+            // '/u000D' will be fully consumed
+            //								for (int lookAhead = 0;
+            //									lookAhead < 3;
+            //									lookAhead++) {
+            //									if (currentPosition + lookAhead
+            //										== source.length)
+            //										break;
+            //									if (source[currentPosition + lookAhead]
+            //										== '\n')
+            //										break;
+            //									if (source[currentPosition + lookAhead]
+            //										== '\'') {
+            //										currentPosition += lookAhead + 1;
+            //										break;
+            //									}
+            //								}
+            //								throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
+            //							}
+            //						}
+            //						if (getNextChar('\'')) {
+            //							// relocate if finding another quote fairly close: thus unicode
+            // '/u000D' will be fully consumed
+            //							for (int lookAhead = 0;
+            //								lookAhead < 3;
+            //								lookAhead++) {
+            //								if (currentPosition + lookAhead
+            //									== source.length)
+            //									break;
+            //								if (source[currentPosition + lookAhead]
+            //									== '\n')
+            //									break;
+            //								if (source[currentPosition + lookAhead]
+            //									== '\'') {
+            //									currentPosition += lookAhead + 1;
+            //									break;
+            //								}
+            //							}
+            //							throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
+            //						}
+            //						if (getNextChar('\\'))
+            //							scanEscapeCharacter();
+            //						else { // consume next character
+            //							unicodeAsBackSlash = false;
+            //							if (((currentCharacter = source[currentPosition++])
+            //								== '\\')
+            //								&& (source[currentPosition] == 'u')) {
+            //								getNextUnicodeChar();
+            //							} else {
+            //								if (withoutUnicodePtr != 0) {
+            //									withoutUnicodeBuffer[++withoutUnicodePtr] =
+            //										currentCharacter;
+            //								}
+            //							}
+            //						}
+            //						// if (getNextChar('\''))
+            //						// return TokenNameCharacterLiteral;
+            //						// relocate if finding another quote fairly close: thus unicode
+            // '/u000D' will be fully consumed
+            //						for (int lookAhead = 0; lookAhead < 20; lookAhead++) {
+            //							if (currentPosition + lookAhead == source.length)
+            //								break;
+            //							if (source[currentPosition + lookAhead] == '\n')
+            //								break;
+            //							if (source[currentPosition + lookAhead] == '\'') {
+            //								currentPosition += lookAhead + 1;
+            //								break;
+            //							}
+            //						}
+            //						throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
             case '\'' :
               try {
                 // consume next character
@@ -1085,13 +1041,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 //                      currentCharacter;
                 //                  }
                 //                }
-
                 while (currentCharacter != '\'') {
-
                   /** ** in PHP \r and \n are valid in string literals *** */
                   //                  if ((currentCharacter == '\n')
                   //                    || (currentCharacter == '\r')) {
-                  //                    // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  //                    // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   //                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                   //                      if (currentPosition + lookAhead == source.length)
                   //                        break;
@@ -1107,17 +1062,22 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   if (currentCharacter == '\\') {
                     int escapeSize = currentPosition;
                     boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
+                    //scanEscapeCharacter make a side effect on this value and
+                    // we need the previous value few lines down this one
                     scanSingleQuotedEscapeCharacter();
                     escapeSize = currentPosition - escapeSize;
                     if (withoutUnicodePtr == 0) {
                       //buffer all the entries that have been left aside....
-                      withoutUnicodePtr = currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(source, startPosition, withoutUnicodeBuffer, 1, withoutUnicodePtr);
+                      withoutUnicodePtr = currentPosition - escapeSize - 1
+                          - startPosition;
+                      System.arraycopy(source, startPosition,
+                          withoutUnicodeBuffer, 1, withoutUnicodePtr);
                       withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                     } else { //overwrite the / in the buffer
                       withoutUnicodeBuffer[withoutUnicodePtr] = currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
+                      if (backSlashAsUnicodeInString) { //there are TWO \ in
+                        // the stream where
+                        // only one is correct
                         withoutUnicodePtr--;
                       }
                     }
@@ -1125,7 +1085,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   // consume next character
                   unicodeAsBackSlash = false;
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    getNextUnicodeChar();
                   //                  } else {
@@ -1133,13 +1094,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                   }
                   //                  }
-
                 }
               } catch (IndexOutOfBoundsException e) {
                 throw new InvalidInputException(UNTERMINATED_STRING);
               } catch (InvalidInputException e) {
                 if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                     if (currentPosition + lookAhead == source.length)
                       break;
@@ -1150,16 +1111,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       break;
                     }
                   }
-
                 }
                 throw e; // rethrow
               }
-              if (checkNonExternalizedStringLiterals) { // check for presence of NLS tags //$NON-NLS-?$ where ? is an int.
+              if (checkNonExternalizedStringLiterals) { // check for presence
+                // of NLS tags
+                // //$NON-NLS-?$ where
+                // ? is an int.
                 if (currentLine == null) {
                   currentLine = new NLSLine();
                   lines.add(currentLine);
                 }
-                currentLine.add(new StringLiteral(getCurrentTokenSourceString(), startPosition, currentPosition - 1));
+                currentLine.add(new StringLiteral(
+                    getCurrentTokenSourceString(), startPosition,
+                    currentPosition - 1));
               }
               return TokenNameStringConstant;
             case '"' :
@@ -1176,13 +1141,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 //                      currentCharacter;
                 //                  }
                 //                }
-
                 while (currentCharacter != '"') {
-
                   /** ** in PHP \r and \n are valid in string literals *** */
                   //                  if ((currentCharacter == '\n')
                   //                    || (currentCharacter == '\r')) {
-                  //                    // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  //                    // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   //                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                   //                      if (currentPosition + lookAhead == source.length)
                   //                        break;
@@ -1198,17 +1162,22 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   if (currentCharacter == '\\') {
                     int escapeSize = currentPosition;
                     boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
+                    //scanEscapeCharacter make a side effect on this value and
+                    // we need the previous value few lines down this one
                     scanDoubleQuotedEscapeCharacter();
                     escapeSize = currentPosition - escapeSize;
                     if (withoutUnicodePtr == 0) {
                       //buffer all the entries that have been left aside....
-                      withoutUnicodePtr = currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(source, startPosition, withoutUnicodeBuffer, 1, withoutUnicodePtr);
+                      withoutUnicodePtr = currentPosition - escapeSize - 1
+                          - startPosition;
+                      System.arraycopy(source, startPosition,
+                          withoutUnicodeBuffer, 1, withoutUnicodePtr);
                       withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                     } else { //overwrite the / in the buffer
                       withoutUnicodeBuffer[withoutUnicodePtr] = currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
+                      if (backSlashAsUnicodeInString) { //there are TWO \ in
+                        // the stream where
+                        // only one is correct
                         withoutUnicodePtr--;
                       }
                     }
@@ -1216,7 +1185,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   // consume next character
                   unicodeAsBackSlash = false;
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    getNextUnicodeChar();
                   //                  } else {
@@ -1224,13 +1194,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                   }
                   //                  }
-
                 }
               } catch (IndexOutOfBoundsException e) {
                 throw new InvalidInputException(UNTERMINATED_STRING);
               } catch (InvalidInputException e) {
                 if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                     if (currentPosition + lookAhead == source.length)
                       break;
@@ -1241,16 +1211,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       break;
                     }
                   }
-
                 }
                 throw e; // rethrow
               }
-              if (checkNonExternalizedStringLiterals) { // check for presence of NLS tags //$NON-NLS-?$ where ? is an int.
+              if (checkNonExternalizedStringLiterals) { // check for presence
+                // of NLS tags
+                // //$NON-NLS-?$ where
+                // ? is an int.
                 if (currentLine == null) {
                   currentLine = new NLSLine();
                   lines.add(currentLine);
                 }
-                currentLine.add(new StringLiteral(getCurrentTokenSourceString(), startPosition, currentPosition - 1));
+                currentLine.add(new StringLiteral(
+                    getCurrentTokenSourceString(), startPosition,
+                    currentPosition - 1));
               }
               return TokenNameStringLiteral;
             case '`' :
@@ -1267,13 +1241,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 //                      currentCharacter;
                 //                  }
                 //                }
-
                 while (currentCharacter != '`') {
-
                   /** ** in PHP \r and \n are valid in string literals *** */
                   //                if ((currentCharacter == '\n')
                   //                  || (currentCharacter == '\r')) {
-                  //                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  //                  // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   //                  for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                   //                    if (currentPosition + lookAhead == source.length)
                   //                      break;
@@ -1289,17 +1262,22 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   if (currentCharacter == '\\') {
                     int escapeSize = currentPosition;
                     boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
+                    //scanEscapeCharacter make a side effect on this value and
+                    // we need the previous value few lines down this one
                     scanDoubleQuotedEscapeCharacter();
                     escapeSize = currentPosition - escapeSize;
                     if (withoutUnicodePtr == 0) {
                       //buffer all the entries that have been left aside....
-                      withoutUnicodePtr = currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(source, startPosition, withoutUnicodeBuffer, 1, withoutUnicodePtr);
+                      withoutUnicodePtr = currentPosition - escapeSize - 1
+                          - startPosition;
+                      System.arraycopy(source, startPosition,
+                          withoutUnicodeBuffer, 1, withoutUnicodePtr);
                       withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                     } else { //overwrite the / in the buffer
                       withoutUnicodeBuffer[withoutUnicodePtr] = currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
+                      if (backSlashAsUnicodeInString) { //there are TWO \ in
+                        // the stream where
+                        // only one is correct
                         withoutUnicodePtr--;
                       }
                     }
@@ -1307,7 +1285,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   // consume next character
                   unicodeAsBackSlash = false;
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    getNextUnicodeChar();
                   //                  } else {
@@ -1315,13 +1294,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                   }
                   //                  }
-
                 }
               } catch (IndexOutOfBoundsException e) {
                 throw new InvalidInputException(UNTERMINATED_STRING);
               } catch (InvalidInputException e) {
                 if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
+                  // relocate if finding another quote fairly close: thus
+                  // unicode '/u000D' will be fully consumed
                   for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
                     if (currentPosition + lookAhead == source.length)
                       break;
@@ -1332,23 +1311,28 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       break;
                     }
                   }
-
                 }
                 throw e; // rethrow
               }
-              if (checkNonExternalizedStringLiterals) { // check for presence of NLS tags //$NON-NLS-?$ where ? is an int.
+              if (checkNonExternalizedStringLiterals) { // check for presence
+                // of NLS tags
+                // //$NON-NLS-?$ where
+                // ? is an int.
                 if (currentLine == null) {
                   currentLine = new NLSLine();
                   lines.add(currentLine);
                 }
-                currentLine.add(new StringLiteral(getCurrentTokenSourceString(), startPosition, currentPosition - 1));
+                currentLine.add(new StringLiteral(
+                    getCurrentTokenSourceString(), startPosition,
+                    currentPosition - 1));
               }
               return TokenNameStringInterpolated;
             case '#' :
             case '/' :
               {
                 int test;
-                if ((currentCharacter == '#') || (test = getNextChar('/', '*')) == 0) {
+                if ((currentCharacter == '#')
+                    || (test = getNextChar('/', '*')) == 0) {
                   //line comment
                   int endPositionForLineComment = 0;
                   try { //get the next char
@@ -1384,7 +1368,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     //                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                     //                      }
                     //                    }
-
                     //handle the \\u case manually into comment
                     //                    if (currentCharacter == '\\') {
                     //                      if (source[currentPosition] == '\\')
@@ -1399,7 +1382,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                           return TokenNameStopPHP;
                         }
                       }
-
                       //get the next char
                       isUnicode = false;
                       currentCharacter = source[currentPosition++];
@@ -1432,7 +1414,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       //                              source[currentPosition++]))
                       //                            > 15
                       //                          || c4 < 0) {
-                      //                          throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
+                      //                          throw new
+                      // InvalidInputException(INVALID_UNICODE_ESCAPE);
                       //                        } else {
                       //                          currentCharacter =
                       //                            (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
@@ -1450,7 +1433,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       endPositionForLineComment = currentPosition - 1;
                     }
                     recordComment(false);
-                    if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+                    if ((currentCharacter == '\r')
+                        || (currentCharacter == '\n')) {
                       checkNonExternalizeString();
                       if (recordLineSeparator) {
                         if (isUnicode) {
@@ -1469,7 +1453,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                       }
                       return TokenNameCOMMENT_LINE;
                     }
-                  } catch (IndexOutOfBoundsException e) { //an eof will them be generated
+                  } catch (IndexOutOfBoundsException e) { //an eof will them
+                    // be generated
                     if (tokenizeComments) {
                       currentPosition--;
                       // reset one character behind
@@ -1484,7 +1469,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   // consume next character
                   unicodeAsBackSlash = false;
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    getNextUnicodeChar();
                   //                  } else {
@@ -1493,7 +1479,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   //                        currentCharacter;
                   //                    }
                   //                  }
-
                   if (currentCharacter == '*') {
                     isJavadoc = true;
                     star = true;
@@ -1526,7 +1511,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     }
                     //loop until end of comment */
                     while ((currentCharacter != '/') || (!star)) {
-                      if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+                      if ((currentCharacter == '\r')
+                          || (currentCharacter == '\n')) {
                         checkNonExternalizeString();
                         if (recordLineSeparator) {
                           pushLineSeparator();
@@ -1567,9 +1553,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
             case '\u001a' :
               if (atEnd())
                 return TokenNameEOF;
-              //the atEnd may not be <currentPosition == source.length> if source is only some part of a real (external) stream
+              //the atEnd may not be <currentPosition == source.length> if
+              // source is only some part of a real (external) stream
               throw new InvalidInputException("Ctrl-Z"); //$NON-NLS-1$
-
             default :
               if (currentCharacter == '$') {
                 while ((currentCharacter = source[currentPosition++]) == '$') {
@@ -1593,12 +1579,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return TokenNameEOF;
   }
-
   //  public final void getNextUnicodeChar()
   //    throws IndexOutOfBoundsException, InvalidInputException {
   //    //VOID
   //    //handle the case of unicode.
-  //    //when a unicode appears then we must use a buffer that holds char internal values
+  //    //when a unicode appears then we must use a buffer that holds char
+  // internal values
   //    //At the end of this method currentCharacter holds the new visited char
   //    //and currentPosition points right next after it
   //
@@ -1639,10 +1625,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
   //    unicodeAsBackSlash = currentCharacter == '\\';
   //  }
   /*
-   * Tokenize a method body, assuming that curly brackets are properly balanced.
+   * Tokenize a method body, assuming that curly brackets are properly
+   * balanced.
    */
   public final void jumpOverMethodBody() {
-
     this.wasAcr = false;
     int found = 1;
     try {
@@ -1656,12 +1642,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
           //            && (source[currentPosition] == 'u')) {
           //            isWhiteSpace = jumpOverUnicodeWhiteSpace();
           //          } else {
-          if (recordLineSeparator && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+          if (recordLineSeparator
+              && ((currentCharacter == '\r') || (currentCharacter == '\n')))
             pushLineSeparator();
           isWhiteSpace = Character.isWhitespace(currentCharacter);
           //          }
         } while (isWhiteSpace);
-
         // -------consume token until } is found---------
         switch (currentCharacter) {
           case '{' :
@@ -1757,7 +1743,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 try {
                   //get the next char
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    //-------------unicode traitement ------------
                   //                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
@@ -1789,7 +1776,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   //                        (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                   //                    }
                   //                  }
-
                   while (currentCharacter != '\r' && currentCharacter != '\n') {
                     //get the next char
                     currentCharacter = source[currentPosition++];
@@ -1827,7 +1813,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                     //                      }
                     //                    }
                   }
-                  if (recordLineSeparator && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+                  if (recordLineSeparator
+                      && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                     pushLineSeparator();
                 } catch (IndexOutOfBoundsException e) {
                 } //an eof will them be generated
@@ -1852,11 +1839,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 if (currentCharacter == '*') {
                   star = true;
                 }
-                if (recordLineSeparator && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+                if (recordLineSeparator
+                    && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                   pushLineSeparator();
                 try { //get the next char
                   currentCharacter = source[currentPosition++];
-                  //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
                   //                    && (source[currentPosition] == 'u')) {
                   //                    //-------------unicode traitement ------------
                   //                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
@@ -1890,7 +1879,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   //                  }
                   //loop until end of comment */
                   while ((currentCharacter != '/') || (!star)) {
-                    if (recordLineSeparator && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+                    if (recordLineSeparator
+                        && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                       pushLineSeparator();
                     star = currentCharacter == '*';
                     //get next char
@@ -1936,9 +1926,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
               }
               break;
             }
-
           default :
-            if (isPHPIdentifierStart(currentCharacter) || currentCharacter == '$') {
+            if (isPHPIdentifierStart(currentCharacter)
+                || currentCharacter == '$') {
               try {
                 scanIdentifierOrKeyword((currentCharacter == '$'));
               } catch (InvalidInputException ex) {
@@ -2006,18 +1996,15 @@ public class Scanner implements IScanner, ITerminalSymbols {
   //  }
   public final int[] getLineEnds() {
     //return a bounded copy of this.lineEnds
-
     int[] copy;
     System.arraycopy(lineEnds, 0, copy = new int[linePtr + 1], 0, linePtr + 1);
     return copy;
   }
-
   public char[] getSource() {
     return this.source;
   }
   final char[] optimizedCurrentTokenSource1() {
     //return always the same char[] build only once
-
     //optimization at no speed cost of 99.5 % of the singleCharIdentifier
     char charOne = source[startPosition];
     switch (charOne) {
@@ -2074,15 +2061,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case 'z' :
         return charArray_z;
       default :
-        return new char[] { charOne };
+        return new char[]{charOne};
     }
   }
-
   final char[] optimizedCurrentTokenSource2() {
     //try to return the same char[] build only once
-
     char c0, c1;
-    int hash = (((c0 = source[startPosition]) << 6) + (c1 = source[startPosition + 1])) % TableSize;
+    int hash = (((c0 = source[startPosition]) << 6) + (c1 = source[startPosition + 1]))
+        % TableSize;
     char[][] table = charArray_length[0][hash];
     int i = newEntry2;
     while (++i < InternalTableSize) {
@@ -2102,17 +2088,15 @@ public class Scanner implements IScanner, ITerminalSymbols {
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1 });
+    table[max] = (r = new char[]{c0, c1});
     newEntry2 = max;
     return r;
   }
-
   final char[] optimizedCurrentTokenSource3() {
     //try to return the same char[] build only once
-
     char c0, c1, c2;
-    int hash =
-      (((c0 = source[startPosition]) << 12) + ((c1 = source[startPosition + 1]) << 6) + (c2 = source[startPosition + 2]))
+    int hash = (((c0 = source[startPosition]) << 12)
+        + ((c1 = source[startPosition + 1]) << 6) + (c2 = source[startPosition + 2]))
         % TableSize;
     char[][] table = charArray_length[1][hash];
     int i = newEntry3;
@@ -2133,26 +2117,23 @@ public class Scanner implements IScanner, ITerminalSymbols {
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2 });
+    table[max] = (r = new char[]{c0, c1, c2});
     newEntry3 = max;
     return r;
   }
-
   final char[] optimizedCurrentTokenSource4() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 18)
+    long hash = ((((long) (c0 = source[startPosition])) << 18)
         + ((c1 = source[startPosition + 1]) << 12)
-        + ((c2 = source[startPosition + 2]) << 6)
-        + (c3 = source[startPosition + 3]))
+        + ((c2 = source[startPosition + 2]) << 6) + (c3 = source[startPosition + 3]))
         % TableSize;
     char[][] table = charArray_length[2][(int) hash];
     int i = newEntry4;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2]) && (c3 == charArray[3]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]))
         return charArray;
     }
     //---------other side---------
@@ -2160,35 +2141,32 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry4;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2]) && (c3 == charArray[3]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3 });
+    table[max] = (r = new char[]{c0, c1, c2, c3});
     newEntry4 = max;
     return r;
-
   }
-
   final char[] optimizedCurrentTokenSource5() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3, c4;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 24)
+    long hash = ((((long) (c0 = source[startPosition])) << 24)
         + (((long) (c1 = source[startPosition + 1])) << 18)
         + ((c2 = source[startPosition + 2]) << 12)
-        + ((c3 = source[startPosition + 3]) << 6)
-        + (c4 = source[startPosition + 4]))
+        + ((c3 = source[startPosition + 3]) << 6) + (c4 = source[startPosition + 4]))
         % TableSize;
     char[][] table = charArray_length[3][(int) hash];
     int i = newEntry5;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2]) && (c3 == charArray[3]) && (c4 == charArray[4]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4]))
         return charArray;
     }
     //---------other side---------
@@ -2196,41 +2174,34 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry5;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2]) && (c3 == charArray[3]) && (c4 == charArray[4]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3, c4 });
+    table[max] = (r = new char[]{c0, c1, c2, c3, c4});
     newEntry5 = max;
     return r;
-
   }
-
   final char[] optimizedCurrentTokenSource6() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3, c4, c5;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 32)
+    long hash = ((((long) (c0 = source[startPosition])) << 32)
         + (((long) (c1 = source[startPosition + 1])) << 24)
         + (((long) (c2 = source[startPosition + 2])) << 18)
         + ((c3 = source[startPosition + 3]) << 12)
-        + ((c4 = source[startPosition + 4]) << 6)
-        + (c5 = source[startPosition + 5]))
+        + ((c4 = source[startPosition + 4]) << 6) + (c5 = source[startPosition + 5]))
         % TableSize;
     char[][] table = charArray_length[4][(int) hash];
     int i = newEntry6;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4])
-        && (c5 == charArray[5]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4])
+          && (c5 == charArray[5]))
         return charArray;
     }
     //---------other side---------
@@ -2238,33 +2209,27 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry6;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4])
-        && (c5 == charArray[5]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4])
+          && (c5 == charArray[5]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3, c4, c5 });
+    table[max] = (r = new char[]{c0, c1, c2, c3, c4, c5});
     newEntry6 = max;
     return r;
   }
-
   public final void pushLineSeparator() throws InvalidInputException {
     //see comment on isLineDelimiter(char) for the use of '\n' and '\r'
     final int INCREMENT = 250;
-
     if (this.checkNonExternalizedStringLiterals) {
       // reinitialize the current line for non externalize strings purpose
       currentLine = null;
     }
     //currentCharacter is at position currentPosition-1
-
     // cr 000D
     if (currentCharacter == '\r') {
       int separatorPos = currentPosition - 1;
@@ -2323,17 +2288,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
   }
   public final void pushUnicodeLineSeparator() {
     // isUnicode means that the \r or \n has been read as a unicode character
-
     //see comment on isLineDelimiter(char) for the use of '\n' and '\r'
-
     final int INCREMENT = 250;
     //currentCharacter is at position currentPosition-1
-
     if (this.checkNonExternalizedStringLiterals) {
       // reinitialize the current line for non externalize strings purpose
       currentLine = null;
     }
-
     // cr 000D
     if (currentCharacter == '\r') {
       int separatorPos = currentPosition - 6;
@@ -2387,10 +2348,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
   }
   public final void recordComment(boolean isJavadoc) {
-
     // a new annotation comment is recorded
     try {
-      commentStops[++commentPtr] = isJavadoc ? currentPosition : -currentPosition;
+      commentStops[++commentPtr] = isJavadoc
+          ? currentPosition
+          : -currentPosition;
     } catch (IndexOutOfBoundsException e) {
       int oldStackLength = commentStops.length;
       int[] oldStack = commentStops;
@@ -2402,23 +2364,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
       commentStarts = new int[oldStackLength + 30];
       System.arraycopy(old, 0, commentStarts, 0, oldStackLength);
     }
-
     //the buffer is of a correct size here
     commentStarts[commentPtr] = startPosition;
   }
   public void resetTo(int begin, int end) {
     //reset the scanner to a given position where it may rescan again
-
     diet = false;
     initialPosition = startPosition = currentPosition = begin;
     eofPosition = end < Integer.MAX_VALUE ? end + 1 : end;
     commentPtr = -1; // reset comment stack
   }
-
-  public final void scanSingleQuotedEscapeCharacter() throws InvalidInputException {
+  public final void scanSingleQuotedEscapeCharacter()
+      throws InvalidInputException {
     // the string with "\\u" is a legal string of two chars \ and u
     //thus we use a direct access to the source (for regular cases).
-
     //    if (unicodeAsBackSlash) {
     //      // consume next character
     //      unicodeAsBackSlash = false;
@@ -2444,11 +2403,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
         currentPosition--;
     }
   }
-
-  public final void scanDoubleQuotedEscapeCharacter() throws InvalidInputException {
+  public final void scanDoubleQuotedEscapeCharacter()
+      throws InvalidInputException {
     // the string with "\\u" is a legal string of two chars \ and u
     //thus we use a direct access to the source (for regular cases).
-
     //    if (unicodeAsBackSlash) {
     //      // consume next character
     //      unicodeAsBackSlash = false;
@@ -2472,9 +2430,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case 'n' :
         currentCharacter = '\n';
         break;
-        //      case 'f' :
-        //        currentCharacter = '\f';
-        //        break;
+      //      case 'f' :
+      //        currentCharacter = '\f';
+      //        break;
       case 'r' :
         currentCharacter = '\r';
         break;
@@ -2495,7 +2453,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         // OctalDigit
         // OctalDigit OctalDigit
         // ZeroToThree OctalDigit OctalDigit
-
         int number = Character.getNumericValue(currentCharacter);
         if (number >= 0 && number <= 7) {
           boolean zeroToThreeNot = number > 3;
@@ -2503,22 +2460,27 @@ public class Scanner implements IScanner, ITerminalSymbols {
             int digit = Character.getNumericValue(currentCharacter);
             if (digit >= 0 && digit <= 7) {
               number = (number * 8) + digit;
-              if (Character.isDigit(currentCharacter = source[currentPosition++])) {
-                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit Digit --> ignore last character
+              if (Character
+                  .isDigit(currentCharacter = source[currentPosition++])) {
+                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit
+                  // Digit --> ignore last character
                   currentPosition--;
                 } else {
                   digit = Character.getNumericValue(currentCharacter);
                   if (digit >= 0 && digit <= 7) {
                     // has read \ZeroToThree OctalDigit OctalDigit
                     number = (number * 8) + digit;
-                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit --> ignore last character
+                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit
+                    // --> ignore last character
                     currentPosition--;
                   }
                 }
-              } else { // has read \OctalDigit NonDigit--> ignore last character
+              } else { // has read \OctalDigit NonDigit--> ignore last
+                // character
                 currentPosition--;
               }
-            } else { // has read \OctalDigit NonOctalDigit--> ignore last character
+            } else { // has read \OctalDigit NonOctalDigit--> ignore last
+              // character
               currentPosition--;
             }
           } else { // has read \OctalDigit --> ignore last character
@@ -2528,28 +2490,23 @@ public class Scanner implements IScanner, ITerminalSymbols {
             throw new InvalidInputException(INVALID_ESCAPE);
           currentCharacter = (char) number;
         }
-        //else
-        //     throw new InvalidInputException(INVALID_ESCAPE);
+    //else
+    //     throw new InvalidInputException(INVALID_ESCAPE);
     }
   }
-
   //  public int scanIdentifierOrKeyword() throws InvalidInputException {
   //    return scanIdentifierOrKeyword( false );
   //  }
-
-  public int scanIdentifierOrKeyword(boolean isVariable) throws InvalidInputException {
+  public int scanIdentifierOrKeyword(boolean isVariable)
+      throws InvalidInputException {
     //test keywords
-
     //first dispatch on the first char.
     //then the length. If there are several
     //keywors with the same length AND the same first char, then do another
     //disptach on the second char :-)...cool....but fast !
-
     useAssertAsAnIndentifier = false;
-
     while (getNextCharAsJavaIdentifierPart()) {
     };
-
     if (isVariable) {
       if (new String(getCurrentTokenSource()).equals("$this")) {
         return TokenNamethis;
@@ -2560,11 +2517,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
     char[] data;
     char firstLetter;
     //    if (withoutUnicodePtr == 0)
-
     //quick test on length == 1 but not on length > 12 while most identifier
     //have a length which is <= 12...but there are lots of identifier with
     //only one char....
-
     //      {
     if ((length = currentPosition - startPosition) == 1)
       return TokenNameIdentifier;
@@ -2585,86 +2540,134 @@ public class Scanner implements IScanner, ITerminalSymbols {
     //      }
     //      index = 1;
     //    }
-
     firstLetter = data[index];
     switch (firstLetter) {
-
-      case 'a' : // as and array abstract
+      case '_' :
+        switch (length) {
+          case 8 :
+            //__FILE__
+            if ((data[++index] == '_') && (data[++index] == 'f')
+                && (data[++index] == 'i') && (data[++index] == 'l')
+                && (data[++index] == 'e') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameFILE;
+            index = 0; //__LINE__
+            if ((data[++index] == '_') && (data[++index] == 'l')
+                && (data[++index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 'e') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameLINE;
+            break;
+          case 9 :
+            //__CLASS__
+            if ((data[++index] == '_') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 's') && (data[++index] == 's')
+                && (data[++index] == '_') && (data[++index] == '_'))
+              return TokenNameCLASS_C;
+            break;
+          case 11 :
+            //__METHOD__
+            if ((data[++index] == '_') && (data[++index] == 'm')
+                && (data[++index] == 'e') && (data[++index] == 't')
+                && (data[++index] == 'h') && (data[++index] == 'o')
+                && (data[++index] == 'd') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameMETHOD_C;
+            break;
+          case 12 :
+            //__FUNCTION__
+            if ((data[++index] == '_') && (data[++index] == 'f')
+                && (data[++index] == 'u') && (data[++index] == 'n')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'i') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameFUNC_C;
+            break;
+        }
+        return TokenNameIdentifier;
+      case 'a' :
+        // as and array abstract
         switch (length) {
-          case 2 : //as
+          case 2 :
+            //as
             if ((data[++index] == 's')) {
               return TokenNameas;
             } else {
               return TokenNameIdentifier;
             }
-          case 3 : //and
+          case 3 :
+            //and
             if ((data[++index] == 'n') && (data[++index] == 'd')) {
               return TokenNameAND;
             } else {
               return TokenNameIdentifier;
             }
-          case 5 : // array
-            if ((data[++index] == 'r') && (data[++index] == 'r') && (data[++index] == 'a') && (data[++index] == 'y'))
+          case 5 :
+            // array
+            if ((data[++index] == 'r') && (data[++index] == 'r')
+                && (data[++index] == 'a') && (data[++index] == 'y'))
               return TokenNamearray;
             else
               return TokenNameIdentifier;
           case 8 :
-            if ((data[++index] == 'b')
-              && (data[++index] == 's')
-              && (data[++index] == 't')
-              && (data[++index] == 'r')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 't'))
+            if ((data[++index] == 'b') && (data[++index] == 's')
+                && (data[++index] == 't') && (data[++index] == 'r')
+                && (data[++index] == 'a') && (data[++index] == 'c')
+                && (data[++index] == 't'))
               return TokenNameabstract;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'b' : //break
+      case 'b' :
+        //break
         switch (length) {
           case 5 :
-            if ((data[++index] == 'r') && (data[++index] == 'e') && (data[++index] == 'a') && (data[++index] == 'k'))
+            if ((data[++index] == 'r') && (data[++index] == 'e')
+                && (data[++index] == 'a') && (data[++index] == 'k'))
               return TokenNamebreak;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'c' : //case catch class const continue
+      case 'c' :
+        //case catch class const continue
         switch (length) {
           case 4 :
-            if ((data[++index] == 'a') && (data[++index] == 's') && (data[++index] == 'e'))
+            if ((data[++index] == 'a') && (data[++index] == 's')
+                && (data[++index] == 'e'))
               return TokenNamecase;
             else
               return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'a') && (data[++index] == 't') && (data[++index] == 'c') && (data[++index] == 'h'))
+            if ((data[++index] == 'a') && (data[++index] == 't')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNamecatch;
-            if ((data[index] == 'l') && (data[++index] == 'a') && (data[++index] == 's') && (data[++index] == 's'))
+            if ((data[index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 's') && (data[++index] == 's'))
               return TokenNameclass;
-            if ((data[index] == 'o') && (data[++index] == 'n') && (data[++index] == 's') && (data[++index] == 't'))
+            if ((data[index] == 'o') && (data[++index] == 'n')
+                && (data[++index] == 's') && (data[++index] == 't'))
               return TokenNameconst;
             else
               return TokenNameIdentifier;
           case 8 :
-            if ((data[++index] == 'o')
-              && (data[++index] == 'n')
-              && (data[++index] == 't')
-              && (data[++index] == 'i')
-              && (data[++index] == 'n')
-              && (data[++index] == 'u')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'o') && (data[++index] == 'n')
+                && (data[++index] == 't') && (data[++index] == 'i')
+                && (data[++index] == 'n') && (data[++index] == 'u')
+                && (data[++index] == 'e'))
               return TokenNamecontinue;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'd' : // declare default do die
+      case 'd' :
+        // declare default do die
         // TODO delete define ==> no keyword !
         switch (length) {
           case 2 :
@@ -2672,135 +2675,117 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNamedo;
             else
               return TokenNameIdentifier;
-//          case 6 :
-//            if ((data[++index] == 'e')
-//              && (data[++index] == 'f')
-//              && (data[++index] == 'i')
-//              && (data[++index] == 'n')
-//              && (data[++index] == 'e'))
-//              return TokenNamedefine;
-//            else
-//              return TokenNameIdentifier;
+          //          case 6 :
+          //            if ((data[++index] == 'e')
+          //              && (data[++index] == 'f')
+          //              && (data[++index] == 'i')
+          //              && (data[++index] == 'n')
+          //              && (data[++index] == 'e'))
+          //              return TokenNamedefine;
+          //            else
+          //              return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'e')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'a')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'e') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 'r') && (data[++index] == 'e'))
               return TokenNamedeclare;
             index = 0;
-            if ((data[++index] == 'e')
-              && (data[++index] == 'f')
-              && (data[++index] == 'a')
-              && (data[++index] == 'u')
-              && (data[++index] == 'l')
-              && (data[++index] == 't'))
+            if ((data[++index] == 'e') && (data[++index] == 'f')
+                && (data[++index] == 'a') && (data[++index] == 'u')
+                && (data[++index] == 'l') && (data[++index] == 't'))
               return TokenNamedefault;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'e' : //echo else exit elseif extends eval
+      case 'e' :
+        //echo else exit elseif extends eval
         switch (length) {
           case 4 :
-            if ((data[++index] == 'c') && (data[++index] == 'h') && (data[++index] == 'o'))
+            if ((data[++index] == 'c') && (data[++index] == 'h')
+                && (data[++index] == 'o'))
               return TokenNameecho;
-            else if ((data[index] == 'l') && (data[++index] == 's') && (data[++index] == 'e'))
+            else if ((data[index] == 'l') && (data[++index] == 's')
+                && (data[++index] == 'e'))
               return TokenNameelse;
-            else if ((data[index] == 'x') && (data[++index] == 'i') && (data[++index] == 't'))
+            else if ((data[index] == 'x') && (data[++index] == 'i')
+                && (data[++index] == 't'))
               return TokenNameexit;
-            else if ((data[index] == 'v') && (data[++index] == 'a') && (data[++index] == 'l'))
+            else if ((data[index] == 'v') && (data[++index] == 'a')
+                && (data[++index] == 'l'))
               return TokenNameeval;
             else
               return TokenNameIdentifier;
-          case 5 : // endif empty
-            if ((data[++index] == 'n') && (data[++index] == 'd') && (data[++index] == 'i') && (data[++index] == 'f'))
+          case 5 :
+            // endif empty
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'i') && (data[++index] == 'f'))
               return TokenNameendif;
-            if ((data[index] == 'm') && (data[++index] == 'p') && (data[++index] == 't') && (data[++index] == 'y'))
+            if ((data[index] == 'm') && (data[++index] == 'p')
+                && (data[++index] == 't') && (data[++index] == 'y'))
               return TokenNameempty;
             else
               return TokenNameIdentifier;
-          case 6 : // endfor
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'f')
-              && (data[++index] == 'o')
-              && (data[++index] == 'r'))
+          case 6 :
+            // endfor
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'f') && (data[++index] == 'o')
+                && (data[++index] == 'r'))
               return TokenNameendfor;
-            else if (
-              (data[index] == 'l')
-                && (data[++index] == 's')
-                && (data[++index] == 'e')
-                && (data[++index] == 'i')
+            else if ((data[index] == 'l') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 'i')
                 && (data[++index] == 'f'))
               return TokenNameelseif;
             else
               return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'x')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')
-              && (data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 's'))
+            if ((data[++index] == 'x') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'n')
+                && (data[++index] == 'd') && (data[++index] == 's'))
               return TokenNameextends;
             else
               return TokenNameIdentifier;
-          case 8 : // endwhile
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'w')
-              && (data[++index] == 'h')
-              && (data[++index] == 'i')
-              && (data[++index] == 'l')
-              && (data[++index] == 'e'))
+          case 8 :
+            // endwhile
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'w') && (data[++index] == 'h')
+                && (data[++index] == 'i') && (data[++index] == 'l')
+                && (data[++index] == 'e'))
               return TokenNameendwhile;
             else
               return TokenNameIdentifier;
-          case 9 : // endswitch
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 's')
-              && (data[++index] == 'w')
-              && (data[++index] == 'i')
-              && (data[++index] == 't')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+          case 9 :
+            // endswitch
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 's') && (data[++index] == 'w')
+                && (data[++index] == 'i') && (data[++index] == 't')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameendswitch;
             else
               return TokenNameIdentifier;
-          case 10 : // enddeclare
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'd')
-              && (data[++index] == 'e')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'a')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e'))
+          case 10 :
+            // enddeclare
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'd') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 'l')
+                && (data[++index] == 'a') && (data[++index] == 'r')
+                && (data[++index] == 'e'))
               return TokenNameendforeach;
             index = 0;
             if ((data[++index] == 'n') // endforeach
-              && (data[++index] == 'd')
-              && (data[++index] == 'f')
-              && (data[++index] == 'o')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+                && (data[++index] == 'd') && (data[++index] == 'f')
+                && (data[++index] == 'o') && (data[++index] == 'r')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameendforeach;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
-
-      case 'f' : //for false final function
+      case 'f' :
+        //for false final function
         switch (length) {
           case 3 :
             if ((data[++index] == 'o') && (data[++index] == 'r'))
@@ -2808,154 +2793,136 @@ public class Scanner implements IScanner, ITerminalSymbols {
             else
               return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'a') && (data[++index] == 'l') && (data[++index] == 's') && (data[++index] == 'e'))
-              return TokenNamefalse;
-            if ((data[index] == 'i') && (data[++index] == 'n') && (data[++index] == 'a') && (data[++index] == 'l'))
+//            if ((data[++index] == 'a') && (data[++index] == 'l')
+//                && (data[++index] == 's') && (data[++index] == 'e'))
+//              return TokenNamefalse;
+            if ((data[++index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 'a') && (data[++index] == 'l'))
               return TokenNamefinal;
             else
               return TokenNameIdentifier;
-          case 7 : // foreach
-            if ((data[++index] == 'o')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+          case 7 :
+            // foreach
+            if ((data[++index] == 'o') && (data[++index] == 'r')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameforeach;
             else
               return TokenNameIdentifier;
-          case 8 : // function
-            if ((data[++index] == 'u')
-              && (data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 't')
-              && (data[++index] == 'i')
-              && (data[++index] == 'o')
-              && (data[++index] == 'n'))
+          case 8 :
+            // function
+            if ((data[++index] == 'u') && (data[++index] == 'n')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'i') && (data[++index] == 'o')
+                && (data[++index] == 'n'))
               return TokenNamefunction;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'g' : //global
+      case 'g' :
+        //global
         if (length == 6) {
-          if ((data[++index] == 'l')
-            && (data[++index] == 'o')
-            && (data[++index] == 'b')
-            && (data[++index] == 'a')
-            && (data[++index] == 'l')) {
+          if ((data[++index] == 'l') && (data[++index] == 'o')
+              && (data[++index] == 'b') && (data[++index] == 'a')
+              && (data[++index] == 'l')) {
             return TokenNameglobal;
           }
         }
         return TokenNameIdentifier;
-
-      case 'i' : //if int isset include include_once instanceof interface implements
+      case 'i' :
+        //if int isset include include_once instanceof interface implements
         switch (length) {
           case 2 :
             if (data[++index] == 'f')
               return TokenNameif;
             else
               return TokenNameIdentifier;
-            //          case 3 :
-            //            if ((data[++index] == 'n') && (data[++index] == 't'))
-            //              return TokenNameint;
-            //            else
-            //              return TokenNameIdentifier;
+          //          case 3 :
+          //            if ((data[++index] == 'n') && (data[++index] == 't'))
+          //              return TokenNameint;
+          //            else
+          //              return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 's') && (data[++index] == 's') && (data[++index] == 'e') && (data[++index] == 't'))
+            if ((data[++index] == 's') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 't'))
               return TokenNameisset;
             else
               return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'u')
-              && (data[++index] == 'd')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'u')
+                && (data[++index] == 'd') && (data[++index] == 'e'))
               return TokenNameinclude;
             else
               return TokenNameIdentifier;
-          case 9 : // interface
-            if ((data[++index] == 'n')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')
-              && (data[++index] == 'r')
-              && (data[++index] == 'f')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 'e'))
+          case 9 :
+            // interface
+            if ((data[++index] == 'n') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'r')
+                && (data[++index] == 'f') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'e'))
               return TokenNameinterface;
             else
               return TokenNameIdentifier;
-          case 10 : // instanceof
-            if ((data[++index] == 'n')
-              && (data[++index] == 's')
-              && (data[++index] == 't')
-              && (data[++index] == 'a')
-              && (data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'e')
-              && (data[++index] == 'o')
-              && (data[++index] == 'f'))
+          case 10 :
+            // instanceof
+            if ((data[++index] == 'n') && (data[++index] == 's')
+                && (data[++index] == 't') && (data[++index] == 'a')
+                && (data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'e') && (data[++index] == 'o')
+                && (data[++index] == 'f'))
               return TokenNameinstanceof;
-            if ((data[index] == 'm')
-              && (data[++index] == 'p')
-              && (data[++index] == 'l')
-              && (data[++index] == 'e')
-              && (data[++index] == 'm')
-              && (data[++index] == 'e')
-              && (data[++index] == 'n')
-              && (data[++index] == 't')
-              && (data[++index] == 's'))
+            if ((data[index] == 'm') && (data[++index] == 'p')
+                && (data[++index] == 'l') && (data[++index] == 'e')
+                && (data[++index] == 'm') && (data[++index] == 'e')
+                && (data[++index] == 'n') && (data[++index] == 't')
+                && (data[++index] == 's'))
               return TokenNameimplements;
             else
               return TokenNameIdentifier;
           case 12 :
-            if ((data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'u')
-              && (data[++index] == 'd')
-              && (data[++index] == 'e')
-              && (data[++index] == '_')
-              && (data[++index] == 'o')
-              && (data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'u')
+                && (data[++index] == 'd') && (data[++index] == 'e')
+                && (data[++index] == '_') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'e'))
               return TokenNameinclude_once;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'l' : //list
+      case 'l' :
+        //list
         if (length == 4) {
-          if ((data[++index] == 'i') && (data[++index] == 's') && (data[++index] == 't')) {
+          if ((data[++index] == 'i') && (data[++index] == 's')
+              && (data[++index] == 't')) {
             return TokenNamelist;
           }
         }
         return TokenNameIdentifier;
-
-      case 'n' : // new null
+      case 'n' :
+        // new null
         switch (length) {
           case 3 :
             if ((data[++index] == 'e') && (data[++index] == 'w'))
               return TokenNamenew;
             else
               return TokenNameIdentifier;
-          case 4 :
-            if ((data[++index] == 'u') && (data[++index] == 'l') && (data[++index] == 'l'))
-              return TokenNamenull;
-            else
-              return TokenNameIdentifier;
-
+//          case 4 :
+//            if ((data[++index] == 'u') && (data[++index] == 'l')
+//                && (data[++index] == 'l'))
+//              return TokenNamenull;
+//            else
+//              return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'o' : // or old_function
+      case 'o' :
+        // or old_function
         if (length == 2) {
           if (data[++index] == 'r') {
             return TokenNameOR;
@@ -2977,95 +2944,76 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //          }
         //        }
         return TokenNameIdentifier;
-
-      case 'p' : // print public private protected
+      case 'p' :
+        // print public private protected
         switch (length) {
           case 5 :
-            if ((data[++index] == 'r') && (data[++index] == 'i') && (data[++index] == 'n') && (data[++index] == 't')) {
+            if ((data[++index] == 'r') && (data[++index] == 'i')
+                && (data[++index] == 'n') && (data[++index] == 't')) {
               return TokenNameprint;
             } else
               return TokenNameIdentifier;
           case 6 :
-            if ((data[++index] == 'u')
-              && (data[++index] == 'b')
-              && (data[++index] == 'l')
-              && (data[++index] == 'i')
-              && (data[++index] == 'c')) {
+            if ((data[++index] == 'u') && (data[++index] == 'b')
+                && (data[++index] == 'l') && (data[++index] == 'i')
+                && (data[++index] == 'c')) {
               return TokenNamepublic;
             } else
               return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'r')
-              && (data[++index] == 'i')
-              && (data[++index] == 'v')
-              && (data[++index] == 'a')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')) {
+            if ((data[++index] == 'r') && (data[++index] == 'i')
+                && (data[++index] == 'v') && (data[++index] == 'a')
+                && (data[++index] == 't') && (data[++index] == 'e')) {
               return TokenNameprivate;
             } else
               return TokenNameIdentifier;
           case 9 :
-            if ((data[++index] == 'r')
-              && (data[++index] == 'o')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')
-              && (data[++index] == 'c')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')
-              && (data[++index] == 'd')) {
+            if ((data[++index] == 'r') && (data[++index] == 'o')
+                && (data[++index] == 't') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'd')) {
               return TokenNameprotected;
             } else
               return TokenNameIdentifier;
         }
         return TokenNameIdentifier;
-      case 'r' : //return require require_once
+      case 'r' :
+        //return require require_once
         if (length == 6) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 't')
-            && (data[++index] == 'u')
-            && (data[++index] == 'r')
-            && (data[++index] == 'n')) {
+          if ((data[++index] == 'e') && (data[++index] == 't')
+              && (data[++index] == 'u') && (data[++index] == 'r')
+              && (data[++index] == 'n')) {
             return TokenNamereturn;
           }
         } else if (length == 7) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 'q')
-            && (data[++index] == 'u')
-            && (data[++index] == 'i')
-            && (data[++index] == 'r')
-            && (data[++index] == 'e')) {
+          if ((data[++index] == 'e') && (data[++index] == 'q')
+              && (data[++index] == 'u') && (data[++index] == 'i')
+              && (data[++index] == 'r') && (data[++index] == 'e')) {
             return TokenNamerequire;
           }
         } else if (length == 12) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 'q')
-            && (data[++index] == 'u')
-            && (data[++index] == 'i')
-            && (data[++index] == 'r')
-            && (data[++index] == 'e')
-            && (data[++index] == '_')
-            && (data[++index] == 'o')
-            && (data[++index] == 'n')
-            && (data[++index] == 'c')
-            && (data[++index] == 'e')) {
+          if ((data[++index] == 'e') && (data[++index] == 'q')
+              && (data[++index] == 'u') && (data[++index] == 'i')
+              && (data[++index] == 'r') && (data[++index] == 'e')
+              && (data[++index] == '_') && (data[++index] == 'o')
+              && (data[++index] == 'n') && (data[++index] == 'c')
+              && (data[++index] == 'e')) {
             return TokenNamerequire_once;
           }
         } else
           return TokenNameIdentifier;
-
-      case 's' : //static switch
+      case 's' :
+        //static switch
         switch (length) {
           case 6 :
             if (data[++index] == 't')
-              if ((data[++index] == 'a') && (data[++index] == 't') && (data[++index] == 'i') && (data[++index] == 'c')) {
+              if ((data[++index] == 'a') && (data[++index] == 't')
+                  && (data[++index] == 'i') && (data[++index] == 'c')) {
                 return TokenNamestatic;
               } else
                 return TokenNameIdentifier;
-            else if (
-              (data[index] == 'w')
-                && (data[++index] == 'i')
-                && (data[++index] == 't')
-                && (data[++index] == 'c')
+            else if ((data[index] == 'w') && (data[++index] == 'i')
+                && (data[++index] == 't') && (data[++index] == 'c')
                 && (data[++index] == 'h'))
               return TokenNameswitch;
             else
@@ -3073,29 +3021,31 @@ public class Scanner implements IScanner, ITerminalSymbols {
           default :
             return TokenNameIdentifier;
         }
-
-      case 't' : // try true throw
+      case 't' :
+        // try true throw
         switch (length) {
           case 3 :
             if ((data[++index] == 'r') && (data[++index] == 'y'))
               return TokenNametry;
             else
               return TokenNameIdentifier;
-          case 4 :
-            if ((data[++index] == 'r') && (data[++index] == 'u') && (data[++index] == 'e'))
-              return TokenNametrue;
-            else
-              return TokenNameIdentifier;
+//          case 4 :
+//            if ((data[++index] == 'r') && (data[++index] == 'u')
+//                && (data[++index] == 'e'))
+//              return TokenNametrue;
+//            else
+//              return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'h') && (data[++index] == 'r') && (data[++index] == 'o') && (data[++index] == 'w'))
+            if ((data[++index] == 'h') && (data[++index] == 'r')
+                && (data[++index] == 'o') && (data[++index] == 'w'))
               return TokenNamethrow;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
-      case 'u' : //use unset
+      case 'u' :
+        //use unset
         switch (length) {
           case 3 :
             if ((data[++index] == 's') && (data[++index] == 'e'))
@@ -3103,49 +3053,51 @@ public class Scanner implements IScanner, ITerminalSymbols {
             else
               return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'n') && (data[++index] == 's') && (data[++index] == 'e') && (data[++index] == 't'))
+            if ((data[++index] == 'n') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 't'))
               return TokenNameunset;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'v' : //var
+      case 'v' :
+        //var
         switch (length) {
           case 3 :
             if ((data[++index] == 'a') && (data[++index] == 'r'))
               return TokenNamevar;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
-
-      case 'w' : //while
+      case 'w' :
+        //while
         switch (length) {
           case 5 :
-            if ((data[++index] == 'h') && (data[++index] == 'i') && (data[++index] == 'l') && (data[++index] == 'e'))
+            if ((data[++index] == 'h') && (data[++index] == 'i')
+                && (data[++index] == 'l') && (data[++index] == 'e'))
               return TokenNamewhile;
             else
               return TokenNameIdentifier;
-            //case 6:if ( (data[++index] =='i') && (data[++index]=='d') && (data[++index]=='e') && (data[++index]=='f')&&
-            // (data[++index]=='p'))
-            //return TokenNamewidefp ;
-            //else
-            //return TokenNameIdentifier;
+          //case 6:if ( (data[++index] =='i') && (data[++index]=='d') &&
+          // (data[++index]=='e') && (data[++index]=='f')&&
+          // (data[++index]=='p'))
+          //return TokenNamewidefp ;
+          //else
+          //return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'x' : //xor
+      case 'x' :
+        //xor
         switch (length) {
           case 3 :
             if ((data[++index] == 'o') && (data[++index] == 'r'))
               return TokenNameXOR;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
@@ -3154,11 +3106,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
   }
   public int scanNumber(boolean dotPrefix) throws InvalidInputException {
-
     //when entering this method the currentCharacter is the firt
     //digit of the number , i.e. it may be preceeded by a . when
     //dotPrefix is true
-
     boolean floating = dotPrefix;
     if ((!dotPrefix) && (currentCharacter == '0')) {
       if (getNextChar('x', 'X') >= 0) { //----------hexa-----------------
@@ -3184,14 +3134,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //        else
         return TokenNameIntegerLiteral;
       }
-
       //there is x or X in the number
-      //potential octal ! ... some one may write 000099.0 ! thus 00100 < 00078.0 is true !!!!! crazy language
+      //potential octal ! ... some one may write 000099.0 ! thus 00100 <
+      // 00078.0 is true !!!!! crazy language
       if (getNextCharAsDigit()) {
         //-------------potential octal-----------------
         while (getNextCharAsDigit()) {
         };
-
         //        if (getNextChar('l', 'L') >= 0) {
         //          return TokenNameLongLiteral;
         //        }
@@ -3199,7 +3148,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //        if (getNextChar('f', 'F') >= 0) {
         //          return TokenNameFloatingPointLiteral;
         //        }
-
         if (getNextChar('d', 'D') >= 0) {
           return TokenNameDoubleLiteral;
         } else { //make the distinction between octal and float ....
@@ -3218,7 +3166,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
               //                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
               //                }
               //              }
-
               if ((currentCharacter == '-') || (currentCharacter == '+')) {
                 // consume next character
                 unicodeAsBackSlash = false;
@@ -3250,21 +3197,16 @@ public class Scanner implements IScanner, ITerminalSymbols {
         /* carry on */
       }
     }
-
     while (getNextCharAsDigit()) {
     };
-
     //    if ((!dotPrefix) && (getNextChar('l', 'L') >= 0))
     //      return TokenNameLongLiteral;
-
     if ((!dotPrefix) && (getNextChar('.'))) { //decimal part that can be empty
       while (getNextCharAsDigit()) {
       };
       floating = true;
     }
-
     //if floating is true both exponant and suffix may be optional
-
     if (getNextChar('e', 'E') >= 0) {
       floating = true;
       // consume next character
@@ -3278,8 +3220,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
       //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
       //        }
       //      }
-
-      if ((currentCharacter == '-') || (currentCharacter == '+')) { // consume next character
+      if ((currentCharacter == '-') || (currentCharacter == '+')) { // consume
+        // next
+        // character
         unicodeAsBackSlash = false;
         currentCharacter = source[currentPosition++];
         //        if (((currentCharacter = source[currentPosition++]) == '\\')
@@ -3296,14 +3239,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
       while (getNextCharAsDigit()) {
       };
     }
-
     if (getNextChar('d', 'D') >= 0)
       return TokenNameDoubleLiteral;
     //    if (getNextChar('f', 'F') >= 0)
     //      return TokenNameFloatingPointLiteral;
-
     //the long flag has been tested before
-
     return floating ? TokenNameDoubleLiteral : TokenNameIntegerLiteral;
   }
   /**
@@ -3311,7 +3251,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
    *  
    */
   public final int getLineNumber(int position) {
-
     if (lineEnds == null)
       return 1;
     int length = linePtr + 1;
@@ -3334,14 +3273,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return m + 2;
   }
-
   public void setPHPMode(boolean mode) {
     phpMode = mode;
   }
-
   public final void setSource(char[] source) {
     //the source-buffer is set to sourceString
-
     if (source == null) {
       this.source = new char[0];
     } else {
@@ -3351,18 +3287,14 @@ public class Scanner implements IScanner, ITerminalSymbols {
     initialPosition = currentPosition = 0;
     containsAssertKeyword = false;
     withoutUnicodeBuffer = new char[this.source.length];
-
   }
-
   public String toString() {
     if (startPosition == source.length)
       return "EOF\n\n" + new String(source); //$NON-NLS-1$
     if (currentPosition > source.length)
       return "behind the EOF :-( ....\n\n" + new String(source); //$NON-NLS-1$
-
     char front[] = new char[startPosition];
     System.arraycopy(source, 0, front, 0, startPosition);
-
     int middleLength = (currentPosition - 1) - startPosition + 1;
     char middle[];
     if (middleLength > -1) {
@@ -3371,19 +3303,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
     } else {
       middle = new char[0];
     }
-
     char end[] = new char[source.length - (currentPosition - 1)];
-    System.arraycopy(source, (currentPosition - 1) + 1, end, 0, source.length - (currentPosition - 1) - 1);
-
-    return new String(front) + "\n===============================\nStarts here -->" //$NON-NLS-1$
-    + new String(middle) + "<-- Ends here\n===============================\n" //$NON-NLS-1$
-    + new String(end);
+    System.arraycopy(source, (currentPosition - 1) + 1, end, 0, source.length
+        - (currentPosition - 1) - 1);
+    return new String(front)
+        + "\n===============================\nStarts here -->" //$NON-NLS-1$
+        + new String(middle)
+        + "<-- Ends here\n===============================\n" //$NON-NLS-1$
+        + new String(end);
   }
   public final String toStringAction(int act) {
-
     switch (act) {
       case TokenNameERROR :
-        return "ScannerError"; // + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+        return "ScannerError"; // + new String(getCurrentTokenSource()) + ")";
+      // //$NON-NLS-1$
       case TokenNameStopPHP :
         return "StopPHP(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameIdentifier :
@@ -3406,8 +3339,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "continue"; //$NON-NLS-1$
       case TokenNamedefault :
         return "default"; //$NON-NLS-1$
-//      case TokenNamedefine :
-//        return "define"; //$NON-NLS-1$
+      //      case TokenNamedefine :
+      //        return "define"; //$NON-NLS-1$
       case TokenNamedo :
         return "do"; //$NON-NLS-1$
       case TokenNameecho :
@@ -3428,8 +3361,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "endwhile"; //$NON-NLS-1$
       case TokenNameextends :
         return "extends"; //$NON-NLS-1$
-      case TokenNamefalse :
-        return "false"; //$NON-NLS-1$
+//      case TokenNamefalse :
+//        return "false"; //$NON-NLS-1$
       case TokenNamefinal :
         return "final"; //$NON-NLS-1$
       case TokenNamefor :
@@ -3454,8 +3387,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "list"; //$NON-NLS-1$
       case TokenNamenew :
         return "new"; //$NON-NLS-1$
-      case TokenNamenull :
-        return "null"; //$NON-NLS-1$
+//      case TokenNamenull :
+//        return "null"; //$NON-NLS-1$
       case TokenNameprint :
         return "print"; //$NON-NLS-1$
       case TokenNameprivate :
@@ -3474,8 +3407,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "static"; //$NON-NLS-1$
       case TokenNameswitch :
         return "switch"; //$NON-NLS-1$
-      case TokenNametrue :
-        return "true"; //$NON-NLS-1$
+//      case TokenNametrue :
+//        return "true"; //$NON-NLS-1$
       case TokenNameunset :
         return "unset"; //$NON-NLS-1$
       case TokenNamevar :
@@ -3493,10 +3426,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case TokenNameStringConstant :
         return "StringConstant(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameStringInterpolated :
-        return "StringInterpolated(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        return "StringInterpolated(" + new String(getCurrentTokenSource())
+            + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameHEREDOC :
         return "HEREDOC(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
-
       case TokenNamePLUS_PLUS :
         return "++"; //$NON-NLS-1$
       case TokenNameMINUS_MINUS :
@@ -3611,33 +3544,39 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "COMMENT_PHPDOC(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
       case TokenNameHTML :
         return "HTML(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+      case TokenNameFILE :
+        return "__FILE__"; //$NON-NLS-1$
+      case TokenNameLINE :
+        return "__LINE__"; //$NON-NLS-1$
+      case TokenNameCLASS_C :
+        return "__CLASS__"; //$NON-NLS-1$
+      case TokenNameMETHOD_C :
+        return "__METHOD__"; //$NON-NLS-1$
+      case TokenNameFUNC_C :
+        return "__FUNCTION__"; //$NON-NLS-1$
       default :
-        return "not-a-token(" + (new Integer(act)) + ") " + new String(getCurrentTokenSource()); //$NON-NLS-1$
+        return "not-a-token(" + (new Integer(act)) + ") "
+            + new String(getCurrentTokenSource()); //$NON-NLS-1$
     }
   }
-
-  public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean checkNonExternalizedStringLiterals) {
-    this(tokenizeComments, tokenizeWhiteSpace, checkNonExternalizedStringLiterals, false);
+  public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace,
+      boolean checkNonExternalizedStringLiterals) {
+    this(tokenizeComments, tokenizeWhiteSpace,
+        checkNonExternalizedStringLiterals, false);
   }
-
-  public Scanner(
-    boolean tokenizeComments,
-    boolean tokenizeWhiteSpace,
-    boolean checkNonExternalizedStringLiterals,
-    boolean assertMode) {
+  public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace,
+      boolean checkNonExternalizedStringLiterals, boolean assertMode) {
     this.eofPosition = Integer.MAX_VALUE;
     this.tokenizeComments = tokenizeComments;
     this.tokenizeWhiteSpace = tokenizeWhiteSpace;
     this.checkNonExternalizedStringLiterals = checkNonExternalizedStringLiterals;
     this.assertMode = assertMode;
   }
-
   private void checkNonExternalizeString() throws InvalidInputException {
     if (currentLine == null)
       return;
     parseTags(currentLine);
   }
-
   private void parseTags(NLSLine line) throws InvalidInputException {
     String s = new String(getCurrentTokenSource());
     int pos = s.indexOf(TAG_PREFIX);
@@ -3658,7 +3597,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
       pos = s.indexOf(TAG_PREFIX, start);
     }
-
     this.nonNLSStrings = new StringLiteral[lineLength];
     int nonNLSCounter = 0;
     for (Iterator iterator = line.iterator(); iterator.hasNext();) {
@@ -3674,19 +3612,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     this.wasNonExternalizedStringLiteral = true;
     if (nonNLSCounter != lineLength) {
-      System.arraycopy(this.nonNLSStrings, 0, (this.nonNLSStrings = new StringLiteral[nonNLSCounter]), 0, nonNLSCounter);
+      System.arraycopy(this.nonNLSStrings, 0,
+          (this.nonNLSStrings = new StringLiteral[nonNLSCounter]), 0,
+          nonNLSCounter);
     }
     currentLine = null;
   }
-
   public final void scanEscapeCharacter() throws InvalidInputException {
     // the string with "\\u" is a legal string of two chars \ and u
     //thus we use a direct access to the source (for regular cases).
-
     if (unicodeAsBackSlash) {
       // consume next character
       unicodeAsBackSlash = false;
-      //			if (((currentCharacter = source[currentPosition++]) == '\\') && (source[currentPosition] == 'u')) {
+      //			if (((currentCharacter = source[currentPosition++]) == '\\') &&
+      // (source[currentPosition] == 'u')) {
       //				getNextUnicodeChar();
       //			} else {
       if (withoutUnicodePtr != 0) {
@@ -3725,7 +3664,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         // OctalDigit
         // OctalDigit OctalDigit
         // ZeroToThree OctalDigit OctalDigit
-
         int number = Character.getNumericValue(currentCharacter);
         if (number >= 0 && number <= 7) {
           boolean zeroToThreeNot = number > 3;
@@ -3733,21 +3671,27 @@ public class Scanner implements IScanner, ITerminalSymbols {
             int digit = Character.getNumericValue(currentCharacter);
             if (digit >= 0 && digit <= 7) {
               number = (number * 8) + digit;
-              if (Character.isDigit(currentCharacter = source[currentPosition++])) {
-                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit Digit --> ignore last character
+              if (Character
+                  .isDigit(currentCharacter = source[currentPosition++])) {
+                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit
+                  // Digit --> ignore last character
                   currentPosition--;
                 } else {
                   digit = Character.getNumericValue(currentCharacter);
-                  if (digit >= 0 && digit <= 7) { // has read \ZeroToThree OctalDigit OctalDigit
+                  if (digit >= 0 && digit <= 7) { // has read \ZeroToThree
+                    // OctalDigit OctalDigit
                     number = (number * 8) + digit;
-                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit --> ignore last character
+                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit
+                    // --> ignore last character
                     currentPosition--;
                   }
                 }
-              } else { // has read \OctalDigit NonDigit--> ignore last character
+              } else { // has read \OctalDigit NonDigit--> ignore last
+                // character
                 currentPosition--;
               }
-            } else { // has read \OctalDigit NonOctalDigit--> ignore last character
+            } else { // has read \OctalDigit NonOctalDigit--> ignore last
+              // character
               currentPosition--;
             }
           } else { // has read \OctalDigit --> ignore last character
@@ -3760,83 +3704,76 @@ public class Scanner implements IScanner, ITerminalSymbols {
           throw new InvalidInputException(INVALID_ESCAPE);
     }
   }
-
   // chech presence of task: tags
   public void checkTaskTag(int commentStart, int commentEnd) {
-
     // only look for newer task: tags
-    if (this.foundTaskCount > 0 && this.foundTaskPositions[this.foundTaskCount - 1][0] >= commentStart) {
+    if (this.foundTaskCount > 0
+        && this.foundTaskPositions[this.foundTaskCount - 1][0] >= commentStart) {
       return;
     }
     int foundTaskIndex = this.foundTaskCount;
-    nextChar : for (int i = commentStart; i < commentEnd && i < this.eofPosition; i++) {
-
+    nextChar : for (int i = commentStart; i < commentEnd
+        && i < this.eofPosition; i++) {
       char[] tag = null;
       char[] priority = null;
-
       // check for tag occurrence
       nextTag : for (int itag = 0; itag < this.taskTags.length; itag++) {
         tag = this.taskTags[itag];
-        priority = this.taskPriorities != null && itag < this.taskPriorities.length ? this.taskPriorities[itag] : null;
+        priority = this.taskPriorities != null
+            && itag < this.taskPriorities.length
+            ? this.taskPriorities[itag]
+            : null;
         int tagLength = tag.length;
         for (int t = 0; t < tagLength; t++) {
           if (this.source[i + t] != tag[t])
             continue nextTag;
         }
-
         if (this.foundTaskTags == null) {
           this.foundTaskTags = new char[5][];
           this.foundTaskMessages = new char[5][];
           this.foundTaskPriorities = new char[5][];
           this.foundTaskPositions = new int[5][];
         } else if (this.foundTaskCount == this.foundTaskTags.length) {
-          System.arraycopy(this.foundTaskTags, 0, this.foundTaskTags = new char[this.foundTaskCount * 2][], 0, this.foundTaskCount);
-          System.arraycopy(
-            this.foundTaskMessages,
-            0,
-            this.foundTaskMessages = new char[this.foundTaskCount * 2][],
-            0,
-            this.foundTaskCount);
-          System.arraycopy(
-            this.foundTaskPriorities,
-            0,
-            this.foundTaskPriorities = new char[this.foundTaskCount * 2][],
-            0,
-            this.foundTaskCount);
-          System.arraycopy(
-            this.foundTaskPositions,
-            0,
-            this.foundTaskPositions = new int[this.foundTaskCount * 2][],
-            0,
-            this.foundTaskCount);
+          System.arraycopy(this.foundTaskTags, 0,
+              this.foundTaskTags = new char[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
+          System.arraycopy(this.foundTaskMessages, 0,
+              this.foundTaskMessages = new char[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
+          System.arraycopy(this.foundTaskPriorities, 0,
+              this.foundTaskPriorities = new char[this.foundTaskCount * 2][],
+              0, this.foundTaskCount);
+          System.arraycopy(this.foundTaskPositions, 0,
+              this.foundTaskPositions = new int[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
         }
         this.foundTaskTags[this.foundTaskCount] = tag;
         this.foundTaskPriorities[this.foundTaskCount] = priority;
-        this.foundTaskPositions[this.foundTaskCount] = new int[] { i, i + tagLength - 1 };
+        this.foundTaskPositions[this.foundTaskCount] = new int[]{i,
+            i + tagLength - 1};
         this.foundTaskMessages[this.foundTaskCount] = CharOperation.NO_CHAR;
         this.foundTaskCount++;
-
         i += tagLength - 1; // will be incremented when looping
       }
     }
-
     for (int i = foundTaskIndex; i < this.foundTaskCount; i++) {
       // retrieve message start and end positions
-      int msgStart = this.foundTaskPositions[i][0] + this.foundTaskTags[i].length;
-      int max_value = i + 1 < this.foundTaskCount ? this.foundTaskPositions[i + 1][0] - 1 : commentEnd - 1;
+      int msgStart = this.foundTaskPositions[i][0]
+          + this.foundTaskTags[i].length;
+      int max_value = i + 1 < this.foundTaskCount
+          ? this.foundTaskPositions[i + 1][0] - 1
+          : commentEnd - 1;
       // at most beginning of next task
       if (max_value < msgStart)
         max_value = msgStart; // would only occur if tag is before EOF.
       int end = -1;
       char c;
-
       for (int j = msgStart; j < max_value; j++) {
         if ((c = this.source[j]) == '\n' || c == '\r') {
           end = j - 1;
           break;
         }
       }
-
       if (end == -1) {
         for (int j = max_value; j > msgStart; j--) {
           if ((c = this.source[j]) == '*') {
@@ -3847,26 +3784,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
         if (end == -1)
           end = max_value;
       }
-
       if (msgStart == end)
         continue; // empty
-
       // trim the message
       while (CharOperation.isWhitespace(source[end]) && msgStart <= end)
         end--;
       while (CharOperation.isWhitespace(source[msgStart]) && msgStart <= end)
         msgStart++;
-
       // update the end position of the task
       this.foundTaskPositions[i][1] = end;
-
       // get the message source
       final int messageLength = end - msgStart + 1;
       char[] message = new char[messageLength];
-
       System.arraycopy(source, msgStart, message, 0, messageLength);
       this.foundTaskMessages[i] = message;
     }
   }
-
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemHandler.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemHandler.java
index e96bead..6e52747 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemHandler.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemHandler.java
@@ -51,7 +51,10 @@ public ProblemHandler(IErrorHandlingPolicy policy, IProblemFactory problemFactor
  *		Error | Warning | Ignore
  */
 public int computeSeverity(int problemId){
-	
+	if (problemId==IProblem.PHPParsingWarning ||
+	    problemId==IProblem.PHPVarDeprecatedWarning) {
+	  return Warning;
+	}
 	return Error; // by default all problems are errors
 }
 public IProblem createProblem(
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
index 7e72de4..7e1acce 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
@@ -76,2821 +76,2663 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.UnaryExpression;
 public class ProblemReporter extends ProblemHandler implements ProblemReasons {
-	public ReferenceContext referenceContext;
-	public ProblemReporter(IErrorHandlingPolicy policy,
-			IProblemFactory problemFactory) {
-		//CompilerOptions options, IProblemFactory problemFactory) {
-		super(policy, problemFactory);//options, problemFactory);
-	}
-	public void abortDueToInternalError(String errorMessage) {
-		String[] arguments = new String[]{errorMessage};
-		this.handle(IProblem.Unclassified, arguments, arguments, Error | Abort,
-				0, 0);
-	}
-	public void abortDueToInternalError(String errorMessage, AstNode location) {
-		String[] arguments = new String[]{errorMessage};
-		this.handle(IProblem.Unclassified, arguments, arguments, Error | Abort,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void abstractMethodCannotBeOverridden(SourceTypeBinding type,
-			MethodBinding concreteMethod) {
-		this.handle(
-		// %1 must be abstract since it cannot override the inherited
-		// package-private abstract method %2
-				IProblem.AbstractMethodCannotBeOverridden, new String[]{
-						new String(type.sourceName()),
-						new String(CharOperation.concat(
-								concreteMethod.declaringClass.readableName(),
-								concreteMethod.readableName(), '.'))},
-				new String[]{
-						new String(type.sourceName()),
-						new String(CharOperation.concat(
-								concreteMethod.declaringClass
-										.shortReadableName(), concreteMethod
-										.shortReadableName(), '.'))}, type
-						.sourceStart(), type.sourceEnd());
-	}
-	public void abstractMethodInAbstractClass(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.AbstractMethodInAbstractClass, arguments,
-				arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void abstractMethodMustBeImplemented(SourceTypeBinding type,
-			MethodBinding abstractMethod) {
-		this.handle(
-		// Must implement the inherited abstract method %1
-				// 8.4.3 - Every non-abstract subclass of an abstract type, A,
-				// must provide a concrete implementation of all of A's
-				// methods.
-				IProblem.AbstractMethodMustBeImplemented,
-				new String[]{new String(CharOperation.concat(
-						abstractMethod.declaringClass.readableName(),
-						abstractMethod.readableName(), '.'))},
-				new String[]{new String(CharOperation.concat(
-						abstractMethod.declaringClass.shortReadableName(),
-						abstractMethod.shortReadableName(), '.'))}, type
-						.sourceStart(), type.sourceEnd());
-	}
-	public void abstractMethodNeedingNoBody(AbstractMethodDeclaration method) {
-		this.handle(IProblem.BodyForAbstractMethod, NoArgument, NoArgument,
-				method.sourceStart, method.sourceEnd, method, method
-						.compilationResult());
-	}
-	public void alreadyDefinedLabel(char[] labelName, AstNode location) {
-		String[] arguments = new String[]{new String(labelName)};
-		this.handle(IProblem.DuplicateLabel, arguments, arguments,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void anonymousClassCannotExtendFinalClass(Expression expression,
-			TypeBinding type) {
-		this.handle(IProblem.AnonymousClassCannotExtendFinalClass,
-				new String[]{new String(type.readableName())},
-				new String[]{new String(type.shortReadableName())},
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void argumentTypeCannotBeVoid(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl, Argument arg) {
-		String[] arguments = new String[]{new String(methodDecl.selector),
-				new String(arg.name)};
-		this.handle(IProblem.ArgumentTypeCannotBeVoid, arguments, arguments,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void argumentTypeCannotBeVoidArray(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl, Argument arg) {
-		String[] arguments = new String[]{new String(methodDecl.selector),
-				new String(arg.name)};
-		this.handle(IProblem.ArgumentTypeCannotBeVoidArray, arguments,
-				arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void argumentTypeProblem(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl, Argument arg,
-			TypeBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.ArgumentTypeNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.ArgumentTypeNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.ArgumentTypeAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.ArgumentTypeInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.ArgumentTypeInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{new String(methodDecl.selector),
-				arg.name(), new String(expectedType.readableName())},
-				new String[]{new String(methodDecl.selector), arg.name(),
-						new String(expectedType.shortReadableName())},
-				arg.type.sourceStart, arg.type.sourceEnd);
-	}
-	public void arrayConstantsOnlyInArrayInitializers(int sourceStart,
-			int sourceEnd) {
-		this.handle(IProblem.ArrayConstantsOnlyInArrayInitializers, NoArgument,
-				NoArgument, sourceStart, sourceEnd);
-	}
-	public void assignmentHasNoEffect(Assignment assignment, char[] name) {
-		String[] arguments = new String[]{new String(name)};
-		this.handle(IProblem.AssignmentHasNoEffect, arguments, arguments,
-				assignment.sourceStart, assignment.sourceEnd);
-	}
-	public void attemptToReturnNonVoidExpression(
-			ReturnStatement returnStatement, TypeBinding expectedType) {
-		this.handle(IProblem.VoidMethodReturnsValue, new String[]{new String(
-				expectedType.readableName())}, new String[]{new String(
-				expectedType.shortReadableName())},
-				returnStatement.sourceStart, returnStatement.sourceEnd);
-	}
-	public void attemptToReturnVoidValue(ReturnStatement returnStatement) {
-		this.handle(IProblem.MethodReturnsVoid, NoArgument, NoArgument,
-				returnStatement.sourceStart, returnStatement.sourceEnd);
-	}
-	//public void bytecodeExceeds64KLimit(AbstractMethodDeclaration location)
-	// {
-	//	String[] arguments = new String[] {new String(location.selector),
-	// parametersAsString(location.binding)};
-	//	if (location.isConstructor()) {
-	//		this.handle(
-	//			IProblem.BytecodeExceeds64KLimitForConstructor,
-	//			arguments,
-	//			arguments,
-	//			Error | Abort,
-	//			location.sourceStart,
-	//			location.sourceEnd);
-	//	} else {
-	//		this.handle(
-	//			IProblem.BytecodeExceeds64KLimit,
-	//			arguments,
-	//			arguments,
-	//			Error | Abort,
-	//			location.sourceStart,
-	//			location.sourceEnd);
-	//	}
-	//}
-	public void bytecodeExceeds64KLimit(TypeDeclaration location) {
-		this.handle(IProblem.BytecodeExceeds64KLimitForClinit, NoArgument,
-				NoArgument, Error | Abort, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void cannotAllocateVoidArray(Expression expression) {
-		this.handle(IProblem.CannotAllocateVoidArray, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void cannotAssignToFinalField(FieldBinding field, AstNode location) {
-		this.handle(IProblem.FinalFieldAssignment, new String[]{
-				(field.declaringClass == null ? "array" : new String(
-						field.declaringClass.readableName())), //$NON-NLS-1$
-				new String(field.readableName())}, new String[]{
-				(field.declaringClass == null ? "array" : new String(
-						field.declaringClass.shortReadableName())), //$NON-NLS-1$
-				new String(field.shortReadableName())}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void cannotAssignToFinalLocal(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.readableName())};
-		this.handle(IProblem.NonBlankFinalLocalAssignment, arguments,
-				arguments, location.sourceStart, location.sourceEnd);
-	}
-	public void cannotAssignToFinalOuterLocal(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.readableName())};
-		this.handle(IProblem.FinalOuterLocalAssignment, arguments, arguments,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void cannotDeclareLocalInterface(char[] interfaceName,
-			int sourceStart, int sourceEnd) {
-		String[] arguments = new String[]{new String(interfaceName)};
-		this.handle(IProblem.CannotDefineInterfaceInLocalType, arguments,
-				arguments, sourceStart, sourceEnd);
-	}
-	public void cannotDefineDimensionsAndInitializer(
-			ArrayAllocationExpression expresssion) {
-		this.handle(IProblem.CannotDefineDimensionExpressionsWithInit,
-				NoArgument, NoArgument, expresssion.sourceStart,
-				expresssion.sourceEnd);
-	}
-	public void cannotDireclyInvokeAbstractMethod(MessageSend messageSend,
-			MethodBinding method) {
-		this.handle(IProblem.DirectInvocationOfAbstractMethod, new String[]{
-				new String(method.declaringClass.readableName()),
-				new String(method.selector), parametersAsString(method)},
-				new String[]{
-						new String(method.declaringClass.shortReadableName()),
-						new String(method.selector),
-						parametersAsShortString(method)},
-				messageSend.sourceStart, messageSend.sourceEnd);
-	}
-	public void cannotImportPackage(ImportReference importRef) {
-		String[] arguments = new String[]{CharOperation
-				.toString(importRef.tokens)};
-		this.handle(IProblem.CannotImportPackage, arguments, arguments,
-				importRef.sourceStart, importRef.sourceEnd);
-	}
-	public void cannotInstantiate(TypeReference typeRef, TypeBinding type) {
-		this.handle(IProblem.InvalidClassInstantiation,
-				new String[]{new String(type.readableName())},
-				new String[]{new String(type.shortReadableName())},
-				typeRef.sourceStart, typeRef.sourceEnd);
-	}
-	public void cannotReferToNonFinalOuterLocal(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.readableName())};
-		this.handle(IProblem.OuterLocalMustBeFinal, arguments, arguments,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void cannotReturnInInitializer(AstNode location) {
-		this.handle(IProblem.CannotReturnInInitializer, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void cannotThrowNull(ThrowStatement statement) {
-		this.handle(IProblem.CannotThrowNull, NoArgument, NoArgument,
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void cannotThrowType(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl, TypeReference exceptionType,
-			TypeBinding expectedType) {
-		this.handle(IProblem.CannotThrowType, new String[]{new String(
-				expectedType.readableName())}, new String[]{new String(
-				expectedType.shortReadableName())}, exceptionType.sourceStart,
-				exceptionType.sourceEnd);
-	}
-	public void cannotUseSuperInJavaLangObject(AstNode reference) {
-		this.handle(IProblem.ObjectHasNoSuperclass, NoArgument, NoArgument,
-				reference.sourceStart, reference.sourceEnd);
-	}
-	public void cannotUseSuperInCodeSnippet(int start, int end) {
-		this.handle(IProblem.CannotUseSuperInCodeSnippet, NoArgument,
-				NoArgument, Error | Abort, start, end);
-	}
-	public void caseExpressionMustBeConstant(Expression expression) {
-		this.handle(IProblem.NonConstantExpression, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void classExtendFinalClass(SourceTypeBinding type,
-			TypeReference superclass, TypeBinding expectedType) {
-		String name = new String(type.sourceName());
-		String expectedFullName = new String(expectedType.readableName());
-		String expectedShortName = new String(expectedType.shortReadableName());
-		if (expectedShortName.equals(name))
-			expectedShortName = expectedFullName;
-		this.handle(IProblem.ClassExtendFinalClass, new String[]{
-				expectedFullName, name}, new String[]{expectedShortName, name},
-				superclass.sourceStart, superclass.sourceEnd);
-	}
-	public void codeSnippetMissingClass(String missing, int start, int end) {
-		String[] arguments = new String[]{missing};
-		this.handle(IProblem.CodeSnippetMissingClass, arguments, arguments,
-				Error | Abort, start, end);
-	}
-	public void codeSnippetMissingMethod(String className,
-			String missingMethod, String argumentTypes, int start, int end) {
-		String[] arguments = new String[]{className, missingMethod,
-				argumentTypes};
-		this.handle(IProblem.CodeSnippetMissingMethod, arguments, arguments,
-				Error | Abort, start, end);
-	}
-	/*
-	 * Given the current configuration, answers which category the problem
-	 * falls into: Error | Warning | Ignore
-	 */
-	//public int computeSeverity(int problemId){
-	//
-	//	// severity can have been preset on the problem
-	//// if ((problem.severity & Fatal) != 0){
-	//// return Error;
-	//// }
-	//
-	//	// if not then check whether it is a configurable problem
-	//	int errorThreshold = options.errorThreshold;
-	//	int warningThreshold = options.warningThreshold;
-	//	
-	//	switch(problemId){
-	//
-	//		case IProblem.UnreachableCatch :
-	//		case IProblem.CodeCannotBeReached :
-	//			if ((errorThreshold & CompilerOptions.UnreachableCode) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UnreachableCode) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//
-	//		case IProblem.MaskedCatch :
-	//			if ((errorThreshold & CompilerOptions.MaskedCatchBlock) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.MaskedCatchBlock) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//			
-	///*
-	//		case Never Used :
-	//			if ((errorThreshold & ParsingOptionalError) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & ParsingOptionalError) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//*/
-	//		case IProblem.ImportNotFound :
-	//		case IProblem.ImportNotVisible :
-	//		case IProblem.ImportAmbiguous :
-	//		case IProblem.ImportInternalNameProvided :
-	//		case IProblem.ImportInheritedNameHidesEnclosingName :
-	//		case IProblem.DuplicateImport :
-	//		case IProblem.ConflictingImport :
-	//		case IProblem.CannotImportPackage :
-	//			if ((errorThreshold & CompilerOptions.ImportProblem) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.ImportProblem) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//			
-	//		case IProblem.UnusedImport :
-	//			// if import problem are disabled, then ignore
-	//			if ((errorThreshold & CompilerOptions.ImportProblem) == 0
-	//				&& (warningThreshold & CompilerOptions.ImportProblem) == 0){
-	//				return Ignore;
-	//			}
-	//			if ((errorThreshold & CompilerOptions.UnusedImport) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UnusedImport) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//			
-	//		case IProblem.MethodButWithConstructorName :
-	//			if ((errorThreshold & CompilerOptions.MethodWithConstructorName) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.MethodWithConstructorName) !=
-	// 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		
-	//		case IProblem.OverridingNonVisibleMethod :
-	//			if ((errorThreshold & CompilerOptions.OverriddenPackageDefaultMethod) !=
-	// 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.OverriddenPackageDefaultMethod)
-	// != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//
-	//		case IProblem.IncompatibleReturnTypeForNonInheritedInterfaceMethod :
-	//		case
-	// IProblem.IncompatibleExceptionInThrowsClauseForNonInheritedInterfaceMethod
-	// :
-	//			if ((errorThreshold &
-	// CompilerOptions.IncompatibleNonInheritedInterfaceMethod) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold &
-	// CompilerOptions.IncompatibleNonInheritedInterfaceMethod) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//
-	//		case IProblem.OverridingDeprecatedMethod :
-	//		case IProblem.UsingDeprecatedType :
-	//		case IProblem.UsingDeprecatedMethod :
-	//		case IProblem.UsingDeprecatedConstructor :
-	//		case IProblem.UsingDeprecatedField :
-	//			if ((errorThreshold & CompilerOptions.UsingDeprecatedAPI) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UsingDeprecatedAPI) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		
-	//		case IProblem.LocalVariableIsNeverUsed :
-	//			if ((errorThreshold & CompilerOptions.UnusedLocalVariable) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UnusedLocalVariable) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		
-	//		case IProblem.ArgumentIsNeverUsed :
-	//			if ((errorThreshold & CompilerOptions.UnusedArgument) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UnusedArgument) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//
-	//		case IProblem.NoImplicitStringConversionForCharArrayExpression :
-	//			if ((errorThreshold & CompilerOptions.NoImplicitStringConversion) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.NoImplicitStringConversion) !=
-	// 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//
-	//		case IProblem.NeedToEmulateFieldReadAccess :
-	//		case IProblem.NeedToEmulateFieldWriteAccess :
-	//		case IProblem.NeedToEmulateMethodAccess :
-	//		case IProblem.NeedToEmulateConstructorAccess :
-	//			if ((errorThreshold & CompilerOptions.AccessEmulation) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.AccessEmulation) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		case IProblem.NonExternalizedStringLiteral :
-	//			if ((errorThreshold & CompilerOptions.NonExternalizedString) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.NonExternalizedString) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		case IProblem.UseAssertAsAnIdentifier :
-	//			if ((errorThreshold & CompilerOptions.AssertUsedAsAnIdentifier) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.AssertUsedAsAnIdentifier) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		case IProblem.NonStaticAccessToStaticMethod :
-	//		case IProblem.NonStaticAccessToStaticField :
-	//			if ((errorThreshold & CompilerOptions.StaticAccessReceiver) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.StaticAccessReceiver) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		case IProblem.AssignmentHasNoEffect:
-	//			if ((errorThreshold & CompilerOptions.NoEffectAssignment) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.NoEffectAssignment) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		case IProblem.UnusedPrivateConstructor:
-	//		case IProblem.UnusedPrivateMethod:
-	//		case IProblem.UnusedPrivateField:
-	//		case IProblem.UnusedPrivateType:
-	//			if ((errorThreshold & CompilerOptions.UnusedPrivateMember) != 0){
-	//				return Error;
-	//			}
-	//			if ((warningThreshold & CompilerOptions.UnusedPrivateMember) != 0){
-	//				return Warning;
-	//			}
-	//			return Ignore;
-	//		
-	//		case IProblem.Task :
-	//			return Warning;
-	//		default:
-	//			return Error;
-	//	}
-	//}
-	//public void conditionalArgumentsIncompatibleTypes(ConditionalExpression
-	// expression, TypeBinding trueType, TypeBinding falseType) {
-	//	this.handle(
-	//		IProblem.IncompatibleTypesInConditionalOperator,
-	//		new String[] {new String(trueType.readableName()), new
-	// String(falseType.readableName())},
-	//		new String[] {new String(trueType.sourceName()), new
-	// String(falseType.sourceName())},
-	//		expression.sourceStart,
-	//		expression.sourceEnd);
-	//}
-	public void conflictingImport(ImportReference importRef) {
-		String[] arguments = new String[]{CharOperation
-				.toString(importRef.tokens)};
-		this.handle(IProblem.ConflictingImport, arguments, arguments,
-				importRef.sourceStart, importRef.sourceEnd);
-	}
-	public void constantOutOfFormat(NumberLiteral lit) {
-		// the literal is not in a correct format
-		// this code is called on IntLiteral and LongLiteral
-		// example 000811 ...the 8 is uncorrect.
-		if ((lit instanceof LongLiteral) || (lit instanceof IntLiteral)) {
-			char[] source = lit.source();
-			try {
-				final String Radix;
-				final int radix;
-				if ((source[1] == 'x') || (source[1] == 'X')) {
-					radix = 16;
-					Radix = "Hexa"; //$NON-NLS-1$
-				} else {
-					radix = 8;
-					Radix = "Octal"; //$NON-NLS-1$
-				}
-				//look for the first digit that is incorrect
-				int place = -1;
-				label : for (int i = radix == 8 ? 1 : 2; i < source.length; i++) {
-					if (Character.digit(source[i], radix) == -1) {
-						place = i;
-						break label;
-					}
-				}
-				String[] arguments = new String[]{Radix + " "
-						+ new String(source) + " (digit "
-						+ new String(new char[]{source[place]}) + ")"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				this.handle(IProblem.NumericValueOutOfRange, arguments,
-						arguments, lit.sourceStart, lit.sourceEnd);
-				return;
-			} catch (IndexOutOfBoundsException ex) {
-			}
-			// just in case .... use a predefined error..
-			// we should never come here...(except if the code changes !)
-			this.constantOutOfRange(lit);
-		}
-	}
-	public void constantOutOfRange(Literal lit) {
-		// lit is some how out of range of it declared type
-		// example
-		// 9999999999999999999999999999999999999999999999999999999999999999999
-		String[] arguments = new String[]{new String(lit.source())};
-		this.handle(IProblem.NumericValueOutOfRange, arguments, arguments,
-				lit.sourceStart, lit.sourceEnd);
-	}
-	public void deprecatedField(FieldBinding field, AstNode location) {
-		this.handle(IProblem.UsingDeprecatedField, new String[]{
-				new String(field.declaringClass.readableName()),
-				new String(field.name)}, new String[]{
-				new String(field.declaringClass.shortReadableName()),
-				new String(field.name)}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void deprecatedMethod(MethodBinding method, AstNode location) {
-		if (method.isConstructor())
-			this.handle(IProblem.UsingDeprecatedConstructor, new String[]{
-					new String(method.declaringClass.readableName()),
-					parametersAsString(method)}, new String[]{
-					new String(method.declaringClass.shortReadableName()),
-					parametersAsShortString(method)}, location.sourceStart,
-					location.sourceEnd);
-		else
-			this.handle(IProblem.UsingDeprecatedMethod, new String[]{
-					new String(method.declaringClass.readableName()),
-					new String(method.selector), parametersAsString(method)},
-					new String[]{
-							new String(method.declaringClass
-									.shortReadableName()),
-							new String(method.selector),
-							parametersAsShortString(method)},
-					location.sourceStart, location.sourceEnd);
-	}
-	public void deprecatedType(TypeBinding type, AstNode location) {
-		if (location == null)
-			return; // 1G828DN - no type ref for synthetic arguments
-		this.handle(IProblem.UsingDeprecatedType, new String[]{new String(type
-				.readableName())}, new String[]{new String(type
-				.shortReadableName())}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void duplicateCase(Case statement, Constant constant) {
-		String[] arguments = new String[]{String.valueOf(constant.intValue())};
-		this.handle(IProblem.DuplicateCase, arguments, arguments,
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void duplicateDefaultCase(DefaultCase statement) {
-		this.handle(IProblem.DuplicateDefaultCase, NoArgument, NoArgument,
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void duplicateFieldInType(SourceTypeBinding type,
-			FieldDeclaration fieldDecl) {
-		this.handle(IProblem.DuplicateField, new String[]{
-				new String(type.sourceName()), fieldDecl.name()}, new String[]{
-				new String(type.shortReadableName()), fieldDecl.name()},
-				fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void duplicateImport(ImportReference importRef) {
-		String[] arguments = new String[]{CharOperation
-				.toString(importRef.tokens)};
-		this.handle(IProblem.DuplicateImport, arguments, arguments,
-				importRef.sourceStart, importRef.sourceEnd);
-	}
-	public void duplicateInitializationOfBlankFinalField(FieldBinding field,
-			Reference reference) {
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(IProblem.DuplicateBlankFinalFieldInitialization, arguments,
-				arguments, reference.sourceStart, reference.sourceEnd);
-	}
-	public void duplicateInitializationOfFinalLocal(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.readableName())};
-		this.handle(IProblem.DuplicateFinalLocalInitialization, arguments,
-				arguments, location.sourceStart, location.sourceEnd);
-	}
-	public void duplicateMethodInType(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(methodDecl.selector),
-				new String(type.sourceName())};
-		this.handle(IProblem.DuplicateMethod, arguments, arguments,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void duplicateModifierForField(ReferenceBinding type,
-			FieldDeclaration fieldDecl) {
-		/*
-		 * to highlight modifiers use: this.handle( new Problem(
-		 * DuplicateModifierForField, new String[] {fieldDecl.name()},
-		 * fieldDecl.modifiers.sourceStart, fieldDecl.modifiers.sourceEnd));
-		 */
-		String[] arguments = new String[]{fieldDecl.name()};
-		this.handle(IProblem.DuplicateModifierForField, arguments, arguments,
-				fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void duplicateModifierForMethod(ReferenceBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		this.handle(IProblem.DuplicateModifierForMethod,
-				new String[]{new String(type.sourceName()),
-						new String(methodDecl.selector)}, new String[]{
-						new String(type.shortReadableName()),
-						new String(methodDecl.selector)},
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void duplicateModifierForType(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.DuplicateModifierForType, arguments, arguments,
-				type.sourceStart(), type.sourceEnd());
-	}
-	public void duplicateModifierForVariable(LocalDeclaration localDecl,
-			boolean complainForArgument) {
-		String[] arguments = new String[]{localDecl.name()};
-		this.handle(complainForArgument
-				? IProblem.DuplicateModifierForArgument
-				: IProblem.DuplicateModifierForVariable, arguments, arguments,
-				localDecl.sourceStart, localDecl.sourceEnd);
-	}
-	public void duplicateNestedType(TypeDeclaration typeDecl) {
-		String[] arguments = new String[]{new String(typeDecl.name)};
-		this.handle(IProblem.DuplicateNestedType, arguments, arguments,
-				typeDecl.sourceStart, typeDecl.sourceEnd);
-	}
-	public void duplicateSuperinterface(SourceTypeBinding type,
-			TypeDeclaration typeDecl, ReferenceBinding superType) {
-		this.handle(IProblem.DuplicateSuperInterface, new String[]{
-				new String(superType.readableName()),
-				new String(type.sourceName())}, new String[]{
-				new String(superType.shortReadableName()),
-				new String(type.sourceName())}, typeDecl.sourceStart,
-				typeDecl.sourceEnd);
-	}
-	public void duplicateTypes(CompilationUnitDeclaration compUnitDecl,
-			TypeDeclaration typeDecl) {
-		String[] arguments = new String[]{
-				new String(compUnitDecl.getFileName()),
-				new String(typeDecl.name)};
-		this.referenceContext = typeDecl; // report the problem against the
-										  // type not the entire compilation
-										  // unit
-		this.handle(IProblem.DuplicateTypes, arguments, arguments,
-				typeDecl.sourceStart, typeDecl.sourceEnd,
-				compUnitDecl.compilationResult);
-	}
-	public void errorNoMethodFor(MessageSend messageSend, TypeBinding recType,
-			TypeBinding[] params) {
-		StringBuffer buffer = new StringBuffer();
-		StringBuffer shortBuffer = new StringBuffer();
-		for (int i = 0, length = params.length; i < length; i++) {
-			if (i != 0) {
-				buffer.append(", "); //$NON-NLS-1$
-				shortBuffer.append(", "); //$NON-NLS-1$
-			}
-			buffer.append(new String(params[i].readableName()));
-			shortBuffer.append(new String(params[i].shortReadableName()));
-		}
-		this.handle(recType.isArrayType()
-				? IProblem.NoMessageSendOnArrayType
-				: IProblem.NoMessageSendOnBaseType, new String[]{
-				new String(recType.readableName()),
-				new String(messageSend.selector), buffer.toString()},
-				new String[]{new String(recType.shortReadableName()),
-						new String(messageSend.selector),
-						shortBuffer.toString()}, messageSend.sourceStart,
-				messageSend.sourceEnd);
-	}
-	public void errorThisSuperInStatic(AstNode reference) {
-		String[] arguments = new String[]{reference.isSuper()
-				? "super"
-				: "this"}; //$NON-NLS-2$ //$NON-NLS-1$
-		this.handle(IProblem.ThisInStaticContext, arguments, arguments,
-				reference.sourceStart, reference.sourceEnd);
-	}
-	public void exceptionTypeProblem(SourceTypeBinding type,
-			AbstractMethodDeclaration methodDecl, TypeReference exceptionType,
-			TypeBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.ExceptionTypeNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.ExceptionTypeNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.ExceptionTypeAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.ExceptionTypeInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.ExceptionTypeInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{new String(methodDecl.selector),
-				new String(expectedType.readableName())}, new String[]{
-				new String(methodDecl.selector),
-				new String(expectedType.shortReadableName())},
-				exceptionType.sourceStart, exceptionType.sourceEnd);
-	}
-	public void expressionShouldBeAVariable(Expression expression) {
-		this.handle(IProblem.ExpressionShouldBeAVariable, NoArgument,
-				NoArgument, expression.sourceStart, expression.sourceEnd);
-	}
-	public void fieldsOrThisBeforeConstructorInvocation(ThisReference reference) {
-		this.handle(IProblem.ThisSuperDuringConstructorInvocation, NoArgument,
-				NoArgument, reference.sourceStart, reference.sourceEnd);
-	}
-	public void fieldTypeProblem(SourceTypeBinding type,
-			FieldDeclaration fieldDecl, TypeBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.FieldTypeNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.FieldTypeNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.FieldTypeAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.FieldTypeInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.FieldTypeInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{fieldDecl.name(),
-				new String(type.sourceName()),
-				new String(expectedType.readableName())}, new String[]{
-				fieldDecl.name(), new String(type.sourceName()),
-				new String(expectedType.shortReadableName())},
-				fieldDecl.type.sourceStart, fieldDecl.type.sourceEnd);
-	}
-	public void finalMethodCannotBeOverridden(MethodBinding currentMethod,
-			MethodBinding inheritedMethod) {
-		this.handle(
-		// Cannot override the final method from %1
-				// 8.4.3.3 - Final methods cannot be overridden or hidden.
-				IProblem.FinalMethodCannotBeOverridden,
-				new String[]{new String(inheritedMethod.declaringClass
-						.readableName())}, new String[]{new String(
-						inheritedMethod.declaringClass.shortReadableName())},
-				currentMethod.sourceStart(), currentMethod.sourceEnd());
-	}
-	public void forwardReference(Reference reference, int indexInQualification,
-			TypeBinding type) {
-		this.handle(IProblem.ReferenceToForwardField, NoArgument, NoArgument,
-				reference.sourceStart, reference.sourceEnd);
-	}
-	// use this private API when the compilation unit result can be found
-	// through the
-	// reference context. Otherwise, use the other API taking a problem and a
-	// compilation result
-	// as arguments
-	private void handle(int problemId, String[] problemArguments,
-			String[] messageArguments, int problemStartPosition,
-			int problemEndPosition) {
-		this.handle(problemId, problemArguments, messageArguments,
-				problemStartPosition, problemEndPosition, referenceContext,
-				referenceContext == null ? null : referenceContext
-						.compilationResult());
-		referenceContext = null;
-	}
-	// use this private API when the compilation unit result can be found
-	// through the
-	// reference context. Otherwise, use the other API taking a problem and a
-	// compilation result
-	// as arguments
-	private void handle(int problemId, String[] problemArguments,
-			String[] messageArguments, int severity, int problemStartPosition,
-			int problemEndPosition) {
-		this.handle(problemId, problemArguments, messageArguments, severity,
-				problemStartPosition, problemEndPosition, referenceContext,
-				referenceContext == null ? null : referenceContext
-						.compilationResult());
-		referenceContext = null;
-	}
-	// use this private API when the compilation unit result cannot be found
-	// through the
-	// reference context.
-	private void handle(int problemId, String[] problemArguments,
-			String[] messageArguments, int problemStartPosition,
-			int problemEndPosition, CompilationResult unitResult) {
-		this.handle(problemId, problemArguments, messageArguments,
-				problemStartPosition, problemEndPosition, referenceContext,
-				unitResult);
-		referenceContext = null;
-	}
-	public void hidingEnclosingType(TypeDeclaration typeDecl) {
-		String[] arguments = new String[]{new String(typeDecl.name)};
-		this.handle(IProblem.HidingEnclosingType, arguments, arguments,
-				typeDecl.sourceStart, typeDecl.sourceEnd);
-	}
-	public void hierarchyCircularity(SourceTypeBinding sourceType,
-			ReferenceBinding superType, TypeReference reference) {
-		int start = 0;
-		int end = 0;
-		String typeName = ""; //$NON-NLS-1$
-		String shortTypeName = ""; //$NON-NLS-1$
-		if (reference == null) { // can only happen when java.lang.Object is
-								 // busted
-			start = sourceType.sourceStart();
-			end = sourceType.sourceEnd();
-			typeName = new String(superType.readableName());
-			shortTypeName = new String(superType.sourceName());
-		} else {
-			start = reference.sourceStart;
-			end = reference.sourceEnd;
-			char[][] qName = reference.getTypeName();
-			typeName = CharOperation.toString(qName);
-			shortTypeName = new String(qName[qName.length - 1]);
-		}
-		if (sourceType == superType)
-			this
-					.handle(IProblem.HierarchyCircularitySelfReference,
-							new String[]{new String(sourceType.sourceName()),
-									typeName}, new String[]{
-									new String(sourceType.sourceName()),
-									shortTypeName}, start, end);
-		else
-			this.handle(IProblem.HierarchyCircularity, new String[]{
-					new String(sourceType.sourceName()), typeName},
-					new String[]{new String(sourceType.sourceName()),
-							shortTypeName}, start, end);
-	}
-	public void hierarchyHasProblems(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.HierarchyHasProblems, arguments, arguments, type
-				.sourceStart(), type.sourceEnd());
-	}
-	public void illegalAbstractModifierCombinationForMethod(
-			ReferenceBinding type, AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.IllegalAbstractModifierCombinationForMethod,
-				arguments, arguments, methodDecl.sourceStart,
-				methodDecl.sourceEnd);
-	}
-	public void illegalModifierCombinationFinalAbstractForClass(
-			SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierCombinationFinalAbstractForClass,
-				arguments, arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierCombinationFinalVolatileForField(
-			ReferenceBinding type, FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{fieldDecl.name()};
-		this.handle(IProblem.IllegalModifierCombinationFinalVolatileForField,
-				arguments, arguments, fieldDecl.sourceStart,
-				fieldDecl.sourceEnd);
-	}
-	public void illegalModifierForClass(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierForClass, arguments, arguments,
-				type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierForField(ReferenceBinding type,
-			FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{fieldDecl.name()};
-		this.handle(IProblem.IllegalModifierForField, arguments, arguments,
-				fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void illegalModifierForInterface(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierForInterface, arguments, arguments,
-				type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierForInterfaceField(ReferenceBinding type,
-			FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{fieldDecl.name()};
-		this.handle(IProblem.IllegalModifierForInterfaceField, arguments,
-				arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void illegalModifierForInterfaceMethod(ReferenceBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.IllegalModifierForInterfaceMethod, arguments,
-				arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void illegalModifierForLocalClass(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierForLocalClass, arguments,
-				arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierForMemberClass(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierForMemberClass, arguments,
-				arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierForMemberInterface(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalModifierForMemberInterface, arguments,
-				arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalModifierForMethod(ReferenceBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.IllegalModifierForMethod, arguments, arguments,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void illegalModifierForVariable(LocalDeclaration localDecl,
-			boolean complainAsArgument) {
-		String[] arguments = new String[]{localDecl.name()};
-		this.handle(complainAsArgument
-				? IProblem.IllegalModifierForArgument
-				: IProblem.IllegalModifierForVariable, arguments, arguments,
-				localDecl.sourceStart, localDecl.sourceEnd);
-	}
-	public void illegalPrimitiveOrArrayTypeForEnclosingInstance(
-			TypeBinding enclosingType, AstNode location) {
-		this.handle(IProblem.IllegalPrimitiveOrArrayTypeForEnclosingInstance,
-				new String[]{new String(enclosingType.readableName())},
-				new String[]{new String(enclosingType.shortReadableName())},
-				location.sourceStart, location.sourceEnd);
-	}
-	public void illegalStaticModifierForMemberType(SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalStaticModifierForMemberType, arguments,
-				arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalVisibilityModifierCombinationForField(
-			ReferenceBinding type, FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{new String(fieldDecl.name())};
-		this.handle(IProblem.IllegalVisibilityModifierCombinationForField,
-				arguments, arguments, fieldDecl.sourceStart,
-				fieldDecl.sourceEnd);
-	}
-	public void illegalVisibilityModifierCombinationForMemberType(
-			SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalVisibilityModifierCombinationForMemberType,
-				arguments, arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalVisibilityModifierCombinationForMethod(
-			ReferenceBinding type, AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.IllegalVisibilityModifierCombinationForMethod,
-				arguments, arguments, methodDecl.sourceStart,
-				methodDecl.sourceEnd);
-	}
-	public void illegalVisibilityModifierForInterfaceMemberType(
-			SourceTypeBinding type) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.IllegalVisibilityModifierForInterfaceMemberType,
-				arguments, arguments, type.sourceStart(), type.sourceEnd());
-	}
-	public void illegalVoidExpression(AstNode location) {
-		this.handle(IProblem.InvalidVoidExpression, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void importProblem(ImportReference importRef, Binding expectedImport) {
-		int problemId = expectedImport.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.ImportNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.ImportNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.ImportAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.ImportInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.ImportInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		String argument;
-		if (expectedImport instanceof ProblemReferenceBinding) {
-			argument = CharOperation
-					.toString(((ProblemReferenceBinding) expectedImport).compoundName);
-		} else {
-			argument = CharOperation.toString(importRef.tokens);
-		}
-		String[] arguments = new String[]{argument};
-		this.handle(id, arguments, arguments, importRef.sourceStart,
-				importRef.sourceEnd);
-	}
-	public void incompatibleExceptionInThrowsClause(SourceTypeBinding type,
-			MethodBinding currentMethod, MethodBinding inheritedMethod,
-			ReferenceBinding exceptionType) {
-		if (type == currentMethod.declaringClass) {
-			int id;
-			if (currentMethod.declaringClass.isInterface()
-					&& !inheritedMethod.isPublic()) { // interface inheriting
-													  // Object protected
-													  // method
-				id = IProblem.IncompatibleExceptionInThrowsClauseForNonInheritedInterfaceMethod;
-			} else {
-				id = IProblem.IncompatibleExceptionInThrowsClause;
-			}
-			this
-					.handle(
-							// Exception %1 is not compatible with throws
-							// clause in %2
-							// 9.4.4 - The type of exception in the throws
-							// clause is incompatible.
-							id,
-							new String[]{
-									new String(exceptionType.sourceName()),
-									new String(
-											CharOperation
-													.concat(
-															inheritedMethod.declaringClass
-																	.readableName(),
-															inheritedMethod
-																	.readableName(),
-															'.'))},
-							new String[]{
-									new String(exceptionType.sourceName()),
-									new String(
-											CharOperation
-													.concat(
-															inheritedMethod.declaringClass
-																	.shortReadableName(),
-															inheritedMethod
-																	.shortReadableName(),
-															'.'))},
-							currentMethod.sourceStart(), currentMethod
-									.sourceEnd());
-		} else
-			this
-					.handle(
-							// Exception %1 in throws clause of %2 is not
-							// compatible with %3
-							// 9.4.4 - The type of exception in the throws
-							// clause is incompatible.
-							IProblem.IncompatibleExceptionInInheritedMethodThrowsClause,
-							new String[]{
-									new String(exceptionType.sourceName()),
-									new String(CharOperation.concat(
-											currentMethod.declaringClass
-													.sourceName(),
-											currentMethod.readableName(), '.')),
-									new String(
-											CharOperation
-													.concat(
-															inheritedMethod.declaringClass
-																	.readableName(),
-															inheritedMethod
-																	.readableName(),
-															'.'))},
-							new String[]{
-									new String(exceptionType.sourceName()),
-									new String(CharOperation.concat(
-											currentMethod.declaringClass
-													.sourceName(),
-											currentMethod.shortReadableName(),
-											'.')),
-									new String(
-											CharOperation
-													.concat(
-															inheritedMethod.declaringClass
-																	.shortReadableName(),
-															inheritedMethod
-																	.shortReadableName(),
-															'.'))}, type
-									.sourceStart(), type.sourceEnd());
-	}
-	public void incompatibleReturnType(MethodBinding currentMethod,
-			MethodBinding inheritedMethod) {
-		StringBuffer methodSignature = new StringBuffer();
-		methodSignature.append(inheritedMethod.declaringClass.readableName())
-				.append('.').append(inheritedMethod.readableName());
-		StringBuffer shortSignature = new StringBuffer();
-		shortSignature.append(
-				inheritedMethod.declaringClass.shortReadableName()).append('.')
-				.append(inheritedMethod.shortReadableName());
-		int id;
-		if (currentMethod.declaringClass.isInterface()
-				&& !inheritedMethod.isPublic()) { // interface inheriting
-												  // Object protected method
-			id = IProblem.IncompatibleReturnTypeForNonInheritedInterfaceMethod;
-		} else {
-			id = IProblem.IncompatibleReturnType;
-		}
-		this.handle(id, new String[]{methodSignature.toString()},
-				new String[]{shortSignature.toString()}, currentMethod
-						.sourceStart(), currentMethod.sourceEnd());
-	}
-	public void incorrectLocationForEmptyDimension(
-			ArrayAllocationExpression expression, int index) {
-		this.handle(IProblem.IllegalDimension, NoArgument, NoArgument,
-				expression.dimensions[index + 1].sourceStart,
-				expression.dimensions[index + 1].sourceEnd);
-	}
-	public void incorrectSwitchType(Expression expression, TypeBinding testType) {
-		this.handle(IProblem.IncorrectSwitchType, new String[]{new String(
-				testType.readableName())}, new String[]{new String(testType
-				.shortReadableName())}, expression.sourceStart,
-				expression.sourceEnd);
-	}
-	public void inheritedMethodReducesVisibility(SourceTypeBinding type,
-			MethodBinding concreteMethod, MethodBinding[] abstractMethods) {
-		StringBuffer concreteSignature = new StringBuffer();
-		concreteSignature.append(concreteMethod.declaringClass.readableName())
-				.append('.').append(concreteMethod.readableName());
-		StringBuffer shortSignature = new StringBuffer();
-		shortSignature
-				.append(concreteMethod.declaringClass.shortReadableName())
-				.append('.').append(concreteMethod.shortReadableName());
-		this.handle(
-		// The inherited method %1 cannot hide the public abstract method in %2
-				IProblem.InheritedMethodReducesVisibility, new String[]{
-						new String(concreteSignature.toString()),
-						new String(abstractMethods[0].declaringClass
-								.readableName())}, new String[]{
-						new String(shortSignature.toString()),
-						new String(abstractMethods[0].declaringClass
-								.shortReadableName())}, type.sourceStart(),
-				type.sourceEnd());
-	}
-	public void inheritedMethodsHaveIncompatibleReturnTypes(
-			SourceTypeBinding type, MethodBinding[] inheritedMethods, int length) {
-		StringBuffer methodSignatures = new StringBuffer();
-		StringBuffer shortSignatures = new StringBuffer();
-		for (int i = length; --i >= 0;) {
-			methodSignatures.append(
-					inheritedMethods[i].declaringClass.readableName()).append(
-					'.').append(inheritedMethods[i].readableName());
-			shortSignatures.append(
-					inheritedMethods[i].declaringClass.shortReadableName())
-					.append('.')
-					.append(inheritedMethods[i].shortReadableName());
-			if (i != 0) {
-				methodSignatures.append(", "); //$NON-NLS-1$
-				shortSignatures.append(", "); //$NON-NLS-1$
-			}
-		}
-		this.handle(
-		// Return type is incompatible with %1
-				// 9.4.2 - The return type from the method is incompatible with
-				// the declaration.
-				IProblem.IncompatibleReturnType, new String[]{methodSignatures
-						.toString()}, new String[]{shortSignatures.toString()},
-				type.sourceStart(), type.sourceEnd());
-	}
-	public void initializerMustCompleteNormally(FieldDeclaration fieldDecl) {
-		this.handle(IProblem.InitializerMustCompleteNormally, NoArgument,
-				NoArgument, fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void innerTypesCannotDeclareStaticInitializers(
-			ReferenceBinding innerType, AstNode location) {
-		this.handle(IProblem.CannotDefineStaticInitializerInLocalType,
-				new String[]{new String(innerType.readableName())},
-				new String[]{new String(innerType.shortReadableName())},
-				location.sourceStart, location.sourceEnd);
-	}
-	public void interfaceCannotHaveConstructors(
-			ConstructorDeclaration constructor) {
-		this.handle(IProblem.InterfaceCannotHaveConstructors, NoArgument,
-				NoArgument, constructor.sourceStart, constructor.sourceEnd,
-				constructor, constructor.compilationResult());
-	}
-	public void interfaceCannotHaveInitializers(SourceTypeBinding type,
-			FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{new String(type.sourceName())};
-		this.handle(IProblem.InterfaceCannotHaveInitializers, arguments,
-				arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void invalidBreak(AstNode location) {
-		this.handle(IProblem.InvalidBreak, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void invalidConstructor(Statement statement,
-			MethodBinding targetConstructor) {
-		boolean insideDefaultConstructor = (referenceContext instanceof ConstructorDeclaration)
-				&& ((ConstructorDeclaration) referenceContext)
-						.isDefaultConstructor();
-		boolean insideImplicitConstructorCall = (statement instanceof ExplicitConstructorCall)
-				&& (((ExplicitConstructorCall) statement).accessMode == ExplicitConstructorCall.ImplicitSuper);
-		int flag = IProblem.UndefinedConstructor; //default...
-		switch (targetConstructor.problemId()) {
-			case NotFound :
-				if (insideDefaultConstructor) {
-					flag = IProblem.UndefinedConstructorInDefaultConstructor;
-				} else if (insideImplicitConstructorCall) {
-					flag = IProblem.UndefinedConstructorInImplicitConstructorCall;
-				} else {
-					flag = IProblem.UndefinedConstructor;
-				}
-				break;
-			case NotVisible :
-				if (insideDefaultConstructor) {
-					flag = IProblem.NotVisibleConstructorInDefaultConstructor;
-				} else if (insideImplicitConstructorCall) {
-					flag = IProblem.NotVisibleConstructorInImplicitConstructorCall;
-				} else {
-					flag = IProblem.NotVisibleConstructor;
-				}
-				break;
-			case Ambiguous :
-				if (insideDefaultConstructor) {
-					flag = IProblem.AmbiguousConstructorInDefaultConstructor;
-				} else if (insideImplicitConstructorCall) {
-					flag = IProblem.AmbiguousConstructorInImplicitConstructorCall;
-				} else {
-					flag = IProblem.AmbiguousConstructor;
-				}
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		this.handle(flag, new String[]{
-				new String(targetConstructor.declaringClass.readableName()),
-				parametersAsString(targetConstructor)},
-				new String[]{
-						new String(targetConstructor.declaringClass
-								.shortReadableName()),
-						parametersAsShortString(targetConstructor)},
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void invalidContinue(AstNode location) {
-		this.handle(IProblem.InvalidContinue, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void invalidEnclosingType(Expression expression, TypeBinding type,
-			ReferenceBinding enclosingType) {
-		if (enclosingType.isAnonymousType())
-			enclosingType = enclosingType.superclass();
-		int flag = IProblem.UndefinedType; // default
-		switch (type.problemId()) {
-			case NotFound :
-				// 1
-				flag = IProblem.UndefinedType;
-				break;
-			case NotVisible :
-				// 2
-				flag = IProblem.NotVisibleType;
-				break;
-			case Ambiguous :
-				// 3
-				flag = IProblem.AmbiguousType;
-				break;
-			case InternalNameProvided :
-				flag = IProblem.InternalTypeNameProvided;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		this.handle(flag, new String[]{new String(enclosingType.readableName())
-				+ "." + new String(type.readableName())}, //$NON-NLS-1$
-				new String[]{new String(enclosingType.shortReadableName())
-						+ "." + new String(type.shortReadableName())}, //$NON-NLS-1$
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidExpressionAsStatement(Expression expression) {
-		this.handle(IProblem.InvalidExpressionAsStatement, NoArgument,
-				NoArgument, expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidField(FieldReference fieldRef, TypeBinding searchedType) {
-		int severity = Error;
-		int flag = IProblem.UndefinedField;
-		FieldBinding field = fieldRef.binding;
-		switch (field.problemId()) {
-			case NotFound :
-				flag = IProblem.UndefinedField;
-				/*
-				 * also need to check that the searchedType is the receiver
-				 * type if (searchedType.isHierarchyInconsistent()) severity =
-				 * SecondaryError;
-				 */
-				break;
-			case NotVisible :
-				flag = IProblem.NotVisibleField;
-				break;
-			case Ambiguous :
-				flag = IProblem.AmbiguousField;
-				break;
-			case NonStaticReferenceInStaticContext :
-				flag = IProblem.NonStaticFieldFromStaticInvocation;
-				break;
-			case NonStaticReferenceInConstructorInvocation :
-				flag = IProblem.InstanceFieldDuringConstructorInvocation;
-				break;
-			case InheritedNameHidesEnclosingName :
-				flag = IProblem.InheritedFieldHidesEnclosingName;
-				break;
-			case ReceiverTypeNotVisible :
-				this.handle(IProblem.NotVisibleType, new String[]{new String(
-						searchedType.leafComponentType().readableName())},
-						new String[]{new String(searchedType
-								.leafComponentType().shortReadableName())},
-						fieldRef.receiver.sourceStart,
-						fieldRef.receiver.sourceEnd);
-				return;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(flag, arguments, arguments, severity, fieldRef.sourceStart,
-				fieldRef.sourceEnd);
-	}
-	public void invalidField(NameReference nameRef, FieldBinding field) {
-		int flag = IProblem.UndefinedField;
-		switch (field.problemId()) {
-			case NotFound :
-				flag = IProblem.UndefinedField;
-				break;
-			case NotVisible :
-				flag = IProblem.NotVisibleField;
-				break;
-			case Ambiguous :
-				flag = IProblem.AmbiguousField;
-				break;
-			case NonStaticReferenceInStaticContext :
-				flag = IProblem.NonStaticFieldFromStaticInvocation;
-				break;
-			case NonStaticReferenceInConstructorInvocation :
-				flag = IProblem.InstanceFieldDuringConstructorInvocation;
-				break;
-			case InheritedNameHidesEnclosingName :
-				flag = IProblem.InheritedFieldHidesEnclosingName;
-				break;
-			case ReceiverTypeNotVisible :
-				this.handle(IProblem.NotVisibleType,
-						new String[]{new String(field.declaringClass
-								.leafComponentType().readableName())},
-						new String[]{new String(field.declaringClass
-								.leafComponentType().shortReadableName())},
-						nameRef.sourceStart, nameRef.sourceEnd);
-				return;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(flag, arguments, arguments, nameRef.sourceStart,
-				nameRef.sourceEnd);
-	}
-	public void invalidField(QualifiedNameReference nameRef,
-			FieldBinding field, int index, TypeBinding searchedType) {
-		//the resolution of the index-th field of qname failed
-		//qname.otherBindings[index] is the binding that has produced the
-		// error
-		//The different targetted errors should be :
-		//UndefinedField
-		//NotVisibleField
-		//AmbiguousField
-		if (searchedType.isBaseType()) {
-			this.handle(IProblem.NoFieldOnBaseType, new String[]{
-					new String(searchedType.readableName()),
-					CharOperation.toString(CharOperation.subarray(
-							nameRef.tokens, 0, index)),
-					new String(nameRef.tokens[index])}, new String[]{
-					new String(searchedType.sourceName()),
-					CharOperation.toString(CharOperation.subarray(
-							nameRef.tokens, 0, index)),
-					new String(nameRef.tokens[index])}, nameRef.sourceStart,
-					nameRef.sourceEnd);
-			return;
-		}
-		int flag = IProblem.UndefinedField;
-		switch (field.problemId()) {
-			case NotFound :
-				flag = IProblem.UndefinedField;
-				/*
-				 * also need to check that the searchedType is the receiver
-				 * type if (searchedType.isHierarchyInconsistent()) severity =
-				 * SecondaryError;
-				 */
-				break;
-			case NotVisible :
-				flag = IProblem.NotVisibleField;
-				break;
-			case Ambiguous :
-				flag = IProblem.AmbiguousField;
-				break;
-			case NonStaticReferenceInStaticContext :
-				flag = IProblem.NonStaticFieldFromStaticInvocation;
-				break;
-			case NonStaticReferenceInConstructorInvocation :
-				flag = IProblem.InstanceFieldDuringConstructorInvocation;
-				break;
-			case InheritedNameHidesEnclosingName :
-				flag = IProblem.InheritedFieldHidesEnclosingName;
-				break;
-			case ReceiverTypeNotVisible :
-				this.handle(IProblem.NotVisibleType, new String[]{new String(
-						searchedType.leafComponentType().readableName())},
-						new String[]{new String(searchedType
-								.leafComponentType().shortReadableName())},
-						nameRef.sourceStart, nameRef.sourceEnd);
-				return;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		String[] arguments = new String[]{CharOperation.toString(CharOperation
-				.subarray(nameRef.tokens, 0, index + 1))};
-		this.handle(flag, arguments, arguments, nameRef.sourceStart,
-				nameRef.sourceEnd);
-	}
-	public void invalidMethod(MessageSend messageSend, MethodBinding method) {
-		// CODE should be UPDATED according to error coding in the different
-		// method binding errors
-		// The different targetted errors should be :
-		// 	UndefinedMethod
-		//	NotVisibleMethod
-		//	AmbiguousMethod
-		//  InheritedNameHidesEnclosingName
-		//	InstanceMethodDuringConstructorInvocation
-		// StaticMethodRequested
-		int flag = IProblem.UndefinedMethod; //default...
-		switch (method.problemId()) {
-			case NotFound :
-				flag = IProblem.UndefinedMethod;
-				break;
-			case NotVisible :
-				flag = IProblem.NotVisibleMethod;
-				break;
-			case Ambiguous :
-				flag = IProblem.AmbiguousMethod;
-				break;
-			case InheritedNameHidesEnclosingName :
-				flag = IProblem.InheritedMethodHidesEnclosingName;
-				break;
-			case NonStaticReferenceInConstructorInvocation :
-				flag = IProblem.InstanceMethodDuringConstructorInvocation;
-				break;
-			case NonStaticReferenceInStaticContext :
-				flag = IProblem.StaticMethodRequested;
-				break;
-			case ReceiverTypeNotVisible :
-				this.handle(IProblem.NotVisibleType, new String[]{new String(
-						method.declaringClass.leafComponentType()
-								.readableName())}, new String[]{new String(
-						method.declaringClass.leafComponentType()
-								.shortReadableName())},
-						messageSend.receiver.sourceStart,
-						messageSend.receiver.sourceEnd);
-				return;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		if (flag == IProblem.UndefinedMethod) {
-			ProblemMethodBinding problemMethod = (ProblemMethodBinding) method;
-			if (problemMethod.closestMatch != null) {
-				String closestParameterTypeNames = parametersAsString(problemMethod.closestMatch);
-				String parameterTypeNames = parametersAsString(method);
-				String closestParameterTypeShortNames = parametersAsShortString(problemMethod.closestMatch);
-				String parameterTypeShortNames = parametersAsShortString(method);
-				if (closestParameterTypeShortNames
-						.equals(parameterTypeShortNames)) {
-					closestParameterTypeShortNames = closestParameterTypeNames;
-					parameterTypeShortNames = parameterTypeNames;
-				}
-				this
-						.handle(
-								IProblem.ParameterMismatch,
-								new String[]{
-										new String(
-												problemMethod.closestMatch.declaringClass
-														.readableName()),
-										new String(
-												problemMethod.closestMatch.selector),
-										closestParameterTypeNames,
-										parameterTypeNames},
-								new String[]{
-										new String(
-												problemMethod.closestMatch.declaringClass
-														.shortReadableName()),
-										new String(
-												problemMethod.closestMatch.selector),
-										closestParameterTypeShortNames,
-										parameterTypeShortNames},
-								(int) (messageSend.nameSourcePosition >>> 32),
-								(int) messageSend.nameSourcePosition);
-				return;
-			}
-		}
-		this.handle(flag, new String[]{
-				new String(method.declaringClass.readableName()),
-				new String(method.selector), parametersAsString(method)},
-				new String[]{
-						new String(method.declaringClass.shortReadableName()),
-						new String(method.selector),
-						parametersAsShortString(method)},
-				(int) (messageSend.nameSourcePosition >>> 32),
-				(int) messageSend.nameSourcePosition);
-	}
-	public void invalidNullToSynchronize(Expression expression) {
-		this.handle(IProblem.InvalidNullToSynchronized, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidOperator(BinaryExpression expression,
-			TypeBinding leftType, TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.InvalidOperator, new String[]{
-				expression.operatorToString(), leftName + ", " + rightName}, //$NON-NLS-1$
-				new String[]{expression.operatorToString(),
-						leftShortName + ", " + rightShortName}, //$NON-NLS-1$
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidOperator(CompoundAssignment assign,
-			TypeBinding leftType, TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.InvalidOperator, new String[]{
-				assign.operatorToString(), leftName + ", " + rightName}, //$NON-NLS-1$
-				new String[]{assign.operatorToString(),
-						leftShortName + ", " + rightShortName}, //$NON-NLS-1$
-				assign.sourceStart, assign.sourceEnd);
-	}
-	public void invalidOperator(UnaryExpression expression, TypeBinding type) {
-		this.handle(IProblem.InvalidOperator,
-				new String[]{expression.operatorToString(),
-						new String(type.readableName())}, new String[]{
-						expression.operatorToString(),
-						new String(type.shortReadableName())},
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidParenthesizedExpression(AstNode reference) {
-		this.handle(IProblem.InvalidParenthesizedExpression, NoArgument,
-				NoArgument, reference.sourceStart, reference.sourceEnd);
-	}
-	public void invalidSuperclass(SourceTypeBinding type,
-			TypeReference superclassRef, ReferenceBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.SuperclassNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.SuperclassNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.SuperclassAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.SuperclassInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.SuperclassInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{new String(expectedType.readableName()),
-				new String(type.sourceName())}, new String[]{
-				new String(expectedType.shortReadableName()),
-				new String(type.sourceName())}, superclassRef.sourceStart,
-				superclassRef.sourceEnd);
-	}
-	public void invalidSuperinterface(SourceTypeBinding type,
-			TypeReference superinterfaceRef, ReferenceBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.InterfaceNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.InterfaceNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.InterfaceAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.InterfaceInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.InterfaceInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{new String(expectedType.readableName()),
-				new String(type.sourceName())}, new String[]{
-				new String(expectedType.shortReadableName()),
-				new String(type.sourceName())}, superinterfaceRef.sourceStart,
-				superinterfaceRef.sourceEnd);
-	}
-	public void invalidType(AstNode location, TypeBinding type) {
-		int flag = IProblem.UndefinedType; // default
-		switch (type.problemId()) {
-			case NotFound :
-				flag = IProblem.UndefinedType;
-				break;
-			case NotVisible :
-				flag = IProblem.NotVisibleType;
-				break;
-			case Ambiguous :
-				flag = IProblem.AmbiguousType;
-				break;
-			case InternalNameProvided :
-				flag = IProblem.InternalTypeNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				flag = IProblem.InheritedTypeHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				break;
-		}
-		this.handle(flag, new String[]{new String(type.readableName())},
-				new String[]{new String(type.shortReadableName())},
-				location.sourceStart, location.sourceEnd);
-	}
-	public void invalidTypeReference(Expression expression) {
-		this.handle(IProblem.InvalidTypeExpression, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidTypeToSynchronize(Expression expression, TypeBinding type) {
-		this.handle(IProblem.InvalidTypeToSynchronized,
-				new String[]{new String(type.readableName())},
-				new String[]{new String(type.shortReadableName())},
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void invalidUnaryExpression(Expression expression) {
-		this.handle(IProblem.InvalidUnaryExpression, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void isClassPathCorrect(char[][] wellKnownTypeName,
-			CompilationUnitDeclaration compUnitDecl) {
-		referenceContext = compUnitDecl;
-		String[] arguments = new String[]{CharOperation
-				.toString(wellKnownTypeName)};
-		this.handle(IProblem.IsClassPathCorrect, arguments, arguments,
-				AbortCompilation | Error, compUnitDecl == null
-						? 0
-						: compUnitDecl.sourceStart, compUnitDecl == null
-						? 1
-						: compUnitDecl.sourceEnd);
-	}
-	public void maskedExceptionHandler(ReferenceBinding exceptionType,
-			AstNode location) {
-		this.handle(IProblem.MaskedCatch, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void methodNeedingAbstractModifier(MethodDeclaration methodDecl) {
-		this.handle(IProblem.MethodRequiresBody, NoArgument, NoArgument,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void methodNeedingNoBody(MethodDeclaration methodDecl) {
-		this.handle(
-		//		((methodDecl.modifiers & CompilerModifiers.AccNative) != 0) ?
-		// IProblem.BodyForNativeMethod : IProblem.BodyForAbstractMethod,
-				IProblem.BodyForAbstractMethod, NoArgument, NoArgument,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void methodWithConstructorName(MethodDeclaration methodDecl) {
-		this.handle(IProblem.MethodButWithConstructorName, NoArgument,
-				NoArgument, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	//public void missingEnclosingInstanceSpecification(ReferenceBinding
-	// enclosingType, AstNode location) {
-	//	boolean insideConstructorCall =
-	//		(location instanceof ExplicitConstructorCall)
-	//			&& (((ExplicitConstructorCall) location).accessMode ==
-	// ExplicitConstructorCall.ImplicitSuper);
-	//
-	//	this.handle(
-	//		insideConstructorCall
-	//			? IProblem.MissingEnclosingInstanceForConstructorCall
-	//			: IProblem.MissingEnclosingInstance,
-	//		new String[] {new String(enclosingType.readableName())},
-	//		new String[] {new String(enclosingType.shortReadableName())},
-	//		location.sourceStart,
-	//		location.sourceEnd);
-	//}
-	public void missingReturnType(AbstractMethodDeclaration methodDecl) {
-		this.handle(IProblem.MissingReturnType, NoArgument, NoArgument,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void missingSemiColon(Expression expression) {
-		this.handle(IProblem.MissingSemiColon, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void mustDefineDimensionsOrInitializer(
-			ArrayAllocationExpression expression) {
-		this.handle(IProblem.MustDefineEitherDimensionExpressionsOrInitializer,
-				NoArgument, NoArgument, expression.sourceStart,
-				expression.sourceEnd);
-	}
-	public void mustSpecifyPackage(CompilationUnitDeclaration compUnitDecl) {
-		String[] arguments = new String[]{new String(compUnitDecl.getFileName())};
-		this.handle(IProblem.MustSpecifyPackage, arguments, arguments,
-				compUnitDecl.sourceStart, compUnitDecl.sourceStart + 1);
-	}
-	public void mustUseAStaticMethod(MessageSend messageSend,
-			MethodBinding method) {
-		this.handle(IProblem.StaticMethodRequested, new String[]{
-				new String(method.declaringClass.readableName()),
-				new String(method.selector), parametersAsString(method)},
-				new String[]{
-						new String(method.declaringClass.shortReadableName()),
-						new String(method.selector),
-						parametersAsShortString(method)},
-				messageSend.sourceStart, messageSend.sourceEnd);
-	}
-	public void nativeMethodsCannotBeStrictfp(ReferenceBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.NativeMethodsCannotBeStrictfp, arguments,
-				arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void needImplementation() {
-		this.abortDueToInternalError(Util.bind("abort.missingCode")); //$NON-NLS-1$
-	}
-	public void needToEmulateFieldReadAccess(FieldBinding field,
-			AstNode location) {
-		this.handle(IProblem.NeedToEmulateFieldReadAccess, new String[]{
-				new String(field.declaringClass.readableName()),
-				new String(field.name)}, new String[]{
-				new String(field.declaringClass.shortReadableName()),
-				new String(field.name)}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void needToEmulateFieldWriteAccess(FieldBinding field,
-			AstNode location) {
-		this.handle(IProblem.NeedToEmulateFieldWriteAccess, new String[]{
-				new String(field.declaringClass.readableName()),
-				new String(field.name)}, new String[]{
-				new String(field.declaringClass.shortReadableName()),
-				new String(field.name)}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void needToEmulateMethodAccess(MethodBinding method, AstNode location) {
-		if (method.isConstructor())
-			this.handle(IProblem.NeedToEmulateConstructorAccess, new String[]{
-					new String(method.declaringClass.readableName()),
-					parametersAsString(method)}, new String[]{
-					new String(method.declaringClass.shortReadableName()),
-					parametersAsShortString(method)}, location.sourceStart,
-					location.sourceEnd);
-		else
-			this.handle(IProblem.NeedToEmulateMethodAccess, new String[]{
-					new String(method.declaringClass.readableName()),
-					new String(method.selector), parametersAsString(method)},
-					new String[]{
-							new String(method.declaringClass
-									.shortReadableName()),
-							new String(method.selector),
-							parametersAsShortString(method)},
-					location.sourceStart, location.sourceEnd);
-	}
-	public void nestedClassCannotDeclareInterface(TypeDeclaration typeDecl) {
-		String[] arguments = new String[]{new String(typeDecl.name)};
-		this.handle(IProblem.CannotDefineInterfaceInLocalType, arguments,
-				arguments, typeDecl.sourceStart, typeDecl.sourceEnd);
-	}
-	public void noMoreAvailableSpaceForArgument(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.name)};
-		this.handle(local instanceof SyntheticArgumentBinding
-				? IProblem.TooManySyntheticArgumentSlots
-				: IProblem.TooManyArgumentSlots, arguments, arguments, Abort
-				| Error, location.sourceStart, location.sourceEnd);
-	}
-	public void noMoreAvailableSpaceForLocal(LocalVariableBinding local,
-			AstNode location) {
-		String[] arguments = new String[]{new String(local.name)};
-		this.handle(IProblem.TooManyLocalVariableSlots, arguments, arguments,
-				Abort | Error, location.sourceStart, location.sourceEnd);
-	}
-	public void noSuchEnclosingInstance(TypeBinding targetType,
-			AstNode location, boolean isConstructorCall) {
-		int id;
-		if (isConstructorCall) {
-			//28 = No enclosing instance of type {0} is available due to some
-			// intermediate constructor invocation
-			id = IProblem.EnclosingInstanceInConstructorCall;
-		} else if ((location instanceof ExplicitConstructorCall)
-				&& ((ExplicitConstructorCall) location).accessMode == ExplicitConstructorCall.ImplicitSuper) {
-			//20 = No enclosing instance of type {0} is accessible to invoke
-			// the super constructor. Must define a constructor and explicitly
-			// qualify its super constructor invocation with an instance of {0}
-			// (e.g. x.super() where x is an instance of {0}).
-			id = IProblem.MissingEnclosingInstanceForConstructorCall;
-		} else if (location instanceof AllocationExpression
-				&& (((AllocationExpression) location).binding.declaringClass
-						.isMemberType() || (((AllocationExpression) location).binding.declaringClass
-						.isAnonymousType() && ((AllocationExpression) location).binding.declaringClass
-						.superclass().isMemberType()))) {
-			//21 = No enclosing instance of type {0} is accessible. Must
-			// qualify the allocation with an enclosing instance of type {0}
-			// (e.g. x.new A() where x is an instance of {0}).
-			id = IProblem.MissingEnclosingInstance;
-		} else { // default
-			//22 = No enclosing instance of the type {0} is accessible in
-			// scope
-			id = IProblem.IncorrectEnclosingInstanceReference;
-		}
-		this.handle(id, new String[]{new String(targetType.readableName())},
-				new String[]{new String(targetType.shortReadableName())},
-				location.sourceStart, location.sourceEnd);
-	}
-	public void notCompatibleTypesError(EqualExpression expression,
-			TypeBinding leftType, TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.IncompatibleTypesInEqualityOperator, new String[]{
-				leftName, rightName}, new String[]{leftShortName,
-				rightShortName}, expression.sourceStart, expression.sourceEnd);
-	}
-	public void notCompatibleTypesError(InstanceOfExpression expression,
-			TypeBinding leftType, TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.IncompatibleTypesInConditionalOperator,
-				new String[]{leftName, rightName}, new String[]{leftShortName,
-						rightShortName}, expression.sourceStart,
-				expression.sourceEnd);
-	}
-	public void objectCannotHaveSuperTypes(SourceTypeBinding type) {
-		this.handle(IProblem.ObjectCannotHaveSuperTypes, NoArgument,
-				NoArgument, type.sourceStart(), type.sourceEnd());
-	}
-	public void operatorOnlyValidOnNumericType(CompoundAssignment assignment,
-			TypeBinding leftType, TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.TypeMismatch, new String[]{leftName, rightName},
-				new String[]{leftShortName, rightShortName},
-				assignment.sourceStart, assignment.sourceEnd);
-	}
-	public void overridesDeprecatedMethod(MethodBinding localMethod,
-			MethodBinding inheritedMethod) {
-		this.handle(IProblem.OverridingDeprecatedMethod, new String[]{
-				new String(CharOperation.concat(localMethod.declaringClass
-						.readableName(), localMethod.readableName(), '.')),
-				new String(inheritedMethod.declaringClass.readableName())},
-				new String[]{
-						new String(CharOperation.concat(
-								localMethod.declaringClass.shortReadableName(),
-								localMethod.shortReadableName(), '.')),
-						new String(inheritedMethod.declaringClass
-								.shortReadableName())}, localMethod
-						.sourceStart(), localMethod.sourceEnd());
-	}
-	public void overridesPackageDefaultMethod(MethodBinding localMethod,
-			MethodBinding inheritedMethod) {
-		this.handle(IProblem.OverridingNonVisibleMethod, new String[]{
-				new String(CharOperation.concat(localMethod.declaringClass
-						.readableName(), localMethod.readableName(), '.')),
-				new String(inheritedMethod.declaringClass.readableName())},
-				new String[]{
-						new String(CharOperation.concat(
-								localMethod.declaringClass.shortReadableName(),
-								localMethod.shortReadableName(), '.')),
-						new String(inheritedMethod.declaringClass
-								.shortReadableName())}, localMethod
-						.sourceStart(), localMethod.sourceEnd());
-	}
-	public void packageCollidesWithType(CompilationUnitDeclaration compUnitDecl) {
-		String[] arguments = new String[]{CharOperation
-				.toString(compUnitDecl.currentPackage.tokens)};
-		this.handle(IProblem.PackageCollidesWithType, arguments, arguments,
-				compUnitDecl.currentPackage.sourceStart,
-				compUnitDecl.currentPackage.sourceEnd);
-	}
-	public void packageIsNotExpectedPackage(
-			CompilationUnitDeclaration compUnitDecl) {
-		String[] arguments = new String[]{CharOperation
-				.toString(compUnitDecl.compilationResult.compilationUnit
-						.getPackageName())};
-		this.handle(IProblem.PackageIsNotExpectedPackage, arguments, arguments,
-				compUnitDecl.currentPackage == null
-						? 0
-						: compUnitDecl.currentPackage.sourceStart,
-				compUnitDecl.currentPackage == null
-						? 0
-						: compUnitDecl.currentPackage.sourceEnd);
-	}
-	private String parametersAsString(MethodBinding method) {
-		TypeBinding[] params = method.parameters;
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0, length = params.length; i < length; i++) {
-			if (i != 0)
-				buffer.append(", "); //$NON-NLS-1$
-			buffer.append(new String(params[i].readableName()));
-		}
-		return buffer.toString();
-	}
-	private String parametersAsShortString(MethodBinding method) {
-		TypeBinding[] params = method.parameters;
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0, length = params.length; i < length; i++) {
-			if (i != 0)
-				buffer.append(", "); //$NON-NLS-1$
-			buffer.append(new String(params[i].shortReadableName()));
-		}
-		return buffer.toString();
-	}
-	public void parseError(int startPosition, int endPosition,
-			char[] currentTokenSource, String errorTokenName,
-			String[] possibleTokens) {
-		if (possibleTokens.length == 0) { //no suggestion available
-			if (isKeyword(currentTokenSource)) {
-				String[] arguments = new String[]{new String(currentTokenSource)};
-				this.handle(IProblem.ParsingErrorOnKeywordNoSuggestion,
-						arguments, arguments, 
-						// this is the current -invalid- token position
-						startPosition, endPosition);
-				return;
-			} else {
-				String[] arguments = new String[]{errorTokenName};
-				this.handle(IProblem.ParsingErrorNoSuggestion, arguments,
-						arguments, 
-						// this is the current -invalid- token position
-						startPosition, endPosition);
-				return;
-			}
-		}
-		//build a list of probable right tokens
-		StringBuffer list = new StringBuffer(20);
-		for (int i = 0, max = possibleTokens.length; i < max; i++) {
-			if (i > 0)
-				list.append(", "); //$NON-NLS-1$
-			list.append('"');
-			list.append(possibleTokens[i]);
-			list.append('"');
-		}
-		if (isKeyword(currentTokenSource)) {
-			String[] arguments = new String[]{new String(currentTokenSource),
-					list.toString()};
-			this.handle(IProblem.ParsingErrorOnKeyword, arguments, arguments, 
-			// this is the current -invalid- token position
-					startPosition, endPosition);
-			return;
-		}
-		//extract the literal when it's a literal
-		if ((errorTokenName.equals("IntegerLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("LongLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("FloatingPointLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("DoubleLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("StringLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("CharacterLiteral")) || //$NON-NLS-1$
-				(errorTokenName.equals("Identifier"))) { //$NON-NLS-1$
-			errorTokenName = new String(currentTokenSource);
-		}
-		String[] arguments = new String[]{errorTokenName, list.toString()};
-		this.handle(IProblem.ParsingError, arguments, arguments, 
-		// this is the current -invalid- token position
-				startPosition, endPosition);
-	}
-	public void publicClassMustMatchFileName(
-			CompilationUnitDeclaration compUnitDecl, TypeDeclaration typeDecl) {
-		this.referenceContext = typeDecl; // report the problem against the
-										  // type not the entire compilation
-										  // unit
-		String[] arguments = new String[]{
-				new String(compUnitDecl.getFileName()),
-				new String(typeDecl.name)};
-		this.handle(IProblem.PublicClassMustMatchFileName, arguments,
-				arguments, typeDecl.sourceStart, typeDecl.sourceEnd,
-				compUnitDecl.compilationResult);
-	}
-	public void recursiveConstructorInvocation(
-			ExplicitConstructorCall constructorCall) {
-		this.handle(IProblem.RecursiveConstructorInvocation, new String[]{
-				new String(constructorCall.binding.declaringClass
-						.readableName()),
-				parametersAsString(constructorCall.binding)}, new String[]{
-				new String(constructorCall.binding.declaringClass
-						.shortReadableName()),
-				parametersAsShortString(constructorCall.binding)},
-				constructorCall.sourceStart, constructorCall.sourceEnd);
-	}
-	public void redefineArgument(Argument arg) {
-		String[] arguments = new String[]{new String(arg.name)};
-		this.handle(IProblem.RedefinedArgument, arguments, arguments,
-				arg.sourceStart, arg.sourceEnd);
-	}
-	public void redefineLocal(LocalDeclaration localDecl) {
-		String[] arguments = new String[]{new String(localDecl.name)};
-		this.handle(IProblem.RedefinedLocal, arguments, arguments,
-				localDecl.sourceStart, localDecl.sourceEnd);
-	}
-	public void referenceMustBeArrayTypeAt(TypeBinding arrayType,
-			ArrayReference arrayRef) {
-		this.handle(IProblem.ArrayReferenceRequired, new String[]{new String(
-				arrayType.readableName())}, new String[]{new String(arrayType
-				.shortReadableName())}, arrayRef.sourceStart,
-				arrayRef.sourceEnd);
-	}
-	public void returnTypeCannotBeVoidArray(SourceTypeBinding type,
-			MethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(methodDecl.selector)};
-		this.handle(IProblem.ReturnTypeCannotBeVoidArray, arguments, arguments,
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void returnTypeProblem(SourceTypeBinding type,
-			MethodDeclaration methodDecl, TypeBinding expectedType) {
-		int problemId = expectedType.problemId();
-		int id;
-		switch (problemId) {
-			case NotFound :
-				// 1
-				id = IProblem.ReturnTypeNotFound;
-				break;
-			case NotVisible :
-				// 2
-				id = IProblem.ReturnTypeNotVisible;
-				break;
-			case Ambiguous :
-				// 3
-				id = IProblem.ReturnTypeAmbiguous;
-				break;
-			case InternalNameProvided :
-				// 4
-				id = IProblem.ReturnTypeInternalNameProvided;
-				break;
-			case InheritedNameHidesEnclosingName :
-				// 5
-				id = IProblem.ReturnTypeInheritedNameHidesEnclosingName;
-				break;
-			case NoError :
-			// 0
-			default :
-				needImplementation(); // want to fail to see why we were
-									  // here...
-				return;
-		}
-		this.handle(id, new String[]{new String(methodDecl.selector),
-				new String(expectedType.readableName())}, new String[]{
-				new String(methodDecl.selector),
-				new String(expectedType.shortReadableName())},
-				methodDecl.returnType.sourceStart,
-				methodDecl.returnType.sourceEnd);
-	}
-	public void scannerError(Parser parser, String errorTokenName) {
-		Scanner scanner = parser.scanner;
-		int flag = IProblem.ParsingErrorNoSuggestion;
-		int startPos = scanner.startPosition;
-		//special treatment for recognized errors....
-		if (errorTokenName.equals(Scanner.END_OF_SOURCE))
-			flag = IProblem.EndOfSource;
-		else if (errorTokenName.equals(Scanner.INVALID_HEXA))
-			flag = IProblem.InvalidHexa;
-		else if (errorTokenName.equals(Scanner.INVALID_OCTAL))
-			flag = IProblem.InvalidOctal;
-		else if (errorTokenName.equals(Scanner.INVALID_CHARACTER_CONSTANT))
-			flag = IProblem.InvalidCharacterConstant;
-		else if (errorTokenName.equals(Scanner.INVALID_ESCAPE))
-			flag = IProblem.InvalidEscape;
-		else if (errorTokenName.equals(Scanner.INVALID_UNICODE_ESCAPE)) {
-			flag = IProblem.InvalidUnicodeEscape;
-			// better locate the error message
-			char[] source = scanner.source;
-			int checkPos = scanner.currentPosition - 1;
-			if (checkPos >= source.length)
-				checkPos = source.length - 1;
-			while (checkPos >= startPos) {
-				if (source[checkPos] == '\\')
-					break;
-				checkPos--;
-			}
-			startPos = checkPos;
-		} else if (errorTokenName.equals(Scanner.INVALID_FLOAT))
-			flag = IProblem.InvalidFloat;
-		else if (errorTokenName.equals(Scanner.UNTERMINATED_STRING))
-			flag = IProblem.UnterminatedString;
-		else if (errorTokenName.equals(Scanner.UNTERMINATED_COMMENT))
-			flag = IProblem.UnterminatedComment;
-		else if (errorTokenName.equals(Scanner.INVALID_CHAR_IN_STRING))
-			flag = IProblem.UnterminatedString;
-		String[] arguments = flag == IProblem.ParsingErrorNoSuggestion
-				? new String[]{errorTokenName}
-				: NoArgument;
-		this.handle(flag, arguments, arguments, 
-		// this is the current -invalid- token position
-				startPos, scanner.currentPosition - 1,
-				parser.compilationUnit.compilationResult);
-	}
-	public void shouldReturn(TypeBinding returnType, AstNode location) {
-		this.handle(IProblem.ShouldReturnValue, new String[]{new String(
-				returnType.readableName())}, new String[]{new String(returnType
-				.shortReadableName())}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void signalNoImplicitStringConversionForCharArrayExpression(
-			Expression expression) {
-		this.handle(IProblem.NoImplicitStringConversionForCharArrayExpression,
-				NoArgument, NoArgument, expression.sourceStart,
-				expression.sourceEnd);
-	}
-	public void staticAndInstanceConflict(MethodBinding currentMethod,
-			MethodBinding inheritedMethod) {
-		if (currentMethod.isStatic())
-			this.handle(
-			// This static method cannot hide the instance method from %1
-					// 8.4.6.4 - If a class inherits more than one method with
-					// the same signature a static (non-abstract) method cannot
-					// hide an instance method.
-					IProblem.CannotHideAnInstanceMethodWithAStaticMethod,
-					new String[]{new String(inheritedMethod.declaringClass
-							.readableName())},
-					new String[]{new String(inheritedMethod.declaringClass
-							.shortReadableName())},
-					currentMethod.sourceStart(), currentMethod.sourceEnd());
-		else
-			this.handle(
-			// This instance method cannot override the static method from %1
-					// 8.4.6.4 - If a class inherits more than one method with
-					// the same signature an instance (non-abstract) method
-					// cannot override a static method.
-					IProblem.CannotOverrideAStaticMethodWithAnInstanceMethod,
-					new String[]{new String(inheritedMethod.declaringClass
-							.readableName())},
-					new String[]{new String(inheritedMethod.declaringClass
-							.shortReadableName())},
-					currentMethod.sourceStart(), currentMethod.sourceEnd());
-	}
-	public void staticFieldAccessToNonStaticVariable(FieldReference fieldRef,
-			FieldBinding field) {
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
-				arguments, fieldRef.sourceStart, fieldRef.sourceEnd);
-	}
-	public void staticFieldAccessToNonStaticVariable(
-			QualifiedNameReference nameRef, FieldBinding field) {
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
-				arguments, nameRef.sourceStart, nameRef.sourceEnd);
-	}
-	public void staticFieldAccessToNonStaticVariable(
-			SingleNameReference nameRef, FieldBinding field) {
-		String[] arguments = new String[]{new String(field.readableName())};
-		this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
-				arguments, nameRef.sourceStart, nameRef.sourceEnd);
-	}
-	public void staticInheritedMethodConflicts(SourceTypeBinding type,
-			MethodBinding concreteMethod, MethodBinding[] abstractMethods) {
-		this.handle(
-		// The static method %1 conflicts with the abstract method in %2
-				// 8.4.6.4 - If a class inherits more than one method with the
-				// same signature it is an error for one to be static
-				// (non-abstract) and the other abstract.
-				IProblem.StaticInheritedMethodConflicts, new String[]{
-						new String(concreteMethod.readableName()),
-						new String(abstractMethods[0].declaringClass
-								.readableName())}, new String[]{
-						new String(concreteMethod.readableName()),
-						new String(abstractMethods[0].declaringClass
-								.shortReadableName())}, type.sourceStart(),
-				type.sourceEnd());
-	}
-	public void stringConstantIsExceedingUtf8Limit(AstNode location) {
-		this.handle(IProblem.StringConstantIsExceedingUtf8Limit, NoArgument,
-				NoArgument, location.sourceStart, location.sourceEnd);
-	}
-	public void superclassMustBeAClass(SourceTypeBinding type,
-			TypeReference superclassRef, ReferenceBinding superType) {
-		this.handle(IProblem.SuperclassMustBeAClass, new String[]{
-				new String(superType.readableName()),
-				new String(type.sourceName())}, new String[]{
-				new String(superType.shortReadableName()),
-				new String(type.sourceName())}, superclassRef.sourceStart,
-				superclassRef.sourceEnd);
-	}
-	public void superinterfaceMustBeAnInterface(SourceTypeBinding type,
-			TypeDeclaration typeDecl, ReferenceBinding superType) {
-		this.handle(IProblem.SuperInterfaceMustBeAnInterface, new String[]{
-				new String(superType.readableName()),
-				new String(type.sourceName())}, new String[]{
-				new String(superType.shortReadableName()),
-				new String(type.sourceName())}, typeDecl.sourceStart,
-				typeDecl.sourceEnd);
-	}
-	public void task(String tag, String message, String priority, int start,
-			int end) {
-		this
-				.handle(
-						IProblem.Task,
-						new String[]{tag, message, priority/*
-														    * secret argument
-														    * that is not
-														    * surfaced in
-														    * getMessage()
-														    */},
-						new String[]{tag, message, priority/*
-														    * secret argument
-														    * that is not
-														    * surfaced in
-														    * getMessage()
-														    */},
-						start, end);
-	}
-	public void tooManyDimensions(AstNode expression) {
-		this.handle(IProblem.TooManyArrayDimensions, NoArgument, NoArgument,
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void tooManyFields(TypeDeclaration typeDeclaration) {
-		this.handle(IProblem.TooManyFields, new String[]{new String(
-				typeDeclaration.binding.readableName())},
-				new String[]{new String(typeDeclaration.binding
-						.shortReadableName())}, Abort | Error,
-				typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
-	}
-	public void tooManyMethods(TypeDeclaration typeDeclaration) {
-		this.handle(IProblem.TooManyMethods, new String[]{new String(
-				typeDeclaration.binding.readableName())},
-				new String[]{new String(typeDeclaration.binding
-						.shortReadableName())}, Abort | Error,
-				typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
-	}
-	public void typeCastError(CastExpression expression, TypeBinding leftType,
-			TypeBinding rightType) {
-		String leftName = new String(leftType.readableName());
-		String rightName = new String(rightType.readableName());
-		String leftShortName = new String(leftType.shortReadableName());
-		String rightShortName = new String(rightType.shortReadableName());
-		if (leftShortName.equals(rightShortName)) {
-			leftShortName = leftName;
-			rightShortName = rightName;
-		}
-		this.handle(IProblem.IllegalCast, new String[]{rightName, leftName},
-				new String[]{rightShortName, leftShortName},
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void typeCollidesWithPackage(
-			CompilationUnitDeclaration compUnitDecl, TypeDeclaration typeDecl) {
-		this.referenceContext = typeDecl; // report the problem against the
-										  // type not the entire compilation
-										  // unit
-		String[] arguments = new String[]{
-				new String(compUnitDecl.getFileName()),
-				new String(typeDecl.name)};
-		this.handle(IProblem.TypeCollidesWithPackage, arguments, arguments,
-				typeDecl.sourceStart, typeDecl.sourceEnd,
-				compUnitDecl.compilationResult);
-	}
-	public void typeMismatchError(TypeBinding resultType,
-			TypeBinding expectedType, AstNode location) {
-		String resultTypeName = new String(resultType.readableName());
-		String expectedTypeName = new String(expectedType.readableName());
-		String resultTypeShortName = new String(resultType.shortReadableName());
-		String expectedTypeShortName = new String(expectedType
-				.shortReadableName());
-		if (resultTypeShortName.equals(expectedTypeShortName)) {
-			resultTypeShortName = resultTypeName;
-			expectedTypeShortName = expectedTypeName;
-		}
-		this.handle(IProblem.TypeMismatch, new String[]{resultTypeName,
-				expectedTypeName}, new String[]{resultTypeShortName,
-				expectedTypeShortName}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void typeMismatchErrorActualTypeExpectedType(Expression expression,
-			TypeBinding constantType, TypeBinding expectedType) {
-		String constantTypeName = new String(constantType.readableName());
-		String expectedTypeName = new String(expectedType.readableName());
-		String constantTypeShortName = new String(constantType
-				.shortReadableName());
-		String expectedTypeShortName = new String(expectedType
-				.shortReadableName());
-		if (constantTypeShortName.equals(expectedTypeShortName)) {
-			constantTypeShortName = constantTypeName;
-			expectedTypeShortName = expectedTypeName;
-		}
-		this.handle(IProblem.TypeMismatch, new String[]{constantTypeName,
-				expectedTypeName}, new String[]{constantTypeShortName,
-				expectedTypeShortName}, expression.sourceStart,
-				expression.sourceEnd);
-	}
-	public void undefinedLabel(BranchStatement statement) {
-		String[] arguments = new String[]{new String(statement.label)};
-		this.handle(IProblem.UndefinedLabel, arguments, arguments,
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void unexpectedStaticModifierForField(SourceTypeBinding type,
-			FieldDeclaration fieldDecl) {
-		String[] arguments = new String[]{fieldDecl.name()};
-		this.handle(IProblem.UnexpectedStaticModifierForField, arguments,
-				arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
-	}
-	public void unexpectedStaticModifierForMethod(ReferenceBinding type,
-			AbstractMethodDeclaration methodDecl) {
-		String[] arguments = new String[]{new String(type.sourceName()),
-				new String(methodDecl.selector)};
-		this.handle(IProblem.UnexpectedStaticModifierForMethod, arguments,
-				arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void unhandledException(TypeBinding exceptionType, AstNode location) {
-		boolean insideDefaultConstructor = (referenceContext instanceof ConstructorDeclaration)
-				&& ((ConstructorDeclaration) referenceContext)
-						.isDefaultConstructor();
-		boolean insideImplicitConstructorCall = (location instanceof ExplicitConstructorCall)
-				&& (((ExplicitConstructorCall) location).accessMode == ExplicitConstructorCall.ImplicitSuper);
-		this
-				.handle(
-						insideDefaultConstructor
-								? IProblem.UnhandledExceptionInDefaultConstructor
-								: (insideImplicitConstructorCall
-										? IProblem.UndefinedConstructorInImplicitConstructorCall
-										: IProblem.UnhandledException),
-						new String[]{new String(exceptionType.readableName())},
-						new String[]{new String(exceptionType
-								.shortReadableName())}, location.sourceStart,
-						location.sourceEnd);
-	}
-	public void uninitializedBlankFinalField(FieldBinding binding,
-			AstNode location) {
-		String[] arguments = new String[]{new String(binding.readableName())};
-		this.handle(IProblem.UninitializedBlankFinalField, arguments,
-				arguments, location.sourceStart, location.sourceEnd);
-	}
-	public void uninitializedLocalVariable(LocalVariableBinding binding,
-			AstNode location) {
-		String[] arguments = new String[]{new String(binding.readableName())};
-		this.handle(IProblem.UninitializedLocalVariable, arguments, arguments,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void unmatchedBracket(int position, ReferenceContext context,
-			CompilationResult compilationResult) {
-		this.handle(IProblem.UnmatchedBracket, NoArgument, NoArgument,
-				position, position, context, compilationResult);
-	}
-	public void unnecessaryEnclosingInstanceSpecification(
-			Expression expression, ReferenceBinding targetType) {
-		this.handle(IProblem.IllegalEnclosingInstanceSpecification,
-				new String[]{new String(targetType.readableName())},
-				new String[]{new String(targetType.shortReadableName())},
-				expression.sourceStart, expression.sourceEnd);
-	}
-	public void unnecessaryReceiverForStaticMethod(AstNode location,
-			MethodBinding method) {
-		this.handle(IProblem.NonStaticAccessToStaticMethod, new String[]{
-				new String(method.declaringClass.readableName()),
-				new String(method.selector), parametersAsString(method)},
-				new String[]{
-						new String(method.declaringClass.shortReadableName()),
-						new String(method.selector),
-						parametersAsShortString(method)}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void unnecessaryReceiverForStaticField(AstNode location,
-			FieldBinding field) {
-		this.handle(IProblem.NonStaticAccessToStaticField, new String[]{
-				new String(field.declaringClass.readableName()),
-				new String(field.name)}, new String[]{
-				new String(field.declaringClass.shortReadableName()),
-				new String(field.name)}, location.sourceStart,
-				location.sourceEnd);
-	}
-	public void unreachableCode(Statement statement) {
-		this.handle(IProblem.CodeCannotBeReached, NoArgument, NoArgument,
-				statement.sourceStart, statement.sourceEnd);
-	}
-	public void unreachableExceptionHandler(ReferenceBinding exceptionType,
-			AstNode location) {
-		this.handle(IProblem.UnreachableCatch, NoArgument, NoArgument,
-				location.sourceStart, location.sourceEnd);
-	}
-	public void unresolvableReference(NameReference nameRef, Binding binding) {
-		int severity = Error;
-		/*
-		 * also need to check that the searchedType is the receiver type if
-		 * (binding instanceof ProblemBinding) { ProblemBinding problem =
-		 * (ProblemBinding) binding; if (problem.searchType != null &&
-		 * problem.searchType.isHierarchyInconsistent()) severity =
-		 * SecondaryError; }
-		 */
-		String[] arguments = new String[]{new String(binding.readableName())};
-		this.handle(IProblem.UndefinedName, arguments, arguments, severity,
-				nameRef.sourceStart, nameRef.sourceEnd);
-	}
-	public void unusedArgument(LocalDeclaration localDecl) {
-		String[] arguments = new String[]{localDecl.name()};
-		this.handle(IProblem.ArgumentIsNeverUsed, arguments, arguments,
-				localDecl.sourceStart, localDecl.sourceEnd);
-	}
-	public void unusedImport(ImportReference importRef) {
-		String[] arguments = new String[]{CharOperation
-				.toString(importRef.tokens)};
-		this.handle(IProblem.UnusedImport, arguments, arguments,
-				importRef.sourceStart, importRef.sourceEnd);
-	}
-	public void unusedLocalVariable(LocalDeclaration localDecl) {
-		String[] arguments = new String[]{localDecl.name()};
-		this.handle(IProblem.LocalVariableIsNeverUsed, arguments, arguments,
-				localDecl.sourceStart, localDecl.sourceEnd);
-	}
-	public void unusedPrivateConstructor(ConstructorDeclaration constructorDecl) {
-		if (computeSeverity(IProblem.UnusedPrivateConstructor) == Ignore)
-			return;
-		// no complaint for no-arg constructors (or default ones) - known
-		// pattern to block instantiation
-		if (constructorDecl.arguments == null
-				|| constructorDecl.arguments.length == 0)
-			return;
-		MethodBinding constructor = constructorDecl.binding;
-		this.handle(IProblem.UnusedPrivateConstructor, new String[]{
-				new String(constructor.declaringClass.readableName()),
-				parametersAsString(constructor)}, new String[]{
-				new String(constructor.declaringClass.shortReadableName()),
-				parametersAsShortString(constructor)},
-				constructorDecl.sourceStart, constructorDecl.sourceEnd);
-	}
-	public void unusedPrivateField(FieldDeclaration fieldDecl) {
-		if (computeSeverity(IProblem.UnusedPrivateField) == Ignore)
-			return;
-		FieldBinding field = fieldDecl.binding;
-		if (CharOperation.equals(TypeConstants.SERIALVERSIONUID, field.name)
-				&& field.isStatic() && field.isFinal()
-				&& TypeBinding.LongBinding == field.type) {
-			return; // do not report unused serialVersionUID field
-		}
-		this.handle(IProblem.UnusedPrivateField, new String[]{
-				new String(field.declaringClass.readableName()),
-				new String(field.name),}, new String[]{
-				new String(field.declaringClass.shortReadableName()),
-				new String(field.name),}, fieldDecl.sourceStart,
-				fieldDecl.sourceEnd);
-	}
-	public void unusedPrivateMethod(AbstractMethodDeclaration methodDecl) {
-		if (computeSeverity(IProblem.UnusedPrivateMethod) == Ignore)
-			return;
-		MethodBinding method = methodDecl.binding;
-		// no report for serialization support 'void
-		// readObject(ObjectInputStream)'
-		if (!method.isStatic()
-				&& TypeBinding.VoidBinding == method.returnType
-				&& method.parameters.length == 1
-				&& method.parameters[0].dimensions() == 0
-				&& CharOperation.equals(method.selector,
-						TypeConstants.READOBJECT)
-				&& CharOperation.equals(
-						TypeConstants.CharArray_JAVA_IO_OBJECTINPUTSTREAM,
-						method.parameters[0].readableName())) {
-			return;
-		}
-		// no report for serialization support 'void
-		// writeObject(ObjectOutputStream)'
-		if (!method.isStatic()
-				&& TypeBinding.VoidBinding == method.returnType
-				&& method.parameters.length == 1
-				&& method.parameters[0].dimensions() == 0
-				&& CharOperation.equals(method.selector,
-						TypeConstants.WRITEOBJECT)
-				&& CharOperation.equals(
-						TypeConstants.CharArray_JAVA_IO_OBJECTOUTPUTSTREAM,
-						method.parameters[0].readableName())) {
-			return;
-		}
-		// no report for serialization support 'Object readResolve()'
-		if (!method.isStatic()
-				&& TypeBinding.T_Object == method.returnType.id
-				&& method.parameters.length == 0
-				&& CharOperation.equals(method.selector,
-						TypeConstants.READRESOLVE)) {
-			return;
-		}
-		// no report for serialization support 'Object writeReplace()'
-		if (!method.isStatic()
-				&& TypeBinding.T_Object == method.returnType.id
-				&& method.parameters.length == 0
-				&& CharOperation.equals(method.selector,
-						TypeConstants.WRITEREPLACE)) {
-			return;
-		}
-		this.handle(IProblem.UnusedPrivateMethod, new String[]{
-				new String(method.declaringClass.readableName()),
-				new String(method.selector), parametersAsString(method)},
-				new String[]{
-						new String(method.declaringClass.shortReadableName()),
-						new String(method.selector),
-						parametersAsShortString(method)},
-				methodDecl.sourceStart, methodDecl.sourceEnd);
-	}
-	public void unusedPrivateType(TypeDeclaration typeDecl) {
-		if (computeSeverity(IProblem.UnusedPrivateType) == Ignore)
-			return;
-		ReferenceBinding type = typeDecl.binding;
-		this.handle(IProblem.UnusedPrivateType, new String[]{new String(type
-				.readableName()),}, new String[]{new String(type
-				.shortReadableName()),}, typeDecl.sourceStart,
-				typeDecl.sourceEnd);
-	}
-	public void useAssertAsAnIdentifier(int sourceStart, int sourceEnd) {
-		this.handle(IProblem.UseAssertAsAnIdentifier, NoArgument, NoArgument,
-				sourceStart, sourceEnd);
-	}
-	public void variableTypeCannotBeVoid(AbstractVariableDeclaration varDecl) {
-		String[] arguments = new String[]{new String(varDecl.name)};
-		this.handle(IProblem.VariableTypeCannotBeVoid, arguments, arguments,
-				varDecl.sourceStart, varDecl.sourceEnd);
-	}
-	public void variableTypeCannotBeVoidArray(
-			AbstractVariableDeclaration varDecl) {
-		String[] arguments = new String[]{new String(varDecl.name)};
-		this.handle(IProblem.VariableTypeCannotBeVoidArray, arguments,
-				arguments, varDecl.sourceStart, varDecl.sourceEnd);
-	}
-	public void visibilityConflict(MethodBinding currentMethod,
-			MethodBinding inheritedMethod) {
-		this.handle(
-		//	Cannot reduce the visibility of the inherited method from %1
-				// 8.4.6.3 - The access modifier of an hiding method must
-				// provide at least as much access as the hidden method.
-				// 8.4.6.3 - The access modifier of an overiding method must
-				// provide at least as much access as the overriden method.
-				IProblem.MethodReducesVisibility, new String[]{new String(
-						inheritedMethod.declaringClass.readableName())},
-				new String[]{new String(inheritedMethod.declaringClass
-						.shortReadableName())}, currentMethod.sourceStart(),
-				currentMethod.sourceEnd());
-	}
-	public void wrongSequenceOfExceptionTypesError(TryStatement statement,
-			int under, int upper) {
-		//the two catch block under and upper are in an incorrect order.
-		//under should be define BEFORE upper in the source
-		TypeReference typeRef = statement.catchArguments[under].type;
-		this.handle(IProblem.UnreachableCatch, NoArgument, NoArgument,
-				typeRef.sourceStart, typeRef.sourceEnd);
-	}
-	public void nonExternalizedStringLiteral(AstNode location) {
-		this.handle(IProblem.NonExternalizedStringLiteral, NoArgument,
-				NoArgument, location.sourceStart, location.sourceEnd);
-	}
-	public void noMoreAvailableSpaceForConstant(TypeDeclaration typeDeclaration) {
-		this
-				.handle(IProblem.TooManyBytesForStringConstant,
-						new String[]{new String(typeDeclaration.binding
-								.readableName())}, new String[]{new String(
-								typeDeclaration.binding.shortReadableName())},
-						Abort | Error, typeDeclaration.sourceStart,
-						typeDeclaration.sourceEnd);
-	}
-	public void noMoreAvailableSpaceInConstantPool(
-			TypeDeclaration typeDeclaration) {
-		this
-				.handle(IProblem.TooManyConstantsInConstantPool,
-						new String[]{new String(typeDeclaration.binding
-								.readableName())}, new String[]{new String(
-								typeDeclaration.binding.shortReadableName())},
-						Abort | Error, typeDeclaration.sourceStart,
-						typeDeclaration.sourceEnd);
-	}
-	private boolean isKeyword(char[] tokenSource) {
-		/*
-		 * This code is heavily grammar dependant
-		 */
-		if (tokenSource == null) {
-			return false;
-		}
-		try {
-			Scanner scanner = new Scanner();
-			scanner.setSource(tokenSource);
-			int token = scanner.getNextToken();
-			char[] currentKeyword;
-			try {
-				currentKeyword = scanner.getCurrentIdentifierSource();
-			} catch (ArrayIndexOutOfBoundsException e) {
-				return false;
-			}
-			int nextToken = scanner.getNextToken();
-			if (nextToken == Scanner.TokenNameEOF
-					&& scanner.startPosition == scanner.source.length) { // to
-																		 // handle
-																		 // case
-																		 // where
-																		 // we
-																		 // had
-																		 // an
-																		 // ArrayIndexOutOfBoundsException
-				// while reading the last token
-				switch (token) {
-					case Scanner.TokenNameERROR :
-						if (CharOperation.equals("goto".toCharArray(),
-								currentKeyword)
-								|| CharOperation.equals("const".toCharArray(),
-										currentKeyword)) { //$NON-NLS-1$ //$NON-NLS-2$
-							return true;
-						} else {
-							return false;
-						}
-					case Scanner.TokenNameabstract :
-					//				case Scanner.TokenNameassert:
-					//				case Scanner.TokenNamebyte:
-					case Scanner.TokenNamebreak :
-					//				case Scanner.TokenNameboolean:
-					case Scanner.TokenNamecase :
-					//				case Scanner.TokenNamechar:
-					case Scanner.TokenNamecatch :
-					case Scanner.TokenNameclass :
-					case Scanner.TokenNamecontinue :
-					case Scanner.TokenNamedo :
-					//				case Scanner.TokenNamedouble:
-					case Scanner.TokenNamedefault :
-					case Scanner.TokenNameelse :
-					case Scanner.TokenNameextends :
-					case Scanner.TokenNamefor :
-					//				case Scanner.TokenNamefinal:
-					//				case Scanner.TokenNamefloat:
-					case Scanner.TokenNamefalse :
-					case Scanner.TokenNamefinally :
-					case Scanner.TokenNameif :
-					//				case Scanner.TokenNameint:
-					//				case Scanner.TokenNameimport:
-					case Scanner.TokenNameinterface :
-					case Scanner.TokenNameimplements :
-					case Scanner.TokenNameinstanceof :
-					//				case Scanner.TokenNamelong:
-					case Scanner.TokenNamenew :
-					case Scanner.TokenNamenull :
-					//				case Scanner.TokenNamenative:
-					case Scanner.TokenNamepublic :
-					//				case Scanner.TokenNamepackage:
-					case Scanner.TokenNameprivate :
-					case Scanner.TokenNameprotected :
-					case Scanner.TokenNamereturn :
-					//				case Scanner.TokenNameshort:
-					case Scanner.TokenNamesuper :
-					case Scanner.TokenNamestatic :
-					case Scanner.TokenNameswitch :
-					//				case Scanner.TokenNamestrictfp:
-					//				case Scanner.TokenNamesynchronized:
-					case Scanner.TokenNametry :
-					case Scanner.TokenNamethis :
-					case Scanner.TokenNametrue :
-					case Scanner.TokenNamethrow :
-					//				case Scanner.TokenNamethrows:
-					//				case Scanner.TokenNametransient:
-					//				case Scanner.TokenNamevoid:
-					//				case Scanner.TokenNamevolatile:
-					case Scanner.TokenNamewhile :
-						return true;
-					default :
-						return false;
-				}
-			} else {
-				return false;
-			}
-		} catch (InvalidInputException e) {
-			return false;
-		}
-	}
-	// jsurfer start
-	public void phpParsingError(String[] messageArguments,
-			int problemStartPosition, int problemEndPosition,
-			ReferenceContext context, CompilationResult compilationResult) {
-		this.handle(IProblem.PHPParsingError, NoArgument, messageArguments,
-				problemStartPosition, problemEndPosition, context,
-				compilationResult);
-	}
+  public ReferenceContext referenceContext;
+  public ProblemReporter(IErrorHandlingPolicy policy,
+      IProblemFactory problemFactory) {
+    //CompilerOptions options, IProblemFactory problemFactory) {
+    super(policy, problemFactory);//options, problemFactory);
+  }
+  public void abortDueToInternalError(String errorMessage) {
+    String[] arguments = new String[]{errorMessage};
+    this.handle(IProblem.Unclassified, arguments, arguments, Error | Abort, 0,
+        0);
+  }
+  public void abortDueToInternalError(String errorMessage, AstNode location) {
+    String[] arguments = new String[]{errorMessage};
+    this.handle(IProblem.Unclassified, arguments, arguments, Error | Abort,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void abstractMethodCannotBeOverridden(SourceTypeBinding type,
+      MethodBinding concreteMethod) {
+    this
+        .handle(
+        // %1 must be abstract since it cannot override the inherited
+            // package-private abstract method %2
+            IProblem.AbstractMethodCannotBeOverridden, new String[]{
+                new String(type.sourceName()),
+                new String(CharOperation.concat(concreteMethod.declaringClass
+                    .readableName(), concreteMethod.readableName(), '.'))},
+            new String[]{
+                new String(type.sourceName()),
+                new String(CharOperation.concat(concreteMethod.declaringClass
+                    .shortReadableName(), concreteMethod.shortReadableName(),
+                    '.'))}, type.sourceStart(), type.sourceEnd());
+  }
+  public void abstractMethodInAbstractClass(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.AbstractMethodInAbstractClass, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void abstractMethodMustBeImplemented(SourceTypeBinding type,
+      MethodBinding abstractMethod) {
+    this.handle(
+    // Must implement the inherited abstract method %1
+        // 8.4.3 - Every non-abstract subclass of an abstract type, A,
+        // must provide a concrete implementation of all of A's
+        // methods.
+        IProblem.AbstractMethodMustBeImplemented, new String[]{new String(
+            CharOperation.concat(abstractMethod.declaringClass.readableName(),
+                abstractMethod.readableName(), '.'))},
+        new String[]{new String(CharOperation.concat(
+            abstractMethod.declaringClass.shortReadableName(), abstractMethod
+                .shortReadableName(), '.'))}, type.sourceStart(), type
+            .sourceEnd());
+  }
+  public void abstractMethodNeedingNoBody(AbstractMethodDeclaration method) {
+    this.handle(IProblem.BodyForAbstractMethod, NoArgument, NoArgument,
+        method.sourceStart, method.sourceEnd, method, method
+            .compilationResult());
+  }
+  public void alreadyDefinedLabel(char[] labelName, AstNode location) {
+    String[] arguments = new String[]{new String(labelName)};
+    this.handle(IProblem.DuplicateLabel, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void anonymousClassCannotExtendFinalClass(Expression expression,
+      TypeBinding type) {
+    this.handle(IProblem.AnonymousClassCannotExtendFinalClass,
+        new String[]{new String(type.readableName())}, new String[]{new String(
+            type.shortReadableName())}, expression.sourceStart,
+        expression.sourceEnd);
+  }
+  public void argumentTypeCannotBeVoid(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl, Argument arg) {
+    String[] arguments = new String[]{new String(methodDecl.selector),
+        new String(arg.name)};
+    this.handle(IProblem.ArgumentTypeCannotBeVoid, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void argumentTypeCannotBeVoidArray(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl, Argument arg) {
+    String[] arguments = new String[]{new String(methodDecl.selector),
+        new String(arg.name)};
+    this.handle(IProblem.ArgumentTypeCannotBeVoidArray, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void argumentTypeProblem(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl, Argument arg,
+      TypeBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.ArgumentTypeNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.ArgumentTypeNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.ArgumentTypeAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.ArgumentTypeInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.ArgumentTypeInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id, new String[]{new String(methodDecl.selector), arg.name(),
+        new String(expectedType.readableName())}, new String[]{
+        new String(methodDecl.selector), arg.name(),
+        new String(expectedType.shortReadableName())}, arg.type.sourceStart,
+        arg.type.sourceEnd);
+  }
+  public void arrayConstantsOnlyInArrayInitializers(int sourceStart,
+      int sourceEnd) {
+    this.handle(IProblem.ArrayConstantsOnlyInArrayInitializers, NoArgument,
+        NoArgument, sourceStart, sourceEnd);
+  }
+  public void assignmentHasNoEffect(Assignment assignment, char[] name) {
+    String[] arguments = new String[]{new String(name)};
+    this.handle(IProblem.AssignmentHasNoEffect, arguments, arguments,
+        assignment.sourceStart, assignment.sourceEnd);
+  }
+  public void attemptToReturnNonVoidExpression(ReturnStatement returnStatement,
+      TypeBinding expectedType) {
+    this.handle(IProblem.VoidMethodReturnsValue, new String[]{new String(
+        expectedType.readableName())}, new String[]{new String(expectedType
+        .shortReadableName())}, returnStatement.sourceStart,
+        returnStatement.sourceEnd);
+  }
+  public void attemptToReturnVoidValue(ReturnStatement returnStatement) {
+    this.handle(IProblem.MethodReturnsVoid, NoArgument, NoArgument,
+        returnStatement.sourceStart, returnStatement.sourceEnd);
+  }
+  //public void bytecodeExceeds64KLimit(AbstractMethodDeclaration location)
+  // {
+  //	String[] arguments = new String[] {new String(location.selector),
+  // parametersAsString(location.binding)};
+  //	if (location.isConstructor()) {
+  //		this.handle(
+  //			IProblem.BytecodeExceeds64KLimitForConstructor,
+  //			arguments,
+  //			arguments,
+  //			Error | Abort,
+  //			location.sourceStart,
+  //			location.sourceEnd);
+  //	} else {
+  //		this.handle(
+  //			IProblem.BytecodeExceeds64KLimit,
+  //			arguments,
+  //			arguments,
+  //			Error | Abort,
+  //			location.sourceStart,
+  //			location.sourceEnd);
+  //	}
+  //}
+  public void bytecodeExceeds64KLimit(TypeDeclaration location) {
+    this.handle(IProblem.BytecodeExceeds64KLimitForClinit, NoArgument,
+        NoArgument, Error | Abort, location.sourceStart, location.sourceEnd);
+  }
+  public void cannotAllocateVoidArray(Expression expression) {
+    this.handle(IProblem.CannotAllocateVoidArray, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void cannotAssignToFinalField(FieldBinding field, AstNode location) {
+    this.handle(IProblem.FinalFieldAssignment, new String[]{
+        (field.declaringClass == null ? "array" : new String(
+            field.declaringClass.readableName())), //$NON-NLS-1$
+        new String(field.readableName())}, new String[]{
+        (field.declaringClass == null ? "array" : new String(
+            field.declaringClass.shortReadableName())), //$NON-NLS-1$
+        new String(field.shortReadableName())}, location.sourceStart,
+        location.sourceEnd);
+  }
+  public void cannotAssignToFinalLocal(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.readableName())};
+    this.handle(IProblem.NonBlankFinalLocalAssignment, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void cannotAssignToFinalOuterLocal(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.readableName())};
+    this.handle(IProblem.FinalOuterLocalAssignment, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void cannotDeclareLocalInterface(char[] interfaceName,
+      int sourceStart, int sourceEnd) {
+    String[] arguments = new String[]{new String(interfaceName)};
+    this.handle(IProblem.CannotDefineInterfaceInLocalType, arguments,
+        arguments, sourceStart, sourceEnd);
+  }
+  public void cannotDefineDimensionsAndInitializer(
+      ArrayAllocationExpression expresssion) {
+    this.handle(IProblem.CannotDefineDimensionExpressionsWithInit, NoArgument,
+        NoArgument, expresssion.sourceStart, expresssion.sourceEnd);
+  }
+  public void cannotDireclyInvokeAbstractMethod(MessageSend messageSend,
+      MethodBinding method) {
+    this.handle(IProblem.DirectInvocationOfAbstractMethod, new String[]{
+        new String(method.declaringClass.readableName()),
+        new String(method.selector), parametersAsString(method)}, new String[]{
+        new String(method.declaringClass.shortReadableName()),
+        new String(method.selector), parametersAsShortString(method)},
+        messageSend.sourceStart, messageSend.sourceEnd);
+  }
+  public void cannotImportPackage(ImportReference importRef) {
+    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+    this.handle(IProblem.CannotImportPackage, arguments, arguments,
+        importRef.sourceStart, importRef.sourceEnd);
+  }
+  public void cannotInstantiate(TypeReference typeRef, TypeBinding type) {
+    this.handle(IProblem.InvalidClassInstantiation, new String[]{new String(
+        type.readableName())},
+        new String[]{new String(type.shortReadableName())},
+        typeRef.sourceStart, typeRef.sourceEnd);
+  }
+  public void cannotReferToNonFinalOuterLocal(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.readableName())};
+    this.handle(IProblem.OuterLocalMustBeFinal, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void cannotReturnInInitializer(AstNode location) {
+    this.handle(IProblem.CannotReturnInInitializer, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void cannotThrowNull(ThrowStatement statement) {
+    this.handle(IProblem.CannotThrowNull, NoArgument, NoArgument,
+        statement.sourceStart, statement.sourceEnd);
+  }
+  public void cannotThrowType(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl, TypeReference exceptionType,
+      TypeBinding expectedType) {
+    this.handle(IProblem.CannotThrowType, new String[]{new String(expectedType
+        .readableName())}, new String[]{new String(expectedType
+        .shortReadableName())}, exceptionType.sourceStart,
+        exceptionType.sourceEnd);
+  }
+  public void cannotUseSuperInJavaLangObject(AstNode reference) {
+    this.handle(IProblem.ObjectHasNoSuperclass, NoArgument, NoArgument,
+        reference.sourceStart, reference.sourceEnd);
+  }
+  public void cannotUseSuperInCodeSnippet(int start, int end) {
+    this.handle(IProblem.CannotUseSuperInCodeSnippet, NoArgument, NoArgument,
+        Error | Abort, start, end);
+  }
+  public void caseExpressionMustBeConstant(Expression expression) {
+    this.handle(IProblem.NonConstantExpression, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void classExtendFinalClass(SourceTypeBinding type,
+      TypeReference superclass, TypeBinding expectedType) {
+    String name = new String(type.sourceName());
+    String expectedFullName = new String(expectedType.readableName());
+    String expectedShortName = new String(expectedType.shortReadableName());
+    if (expectedShortName.equals(name))
+      expectedShortName = expectedFullName;
+    this.handle(IProblem.ClassExtendFinalClass, new String[]{expectedFullName,
+        name}, new String[]{expectedShortName, name}, superclass.sourceStart,
+        superclass.sourceEnd);
+  }
+  public void codeSnippetMissingClass(String missing, int start, int end) {
+    String[] arguments = new String[]{missing};
+    this.handle(IProblem.CodeSnippetMissingClass, arguments, arguments, Error
+        | Abort, start, end);
+  }
+  public void codeSnippetMissingMethod(String className, String missingMethod,
+      String argumentTypes, int start, int end) {
+    String[] arguments = new String[]{className, missingMethod, argumentTypes};
+    this.handle(IProblem.CodeSnippetMissingMethod, arguments, arguments, Error
+        | Abort, start, end);
+  }
+  /*
+   * Given the current configuration, answers which category the problem falls
+   * into: Error | Warning | Ignore
+   */
+  //public int computeSeverity(int problemId){
+  //
+  //	// severity can have been preset on the problem
+  //// if ((problem.severity & Fatal) != 0){
+  //// return Error;
+  //// }
+  //
+  //	// if not then check whether it is a configurable problem
+  //	int errorThreshold = options.errorThreshold;
+  //	int warningThreshold = options.warningThreshold;
+  //	
+  //	switch(problemId){
+  //
+  //		case IProblem.UnreachableCatch :
+  //		case IProblem.CodeCannotBeReached :
+  //			if ((errorThreshold & CompilerOptions.UnreachableCode) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UnreachableCode) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //
+  //		case IProblem.MaskedCatch :
+  //			if ((errorThreshold & CompilerOptions.MaskedCatchBlock) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.MaskedCatchBlock) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //			
+  ///*
+  //		case Never Used :
+  //			if ((errorThreshold & ParsingOptionalError) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & ParsingOptionalError) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //*/
+  //		case IProblem.ImportNotFound :
+  //		case IProblem.ImportNotVisible :
+  //		case IProblem.ImportAmbiguous :
+  //		case IProblem.ImportInternalNameProvided :
+  //		case IProblem.ImportInheritedNameHidesEnclosingName :
+  //		case IProblem.DuplicateImport :
+  //		case IProblem.ConflictingImport :
+  //		case IProblem.CannotImportPackage :
+  //			if ((errorThreshold & CompilerOptions.ImportProblem) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.ImportProblem) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //			
+  //		case IProblem.UnusedImport :
+  //			// if import problem are disabled, then ignore
+  //			if ((errorThreshold & CompilerOptions.ImportProblem) == 0
+  //				&& (warningThreshold & CompilerOptions.ImportProblem) == 0){
+  //				return Ignore;
+  //			}
+  //			if ((errorThreshold & CompilerOptions.UnusedImport) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UnusedImport) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //			
+  //		case IProblem.MethodButWithConstructorName :
+  //			if ((errorThreshold & CompilerOptions.MethodWithConstructorName) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.MethodWithConstructorName) !=
+  // 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		
+  //		case IProblem.OverridingNonVisibleMethod :
+  //			if ((errorThreshold & CompilerOptions.OverriddenPackageDefaultMethod) !=
+  // 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.OverriddenPackageDefaultMethod)
+  // != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //
+  //		case IProblem.IncompatibleReturnTypeForNonInheritedInterfaceMethod :
+  //		case
+  // IProblem.IncompatibleExceptionInThrowsClauseForNonInheritedInterfaceMethod
+  // :
+  //			if ((errorThreshold &
+  // CompilerOptions.IncompatibleNonInheritedInterfaceMethod) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold &
+  // CompilerOptions.IncompatibleNonInheritedInterfaceMethod) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //
+  //		case IProblem.OverridingDeprecatedMethod :
+  //		case IProblem.UsingDeprecatedType :
+  //		case IProblem.UsingDeprecatedMethod :
+  //		case IProblem.UsingDeprecatedConstructor :
+  //		case IProblem.UsingDeprecatedField :
+  //			if ((errorThreshold & CompilerOptions.UsingDeprecatedAPI) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UsingDeprecatedAPI) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		
+  //		case IProblem.LocalVariableIsNeverUsed :
+  //			if ((errorThreshold & CompilerOptions.UnusedLocalVariable) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UnusedLocalVariable) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		
+  //		case IProblem.ArgumentIsNeverUsed :
+  //			if ((errorThreshold & CompilerOptions.UnusedArgument) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UnusedArgument) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //
+  //		case IProblem.NoImplicitStringConversionForCharArrayExpression :
+  //			if ((errorThreshold & CompilerOptions.NoImplicitStringConversion) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.NoImplicitStringConversion) !=
+  // 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //
+  //		case IProblem.NeedToEmulateFieldReadAccess :
+  //		case IProblem.NeedToEmulateFieldWriteAccess :
+  //		case IProblem.NeedToEmulateMethodAccess :
+  //		case IProblem.NeedToEmulateConstructorAccess :
+  //			if ((errorThreshold & CompilerOptions.AccessEmulation) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.AccessEmulation) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		case IProblem.NonExternalizedStringLiteral :
+  //			if ((errorThreshold & CompilerOptions.NonExternalizedString) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.NonExternalizedString) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		case IProblem.UseAssertAsAnIdentifier :
+  //			if ((errorThreshold & CompilerOptions.AssertUsedAsAnIdentifier) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.AssertUsedAsAnIdentifier) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		case IProblem.NonStaticAccessToStaticMethod :
+  //		case IProblem.NonStaticAccessToStaticField :
+  //			if ((errorThreshold & CompilerOptions.StaticAccessReceiver) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.StaticAccessReceiver) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		case IProblem.AssignmentHasNoEffect:
+  //			if ((errorThreshold & CompilerOptions.NoEffectAssignment) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.NoEffectAssignment) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		case IProblem.UnusedPrivateConstructor:
+  //		case IProblem.UnusedPrivateMethod:
+  //		case IProblem.UnusedPrivateField:
+  //		case IProblem.UnusedPrivateType:
+  //			if ((errorThreshold & CompilerOptions.UnusedPrivateMember) != 0){
+  //				return Error;
+  //			}
+  //			if ((warningThreshold & CompilerOptions.UnusedPrivateMember) != 0){
+  //				return Warning;
+  //			}
+  //			return Ignore;
+  //		
+  //		case IProblem.Task :
+  //			return Warning;
+  //		default:
+  //			return Error;
+  //	}
+  //}
+  //public void conditionalArgumentsIncompatibleTypes(ConditionalExpression
+  // expression, TypeBinding trueType, TypeBinding falseType) {
+  //	this.handle(
+  //		IProblem.IncompatibleTypesInConditionalOperator,
+  //		new String[] {new String(trueType.readableName()), new
+  // String(falseType.readableName())},
+  //		new String[] {new String(trueType.sourceName()), new
+  // String(falseType.sourceName())},
+  //		expression.sourceStart,
+  //		expression.sourceEnd);
+  //}
+  public void conflictingImport(ImportReference importRef) {
+    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+    this.handle(IProblem.ConflictingImport, arguments, arguments,
+        importRef.sourceStart, importRef.sourceEnd);
+  }
+  public void constantOutOfFormat(NumberLiteral lit) {
+    // the literal is not in a correct format
+    // this code is called on IntLiteral and LongLiteral
+    // example 000811 ...the 8 is uncorrect.
+    if ((lit instanceof LongLiteral) || (lit instanceof IntLiteral)) {
+      char[] source = lit.source();
+      try {
+        final String Radix;
+        final int radix;
+        if ((source[1] == 'x') || (source[1] == 'X')) {
+          radix = 16;
+          Radix = "Hexa"; //$NON-NLS-1$
+        } else {
+          radix = 8;
+          Radix = "Octal"; //$NON-NLS-1$
+        }
+        //look for the first digit that is incorrect
+        int place = -1;
+        label : for (int i = radix == 8 ? 1 : 2; i < source.length; i++) {
+          if (Character.digit(source[i], radix) == -1) {
+            place = i;
+            break label;
+          }
+        }
+        String[] arguments = new String[]{Radix + " " + new String(source)
+            + " (digit " + new String(new char[]{source[place]}) + ")"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        this.handle(IProblem.NumericValueOutOfRange, arguments, arguments,
+            lit.sourceStart, lit.sourceEnd);
+        return;
+      } catch (IndexOutOfBoundsException ex) {
+      }
+      // just in case .... use a predefined error..
+      // we should never come here...(except if the code changes !)
+      this.constantOutOfRange(lit);
+    }
+  }
+  public void constantOutOfRange(Literal lit) {
+    // lit is some how out of range of it declared type
+    // example
+    // 9999999999999999999999999999999999999999999999999999999999999999999
+    String[] arguments = new String[]{new String(lit.source())};
+    this.handle(IProblem.NumericValueOutOfRange, arguments, arguments,
+        lit.sourceStart, lit.sourceEnd);
+  }
+  public void deprecatedField(FieldBinding field, AstNode location) {
+    this.handle(IProblem.UsingDeprecatedField,
+        new String[]{new String(field.declaringClass.readableName()),
+            new String(field.name)}, new String[]{
+            new String(field.declaringClass.shortReadableName()),
+            new String(field.name)}, location.sourceStart, location.sourceEnd);
+  }
+  public void deprecatedMethod(MethodBinding method, AstNode location) {
+    if (method.isConstructor())
+      this.handle(IProblem.UsingDeprecatedConstructor, new String[]{
+          new String(method.declaringClass.readableName()),
+          parametersAsString(method)}, new String[]{
+          new String(method.declaringClass.shortReadableName()),
+          parametersAsShortString(method)}, location.sourceStart,
+          location.sourceEnd);
+    else
+      this.handle(IProblem.UsingDeprecatedMethod, new String[]{
+          new String(method.declaringClass.readableName()),
+          new String(method.selector), parametersAsString(method)},
+          new String[]{new String(method.declaringClass.shortReadableName()),
+              new String(method.selector), parametersAsShortString(method)},
+          location.sourceStart, location.sourceEnd);
+  }
+  public void deprecatedType(TypeBinding type, AstNode location) {
+    if (location == null)
+      return; // 1G828DN - no type ref for synthetic arguments
+    this.handle(IProblem.UsingDeprecatedType, new String[]{new String(type
+        .readableName())}, new String[]{new String(type.shortReadableName())},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void duplicateCase(Case statement, Constant constant) {
+    String[] arguments = new String[]{String.valueOf(constant.intValue())};
+    this.handle(IProblem.DuplicateCase, arguments, arguments,
+        statement.sourceStart, statement.sourceEnd);
+  }
+  public void duplicateDefaultCase(DefaultCase statement) {
+    this.handle(IProblem.DuplicateDefaultCase, NoArgument, NoArgument,
+        statement.sourceStart, statement.sourceEnd);
+  }
+  public void duplicateFieldInType(SourceTypeBinding type,
+      FieldDeclaration fieldDecl) {
+    this.handle(IProblem.DuplicateField, new String[]{
+        new String(type.sourceName()), fieldDecl.name()}, new String[]{
+        new String(type.shortReadableName()), fieldDecl.name()},
+        fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void duplicateImport(ImportReference importRef) {
+    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+    this.handle(IProblem.DuplicateImport, arguments, arguments,
+        importRef.sourceStart, importRef.sourceEnd);
+  }
+  public void duplicateInitializationOfBlankFinalField(FieldBinding field,
+      Reference reference) {
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(IProblem.DuplicateBlankFinalFieldInitialization, arguments,
+        arguments, reference.sourceStart, reference.sourceEnd);
+  }
+  public void duplicateInitializationOfFinalLocal(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.readableName())};
+    this.handle(IProblem.DuplicateFinalLocalInitialization, arguments,
+        arguments, location.sourceStart, location.sourceEnd);
+  }
+  public void duplicateMethodInType(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(methodDecl.selector),
+        new String(type.sourceName())};
+    this.handle(IProblem.DuplicateMethod, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void duplicateModifierForField(ReferenceBinding type,
+      FieldDeclaration fieldDecl) {
+    /*
+     * to highlight modifiers use: this.handle( new Problem(
+     * DuplicateModifierForField, new String[] {fieldDecl.name()},
+     * fieldDecl.modifiers.sourceStart, fieldDecl.modifiers.sourceEnd));
+     */
+    String[] arguments = new String[]{fieldDecl.name()};
+    this.handle(IProblem.DuplicateModifierForField, arguments, arguments,
+        fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void duplicateModifierForMethod(ReferenceBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    this.handle(IProblem.DuplicateModifierForMethod, new String[]{
+        new String(type.sourceName()), new String(methodDecl.selector)},
+        new String[]{new String(type.shortReadableName()),
+            new String(methodDecl.selector)}, methodDecl.sourceStart,
+        methodDecl.sourceEnd);
+  }
+  public void duplicateModifierForType(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.DuplicateModifierForType, arguments, arguments, type
+        .sourceStart(), type.sourceEnd());
+  }
+  public void duplicateModifierForVariable(LocalDeclaration localDecl,
+      boolean complainForArgument) {
+    String[] arguments = new String[]{localDecl.name()};
+    this.handle(complainForArgument
+        ? IProblem.DuplicateModifierForArgument
+        : IProblem.DuplicateModifierForVariable, arguments, arguments,
+        localDecl.sourceStart, localDecl.sourceEnd);
+  }
+  public void duplicateNestedType(TypeDeclaration typeDecl) {
+    String[] arguments = new String[]{new String(typeDecl.name)};
+    this.handle(IProblem.DuplicateNestedType, arguments, arguments,
+        typeDecl.sourceStart, typeDecl.sourceEnd);
+  }
+  public void duplicateSuperinterface(SourceTypeBinding type,
+      TypeDeclaration typeDecl, ReferenceBinding superType) {
+    this.handle(IProblem.DuplicateSuperInterface, new String[]{
+        new String(superType.readableName()), new String(type.sourceName())},
+        new String[]{new String(superType.shortReadableName()),
+            new String(type.sourceName())}, typeDecl.sourceStart,
+        typeDecl.sourceEnd);
+  }
+  public void duplicateTypes(CompilationUnitDeclaration compUnitDecl,
+      TypeDeclaration typeDecl) {
+    String[] arguments = new String[]{new String(compUnitDecl.getFileName()),
+        new String(typeDecl.name)};
+    this.referenceContext = typeDecl; // report the problem against the
+    // type not the entire compilation
+    // unit
+    this.handle(IProblem.DuplicateTypes, arguments, arguments,
+        typeDecl.sourceStart, typeDecl.sourceEnd,
+        compUnitDecl.compilationResult);
+  }
+  public void errorNoMethodFor(MessageSend messageSend, TypeBinding recType,
+      TypeBinding[] params) {
+    StringBuffer buffer = new StringBuffer();
+    StringBuffer shortBuffer = new StringBuffer();
+    for (int i = 0, length = params.length; i < length; i++) {
+      if (i != 0) {
+        buffer.append(", "); //$NON-NLS-1$
+        shortBuffer.append(", "); //$NON-NLS-1$
+      }
+      buffer.append(new String(params[i].readableName()));
+      shortBuffer.append(new String(params[i].shortReadableName()));
+    }
+    this.handle(recType.isArrayType()
+        ? IProblem.NoMessageSendOnArrayType
+        : IProblem.NoMessageSendOnBaseType, new String[]{
+        new String(recType.readableName()), new String(messageSend.selector),
+        buffer.toString()}, new String[]{
+        new String(recType.shortReadableName()),
+        new String(messageSend.selector), shortBuffer.toString()},
+        messageSend.sourceStart, messageSend.sourceEnd);
+  }
+  public void errorThisSuperInStatic(AstNode reference) {
+    String[] arguments = new String[]{reference.isSuper() ? "super" : "this"}; //$NON-NLS-2$ //$NON-NLS-1$
+    this.handle(IProblem.ThisInStaticContext, arguments, arguments,
+        reference.sourceStart, reference.sourceEnd);
+  }
+  public void exceptionTypeProblem(SourceTypeBinding type,
+      AbstractMethodDeclaration methodDecl, TypeReference exceptionType,
+      TypeBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.ExceptionTypeNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.ExceptionTypeNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.ExceptionTypeAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.ExceptionTypeInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.ExceptionTypeInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id, new String[]{new String(methodDecl.selector),
+        new String(expectedType.readableName())}, new String[]{
+        new String(methodDecl.selector),
+        new String(expectedType.shortReadableName())},
+        exceptionType.sourceStart, exceptionType.sourceEnd);
+  }
+  public void expressionShouldBeAVariable(Expression expression) {
+    this.handle(IProblem.ExpressionShouldBeAVariable, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void fieldsOrThisBeforeConstructorInvocation(ThisReference reference) {
+    this.handle(IProblem.ThisSuperDuringConstructorInvocation, NoArgument,
+        NoArgument, reference.sourceStart, reference.sourceEnd);
+  }
+  public void fieldTypeProblem(SourceTypeBinding type,
+      FieldDeclaration fieldDecl, TypeBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.FieldTypeNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.FieldTypeNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.FieldTypeAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.FieldTypeInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.FieldTypeInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id,
+        new String[]{fieldDecl.name(), new String(type.sourceName()),
+            new String(expectedType.readableName())}, new String[]{
+            fieldDecl.name(), new String(type.sourceName()),
+            new String(expectedType.shortReadableName())},
+        fieldDecl.type.sourceStart, fieldDecl.type.sourceEnd);
+  }
+  public void finalMethodCannotBeOverridden(MethodBinding currentMethod,
+      MethodBinding inheritedMethod) {
+    this.handle(
+    // Cannot override the final method from %1
+        // 8.4.3.3 - Final methods cannot be overridden or hidden.
+        IProblem.FinalMethodCannotBeOverridden, new String[]{new String(
+            inheritedMethod.declaringClass.readableName())},
+        new String[]{new String(inheritedMethod.declaringClass
+            .shortReadableName())}, currentMethod.sourceStart(), currentMethod
+            .sourceEnd());
+  }
+  public void forwardReference(Reference reference, int indexInQualification,
+      TypeBinding type) {
+    this.handle(IProblem.ReferenceToForwardField, NoArgument, NoArgument,
+        reference.sourceStart, reference.sourceEnd);
+  }
+  // use this private API when the compilation unit result can be found
+  // through the
+  // reference context. Otherwise, use the other API taking a problem and a
+  // compilation result
+  // as arguments
+  private void handle(int problemId, String[] problemArguments,
+      String[] messageArguments, int problemStartPosition,
+      int problemEndPosition) {
+    this.handle(problemId, problemArguments, messageArguments,
+        problemStartPosition, problemEndPosition, referenceContext,
+        referenceContext == null ? null : referenceContext.compilationResult());
+    referenceContext = null;
+  }
+  // use this private API when the compilation unit result can be found
+  // through the
+  // reference context. Otherwise, use the other API taking a problem and a
+  // compilation result
+  // as arguments
+  private void handle(int problemId, String[] problemArguments,
+      String[] messageArguments, int severity, int problemStartPosition,
+      int problemEndPosition) {
+    this.handle(problemId, problemArguments, messageArguments, severity,
+        problemStartPosition, problemEndPosition, referenceContext,
+        referenceContext == null ? null : referenceContext.compilationResult());
+    referenceContext = null;
+  }
+  // use this private API when the compilation unit result cannot be found
+  // through the
+  // reference context.
+  private void handle(int problemId, String[] problemArguments,
+      String[] messageArguments, int problemStartPosition,
+      int problemEndPosition, CompilationResult unitResult) {
+    this.handle(problemId, problemArguments, messageArguments,
+        problemStartPosition, problemEndPosition, referenceContext, unitResult);
+    referenceContext = null;
+  }
+  public void hidingEnclosingType(TypeDeclaration typeDecl) {
+    String[] arguments = new String[]{new String(typeDecl.name)};
+    this.handle(IProblem.HidingEnclosingType, arguments, arguments,
+        typeDecl.sourceStart, typeDecl.sourceEnd);
+  }
+  public void hierarchyCircularity(SourceTypeBinding sourceType,
+      ReferenceBinding superType, TypeReference reference) {
+    int start = 0;
+    int end = 0;
+    String typeName = ""; //$NON-NLS-1$
+    String shortTypeName = ""; //$NON-NLS-1$
+    if (reference == null) { // can only happen when java.lang.Object is
+      // busted
+      start = sourceType.sourceStart();
+      end = sourceType.sourceEnd();
+      typeName = new String(superType.readableName());
+      shortTypeName = new String(superType.sourceName());
+    } else {
+      start = reference.sourceStart;
+      end = reference.sourceEnd;
+      char[][] qName = reference.getTypeName();
+      typeName = CharOperation.toString(qName);
+      shortTypeName = new String(qName[qName.length - 1]);
+    }
+    if (sourceType == superType)
+      this.handle(IProblem.HierarchyCircularitySelfReference, new String[]{
+          new String(sourceType.sourceName()), typeName}, new String[]{
+          new String(sourceType.sourceName()), shortTypeName}, start, end);
+    else
+      this.handle(IProblem.HierarchyCircularity, new String[]{
+          new String(sourceType.sourceName()), typeName}, new String[]{
+          new String(sourceType.sourceName()), shortTypeName}, start, end);
+  }
+  public void hierarchyHasProblems(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.HierarchyHasProblems, arguments, arguments, type
+        .sourceStart(), type.sourceEnd());
+  }
+  public void illegalAbstractModifierCombinationForMethod(
+      ReferenceBinding type, AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.IllegalAbstractModifierCombinationForMethod,
+        arguments, arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void illegalModifierCombinationFinalAbstractForClass(
+      SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierCombinationFinalAbstractForClass,
+        arguments, arguments, type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierCombinationFinalVolatileForField(
+      ReferenceBinding type, FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{fieldDecl.name()};
+    this.handle(IProblem.IllegalModifierCombinationFinalVolatileForField,
+        arguments, arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void illegalModifierForClass(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierForClass, arguments, arguments, type
+        .sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierForField(ReferenceBinding type,
+      FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{fieldDecl.name()};
+    this.handle(IProblem.IllegalModifierForField, arguments, arguments,
+        fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void illegalModifierForInterface(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierForInterface, arguments, arguments,
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierForInterfaceField(ReferenceBinding type,
+      FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{fieldDecl.name()};
+    this.handle(IProblem.IllegalModifierForInterfaceField, arguments,
+        arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void illegalModifierForInterfaceMethod(ReferenceBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.IllegalModifierForInterfaceMethod, arguments,
+        arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void illegalModifierForLocalClass(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierForLocalClass, arguments, arguments,
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierForMemberClass(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierForMemberClass, arguments, arguments,
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierForMemberInterface(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalModifierForMemberInterface, arguments,
+        arguments, type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalModifierForMethod(ReferenceBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.IllegalModifierForMethod, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void illegalModifierForVariable(LocalDeclaration localDecl,
+      boolean complainAsArgument) {
+    String[] arguments = new String[]{localDecl.name()};
+    this.handle(complainAsArgument
+        ? IProblem.IllegalModifierForArgument
+        : IProblem.IllegalModifierForVariable, arguments, arguments,
+        localDecl.sourceStart, localDecl.sourceEnd);
+  }
+  public void illegalPrimitiveOrArrayTypeForEnclosingInstance(
+      TypeBinding enclosingType, AstNode location) {
+    this.handle(IProblem.IllegalPrimitiveOrArrayTypeForEnclosingInstance,
+        new String[]{new String(enclosingType.readableName())},
+        new String[]{new String(enclosingType.shortReadableName())},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void illegalStaticModifierForMemberType(SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalStaticModifierForMemberType, arguments,
+        arguments, type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalVisibilityModifierCombinationForField(
+      ReferenceBinding type, FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{new String(fieldDecl.name())};
+    this.handle(IProblem.IllegalVisibilityModifierCombinationForField,
+        arguments, arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void illegalVisibilityModifierCombinationForMemberType(
+      SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalVisibilityModifierCombinationForMemberType,
+        arguments, arguments, type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalVisibilityModifierCombinationForMethod(
+      ReferenceBinding type, AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.IllegalVisibilityModifierCombinationForMethod,
+        arguments, arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void illegalVisibilityModifierForInterfaceMemberType(
+      SourceTypeBinding type) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.IllegalVisibilityModifierForInterfaceMemberType,
+        arguments, arguments, type.sourceStart(), type.sourceEnd());
+  }
+  public void illegalVoidExpression(AstNode location) {
+    this.handle(IProblem.InvalidVoidExpression, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void importProblem(ImportReference importRef, Binding expectedImport) {
+    int problemId = expectedImport.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.ImportNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.ImportNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.ImportAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.ImportInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.ImportInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    String argument;
+    if (expectedImport instanceof ProblemReferenceBinding) {
+      argument = CharOperation
+          .toString(((ProblemReferenceBinding) expectedImport).compoundName);
+    } else {
+      argument = CharOperation.toString(importRef.tokens);
+    }
+    String[] arguments = new String[]{argument};
+    this.handle(id, arguments, arguments, importRef.sourceStart,
+        importRef.sourceEnd);
+  }
+  public void incompatibleExceptionInThrowsClause(SourceTypeBinding type,
+      MethodBinding currentMethod, MethodBinding inheritedMethod,
+      ReferenceBinding exceptionType) {
+    if (type == currentMethod.declaringClass) {
+      int id;
+      if (currentMethod.declaringClass.isInterface()
+          && !inheritedMethod.isPublic()) { // interface inheriting
+        // Object protected
+        // method
+        id = IProblem.IncompatibleExceptionInThrowsClauseForNonInheritedInterfaceMethod;
+      } else {
+        id = IProblem.IncompatibleExceptionInThrowsClause;
+      }
+      this.handle(
+      // Exception %1 is not compatible with throws
+          // clause in %2
+          // 9.4.4 - The type of exception in the throws
+          // clause is incompatible.
+          id, new String[]{
+              new String(exceptionType.sourceName()),
+              new String(CharOperation.concat(inheritedMethod.declaringClass
+                  .readableName(), inheritedMethod.readableName(), '.'))},
+          new String[]{
+              new String(exceptionType.sourceName()),
+              new String(CharOperation.concat(inheritedMethod.declaringClass
+                  .shortReadableName(), inheritedMethod.shortReadableName(),
+                  '.'))}, currentMethod.sourceStart(), currentMethod
+              .sourceEnd());
+    } else
+      this.handle(
+      // Exception %1 in throws clause of %2 is not
+          // compatible with %3
+          // 9.4.4 - The type of exception in the throws
+          // clause is incompatible.
+          IProblem.IncompatibleExceptionInInheritedMethodThrowsClause,
+          new String[]{
+              new String(exceptionType.sourceName()),
+              new String(CharOperation.concat(currentMethod.declaringClass
+                  .sourceName(), currentMethod.readableName(), '.')),
+              new String(CharOperation.concat(inheritedMethod.declaringClass
+                  .readableName(), inheritedMethod.readableName(), '.'))},
+          new String[]{
+              new String(exceptionType.sourceName()),
+              new String(CharOperation.concat(currentMethod.declaringClass
+                  .sourceName(), currentMethod.shortReadableName(), '.')),
+              new String(CharOperation.concat(inheritedMethod.declaringClass
+                  .shortReadableName(), inheritedMethod.shortReadableName(),
+                  '.'))}, type.sourceStart(), type.sourceEnd());
+  }
+  public void incompatibleReturnType(MethodBinding currentMethod,
+      MethodBinding inheritedMethod) {
+    StringBuffer methodSignature = new StringBuffer();
+    methodSignature.append(inheritedMethod.declaringClass.readableName())
+        .append('.').append(inheritedMethod.readableName());
+    StringBuffer shortSignature = new StringBuffer();
+    shortSignature.append(inheritedMethod.declaringClass.shortReadableName())
+        .append('.').append(inheritedMethod.shortReadableName());
+    int id;
+    if (currentMethod.declaringClass.isInterface()
+        && !inheritedMethod.isPublic()) { // interface inheriting
+      // Object protected method
+      id = IProblem.IncompatibleReturnTypeForNonInheritedInterfaceMethod;
+    } else {
+      id = IProblem.IncompatibleReturnType;
+    }
+    this.handle(id, new String[]{methodSignature.toString()},
+        new String[]{shortSignature.toString()}, currentMethod.sourceStart(),
+        currentMethod.sourceEnd());
+  }
+  public void incorrectLocationForEmptyDimension(
+      ArrayAllocationExpression expression, int index) {
+    this.handle(IProblem.IllegalDimension, NoArgument, NoArgument,
+        expression.dimensions[index + 1].sourceStart,
+        expression.dimensions[index + 1].sourceEnd);
+  }
+  public void incorrectSwitchType(Expression expression, TypeBinding testType) {
+    this.handle(IProblem.IncorrectSwitchType, new String[]{new String(testType
+        .readableName())},
+        new String[]{new String(testType.shortReadableName())},
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void inheritedMethodReducesVisibility(SourceTypeBinding type,
+      MethodBinding concreteMethod, MethodBinding[] abstractMethods) {
+    StringBuffer concreteSignature = new StringBuffer();
+    concreteSignature.append(concreteMethod.declaringClass.readableName())
+        .append('.').append(concreteMethod.readableName());
+    StringBuffer shortSignature = new StringBuffer();
+    shortSignature.append(concreteMethod.declaringClass.shortReadableName())
+        .append('.').append(concreteMethod.shortReadableName());
+    this.handle(
+    // The inherited method %1 cannot hide the public abstract method in %2
+        IProblem.InheritedMethodReducesVisibility, new String[]{
+            new String(concreteSignature.toString()),
+            new String(abstractMethods[0].declaringClass.readableName())},
+        new String[]{new String(shortSignature.toString()),
+            new String(abstractMethods[0].declaringClass.shortReadableName())},
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void inheritedMethodsHaveIncompatibleReturnTypes(
+      SourceTypeBinding type, MethodBinding[] inheritedMethods, int length) {
+    StringBuffer methodSignatures = new StringBuffer();
+    StringBuffer shortSignatures = new StringBuffer();
+    for (int i = length; --i >= 0;) {
+      methodSignatures
+          .append(inheritedMethods[i].declaringClass.readableName())
+          .append('.').append(inheritedMethods[i].readableName());
+      shortSignatures.append(
+          inheritedMethods[i].declaringClass.shortReadableName()).append('.')
+          .append(inheritedMethods[i].shortReadableName());
+      if (i != 0) {
+        methodSignatures.append(", "); //$NON-NLS-1$
+        shortSignatures.append(", "); //$NON-NLS-1$
+      }
+    }
+    this.handle(
+    // Return type is incompatible with %1
+        // 9.4.2 - The return type from the method is incompatible with
+        // the declaration.
+        IProblem.IncompatibleReturnType, new String[]{methodSignatures
+            .toString()}, new String[]{shortSignatures.toString()}, type
+            .sourceStart(), type.sourceEnd());
+  }
+  public void initializerMustCompleteNormally(FieldDeclaration fieldDecl) {
+    this.handle(IProblem.InitializerMustCompleteNormally, NoArgument,
+        NoArgument, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void innerTypesCannotDeclareStaticInitializers(
+      ReferenceBinding innerType, AstNode location) {
+    this.handle(IProblem.CannotDefineStaticInitializerInLocalType,
+        new String[]{new String(innerType.readableName())},
+        new String[]{new String(innerType.shortReadableName())},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void interfaceCannotHaveConstructors(ConstructorDeclaration constructor) {
+    this.handle(IProblem.InterfaceCannotHaveConstructors, NoArgument,
+        NoArgument, constructor.sourceStart, constructor.sourceEnd,
+        constructor, constructor.compilationResult());
+  }
+  public void interfaceCannotHaveInitializers(SourceTypeBinding type,
+      FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{new String(type.sourceName())};
+    this.handle(IProblem.InterfaceCannotHaveInitializers, arguments, arguments,
+        fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void invalidBreak(AstNode location) {
+    this.handle(IProblem.InvalidBreak, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void invalidConstructor(Statement statement,
+      MethodBinding targetConstructor) {
+    boolean insideDefaultConstructor = (referenceContext instanceof ConstructorDeclaration)
+        && ((ConstructorDeclaration) referenceContext).isDefaultConstructor();
+    boolean insideImplicitConstructorCall = (statement instanceof ExplicitConstructorCall)
+        && (((ExplicitConstructorCall) statement).accessMode == ExplicitConstructorCall.ImplicitSuper);
+    int flag = IProblem.UndefinedConstructor; //default...
+    switch (targetConstructor.problemId()) {
+      case NotFound :
+        if (insideDefaultConstructor) {
+          flag = IProblem.UndefinedConstructorInDefaultConstructor;
+        } else if (insideImplicitConstructorCall) {
+          flag = IProblem.UndefinedConstructorInImplicitConstructorCall;
+        } else {
+          flag = IProblem.UndefinedConstructor;
+        }
+        break;
+      case NotVisible :
+        if (insideDefaultConstructor) {
+          flag = IProblem.NotVisibleConstructorInDefaultConstructor;
+        } else if (insideImplicitConstructorCall) {
+          flag = IProblem.NotVisibleConstructorInImplicitConstructorCall;
+        } else {
+          flag = IProblem.NotVisibleConstructor;
+        }
+        break;
+      case Ambiguous :
+        if (insideDefaultConstructor) {
+          flag = IProblem.AmbiguousConstructorInDefaultConstructor;
+        } else if (insideImplicitConstructorCall) {
+          flag = IProblem.AmbiguousConstructorInImplicitConstructorCall;
+        } else {
+          flag = IProblem.AmbiguousConstructor;
+        }
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    this.handle(flag, new String[]{
+        new String(targetConstructor.declaringClass.readableName()),
+        parametersAsString(targetConstructor)}, new String[]{
+        new String(targetConstructor.declaringClass.shortReadableName()),
+        parametersAsShortString(targetConstructor)}, statement.sourceStart,
+        statement.sourceEnd);
+  }
+  public void invalidContinue(AstNode location) {
+    this.handle(IProblem.InvalidContinue, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void invalidEnclosingType(Expression expression, TypeBinding type,
+      ReferenceBinding enclosingType) {
+    if (enclosingType.isAnonymousType())
+      enclosingType = enclosingType.superclass();
+    int flag = IProblem.UndefinedType; // default
+    switch (type.problemId()) {
+      case NotFound :
+        // 1
+        flag = IProblem.UndefinedType;
+        break;
+      case NotVisible :
+        // 2
+        flag = IProblem.NotVisibleType;
+        break;
+      case Ambiguous :
+        // 3
+        flag = IProblem.AmbiguousType;
+        break;
+      case InternalNameProvided :
+        flag = IProblem.InternalTypeNameProvided;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    this.handle(flag, new String[]{new String(enclosingType.readableName())
+        + "." + new String(type.readableName())}, //$NON-NLS-1$
+        new String[]{new String(enclosingType.shortReadableName()) + "."
+            + new String(type.shortReadableName())}, //$NON-NLS-1$
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidExpressionAsStatement(Expression expression) {
+    this.handle(IProblem.InvalidExpressionAsStatement, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidField(FieldReference fieldRef, TypeBinding searchedType) {
+    int severity = Error;
+    int flag = IProblem.UndefinedField;
+    FieldBinding field = fieldRef.binding;
+    switch (field.problemId()) {
+      case NotFound :
+        flag = IProblem.UndefinedField;
+        /*
+         * also need to check that the searchedType is the receiver type if
+         * (searchedType.isHierarchyInconsistent()) severity = SecondaryError;
+         */
+        break;
+      case NotVisible :
+        flag = IProblem.NotVisibleField;
+        break;
+      case Ambiguous :
+        flag = IProblem.AmbiguousField;
+        break;
+      case NonStaticReferenceInStaticContext :
+        flag = IProblem.NonStaticFieldFromStaticInvocation;
+        break;
+      case NonStaticReferenceInConstructorInvocation :
+        flag = IProblem.InstanceFieldDuringConstructorInvocation;
+        break;
+      case InheritedNameHidesEnclosingName :
+        flag = IProblem.InheritedFieldHidesEnclosingName;
+        break;
+      case ReceiverTypeNotVisible :
+        this.handle(IProblem.NotVisibleType, new String[]{new String(
+            searchedType.leafComponentType().readableName())},
+            new String[]{new String(searchedType.leafComponentType()
+                .shortReadableName())}, fieldRef.receiver.sourceStart,
+            fieldRef.receiver.sourceEnd);
+        return;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(flag, arguments, arguments, severity, fieldRef.sourceStart,
+        fieldRef.sourceEnd);
+  }
+  public void invalidField(NameReference nameRef, FieldBinding field) {
+    int flag = IProblem.UndefinedField;
+    switch (field.problemId()) {
+      case NotFound :
+        flag = IProblem.UndefinedField;
+        break;
+      case NotVisible :
+        flag = IProblem.NotVisibleField;
+        break;
+      case Ambiguous :
+        flag = IProblem.AmbiguousField;
+        break;
+      case NonStaticReferenceInStaticContext :
+        flag = IProblem.NonStaticFieldFromStaticInvocation;
+        break;
+      case NonStaticReferenceInConstructorInvocation :
+        flag = IProblem.InstanceFieldDuringConstructorInvocation;
+        break;
+      case InheritedNameHidesEnclosingName :
+        flag = IProblem.InheritedFieldHidesEnclosingName;
+        break;
+      case ReceiverTypeNotVisible :
+        this.handle(IProblem.NotVisibleType, new String[]{new String(
+            field.declaringClass.leafComponentType().readableName())},
+            new String[]{new String(field.declaringClass.leafComponentType()
+                .shortReadableName())}, nameRef.sourceStart, nameRef.sourceEnd);
+        return;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(flag, arguments, arguments, nameRef.sourceStart,
+        nameRef.sourceEnd);
+  }
+  public void invalidField(QualifiedNameReference nameRef, FieldBinding field,
+      int index, TypeBinding searchedType) {
+    //the resolution of the index-th field of qname failed
+    //qname.otherBindings[index] is the binding that has produced the
+    // error
+    //The different targetted errors should be :
+    //UndefinedField
+    //NotVisibleField
+    //AmbiguousField
+    if (searchedType.isBaseType()) {
+      this.handle(IProblem.NoFieldOnBaseType, new String[]{
+          new String(searchedType.readableName()),
+          CharOperation.toString(CharOperation.subarray(nameRef.tokens, 0,
+              index)), new String(nameRef.tokens[index])}, new String[]{
+          new String(searchedType.sourceName()),
+          CharOperation.toString(CharOperation.subarray(nameRef.tokens, 0,
+              index)), new String(nameRef.tokens[index])}, nameRef.sourceStart,
+          nameRef.sourceEnd);
+      return;
+    }
+    int flag = IProblem.UndefinedField;
+    switch (field.problemId()) {
+      case NotFound :
+        flag = IProblem.UndefinedField;
+        /*
+         * also need to check that the searchedType is the receiver type if
+         * (searchedType.isHierarchyInconsistent()) severity = SecondaryError;
+         */
+        break;
+      case NotVisible :
+        flag = IProblem.NotVisibleField;
+        break;
+      case Ambiguous :
+        flag = IProblem.AmbiguousField;
+        break;
+      case NonStaticReferenceInStaticContext :
+        flag = IProblem.NonStaticFieldFromStaticInvocation;
+        break;
+      case NonStaticReferenceInConstructorInvocation :
+        flag = IProblem.InstanceFieldDuringConstructorInvocation;
+        break;
+      case InheritedNameHidesEnclosingName :
+        flag = IProblem.InheritedFieldHidesEnclosingName;
+        break;
+      case ReceiverTypeNotVisible :
+        this.handle(IProblem.NotVisibleType, new String[]{new String(
+            searchedType.leafComponentType().readableName())},
+            new String[]{new String(searchedType.leafComponentType()
+                .shortReadableName())}, nameRef.sourceStart, nameRef.sourceEnd);
+        return;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    String[] arguments = new String[]{CharOperation.toString(CharOperation
+        .subarray(nameRef.tokens, 0, index + 1))};
+    this.handle(flag, arguments, arguments, nameRef.sourceStart,
+        nameRef.sourceEnd);
+  }
+  public void invalidMethod(MessageSend messageSend, MethodBinding method) {
+    // CODE should be UPDATED according to error coding in the different
+    // method binding errors
+    // The different targetted errors should be :
+    // 	UndefinedMethod
+    //	NotVisibleMethod
+    //	AmbiguousMethod
+    //  InheritedNameHidesEnclosingName
+    //	InstanceMethodDuringConstructorInvocation
+    // StaticMethodRequested
+    int flag = IProblem.UndefinedMethod; //default...
+    switch (method.problemId()) {
+      case NotFound :
+        flag = IProblem.UndefinedMethod;
+        break;
+      case NotVisible :
+        flag = IProblem.NotVisibleMethod;
+        break;
+      case Ambiguous :
+        flag = IProblem.AmbiguousMethod;
+        break;
+      case InheritedNameHidesEnclosingName :
+        flag = IProblem.InheritedMethodHidesEnclosingName;
+        break;
+      case NonStaticReferenceInConstructorInvocation :
+        flag = IProblem.InstanceMethodDuringConstructorInvocation;
+        break;
+      case NonStaticReferenceInStaticContext :
+        flag = IProblem.StaticMethodRequested;
+        break;
+      case ReceiverTypeNotVisible :
+        this.handle(IProblem.NotVisibleType, new String[]{new String(
+            method.declaringClass.leafComponentType().readableName())},
+            new String[]{new String(method.declaringClass.leafComponentType()
+                .shortReadableName())}, messageSend.receiver.sourceStart,
+            messageSend.receiver.sourceEnd);
+        return;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    if (flag == IProblem.UndefinedMethod) {
+      ProblemMethodBinding problemMethod = (ProblemMethodBinding) method;
+      if (problemMethod.closestMatch != null) {
+        String closestParameterTypeNames = parametersAsString(problemMethod.closestMatch);
+        String parameterTypeNames = parametersAsString(method);
+        String closestParameterTypeShortNames = parametersAsShortString(problemMethod.closestMatch);
+        String parameterTypeShortNames = parametersAsShortString(method);
+        if (closestParameterTypeShortNames.equals(parameterTypeShortNames)) {
+          closestParameterTypeShortNames = closestParameterTypeNames;
+          parameterTypeShortNames = parameterTypeNames;
+        }
+        this.handle(IProblem.ParameterMismatch,
+            new String[]{
+                new String(problemMethod.closestMatch.declaringClass
+                    .readableName()),
+                new String(problemMethod.closestMatch.selector),
+                closestParameterTypeNames, parameterTypeNames}, new String[]{
+                new String(problemMethod.closestMatch.declaringClass
+                    .shortReadableName()),
+                new String(problemMethod.closestMatch.selector),
+                closestParameterTypeShortNames, parameterTypeShortNames},
+            (int) (messageSend.nameSourcePosition >>> 32),
+            (int) messageSend.nameSourcePosition);
+        return;
+      }
+    }
+    this.handle(flag, new String[]{
+        new String(method.declaringClass.readableName()),
+        new String(method.selector), parametersAsString(method)}, new String[]{
+        new String(method.declaringClass.shortReadableName()),
+        new String(method.selector), parametersAsShortString(method)},
+        (int) (messageSend.nameSourcePosition >>> 32),
+        (int) messageSend.nameSourcePosition);
+  }
+  public void invalidNullToSynchronize(Expression expression) {
+    this.handle(IProblem.InvalidNullToSynchronized, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidOperator(BinaryExpression expression,
+      TypeBinding leftType, TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.InvalidOperator, new String[]{
+        expression.operatorToString(), leftName + ", " + rightName}, //$NON-NLS-1$
+        new String[]{expression.operatorToString(),
+            leftShortName + ", " + rightShortName}, //$NON-NLS-1$
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidOperator(CompoundAssignment assign, TypeBinding leftType,
+      TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.InvalidOperator, new String[]{
+        assign.operatorToString(), leftName + ", " + rightName}, //$NON-NLS-1$
+        new String[]{assign.operatorToString(),
+            leftShortName + ", " + rightShortName}, //$NON-NLS-1$
+        assign.sourceStart, assign.sourceEnd);
+  }
+  public void invalidOperator(UnaryExpression expression, TypeBinding type) {
+    this.handle(IProblem.InvalidOperator, new String[]{
+        expression.operatorToString(), new String(type.readableName())},
+        new String[]{expression.operatorToString(),
+            new String(type.shortReadableName())}, expression.sourceStart,
+        expression.sourceEnd);
+  }
+  public void invalidParenthesizedExpression(AstNode reference) {
+    this.handle(IProblem.InvalidParenthesizedExpression, NoArgument,
+        NoArgument, reference.sourceStart, reference.sourceEnd);
+  }
+  public void invalidSuperclass(SourceTypeBinding type,
+      TypeReference superclassRef, ReferenceBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.SuperclassNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.SuperclassNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.SuperclassAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.SuperclassInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.SuperclassInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id, new String[]{new String(expectedType.readableName()),
+        new String(type.sourceName())}, new String[]{
+        new String(expectedType.shortReadableName()),
+        new String(type.sourceName())}, superclassRef.sourceStart,
+        superclassRef.sourceEnd);
+  }
+  public void invalidSuperinterface(SourceTypeBinding type,
+      TypeReference superinterfaceRef, ReferenceBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.InterfaceNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.InterfaceNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.InterfaceAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.InterfaceInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.InterfaceInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id, new String[]{new String(expectedType.readableName()),
+        new String(type.sourceName())}, new String[]{
+        new String(expectedType.shortReadableName()),
+        new String(type.sourceName())}, superinterfaceRef.sourceStart,
+        superinterfaceRef.sourceEnd);
+  }
+  public void invalidType(AstNode location, TypeBinding type) {
+    int flag = IProblem.UndefinedType; // default
+    switch (type.problemId()) {
+      case NotFound :
+        flag = IProblem.UndefinedType;
+        break;
+      case NotVisible :
+        flag = IProblem.NotVisibleType;
+        break;
+      case Ambiguous :
+        flag = IProblem.AmbiguousType;
+        break;
+      case InternalNameProvided :
+        flag = IProblem.InternalTypeNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        flag = IProblem.InheritedTypeHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        break;
+    }
+    this.handle(flag, new String[]{new String(type.readableName())},
+        new String[]{new String(type.shortReadableName())},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void invalidTypeReference(Expression expression) {
+    this.handle(IProblem.InvalidTypeExpression, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidTypeToSynchronize(Expression expression, TypeBinding type) {
+    this.handle(IProblem.InvalidTypeToSynchronized, new String[]{new String(
+        type.readableName())},
+        new String[]{new String(type.shortReadableName())},
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void invalidUnaryExpression(Expression expression) {
+    this.handle(IProblem.InvalidUnaryExpression, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void isClassPathCorrect(char[][] wellKnownTypeName,
+      CompilationUnitDeclaration compUnitDecl) {
+    referenceContext = compUnitDecl;
+    String[] arguments = new String[]{CharOperation.toString(wellKnownTypeName)};
+    this.handle(IProblem.IsClassPathCorrect, arguments, arguments,
+        AbortCompilation | Error, compUnitDecl == null
+            ? 0
+            : compUnitDecl.sourceStart, compUnitDecl == null
+            ? 1
+            : compUnitDecl.sourceEnd);
+  }
+  public void maskedExceptionHandler(ReferenceBinding exceptionType,
+      AstNode location) {
+    this.handle(IProblem.MaskedCatch, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void methodNeedingAbstractModifier(MethodDeclaration methodDecl) {
+    this.handle(IProblem.MethodRequiresBody, NoArgument, NoArgument,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void methodNeedingNoBody(MethodDeclaration methodDecl) {
+    this.handle(
+    //		((methodDecl.modifiers & CompilerModifiers.AccNative) != 0) ?
+        // IProblem.BodyForNativeMethod : IProblem.BodyForAbstractMethod,
+        IProblem.BodyForAbstractMethod, NoArgument, NoArgument,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void methodWithConstructorName(MethodDeclaration methodDecl) {
+    this.handle(IProblem.MethodButWithConstructorName, NoArgument, NoArgument,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  //public void missingEnclosingInstanceSpecification(ReferenceBinding
+  // enclosingType, AstNode location) {
+  //	boolean insideConstructorCall =
+  //		(location instanceof ExplicitConstructorCall)
+  //			&& (((ExplicitConstructorCall) location).accessMode ==
+  // ExplicitConstructorCall.ImplicitSuper);
+  //
+  //	this.handle(
+  //		insideConstructorCall
+  //			? IProblem.MissingEnclosingInstanceForConstructorCall
+  //			: IProblem.MissingEnclosingInstance,
+  //		new String[] {new String(enclosingType.readableName())},
+  //		new String[] {new String(enclosingType.shortReadableName())},
+  //		location.sourceStart,
+  //		location.sourceEnd);
+  //}
+  public void missingReturnType(AbstractMethodDeclaration methodDecl) {
+    this.handle(IProblem.MissingReturnType, NoArgument, NoArgument,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void missingSemiColon(Expression expression) {
+    this.handle(IProblem.MissingSemiColon, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void mustDefineDimensionsOrInitializer(
+      ArrayAllocationExpression expression) {
+    this.handle(IProblem.MustDefineEitherDimensionExpressionsOrInitializer,
+        NoArgument, NoArgument, expression.sourceStart, expression.sourceEnd);
+  }
+  public void mustSpecifyPackage(CompilationUnitDeclaration compUnitDecl) {
+    String[] arguments = new String[]{new String(compUnitDecl.getFileName())};
+    this.handle(IProblem.MustSpecifyPackage, arguments, arguments,
+        compUnitDecl.sourceStart, compUnitDecl.sourceStart + 1);
+  }
+  public void mustUseAStaticMethod(MessageSend messageSend, MethodBinding method) {
+    this.handle(IProblem.StaticMethodRequested, new String[]{
+        new String(method.declaringClass.readableName()),
+        new String(method.selector), parametersAsString(method)}, new String[]{
+        new String(method.declaringClass.shortReadableName()),
+        new String(method.selector), parametersAsShortString(method)},
+        messageSend.sourceStart, messageSend.sourceEnd);
+  }
+  public void nativeMethodsCannotBeStrictfp(ReferenceBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.NativeMethodsCannotBeStrictfp, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void needImplementation() {
+    this.abortDueToInternalError(Util.bind("abort.missingCode")); //$NON-NLS-1$
+  }
+  public void needToEmulateFieldReadAccess(FieldBinding field, AstNode location) {
+    this.handle(IProblem.NeedToEmulateFieldReadAccess,
+        new String[]{new String(field.declaringClass.readableName()),
+            new String(field.name)}, new String[]{
+            new String(field.declaringClass.shortReadableName()),
+            new String(field.name)}, location.sourceStart, location.sourceEnd);
+  }
+  public void needToEmulateFieldWriteAccess(FieldBinding field, AstNode location) {
+    this.handle(IProblem.NeedToEmulateFieldWriteAccess,
+        new String[]{new String(field.declaringClass.readableName()),
+            new String(field.name)}, new String[]{
+            new String(field.declaringClass.shortReadableName()),
+            new String(field.name)}, location.sourceStart, location.sourceEnd);
+  }
+  public void needToEmulateMethodAccess(MethodBinding method, AstNode location) {
+    if (method.isConstructor())
+      this.handle(IProblem.NeedToEmulateConstructorAccess, new String[]{
+          new String(method.declaringClass.readableName()),
+          parametersAsString(method)}, new String[]{
+          new String(method.declaringClass.shortReadableName()),
+          parametersAsShortString(method)}, location.sourceStart,
+          location.sourceEnd);
+    else
+      this.handle(IProblem.NeedToEmulateMethodAccess, new String[]{
+          new String(method.declaringClass.readableName()),
+          new String(method.selector), parametersAsString(method)},
+          new String[]{new String(method.declaringClass.shortReadableName()),
+              new String(method.selector), parametersAsShortString(method)},
+          location.sourceStart, location.sourceEnd);
+  }
+  public void nestedClassCannotDeclareInterface(TypeDeclaration typeDecl) {
+    String[] arguments = new String[]{new String(typeDecl.name)};
+    this.handle(IProblem.CannotDefineInterfaceInLocalType, arguments,
+        arguments, typeDecl.sourceStart, typeDecl.sourceEnd);
+  }
+  public void noMoreAvailableSpaceForArgument(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.name)};
+    this.handle(local instanceof SyntheticArgumentBinding
+        ? IProblem.TooManySyntheticArgumentSlots
+        : IProblem.TooManyArgumentSlots, arguments, arguments, Abort | Error,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void noMoreAvailableSpaceForLocal(LocalVariableBinding local,
+      AstNode location) {
+    String[] arguments = new String[]{new String(local.name)};
+    this.handle(IProblem.TooManyLocalVariableSlots, arguments, arguments, Abort
+        | Error, location.sourceStart, location.sourceEnd);
+  }
+  public void noSuchEnclosingInstance(TypeBinding targetType, AstNode location,
+      boolean isConstructorCall) {
+    int id;
+    if (isConstructorCall) {
+      //28 = No enclosing instance of type {0} is available due to some
+      // intermediate constructor invocation
+      id = IProblem.EnclosingInstanceInConstructorCall;
+    } else if ((location instanceof ExplicitConstructorCall)
+        && ((ExplicitConstructorCall) location).accessMode == ExplicitConstructorCall.ImplicitSuper) {
+      //20 = No enclosing instance of type {0} is accessible to invoke
+      // the super constructor. Must define a constructor and explicitly
+      // qualify its super constructor invocation with an instance of {0}
+      // (e.g. x.super() where x is an instance of {0}).
+      id = IProblem.MissingEnclosingInstanceForConstructorCall;
+    } else if (location instanceof AllocationExpression
+        && (((AllocationExpression) location).binding.declaringClass
+            .isMemberType() || (((AllocationExpression) location).binding.declaringClass
+            .isAnonymousType() && ((AllocationExpression) location).binding.declaringClass
+            .superclass().isMemberType()))) {
+      //21 = No enclosing instance of type {0} is accessible. Must
+      // qualify the allocation with an enclosing instance of type {0}
+      // (e.g. x.new A() where x is an instance of {0}).
+      id = IProblem.MissingEnclosingInstance;
+    } else { // default
+      //22 = No enclosing instance of the type {0} is accessible in
+      // scope
+      id = IProblem.IncorrectEnclosingInstanceReference;
+    }
+    this.handle(id, new String[]{new String(targetType.readableName())},
+        new String[]{new String(targetType.shortReadableName())},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void notCompatibleTypesError(EqualExpression expression,
+      TypeBinding leftType, TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.IncompatibleTypesInEqualityOperator, new String[]{
+        leftName, rightName}, new String[]{leftShortName, rightShortName},
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void notCompatibleTypesError(InstanceOfExpression expression,
+      TypeBinding leftType, TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.IncompatibleTypesInConditionalOperator, new String[]{
+        leftName, rightName}, new String[]{leftShortName, rightShortName},
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void objectCannotHaveSuperTypes(SourceTypeBinding type) {
+    this.handle(IProblem.ObjectCannotHaveSuperTypes, NoArgument, NoArgument,
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void operatorOnlyValidOnNumericType(CompoundAssignment assignment,
+      TypeBinding leftType, TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.TypeMismatch, new String[]{leftName, rightName},
+        new String[]{leftShortName, rightShortName}, assignment.sourceStart,
+        assignment.sourceEnd);
+  }
+  public void overridesDeprecatedMethod(MethodBinding localMethod,
+      MethodBinding inheritedMethod) {
+    this.handle(IProblem.OverridingDeprecatedMethod, new String[]{
+        new String(CharOperation.concat(localMethod.declaringClass
+            .readableName(), localMethod.readableName(), '.')),
+        new String(inheritedMethod.declaringClass.readableName())},
+        new String[]{
+            new String(CharOperation.concat(localMethod.declaringClass
+                .shortReadableName(), localMethod.shortReadableName(), '.')),
+            new String(inheritedMethod.declaringClass.shortReadableName())},
+        localMethod.sourceStart(), localMethod.sourceEnd());
+  }
+  public void overridesPackageDefaultMethod(MethodBinding localMethod,
+      MethodBinding inheritedMethod) {
+    this.handle(IProblem.OverridingNonVisibleMethod, new String[]{
+        new String(CharOperation.concat(localMethod.declaringClass
+            .readableName(), localMethod.readableName(), '.')),
+        new String(inheritedMethod.declaringClass.readableName())},
+        new String[]{
+            new String(CharOperation.concat(localMethod.declaringClass
+                .shortReadableName(), localMethod.shortReadableName(), '.')),
+            new String(inheritedMethod.declaringClass.shortReadableName())},
+        localMethod.sourceStart(), localMethod.sourceEnd());
+  }
+  public void packageCollidesWithType(CompilationUnitDeclaration compUnitDecl) {
+    String[] arguments = new String[]{CharOperation
+        .toString(compUnitDecl.currentPackage.tokens)};
+    this.handle(IProblem.PackageCollidesWithType, arguments, arguments,
+        compUnitDecl.currentPackage.sourceStart,
+        compUnitDecl.currentPackage.sourceEnd);
+  }
+  public void packageIsNotExpectedPackage(
+      CompilationUnitDeclaration compUnitDecl) {
+    String[] arguments = new String[]{CharOperation
+        .toString(compUnitDecl.compilationResult.compilationUnit
+            .getPackageName())};
+    this.handle(IProblem.PackageIsNotExpectedPackage, arguments, arguments,
+        compUnitDecl.currentPackage == null
+            ? 0
+            : compUnitDecl.currentPackage.sourceStart,
+        compUnitDecl.currentPackage == null
+            ? 0
+            : compUnitDecl.currentPackage.sourceEnd);
+  }
+  private String parametersAsString(MethodBinding method) {
+    TypeBinding[] params = method.parameters;
+    StringBuffer buffer = new StringBuffer();
+    for (int i = 0, length = params.length; i < length; i++) {
+      if (i != 0)
+        buffer.append(", "); //$NON-NLS-1$
+      buffer.append(new String(params[i].readableName()));
+    }
+    return buffer.toString();
+  }
+  private String parametersAsShortString(MethodBinding method) {
+    TypeBinding[] params = method.parameters;
+    StringBuffer buffer = new StringBuffer();
+    for (int i = 0, length = params.length; i < length; i++) {
+      if (i != 0)
+        buffer.append(", "); //$NON-NLS-1$
+      buffer.append(new String(params[i].shortReadableName()));
+    }
+    return buffer.toString();
+  }
+  public void parseError(int startPosition, int endPosition,
+      char[] currentTokenSource, String errorTokenName, String[] possibleTokens) {
+    if (possibleTokens.length == 0) { //no suggestion available
+      if (isKeyword(currentTokenSource)) {
+        String[] arguments = new String[]{new String(currentTokenSource)};
+        this.handle(IProblem.ParsingErrorOnKeywordNoSuggestion, arguments,
+            arguments, 
+            // this is the current -invalid- token position
+            startPosition, endPosition);
+        return;
+      } else {
+        String[] arguments = new String[]{errorTokenName};
+        this.handle(IProblem.ParsingErrorNoSuggestion, arguments, arguments, 
+        // this is the current -invalid- token position
+            startPosition, endPosition);
+        return;
+      }
+    }
+    //build a list of probable right tokens
+    StringBuffer list = new StringBuffer(20);
+    for (int i = 0, max = possibleTokens.length; i < max; i++) {
+      if (i > 0)
+        list.append(", "); //$NON-NLS-1$
+      list.append('"');
+      list.append(possibleTokens[i]);
+      list.append('"');
+    }
+    if (isKeyword(currentTokenSource)) {
+      String[] arguments = new String[]{new String(currentTokenSource),
+          list.toString()};
+      this.handle(IProblem.ParsingErrorOnKeyword, arguments, arguments, 
+      // this is the current -invalid- token position
+          startPosition, endPosition);
+      return;
+    }
+    //extract the literal when it's a literal
+    if ((errorTokenName.equals("IntegerLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("LongLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("FloatingPointLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("DoubleLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("StringLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("CharacterLiteral")) || //$NON-NLS-1$
+        (errorTokenName.equals("Identifier"))) { //$NON-NLS-1$
+      errorTokenName = new String(currentTokenSource);
+    }
+    String[] arguments = new String[]{errorTokenName, list.toString()};
+    this.handle(IProblem.ParsingError, arguments, arguments, 
+    // this is the current -invalid- token position
+        startPosition, endPosition);
+  }
+  public void publicClassMustMatchFileName(
+      CompilationUnitDeclaration compUnitDecl, TypeDeclaration typeDecl) {
+    this.referenceContext = typeDecl; // report the problem against the
+    // type not the entire compilation
+    // unit
+    String[] arguments = new String[]{new String(compUnitDecl.getFileName()),
+        new String(typeDecl.name)};
+    this.handle(IProblem.PublicClassMustMatchFileName, arguments, arguments,
+        typeDecl.sourceStart, typeDecl.sourceEnd,
+        compUnitDecl.compilationResult);
+  }
+  public void recursiveConstructorInvocation(
+      ExplicitConstructorCall constructorCall) {
+    this.handle(IProblem.RecursiveConstructorInvocation, new String[]{
+        new String(constructorCall.binding.declaringClass.readableName()),
+        parametersAsString(constructorCall.binding)}, new String[]{
+        new String(constructorCall.binding.declaringClass.shortReadableName()),
+        parametersAsShortString(constructorCall.binding)},
+        constructorCall.sourceStart, constructorCall.sourceEnd);
+  }
+  public void redefineArgument(Argument arg) {
+    String[] arguments = new String[]{new String(arg.name)};
+    this.handle(IProblem.RedefinedArgument, arguments, arguments,
+        arg.sourceStart, arg.sourceEnd);
+  }
+  public void redefineLocal(LocalDeclaration localDecl) {
+    String[] arguments = new String[]{new String(localDecl.name)};
+    this.handle(IProblem.RedefinedLocal, arguments, arguments,
+        localDecl.sourceStart, localDecl.sourceEnd);
+  }
+  public void referenceMustBeArrayTypeAt(TypeBinding arrayType,
+      ArrayReference arrayRef) {
+    this.handle(IProblem.ArrayReferenceRequired, new String[]{new String(
+        arrayType.readableName())}, new String[]{new String(arrayType
+        .shortReadableName())}, arrayRef.sourceStart, arrayRef.sourceEnd);
+  }
+  public void returnTypeCannotBeVoidArray(SourceTypeBinding type,
+      MethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(methodDecl.selector)};
+    this.handle(IProblem.ReturnTypeCannotBeVoidArray, arguments, arguments,
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void returnTypeProblem(SourceTypeBinding type,
+      MethodDeclaration methodDecl, TypeBinding expectedType) {
+    int problemId = expectedType.problemId();
+    int id;
+    switch (problemId) {
+      case NotFound :
+        // 1
+        id = IProblem.ReturnTypeNotFound;
+        break;
+      case NotVisible :
+        // 2
+        id = IProblem.ReturnTypeNotVisible;
+        break;
+      case Ambiguous :
+        // 3
+        id = IProblem.ReturnTypeAmbiguous;
+        break;
+      case InternalNameProvided :
+        // 4
+        id = IProblem.ReturnTypeInternalNameProvided;
+        break;
+      case InheritedNameHidesEnclosingName :
+        // 5
+        id = IProblem.ReturnTypeInheritedNameHidesEnclosingName;
+        break;
+      case NoError :
+      // 0
+      default :
+        needImplementation(); // want to fail to see why we were
+        // here...
+        return;
+    }
+    this.handle(id, new String[]{new String(methodDecl.selector),
+        new String(expectedType.readableName())}, new String[]{
+        new String(methodDecl.selector),
+        new String(expectedType.shortReadableName())},
+        methodDecl.returnType.sourceStart, methodDecl.returnType.sourceEnd);
+  }
+  public void scannerError(Parser parser, String errorTokenName) {
+    Scanner scanner = parser.scanner;
+    int flag = IProblem.ParsingErrorNoSuggestion;
+    int startPos = scanner.startPosition;
+    //special treatment for recognized errors....
+    if (errorTokenName.equals(Scanner.END_OF_SOURCE))
+      flag = IProblem.EndOfSource;
+    else if (errorTokenName.equals(Scanner.INVALID_HEXA))
+      flag = IProblem.InvalidHexa;
+    else if (errorTokenName.equals(Scanner.INVALID_OCTAL))
+      flag = IProblem.InvalidOctal;
+    else if (errorTokenName.equals(Scanner.INVALID_CHARACTER_CONSTANT))
+      flag = IProblem.InvalidCharacterConstant;
+    else if (errorTokenName.equals(Scanner.INVALID_ESCAPE))
+      flag = IProblem.InvalidEscape;
+    else if (errorTokenName.equals(Scanner.INVALID_UNICODE_ESCAPE)) {
+      flag = IProblem.InvalidUnicodeEscape;
+      // better locate the error message
+      char[] source = scanner.source;
+      int checkPos = scanner.currentPosition - 1;
+      if (checkPos >= source.length)
+        checkPos = source.length - 1;
+      while (checkPos >= startPos) {
+        if (source[checkPos] == '\\')
+          break;
+        checkPos--;
+      }
+      startPos = checkPos;
+    } else if (errorTokenName.equals(Scanner.INVALID_FLOAT))
+      flag = IProblem.InvalidFloat;
+    else if (errorTokenName.equals(Scanner.UNTERMINATED_STRING))
+      flag = IProblem.UnterminatedString;
+    else if (errorTokenName.equals(Scanner.UNTERMINATED_COMMENT))
+      flag = IProblem.UnterminatedComment;
+    else if (errorTokenName.equals(Scanner.INVALID_CHAR_IN_STRING))
+      flag = IProblem.UnterminatedString;
+    String[] arguments = flag == IProblem.ParsingErrorNoSuggestion
+        ? new String[]{errorTokenName}
+        : NoArgument;
+    this.handle(flag, arguments, arguments, 
+    // this is the current -invalid- token position
+        startPos, scanner.currentPosition - 1,
+        parser.compilationUnit.compilationResult);
+  }
+  public void shouldReturn(TypeBinding returnType, AstNode location) {
+    this.handle(IProblem.ShouldReturnValue, new String[]{new String(returnType
+        .readableName())}, new String[]{new String(returnType
+        .shortReadableName())}, location.sourceStart, location.sourceEnd);
+  }
+  public void signalNoImplicitStringConversionForCharArrayExpression(
+      Expression expression) {
+    this.handle(IProblem.NoImplicitStringConversionForCharArrayExpression,
+        NoArgument, NoArgument, expression.sourceStart, expression.sourceEnd);
+  }
+  public void staticAndInstanceConflict(MethodBinding currentMethod,
+      MethodBinding inheritedMethod) {
+    if (currentMethod.isStatic())
+      this
+          .handle(
+          // This static method cannot hide the instance method from %1
+              // 8.4.6.4 - If a class inherits more than one method with
+              // the same signature a static (non-abstract) method cannot
+              // hide an instance method.
+              IProblem.CannotHideAnInstanceMethodWithAStaticMethod,
+              new String[]{new String(inheritedMethod.declaringClass
+                  .readableName())}, new String[]{new String(
+                  inheritedMethod.declaringClass.shortReadableName())},
+              currentMethod.sourceStart(), currentMethod.sourceEnd());
+    else
+      this
+          .handle(
+          // This instance method cannot override the static method from %1
+              // 8.4.6.4 - If a class inherits more than one method with
+              // the same signature an instance (non-abstract) method
+              // cannot override a static method.
+              IProblem.CannotOverrideAStaticMethodWithAnInstanceMethod,
+              new String[]{new String(inheritedMethod.declaringClass
+                  .readableName())}, new String[]{new String(
+                  inheritedMethod.declaringClass.shortReadableName())},
+              currentMethod.sourceStart(), currentMethod.sourceEnd());
+  }
+  public void staticFieldAccessToNonStaticVariable(FieldReference fieldRef,
+      FieldBinding field) {
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
+        arguments, fieldRef.sourceStart, fieldRef.sourceEnd);
+  }
+  public void staticFieldAccessToNonStaticVariable(
+      QualifiedNameReference nameRef, FieldBinding field) {
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
+        arguments, nameRef.sourceStart, nameRef.sourceEnd);
+  }
+  public void staticFieldAccessToNonStaticVariable(SingleNameReference nameRef,
+      FieldBinding field) {
+    String[] arguments = new String[]{new String(field.readableName())};
+    this.handle(IProblem.NonStaticFieldFromStaticInvocation, arguments,
+        arguments, nameRef.sourceStart, nameRef.sourceEnd);
+  }
+  public void staticInheritedMethodConflicts(SourceTypeBinding type,
+      MethodBinding concreteMethod, MethodBinding[] abstractMethods) {
+    this.handle(
+    // The static method %1 conflicts with the abstract method in %2
+        // 8.4.6.4 - If a class inherits more than one method with the
+        // same signature it is an error for one to be static
+        // (non-abstract) and the other abstract.
+        IProblem.StaticInheritedMethodConflicts, new String[]{
+            new String(concreteMethod.readableName()),
+            new String(abstractMethods[0].declaringClass.readableName())},
+        new String[]{new String(concreteMethod.readableName()),
+            new String(abstractMethods[0].declaringClass.shortReadableName())},
+        type.sourceStart(), type.sourceEnd());
+  }
+  public void stringConstantIsExceedingUtf8Limit(AstNode location) {
+    this.handle(IProblem.StringConstantIsExceedingUtf8Limit, NoArgument,
+        NoArgument, location.sourceStart, location.sourceEnd);
+  }
+  public void superclassMustBeAClass(SourceTypeBinding type,
+      TypeReference superclassRef, ReferenceBinding superType) {
+    this.handle(IProblem.SuperclassMustBeAClass, new String[]{
+        new String(superType.readableName()), new String(type.sourceName())},
+        new String[]{new String(superType.shortReadableName()),
+            new String(type.sourceName())}, superclassRef.sourceStart,
+        superclassRef.sourceEnd);
+  }
+  public void superinterfaceMustBeAnInterface(SourceTypeBinding type,
+      TypeDeclaration typeDecl, ReferenceBinding superType) {
+    this.handle(IProblem.SuperInterfaceMustBeAnInterface, new String[]{
+        new String(superType.readableName()), new String(type.sourceName())},
+        new String[]{new String(superType.shortReadableName()),
+            new String(type.sourceName())}, typeDecl.sourceStart,
+        typeDecl.sourceEnd);
+  }
+  public void task(String tag, String message, String priority, int start,
+      int end) {
+    this.handle(IProblem.Task, new String[]{tag, message, priority/*
+                                                                   * secret
+                                                                   * argument
+                                                                   * that is
+                                                                   * not
+                                                                   * surfaced
+                                                                   * in
+                                                                   * getMessage()
+                                                                   */}, new String[]{tag, message, priority/*
+                                              * secret argument that is not
+                                              * surfaced in getMessage()
+                                              */}, start, end);
+  }
+  public void tooManyDimensions(AstNode expression) {
+    this.handle(IProblem.TooManyArrayDimensions, NoArgument, NoArgument,
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void tooManyFields(TypeDeclaration typeDeclaration) {
+    this.handle(IProblem.TooManyFields, new String[]{new String(
+        typeDeclaration.binding.readableName())}, new String[]{new String(
+        typeDeclaration.binding.shortReadableName())}, Abort | Error,
+        typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
+  }
+  public void tooManyMethods(TypeDeclaration typeDeclaration) {
+    this.handle(IProblem.TooManyMethods, new String[]{new String(
+        typeDeclaration.binding.readableName())}, new String[]{new String(
+        typeDeclaration.binding.shortReadableName())}, Abort | Error,
+        typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
+  }
+  public void typeCastError(CastExpression expression, TypeBinding leftType,
+      TypeBinding rightType) {
+    String leftName = new String(leftType.readableName());
+    String rightName = new String(rightType.readableName());
+    String leftShortName = new String(leftType.shortReadableName());
+    String rightShortName = new String(rightType.shortReadableName());
+    if (leftShortName.equals(rightShortName)) {
+      leftShortName = leftName;
+      rightShortName = rightName;
+    }
+    this.handle(IProblem.IllegalCast, new String[]{rightName, leftName},
+        new String[]{rightShortName, leftShortName}, expression.sourceStart,
+        expression.sourceEnd);
+  }
+  public void typeCollidesWithPackage(CompilationUnitDeclaration compUnitDecl,
+      TypeDeclaration typeDecl) {
+    this.referenceContext = typeDecl; // report the problem against the
+    // type not the entire compilation
+    // unit
+    String[] arguments = new String[]{new String(compUnitDecl.getFileName()),
+        new String(typeDecl.name)};
+    this.handle(IProblem.TypeCollidesWithPackage, arguments, arguments,
+        typeDecl.sourceStart, typeDecl.sourceEnd,
+        compUnitDecl.compilationResult);
+  }
+  public void typeMismatchError(TypeBinding resultType,
+      TypeBinding expectedType, AstNode location) {
+    String resultTypeName = new String(resultType.readableName());
+    String expectedTypeName = new String(expectedType.readableName());
+    String resultTypeShortName = new String(resultType.shortReadableName());
+    String expectedTypeShortName = new String(expectedType.shortReadableName());
+    if (resultTypeShortName.equals(expectedTypeShortName)) {
+      resultTypeShortName = resultTypeName;
+      expectedTypeShortName = expectedTypeName;
+    }
+    this.handle(IProblem.TypeMismatch, new String[]{resultTypeName,
+        expectedTypeName}, new String[]{resultTypeShortName,
+        expectedTypeShortName}, location.sourceStart, location.sourceEnd);
+  }
+  public void typeMismatchErrorActualTypeExpectedType(Expression expression,
+      TypeBinding constantType, TypeBinding expectedType) {
+    String constantTypeName = new String(constantType.readableName());
+    String expectedTypeName = new String(expectedType.readableName());
+    String constantTypeShortName = new String(constantType.shortReadableName());
+    String expectedTypeShortName = new String(expectedType.shortReadableName());
+    if (constantTypeShortName.equals(expectedTypeShortName)) {
+      constantTypeShortName = constantTypeName;
+      expectedTypeShortName = expectedTypeName;
+    }
+    this.handle(IProblem.TypeMismatch, new String[]{constantTypeName,
+        expectedTypeName}, new String[]{constantTypeShortName,
+        expectedTypeShortName}, expression.sourceStart, expression.sourceEnd);
+  }
+  public void undefinedLabel(BranchStatement statement) {
+    String[] arguments = new String[]{new String(statement.label)};
+    this.handle(IProblem.UndefinedLabel, arguments, arguments,
+        statement.sourceStart, statement.sourceEnd);
+  }
+  public void unexpectedStaticModifierForField(SourceTypeBinding type,
+      FieldDeclaration fieldDecl) {
+    String[] arguments = new String[]{fieldDecl.name()};
+    this.handle(IProblem.UnexpectedStaticModifierForField, arguments,
+        arguments, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void unexpectedStaticModifierForMethod(ReferenceBinding type,
+      AbstractMethodDeclaration methodDecl) {
+    String[] arguments = new String[]{new String(type.sourceName()),
+        new String(methodDecl.selector)};
+    this.handle(IProblem.UnexpectedStaticModifierForMethod, arguments,
+        arguments, methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void unhandledException(TypeBinding exceptionType, AstNode location) {
+    boolean insideDefaultConstructor = (referenceContext instanceof ConstructorDeclaration)
+        && ((ConstructorDeclaration) referenceContext).isDefaultConstructor();
+    boolean insideImplicitConstructorCall = (location instanceof ExplicitConstructorCall)
+        && (((ExplicitConstructorCall) location).accessMode == ExplicitConstructorCall.ImplicitSuper);
+    this.handle(insideDefaultConstructor
+        ? IProblem.UnhandledExceptionInDefaultConstructor
+        : (insideImplicitConstructorCall
+            ? IProblem.UndefinedConstructorInImplicitConstructorCall
+            : IProblem.UnhandledException), new String[]{new String(
+        exceptionType.readableName())}, new String[]{new String(exceptionType
+        .shortReadableName())}, location.sourceStart, location.sourceEnd);
+  }
+  public void uninitializedBlankFinalField(FieldBinding binding,
+      AstNode location) {
+    String[] arguments = new String[]{new String(binding.readableName())};
+    this.handle(IProblem.UninitializedBlankFinalField, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void uninitializedLocalVariable(LocalVariableBinding binding,
+      AstNode location) {
+    String[] arguments = new String[]{new String(binding.readableName())};
+    this.handle(IProblem.UninitializedLocalVariable, arguments, arguments,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void unmatchedBracket(int position, ReferenceContext context,
+      CompilationResult compilationResult) {
+    this.handle(IProblem.UnmatchedBracket, NoArgument, NoArgument, position,
+        position, context, compilationResult);
+  }
+  public void unnecessaryEnclosingInstanceSpecification(Expression expression,
+      ReferenceBinding targetType) {
+    this.handle(IProblem.IllegalEnclosingInstanceSpecification,
+        new String[]{new String(targetType.readableName())},
+        new String[]{new String(targetType.shortReadableName())},
+        expression.sourceStart, expression.sourceEnd);
+  }
+  public void unnecessaryReceiverForStaticMethod(AstNode location,
+      MethodBinding method) {
+    this.handle(IProblem.NonStaticAccessToStaticMethod, new String[]{
+        new String(method.declaringClass.readableName()),
+        new String(method.selector), parametersAsString(method)}, new String[]{
+        new String(method.declaringClass.shortReadableName()),
+        new String(method.selector), parametersAsShortString(method)},
+        location.sourceStart, location.sourceEnd);
+  }
+  public void unnecessaryReceiverForStaticField(AstNode location,
+      FieldBinding field) {
+    this.handle(IProblem.NonStaticAccessToStaticField,
+        new String[]{new String(field.declaringClass.readableName()),
+            new String(field.name)}, new String[]{
+            new String(field.declaringClass.shortReadableName()),
+            new String(field.name)}, location.sourceStart, location.sourceEnd);
+  }
+  public void unreachableCode(Statement statement) {
+    this.handle(IProblem.CodeCannotBeReached, NoArgument, NoArgument,
+        statement.sourceStart, statement.sourceEnd);
+  }
+  public void unreachableExceptionHandler(ReferenceBinding exceptionType,
+      AstNode location) {
+    this.handle(IProblem.UnreachableCatch, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void unresolvableReference(NameReference nameRef, Binding binding) {
+    int severity = Error;
+    /*
+     * also need to check that the searchedType is the receiver type if
+     * (binding instanceof ProblemBinding) { ProblemBinding problem =
+     * (ProblemBinding) binding; if (problem.searchType != null &&
+     * problem.searchType.isHierarchyInconsistent()) severity = SecondaryError; }
+     */
+    String[] arguments = new String[]{new String(binding.readableName())};
+    this.handle(IProblem.UndefinedName, arguments, arguments, severity,
+        nameRef.sourceStart, nameRef.sourceEnd);
+  }
+  public void unusedArgument(LocalDeclaration localDecl) {
+    String[] arguments = new String[]{localDecl.name()};
+    this.handle(IProblem.ArgumentIsNeverUsed, arguments, arguments,
+        localDecl.sourceStart, localDecl.sourceEnd);
+  }
+  public void unusedImport(ImportReference importRef) {
+    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+    this.handle(IProblem.UnusedImport, arguments, arguments,
+        importRef.sourceStart, importRef.sourceEnd);
+  }
+  public void unusedLocalVariable(LocalDeclaration localDecl) {
+    String[] arguments = new String[]{localDecl.name()};
+    this.handle(IProblem.LocalVariableIsNeverUsed, arguments, arguments,
+        localDecl.sourceStart, localDecl.sourceEnd);
+  }
+  public void unusedPrivateConstructor(ConstructorDeclaration constructorDecl) {
+    if (computeSeverity(IProblem.UnusedPrivateConstructor) == Ignore)
+      return;
+    // no complaint for no-arg constructors (or default ones) - known
+    // pattern to block instantiation
+    if (constructorDecl.arguments == null
+        || constructorDecl.arguments.length == 0)
+      return;
+    MethodBinding constructor = constructorDecl.binding;
+    this.handle(IProblem.UnusedPrivateConstructor, new String[]{
+        new String(constructor.declaringClass.readableName()),
+        parametersAsString(constructor)}, new String[]{
+        new String(constructor.declaringClass.shortReadableName()),
+        parametersAsShortString(constructor)}, constructorDecl.sourceStart,
+        constructorDecl.sourceEnd);
+  }
+  public void unusedPrivateField(FieldDeclaration fieldDecl) {
+    if (computeSeverity(IProblem.UnusedPrivateField) == Ignore)
+      return;
+    FieldBinding field = fieldDecl.binding;
+    if (CharOperation.equals(TypeConstants.SERIALVERSIONUID, field.name)
+        && field.isStatic() && field.isFinal()
+        && TypeBinding.LongBinding == field.type) {
+      return; // do not report unused serialVersionUID field
+    }
+    this.handle(IProblem.UnusedPrivateField, new String[]{
+        new String(field.declaringClass.readableName()),
+        new String(field.name),}, new String[]{
+        new String(field.declaringClass.shortReadableName()),
+        new String(field.name),}, fieldDecl.sourceStart, fieldDecl.sourceEnd);
+  }
+  public void unusedPrivateMethod(AbstractMethodDeclaration methodDecl) {
+    if (computeSeverity(IProblem.UnusedPrivateMethod) == Ignore)
+      return;
+    MethodBinding method = methodDecl.binding;
+    // no report for serialization support 'void
+    // readObject(ObjectInputStream)'
+    if (!method.isStatic()
+        && TypeBinding.VoidBinding == method.returnType
+        && method.parameters.length == 1
+        && method.parameters[0].dimensions() == 0
+        && CharOperation.equals(method.selector, TypeConstants.READOBJECT)
+        && CharOperation.equals(
+            TypeConstants.CharArray_JAVA_IO_OBJECTINPUTSTREAM,
+            method.parameters[0].readableName())) {
+      return;
+    }
+    // no report for serialization support 'void
+    // writeObject(ObjectOutputStream)'
+    if (!method.isStatic()
+        && TypeBinding.VoidBinding == method.returnType
+        && method.parameters.length == 1
+        && method.parameters[0].dimensions() == 0
+        && CharOperation.equals(method.selector, TypeConstants.WRITEOBJECT)
+        && CharOperation.equals(
+            TypeConstants.CharArray_JAVA_IO_OBJECTOUTPUTSTREAM,
+            method.parameters[0].readableName())) {
+      return;
+    }
+    // no report for serialization support 'Object readResolve()'
+    if (!method.isStatic() && TypeBinding.T_Object == method.returnType.id
+        && method.parameters.length == 0
+        && CharOperation.equals(method.selector, TypeConstants.READRESOLVE)) {
+      return;
+    }
+    // no report for serialization support 'Object writeReplace()'
+    if (!method.isStatic() && TypeBinding.T_Object == method.returnType.id
+        && method.parameters.length == 0
+        && CharOperation.equals(method.selector, TypeConstants.WRITEREPLACE)) {
+      return;
+    }
+    this.handle(IProblem.UnusedPrivateMethod, new String[]{
+        new String(method.declaringClass.readableName()),
+        new String(method.selector), parametersAsString(method)}, new String[]{
+        new String(method.declaringClass.shortReadableName()),
+        new String(method.selector), parametersAsShortString(method)},
+        methodDecl.sourceStart, methodDecl.sourceEnd);
+  }
+  public void unusedPrivateType(TypeDeclaration typeDecl) {
+    if (computeSeverity(IProblem.UnusedPrivateType) == Ignore)
+      return;
+    ReferenceBinding type = typeDecl.binding;
+    this.handle(IProblem.UnusedPrivateType, new String[]{new String(type
+        .readableName()),},
+        new String[]{new String(type.shortReadableName()),},
+        typeDecl.sourceStart, typeDecl.sourceEnd);
+  }
+  public void useAssertAsAnIdentifier(int sourceStart, int sourceEnd) {
+    this.handle(IProblem.UseAssertAsAnIdentifier, NoArgument, NoArgument,
+        sourceStart, sourceEnd);
+  }
+  public void variableTypeCannotBeVoid(AbstractVariableDeclaration varDecl) {
+    String[] arguments = new String[]{new String(varDecl.name)};
+    this.handle(IProblem.VariableTypeCannotBeVoid, arguments, arguments,
+        varDecl.sourceStart, varDecl.sourceEnd);
+  }
+  public void variableTypeCannotBeVoidArray(AbstractVariableDeclaration varDecl) {
+    String[] arguments = new String[]{new String(varDecl.name)};
+    this.handle(IProblem.VariableTypeCannotBeVoidArray, arguments, arguments,
+        varDecl.sourceStart, varDecl.sourceEnd);
+  }
+  public void visibilityConflict(MethodBinding currentMethod,
+      MethodBinding inheritedMethod) {
+    this.handle(
+    //	Cannot reduce the visibility of the inherited method from %1
+        // 8.4.6.3 - The access modifier of an hiding method must
+        // provide at least as much access as the hidden method.
+        // 8.4.6.3 - The access modifier of an overiding method must
+        // provide at least as much access as the overriden method.
+        IProblem.MethodReducesVisibility, new String[]{new String(
+            inheritedMethod.declaringClass.readableName())},
+        new String[]{new String(inheritedMethod.declaringClass
+            .shortReadableName())}, currentMethod.sourceStart(), currentMethod
+            .sourceEnd());
+  }
+  public void wrongSequenceOfExceptionTypesError(TryStatement statement,
+      int under, int upper) {
+    //the two catch block under and upper are in an incorrect order.
+    //under should be define BEFORE upper in the source
+    TypeReference typeRef = statement.catchArguments[under].type;
+    this.handle(IProblem.UnreachableCatch, NoArgument, NoArgument,
+        typeRef.sourceStart, typeRef.sourceEnd);
+  }
+  public void nonExternalizedStringLiteral(AstNode location) {
+    this.handle(IProblem.NonExternalizedStringLiteral, NoArgument, NoArgument,
+        location.sourceStart, location.sourceEnd);
+  }
+  public void noMoreAvailableSpaceForConstant(TypeDeclaration typeDeclaration) {
+    this.handle(IProblem.TooManyBytesForStringConstant,
+        new String[]{new String(typeDeclaration.binding.readableName())},
+        new String[]{new String(typeDeclaration.binding.shortReadableName())},
+        Abort | Error, typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
+  }
+  public void noMoreAvailableSpaceInConstantPool(TypeDeclaration typeDeclaration) {
+    this.handle(IProblem.TooManyConstantsInConstantPool,
+        new String[]{new String(typeDeclaration.binding.readableName())},
+        new String[]{new String(typeDeclaration.binding.shortReadableName())},
+        Abort | Error, typeDeclaration.sourceStart, typeDeclaration.sourceEnd);
+  }
+  private boolean isKeyword(char[] tokenSource) {
+    /*
+     * This code is heavily grammar dependant
+     */
+    if (tokenSource == null) {
+      return false;
+    }
+    try {
+      Scanner scanner = new Scanner();
+      scanner.setSource(tokenSource);
+      int token = scanner.getNextToken();
+      char[] currentKeyword;
+      try {
+        currentKeyword = scanner.getCurrentIdentifierSource();
+      } catch (ArrayIndexOutOfBoundsException e) {
+        return false;
+      }
+      int nextToken = scanner.getNextToken();
+      if (nextToken == Scanner.TokenNameEOF
+          && scanner.startPosition == scanner.source.length) { // to
+        // handle
+        // case
+        // where
+        // we
+        // had
+        // an
+        // ArrayIndexOutOfBoundsException
+        // while reading the last token
+        switch (token) {
+          case Scanner.TokenNameERROR :
+            if (CharOperation.equals("goto".toCharArray(), currentKeyword)
+                || CharOperation.equals("const".toCharArray(), currentKeyword)) { //$NON-NLS-1$ //$NON-NLS-2$
+              return true;
+            } else {
+              return false;
+            }
+          case Scanner.TokenNameabstract :
+          //				case Scanner.TokenNameassert:
+          //				case Scanner.TokenNamebyte:
+          case Scanner.TokenNamebreak :
+          //				case Scanner.TokenNameboolean:
+          case Scanner.TokenNamecase :
+          //				case Scanner.TokenNamechar:
+          case Scanner.TokenNamecatch :
+          case Scanner.TokenNameclass :
+          case Scanner.TokenNamecontinue :
+          case Scanner.TokenNamedo :
+          //				case Scanner.TokenNamedouble:
+          case Scanner.TokenNamedefault :
+          case Scanner.TokenNameelse :
+          case Scanner.TokenNameextends :
+          case Scanner.TokenNamefor :
+          //				case Scanner.TokenNamefinal:
+          //				case Scanner.TokenNamefloat:
+          //					case Scanner.TokenNamefalse :
+          case Scanner.TokenNamefinally :
+          case Scanner.TokenNameif :
+          //				case Scanner.TokenNameint:
+          //				case Scanner.TokenNameimport:
+          case Scanner.TokenNameinterface :
+          case Scanner.TokenNameimplements :
+          case Scanner.TokenNameinstanceof :
+          //				case Scanner.TokenNamelong:
+          case Scanner.TokenNamenew :
+          //					case Scanner.TokenNamenull :
+          //				case Scanner.TokenNamenative:
+          case Scanner.TokenNamepublic :
+          //				case Scanner.TokenNamepackage:
+          case Scanner.TokenNameprivate :
+          case Scanner.TokenNameprotected :
+          case Scanner.TokenNamereturn :
+          //				case Scanner.TokenNameshort:
+          case Scanner.TokenNamesuper :
+          case Scanner.TokenNamestatic :
+          case Scanner.TokenNameswitch :
+          //				case Scanner.TokenNamestrictfp:
+          //				case Scanner.TokenNamesynchronized:
+          case Scanner.TokenNametry :
+          case Scanner.TokenNamethis :
+          //					case Scanner.TokenNametrue :
+          case Scanner.TokenNamethrow :
+          //				case Scanner.TokenNamethrows:
+          //				case Scanner.TokenNametransient:
+          //				case Scanner.TokenNamevoid:
+          //				case Scanner.TokenNamevolatile:
+          case Scanner.TokenNamewhile :
+            return true;
+          default :
+            return false;
+        }
+      } else {
+        return false;
+      }
+    } catch (InvalidInputException e) {
+      return false;
+    }
+  }
+  // jsurfer start
+  public void phpParsingError(String[] messageArguments,
+      int problemStartPosition, int problemEndPosition,
+      ReferenceContext context, CompilationResult compilationResult) {
+    this.handle(IProblem.PHPParsingError, NoArgument, messageArguments,
+        problemStartPosition, problemEndPosition, context, compilationResult);
+  }
+  public void phpParsingWarning(String[] messageArguments,
+      int problemStartPosition, int problemEndPosition,
+      ReferenceContext context, CompilationResult compilationResult) {
+    this.handle(IProblem.PHPParsingWarning, NoArgument, messageArguments,
+        problemStartPosition, problemEndPosition, context, compilationResult);
+  }
+  public void phpVarDeprecatedWarning(
+      int problemStartPosition, int problemEndPosition,
+      ReferenceContext context, CompilationResult compilationResult) {
+    this.handle(IProblem.PHPVarDeprecatedWarning, NoArgument, new String[]{},
+        problemStartPosition, problemEndPosition, context, compilationResult);
+  }
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/messages.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/messages.properties
index b4ea5fa..33b1294 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/messages.properties
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/messages.properties
@@ -152,7 +152,10 @@
 208 = Array constants can only be used in initializers
 209 = Syntax error on keyword "{0}"; {1} expected
 210 = Syntax error on keyword "{0}", no accurate correction available
-211 = Parse error "{0}"
+
+211 = Parser error "{0}"
+212 = Parser warning "{0}"
+213 = Keyword 'var' is deprecated. Please use 'public' 'private' or 'protected' modifier for field declarations.
 
 220 = Unmatched bracket
 221 = The primitive type {0} of {1} does not have a field {2}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
index 30ed629..ecfed39 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -1315,7 +1315,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       case TokenNameCOLON : // : (15.24)
         return ":"; //$NON-NLS-1$
 
-      case TokenNameCOLON_COLON : // : (15.24)
+      case TokenNamePAAMAYIM_NEKUDOTAYIM : // : (15.24)
         return "::"; //$NON-NLS-1$
 
       case TokenNameEQUAL_EQUAL : // == (15.20, 15.20.1, 15.20.2, 15.20.3)
-- 
1.7.1


From fcadbe263fb8b5b695872a15fc5b3cd95c652a2c Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Mon, 8 Mar 2004 22:30:30 +0000
Subject: [PATCH 04/16] misc parser changes

---
 .../core/tests/util/AbstractCompilerTest.java      |  226 ++-
 .../php/test/DualParseSyntaxErrorTest.java         |  117 +-
 .../phpeclipse/tests/parser/PHPManualTestCase.java |   48 +-
 .../phpeclipse/tests/parser/PHPParserTestCase.java |   58 +-
 .../phpdt/core/compiler/ITerminalSymbols.java      |   26 +-
 .../phpdt/internal/compiler/parser/Parser.java     | 1609 +++++++++++--------
 .../phpdt/internal/compiler/parser/Scanner.java    |  366 ++++--
 .../internal/compiler/problem/ProblemReporter.java |    2 +-
 .../phpdt/internal/formatter/CodeFormatter.java    | 1717 ++++++++++----------
 .../ui/text/template/DeclarationEngine.java        |    2 +-
 .../phpeclipse/builder/IdentifierIndexManager.java |    3 +-
 .../obfuscator/ObfuscatorPass1Exporter.java        |    2 +-
 .../phpeditor/php/PHPCompletionProcessor.java      |    6 +-
 13 files changed, 2423 insertions(+), 1759 deletions(-)

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
index 5ea14a5..031d81e 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
@@ -10,84 +10,212 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.core.tests.util;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Locale;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.CompilationResult;
+import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
+import net.sourceforge.phpdt.internal.compiler.batch.CompilationUnit;
+import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
+import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
+import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblem;
+import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
+import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
+import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 //import net.sourceforge.phpdt.core.tests.junit.extension.TestCase;
 //import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 
 public class AbstractCompilerTest extends TestCase {
 
-	public static final String COMPLIANCE_1_3 = "1.3";
-	public static final String COMPLIANCE_1_4 = "1.4";
-	public static final String COMPLIANCE_1_5 = "1.5";
-
-	public static final int F_1_3 = 0x1;
-	public static final int F_1_4 = 0x2;
-	public static final int F_1_5 = 0x4;
+//	public static final String COMPLIANCE_1_3 = "1.3";
+//	public static final String COMPLIANCE_1_4 = "1.4";
+//	public static final String COMPLIANCE_1_5 = "1.5";
+//
+//	public static final int F_1_3 = 0x1;
+//	public static final int F_1_4 = 0x2;
+//	public static final int F_1_5 = 0x4;
 
 	private static int possibleComplianceLevels = -1;
 
 	protected String complianceLevel;
+	public void checkParsePHP(
+		char[] source, 
+		String expectedSyntaxErrorDiagnosis) {
+//		String testName) {
 
-	/*
-	 * Returns the possible compliance levels this VM instance can run.
-	 */
-	public static int getPossibleComplianceLevels() {
-		if (possibleComplianceLevels == -1) {
-			String compliance = System.getProperty("compliance");
-			if (compliance != null) {
-				if (COMPLIANCE_1_3.equals(compliance)) {
-					possibleComplianceLevels = F_1_3;
-				} else if (COMPLIANCE_1_4.equals(compliance)) {
-					possibleComplianceLevels = F_1_4;
-				} else if (COMPLIANCE_1_5.equals(compliance)) {
-					possibleComplianceLevels = F_1_5;
-				} else {
-					System.out.println("Invalid compliance specified (" + compliance + ")");
-					System.out.println("Use one of " + COMPLIANCE_1_3 + ", " + COMPLIANCE_1_4 + ", " + COMPLIANCE_1_5);
-					System.out.println("Defaulting to all possible compliances");
+		UnitParser parser = 
+			new UnitParser(
+				new ProblemReporter(
+					DefaultErrorHandlingPolicies.proceedWithAllProblems(), 
+					//new CompilerOptions(getCompilerOptions()), 
+					new DefaultProblemFactory(Locale.getDefault())));
+
+		ICompilationUnit sourceUnit = new CompilationUnit(source, "", null);
+		CompilationResult compilationResult = new CompilationResult(sourceUnit, 0, 0, 0);	
+		
+		CompilationUnitDeclaration computedUnit = parser.dietParse(sourceUnit, compilationResult, true);
+//		if (computedUnit.types != null) {
+//			for (int i = computedUnit.types.size(); --i >= 0;){
+//				((TypeDeclaration)computedUnit.types.get(i)).parseMethod(parser, computedUnit);
+//			}
+//		}
+
+		StringBuffer buffer = new StringBuffer(100);
+		if (compilationResult.hasProblems() || compilationResult.hasTasks()) {
+			IProblem[] problems = compilationResult.getAllProblems();
+			int count = problems.length;
+			int problemCount = 0;
+			char[] unitSource = compilationResult.compilationUnit.getContents();
+			for (int i = 0; i < count; i++) { 
+				if (problems[i] != null) {
+					if (problemCount == 0)
+						buffer.append("----------\n");
+					problemCount++;
+					buffer.append(problemCount + (problems[i].isError() ? ". ERROR" : ". WARNING"));
+					buffer.append(" in " + new String(problems[i].getOriginatingFileName()).replace('/', '\\'));
+					try {
+						buffer.append(((DefaultProblem)problems[i]).errorReportSource(unitSource));
+						buffer.append("\n");
+						buffer.append(problems[i].getMessage());
+						buffer.append("\n");
+					} catch (Exception e) {
+						StringWriter stringWriter = new StringWriter();
+						e.printStackTrace(new PrintWriter(stringWriter));
+						buffer.append(stringWriter.getBuffer());
+					}
+					buffer.append("----------\n");
 				}
 			}
-			if (possibleComplianceLevels == -1) {
-				possibleComplianceLevels = F_1_3;
-				String specVersion = System.getProperty("java.specification.version");
-				boolean canRun1_4 = !"1.0".equals(specVersion) && !"1.1".equals(specVersion) && !"1.2".equals(specVersion) && !"1.3".equals(specVersion);
-				if (canRun1_4) {
-					possibleComplianceLevels |= F_1_4;
-				}
-				boolean canRun1_5 = canRun1_4 && !"1.4".equals(specVersion);
-				if (canRun1_5) {
-					possibleComplianceLevels |= F_1_5;
+		}
+		String computedSyntaxErrorDiagnosis = buffer.toString();
+		if(!expectedSyntaxErrorDiagnosis.equals(computedSyntaxErrorDiagnosis)) {
+	 		System.out.println(Util.displayString(computedSyntaxErrorDiagnosis));
+		}
+		assertEquals(
+			"Invalid syntax error diagnosis",
+			expectedSyntaxErrorDiagnosis,
+			computedSyntaxErrorDiagnosis);
+	}
+	public void checkParseHTML(
+		char[] source, 
+		String expectedSyntaxErrorDiagnosis) {
+//		String testName) {
+
+		UnitParser parser = 
+			new UnitParser(
+				new ProblemReporter(
+					DefaultErrorHandlingPolicies.proceedWithAllProblems(), 
+					//new CompilerOptions(getCompilerOptions()), 
+					new DefaultProblemFactory(Locale.getDefault())));
+
+		ICompilationUnit sourceUnit = new CompilationUnit(source, "", null);
+		CompilationResult compilationResult = new CompilationResult(sourceUnit, 0, 0, 0);	
+		
+		CompilationUnitDeclaration computedUnit = parser.dietParse(sourceUnit, compilationResult, false);
+//		if (computedUnit.types != null) {
+//			for (int i = computedUnit.types.size(); --i >= 0;){
+//				((TypeDeclaration)computedUnit.types.get(i)).parseMethod(parser, computedUnit);
+//			}
+//		}
+
+		StringBuffer buffer = new StringBuffer(100);
+		if (compilationResult.hasProblems() || compilationResult.hasTasks()) {
+			IProblem[] problems = compilationResult.getAllProblems();
+			int count = problems.length;
+			int problemCount = 0;
+			char[] unitSource = compilationResult.compilationUnit.getContents();
+			for (int i = 0; i < count; i++) { 
+				if (problems[i] != null) {
+					if (problemCount == 0)
+						buffer.append("----------\n");
+					problemCount++;
+					buffer.append(problemCount + (problems[i].isError() ? ". ERROR" : ". WARNING"));
+					buffer.append(" in " + new String(problems[i].getOriginatingFileName()).replace('/', '\\'));
+					try {
+						buffer.append(((DefaultProblem)problems[i]).errorReportSource(unitSource));
+						buffer.append("\n");
+						buffer.append(problems[i].getMessage());
+						buffer.append("\n");
+					} catch (Exception e) {
+						StringWriter stringWriter = new StringWriter();
+						e.printStackTrace(new PrintWriter(stringWriter));
+						buffer.append(stringWriter.getBuffer());
+					}
+					buffer.append("----------\n");
 				}
 			}
 		}
-		return possibleComplianceLevels;
+		String computedSyntaxErrorDiagnosis = buffer.toString();
+		if(!expectedSyntaxErrorDiagnosis.equals(computedSyntaxErrorDiagnosis)) {
+	 		System.out.println(Util.displayString(computedSyntaxErrorDiagnosis));
+		}
+		assertEquals(
+			"Invalid syntax error diagnosis",
+			expectedSyntaxErrorDiagnosis,
+			computedSyntaxErrorDiagnosis);
 	}
+	/*
+	 * Returns the possible compliance levels this VM instance can run.
+	 */
+//	public static int getPossibleComplianceLevels() {
+//		if (possibleComplianceLevels == -1) {
+//			String compliance = System.getProperty("compliance");
+//			if (compliance != null) {
+//				if (COMPLIANCE_1_3.equals(compliance)) {
+//					possibleComplianceLevels = F_1_3;
+//				} else if (COMPLIANCE_1_4.equals(compliance)) {
+//					possibleComplianceLevels = F_1_4;
+//				} else if (COMPLIANCE_1_5.equals(compliance)) {
+//					possibleComplianceLevels = F_1_5;
+//				} else {
+//					System.out.println("Invalid compliance specified (" + compliance + ")");
+//					System.out.println("Use one of " + COMPLIANCE_1_3 + ", " + COMPLIANCE_1_4 + ", " + COMPLIANCE_1_5);
+//					System.out.println("Defaulting to all possible compliances");
+//				}
+//			}
+//			if (possibleComplianceLevels == -1) {
+//				possibleComplianceLevels = F_1_3;
+//				String specVersion = System.getProperty("java.specification.version");
+//				boolean canRun1_4 = !"1.0".equals(specVersion) && !"1.1".equals(specVersion) && !"1.2".equals(specVersion) && !"1.3".equals(specVersion);
+//				if (canRun1_4) {
+//					possibleComplianceLevels |= F_1_4;
+//				}
+//				boolean canRun1_5 = canRun1_4 && !"1.4".equals(specVersion);
+//				if (canRun1_5) {
+//					possibleComplianceLevels |= F_1_5;
+//				}
+//			}
+//		}
+//		return possibleComplianceLevels;
+//	}
 
 	/*
 	 * Returns a test suite including the tests defined by the given classes for all possible complianceLevels
 	 * and using the given setup class (CompilerTestSetup or a subclass)
 	 */
-	public static Test suite(String suiteName, Class setupClass, ArrayList testClasses) {
-		TestSuite all = new TestSuite(suiteName);
-		int complianceLevels = AbstractCompilerTest.getPossibleComplianceLevels();
-		if ((complianceLevels & AbstractCompilerTest.F_1_3) != 0) {
-			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_3, setupClass, testClasses));
-		}
-		if ((complianceLevels & AbstractCompilerTest.F_1_4) != 0) {
-			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_4, setupClass, testClasses));
-		}
-		if ((complianceLevels & AbstractCompilerTest.F_1_5) != 0) {
-			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_5, setupClass, testClasses));
-		}
-		return all;
-	}
+//	public static Test suite(String suiteName, Class setupClass, ArrayList testClasses) {
+//		TestSuite all = new TestSuite(suiteName);
+//		int complianceLevels = AbstractCompilerTest.getPossibleComplianceLevels();
+//		if ((complianceLevels & AbstractCompilerTest.F_1_3) != 0) {
+//			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_3, setupClass, testClasses));
+//		}
+//		if ((complianceLevels & AbstractCompilerTest.F_1_4) != 0) {
+//			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_4, setupClass, testClasses));
+//		}
+//		if ((complianceLevels & AbstractCompilerTest.F_1_5) != 0) {
+//			all.addTest(suiteForComplianceLevel(COMPLIANCE_1_5, setupClass, testClasses));
+//		}
+//		return all;
+//	}
 
 	/*
 	 * Returns a test suite including the tests defined by the given classes for the given complianceLevel 
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
index 09830f3..76d4a10 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
@@ -35,66 +35,10 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 	public DualParseSyntaxErrorTest(String testName){
 		super(testName);
 	}
-	public void checkParse(
-		char[] source, 
-		String expectedSyntaxErrorDiagnosis) {
-//		String testName) {
-
-		UnitParser parser = 
-			new UnitParser(
-				new ProblemReporter(
-					DefaultErrorHandlingPolicies.proceedWithAllProblems(), 
-					//new CompilerOptions(getCompilerOptions()), 
-					new DefaultProblemFactory(Locale.getDefault())));
-
-		ICompilationUnit sourceUnit = new CompilationUnit(source, "", null);
-		CompilationResult compilationResult = new CompilationResult(sourceUnit, 0, 0, 0);	
-		
-		CompilationUnitDeclaration computedUnit = parser.dietParse(sourceUnit, compilationResult, true);
-//		if (computedUnit.types != null) {
-//			for (int i = computedUnit.types.size(); --i >= 0;){
-//				((TypeDeclaration)computedUnit.types.get(i)).parseMethod(parser, computedUnit);
-//			}
-//		}
-
-		StringBuffer buffer = new StringBuffer(100);
-		if (compilationResult.hasProblems() || compilationResult.hasTasks()) {
-			IProblem[] problems = compilationResult.getAllProblems();
-			int count = problems.length;
-			int problemCount = 0;
-			char[] unitSource = compilationResult.compilationUnit.getContents();
-			for (int i = 0; i < count; i++) { 
-				if (problems[i] != null) {
-					if (problemCount == 0)
-						buffer.append("----------\n");
-					problemCount++;
-					buffer.append(problemCount + (problems[i].isError() ? ". ERROR" : ". WARNING"));
-					buffer.append(" in " + new String(problems[i].getOriginatingFileName()).replace('/', '\\'));
-					try {
-						buffer.append(((DefaultProblem)problems[i]).errorReportSource(unitSource));
-						buffer.append("\n");
-						buffer.append(problems[i].getMessage());
-						buffer.append("\n");
-					} catch (Exception e) {
-						StringWriter stringWriter = new StringWriter();
-						e.printStackTrace(new PrintWriter(stringWriter));
-						buffer.append(stringWriter.getBuffer());
-					}
-					buffer.append("----------\n");
-				}
-			}
-		}
-		String computedSyntaxErrorDiagnosis = buffer.toString();
-		if(!expectedSyntaxErrorDiagnosis.equals(computedSyntaxErrorDiagnosis)) {
-	 		System.out.println(Util.displayString(computedSyntaxErrorDiagnosis));
-		}
-		assertEquals(
-			"Invalid syntax error diagnosis",
-			expectedSyntaxErrorDiagnosis,
-			computedSyntaxErrorDiagnosis);
-	}
+	
 	public void test01() {
 		String s = 
+			"$login =1; " +
 			"final class test {\n" + 
 			"\n" + 
 			"private function f1() {\n" + 
@@ -110,7 +54,7 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 			"";
 
 		String testName = "<test01>";
-		checkParse(
+		checkParsePHP(
 			s.toCharArray(),
 			expectedSyntaxErrorDiagnosis);
 //			testName);
@@ -127,12 +71,42 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 			"";
 
 		String testName = "<test02>";
-		checkParse(
+		checkParsePHP(
+			s.toCharArray(),
+			expectedSyntaxErrorDiagnosis);
+//			testName);
+	}
+	public void test03() {
+	  String s = 
+	"$chars = ( isset($HTTP_GET_VARS['chars']) ) ? intval($HTTP_GET_VARS['chars']) : 200;";
+	String expectedSyntaxErrorDiagnosis =
+		"";
+
+	checkParsePHP(
+		s.toCharArray(),
+		expectedSyntaxErrorDiagnosis);
+//		testName);
+}
+	public void test96() {
+		String s = "$str = <<<EOD\n" + "Example of string\n"
+        + "spanning multiple lines\n" + "using heredoc syntax.\n" + "EOD;\n"
+        + "\n" + "/* More complex example, with variables. */\n"
+        + "class foo\n" + "{\n" + "    var $foo;\n" + "    var $bar;\n" + "\n"
+        + "    function foo()\n" + "    {\n" + "        $this->foo = 'Foo';\n"
+        + "        $this->bar = array('Bar1', 'Bar2', 'Bar3');\n" + "    }\n"
+        + "}\n" + "\n" + "$foo = new foo();\n" + "$name = 'MyName';\n" + "\n"
+        + "echo <<<EOT\n"
+        + "My name is \"$name\". I am printing some $foo->foo.\n"
+        + "Now, I am printing some {$foo->bar[1]}.\n"
+        + "This should print a capital 'A': \\x41\n" + "EOT;\n";
+		String expectedSyntaxErrorDiagnosis =
+			"";
+
+		checkParsePHP(
 			s.toCharArray(),
 			expectedSyntaxErrorDiagnosis);
 //			testName);
 	}
-	
 	public void test97() {
 		String s = 
 			"class momo {							    \n"+
@@ -144,19 +118,20 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 		String expectedSyntaxErrorDiagnosis =
 			"";
 
-		checkParse(
+		checkParsePHP(
 			s.toCharArray(),
 			expectedSyntaxErrorDiagnosis);
 //			testName);
 	}
 	public void test98() {
 		String s = 
+		  "return(array());"+
 			"if(!$result = mysql_query($sql)) return(array());\n"; 	
 
 		String expectedSyntaxErrorDiagnosis =
 			"";
 
-		checkParse(
+		checkParsePHP(
 			s.toCharArray(),
 			expectedSyntaxErrorDiagnosis);
 //			testName);
@@ -172,9 +147,19 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
 			"}											\n"; 	
 
 		String expectedSyntaxErrorDiagnosis =
-			"";
-
-		checkParse(
+			"----------\n" + 
+			"1. ERROR in  (at line 1)\n" + 
+			"	murks;                                        \n" + 
+			"	^^^^^\n" + 
+			"Parser error \"\'public\' \'private\' or \'protected\' modifier expected for field declarations.\"\n" + 
+			"----------\n" + 
+			"2. ERROR in  (at line 1)\n" + 
+			"	}											\n" + 
+			"	^\n" + 
+			"Parser error \"Too many closing \'}\'; end-of-file not reached.\"\n" + 
+			"----------\n";
+
+		checkParsePHP(
 			s.toCharArray(),
 			expectedSyntaxErrorDiagnosis);
 //			testName);
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
index 56d3697..fb231ff 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
@@ -5,14 +5,13 @@ package net.sourceforge.phpeclipse.tests.parser;
  * under the terms of the Common Public License v1.0 which accompanies this
  * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
  ******************************************************************************/
-import junit.framework.TestCase;
-import net.sourceforge.phpdt.internal.compiler.parser.Parser;
+import net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 /**
  * Tests the php parser
  */
-public class PHPManualTestCase extends TestCase {
-  Parser parser;
+public class PHPManualTestCase extends AbstractCompilerTest {
+//  Parser parser;
   public PHPManualTestCase(String name) {
     super(name);
   }
@@ -87,8 +86,8 @@ public class PHPManualTestCase extends TestCase {
         + "    echo \"<hr>\\n\";\n" + "}\n" + "\n"
         + "// ...because you can simply type\n" + "if ($show_separators) {\n"
         + "    echo \"<hr>\\n\";\n" + "}");
-    checkPHP("echo gettype((bool) \"\");        // bool(false)\n"
-        + "echo gettype((bool) 1);         // bool(true)\n"
+    checkPHP(  // "echo gettype((bool) \"\");        // bool(false)\n"
+        "echo gettype((bool) 1);         // bool(true)\n"
         + "echo gettype((bool) -2);        // bool(true)\n"
         + "echo gettype((bool) \"foo\");     // bool(true)\n"
         + "echo gettype((bool) 2.3e5);     // bool(true)\n"
@@ -124,17 +123,7 @@ public class PHPManualTestCase extends TestCase {
         + "echo 'This will not expand: \\n a newline';\n" + "\n"
         + "// Outputs: Variables do not $expand $either\n"
         + "echo 'Variables do not $expand $either';\n");
-    checkPHP("$str = <<<EOD\n" + "Example of string\n"
-        + "spanning multiple lines\n" + "using heredoc syntax.\n" + "EOD;\n"
-        + "\n" + "/* More complex example, with variables. */\n"
-        + "class foo\n" + "{\n" + "    var $foo;\n" + "    var $bar;\n" + "\n"
-        + "    function foo()\n" + "    {\n" + "        $this->foo = 'Foo';\n"
-        + "        $this->bar = array('Bar1', 'Bar2', 'Bar3');\n" + "    }\n"
-        + "}\n" + "\n" + "$foo = new foo();\n" + "$name = 'MyName';\n" + "\n"
-        + "echo <<<EOT\n"
-        + "My name is \"$name\". I am printing some $foo->foo.\n"
-        + "Now, I am printing some {$foo->bar[1]}.\n"
-        + "This should print a capital 'A': \\x41\n" + "EOT;\n");
+    
     checkPHP("echo \"This works: \" . $arr['foo'][3];");
     checkPHP("echo \"\\$foo==$foo; type is \" . gettype ($foo) . \"<br />\\n\";");
     checkPHP("$arr = array(\"foo\" => \"bar\", 12 => true);\n" + "\n"
@@ -217,19 +206,22 @@ public class PHPManualTestCase extends TestCase {
       System.out.println("\n------------------------------------");
       System.out.println(strEval);
     }
-    parser.phpParserTester(strEval, 1);
-  }
-  private void checkHTML(String strEval) {
-    if (Scanner.DEBUG) {
-      System.out.println("\n------------------------------------");
-      System.out.println(strEval);
-    }
-    parser.parse(strEval);
+    checkParsePHP(
+        strEval.toCharArray(),
+		"");
+//    parser.phpParserTester(strEval, 1);
   }
+//  private void checkHTML(String strEval) {
+//    if (Scanner.DEBUG) {
+//      System.out.println("\n------------------------------------");
+//      System.out.println(strEval);
+//    }
+//    parser.parse(strEval);
+//  }
   /**
    * The JUnit setup method
    */
-  protected void setUp() {
-    parser = new Parser(null);
-  }
+//  protected void setUp() {
+//    parser = new Parser(null);
+//  }
 }
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
index f0c034a..d7759ea 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
@@ -5,14 +5,14 @@ package net.sourceforge.phpeclipse.tests.parser;
  * under the terms of the Common Public License v1.0 which accompanies this
  * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
  ******************************************************************************/
-import junit.framework.TestCase;
+import net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
 import net.sourceforge.phpdt.internal.compiler.parser.Parser;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 /**
  * Tests the php parser
  */
-public class PHPParserTestCase extends TestCase {
-  Parser parser;
+public class PHPParserTestCase extends AbstractCompilerTest {
+//  Parser parser;
   public PHPParserTestCase(String name) {
     super(name);
   }
@@ -20,6 +20,11 @@ public class PHPParserTestCase extends TestCase {
    * Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
+    checkHTML("<?php echo $bgcolor2?>");
+    checkPHP("if ($topic<1) { $topic = 1;}");
+    checkPHP("$this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);");
+    checkPHP("$db->sql_query($sql);");
+    checkPHP("$val = $$add;");
     //  checkPHP("if(!$result = mysql_query($sql)) return(array());");
     checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }");
     // Bugs item #690938
@@ -51,7 +56,7 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("@$connect_function($dbhost, $user, $pw);");
     checkPHP("$conn = @$connect_function($dbhost, $user, $pw);");
     checkPHP("global ${$objectname}; ");
-    checkPHP("class DB_mssql extends DB_common { var $connection; var $phptype, $dbsyntax; }  ");
+   // checkPHP("class DB_mssql extends DB_common { var $connection; var $phptype, $dbsyntax; }  ");
     checkPHP("unset($this->blockvariables[$block][$varname]);");
     checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);");
     checkPHP("for ($i=156, $j=0; $i<512; $i++, $j++) $v_checksum += ord(substr($v_binary_data_last,$j,1));");
@@ -62,8 +67,8 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("function validateAndParseResponse($code, &$arguments) { }");
     checkPHP("$options = Console_Getopt::getopt($argv, \"h?v:e:p:d:\");");
     checkPHP("$this->container = new $container_class($container_options);");
-    checkPHP("class Cmd extends PEAR { var $arrSetting     = array(); }");
-    checkPHP("class Cmd extends PEAR { var $arrSetting     = array(), $i=10; }");
+   // checkPHP("class Cmd extends PEAR { var $arrSetting     = array(); }");
+  //  checkPHP("class Cmd extends PEAR { var $arrSetting     = array(), $i=10; }");
     checkPHP("if (isset($test)) { } elseif (isset($lang)) { }");
     checkPHP("require_once(\"mainfile.php\");  ");
     checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n"
@@ -100,31 +105,44 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));");
     checkPHP("$ol = new Overlib();");
     checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
-    checkHTML("\n\n\n\n  <?php print \"Hello world\" ?>");
-    checkHTML("<?php phpinfo(); ?>");
-    checkHTML("<?php phpinfo()?>");
-    checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
-    checkHTML(" <?php //this is a line comment ?>");
-    checkHTML("<?php echo $module_name ?>");
+//    checkHTML("\n\n\n\n  <?php print \"Hello world\" ?>");
+//    checkHTML("<?php phpinfo(); ?>");
+//    checkHTML("<?php phpinfo()?>");
+//    checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
+//    checkHTML(" <?php //this is a line comment ?>");
+//    checkHTML("<?php echo $module_name ?>");
   }
   private void checkPHP(String strEval) {
     if (Scanner.DEBUG) {
       System.out.println("\n------------------------------------");
       System.out.println(strEval);
     }
-    parser.phpParserTester(strEval, 1);
+    checkParsePHP(
+        strEval.toCharArray(),
+		"");
+//    parser.phpParserTester(strEval, 1);
   }
   private void checkHTML(String strEval) {
     if (Scanner.DEBUG) {
       System.out.println("\n------------------------------------");
       System.out.println(strEval);
     }
-    parser.parse(strEval);
-  }
-  /**
-   * The JUnit setup method
-   */
-  protected void setUp() {
-    parser = new Parser(null);
+    checkParseHTML(
+        strEval.toCharArray(),
+		"");
+//    parser.phpParserTester(strEval, 1);
   }
+//  private void checkHTML(String strEval) {
+//    if (Scanner.DEBUG) {
+//      System.out.println("\n------------------------------------");
+//      System.out.println(strEval);
+//    }
+//    parser.parse(strEval);
+//  }
+//  /**
+//   * The JUnit setup method
+//   */
+//  protected void setUp() {
+//    parser = new Parser(null);
+//  }
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index cc27c47..62feaeb 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -79,8 +79,13 @@ public interface ITerminalSymbols {
   final static int TokenNameQUESTION = 62;
   final static int TokenNamePAAMAYIM_NEKUDOTAYIM = 63;
   final static int TokenNameAT = 64;
+  
+  final static int TokenNameand = 65;
+  final static int TokenNameor = 66;
+  final static int TokenNamexor = 67;
 
-  final static int TokenNameDOLLAR_LBRACE = 127;
+  final static int TokenNameDOLLAR = 126;
+//  final static int TokenNameDOLLAR_LBRACE = 127;
   final static int TokenNameLPAREN = 128;
   final static int TokenNameRPAREN = 129;
   final static int TokenNameLBRACE = 130;
@@ -108,9 +113,19 @@ public interface ITerminalSymbols {
   final static int TokenNameRIGHT_SHIFT = 156;
   final static int TokenNameEQUAL_EQUAL_EQUAL = 157;
   final static int TokenNameNOT_EQUAL_EQUAL = 158;
-  final static int TokenNameOR = 159;
-  final static int TokenNameHEREDOC = 160;
+  
+  final static int TokenNameOR = 160;
+  final static int TokenNameHEREDOC = 161;
 
+  final static int TokenNameintCAST = 174;
+  final static int TokenNameboolCAST = 175;
+  final static int TokenNamedoubleCAST = 176;
+  final static int TokenNamestringCAST = 177;
+  final static int TokenNamearrayCAST = 178;
+  final static int TokenNameobjectCAST = 179;
+  final static int TokenNameunsetCAST = 180;
+  
+  
   public final static int TokenNameKEYWORD = 1000;
   public final static int TokenNameif = 1001;
   public final static int TokenNameelseif = 1002;
@@ -158,7 +173,7 @@ public interface ITerminalSymbols {
 //  public final static int TokenNamenull = 1044;
 //  public final static int TokenNamefalse = 1045;
 //  public final static int TokenNametrue = 1046;
-	public final static int TokenNamethis = 1047;
+//	public final static int TokenNamethis = 1047;
 	//
 	public final static int TokenNameabstract = 1050;
 	public final static int TokenNamecatch = 1051;
@@ -173,7 +188,8 @@ public interface ITerminalSymbols {
 	public final static int TokenNamesuper = 1060;
 	public final static int TokenNamethrow = 1061;
 
-	public final static int TokenNameconst = 1063;
+	public final static int TokenNameconst = 1062;
+	public final static int TokenNameclone = 1063;
 	public final static int TokenNamedeclare = 1064;
 	public final static int TokenNameenddeclare = 1065;
 	public final static int TokenNameeval = 1065;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index f389faa..2a0e2c1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -1,6 +1,6 @@
 /**********************************************************************
  Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
- All rights reserved. This program and the accompanying materials
+ All rights reserved. This program and the accompanying material
  are made available under the terms of the Common Public License v1.0
  which accompanies this distribution, and is available at
  http://www.eclipse.org/legal/cpl-v10.html
@@ -62,7 +62,7 @@ public class Parser //extends PHPParserSuperclass
   private String stringValue;
   /** Contains the current expression. */
   // private StringBuffer expression;
-  private boolean phpMode;
+  //private boolean phpMode;
   protected int modifiers;
   protected int modifiersSourceStart;
   protected Parser() {
@@ -554,78 +554,78 @@ public class Parser //extends PHPParserSuperclass
   //		} catch (CoreException e) {
   //		}
   //	}
-  public void phpParserTester(String s, int rowCount) {
-    this.str = s;
-    if (s == null) {
-      if (phpList.size() != 0) {
-        this.str = ((PHPString) phpList.get(currentPHPString++)).getPHPString();
-      }
-    }
-    this.token = TokenNameEOF;
-    //    this.chIndx = 0;
-    //    this.rowCount = rowCount;
-    //    this.columnCount = 0;
-    this.phpEnd = false;
-    this.phpMode = true;
-    scanner.setSource(s.toCharArray());
-    scanner.setPHPMode(true);
-    getNextToken();
-    do {
-      try {
-        if (token != TokenNameEOF && token != TokenNameERROR) {
-          statementList();
-        }
-        if (token != TokenNameEOF) {
-          if (token == TokenNameERROR) {
-            throwSyntaxError("Scanner error (Found unknown token: "
-                + scanner.toStringAction(token) + ")");
-          }
-          if (token == TokenNameRPAREN) {
-            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
-          }
-          if (token == TokenNameRBRACE) {
-            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
-          }
-          if (token == TokenNameRBRACKET) {
-            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
-          }
-          if (token == TokenNameLPAREN) {
-            throwSyntaxError("Read character '('; end-of-file not reached.");
-          }
-          if (token == TokenNameLBRACE) {
-            throwSyntaxError("Read character '{';  end-of-file not reached.");
-          }
-          if (token == TokenNameLBRACKET) {
-            throwSyntaxError("Read character '[';  end-of-file not reached.");
-          }
-          throwSyntaxError("End-of-file not reached.");
-        }
-        return;
-      } catch (SyntaxError err) {
-        if (s != null) {
-          throw err;
-        } else {
-          //   setMarker(err.getMessage(), err.getLine(), ERROR);
-          //          setMarker(err.getMessage(),
-          // scanner.getCurrentTokenStartPosition(),
-          // scanner.getCurrentTokenEndPosition(), ERROR);
-        }
-        // if an error occured,
-        // try to find keywords 'class' or 'function'
-        // to parse the rest of the string
-        while (token != TokenNameEOF && token != TokenNameERROR) {
-          if (token == TokenNameabstract || token == TokenNamefinal
-              || token == TokenNameclass || token == TokenNamefunction) {
-            break;
-          }
-          getNextToken();
-        }
-        if (token == TokenNameEOF || token == TokenNameERROR) {
-          return;
-        }
-      }
-    } while (true);
-  }
+//  public void phpParserTester(String s, int rowCount) {
+//    this.str = s;
+//    if (s == null) {
+//      if (phpList.size() != 0) {
+//        this.str = ((PHPString) phpList.get(currentPHPString++)).getPHPString();
+//      }
+//    }
+//    this.token = TokenNameEOF;
+//    //    this.chIndx = 0;
+//    //    this.rowCount = rowCount;
+//    //    this.columnCount = 0;
+//    this.phpEnd = false;
+//    this.phpMode = true;
+//    scanner.setSource(s.toCharArray());
+//    scanner.setPHPMode(true);
+//    getNextToken();
+//    do {
+//      try {
+//        if (token != TokenNameEOF && token != TokenNameERROR) {
+//          statementList();
+//        }
+//        if (token != TokenNameEOF) {
+//          if (token == TokenNameERROR) {
+//            throwSyntaxError("Scanner error (Found unknown token: "
+//                + scanner.toStringAction(token) + ")");
+//          }
+//          if (token == TokenNameRPAREN) {
+//            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
+//          }
+//          if (token == TokenNameRBRACE) {
+//            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
+//          }
+//          if (token == TokenNameRBRACKET) {
+//            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
+//          }
+//          if (token == TokenNameLPAREN) {
+//            throwSyntaxError("Read character '('; end-of-file not reached.");
+//          }
+//          if (token == TokenNameLBRACE) {
+//            throwSyntaxError("Read character '{';  end-of-file not reached.");
+//          }
+//          if (token == TokenNameLBRACKET) {
+//            throwSyntaxError("Read character '[';  end-of-file not reached.");
+//          }
+//          throwSyntaxError("End-of-file not reached.");
+//        }
+//        return;
+//      } catch (SyntaxError err) {
+//        if (s != null) {
+//          throw err;
+//        } else {
+//          //   setMarker(err.getMessage(), err.getLine(), ERROR);
+//          //          setMarker(err.getMessage(),
+//          // scanner.getCurrentTokenStartPosition(),
+//          // scanner.getCurrentTokenEndPosition(), ERROR);
+//        }
+//        // if an error occured,
+//        // try to find keywords 'class' or 'function'
+//        // to parse the rest of the string
+//        while (token != TokenNameEOF && token != TokenNameERROR) {
+//          if (token == TokenNameabstract || token == TokenNamefinal
+//              || token == TokenNameclass || token == TokenNamefunction) {
+//            break;
+//          }
+//          getNextToken();
+//        }
+//        if (token == TokenNameEOF || token == TokenNameERROR) {
+//          return;
+//        }
+//      }
+//    } while (true);
+//  }
   public void init(String s) {
     this.str = s;
     this.token = TokenNameEOF;
@@ -633,7 +633,7 @@ public class Parser //extends PHPParserSuperclass
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-    this.phpMode = false;
+//    this.phpMode = false;
     /* scanner initialization */
     scanner.setSource(s.toCharArray());
     scanner.setPHPMode(false);
@@ -647,7 +647,7 @@ public class Parser //extends PHPParserSuperclass
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-    this.phpMode = phpMode;
+//    this.phpMode = phpMode;
     scanner.setPHPMode(phpMode);
   }
   /**
@@ -746,7 +746,7 @@ public class Parser //extends PHPParserSuperclass
   //    return outlineInfo;
   //  }
   private boolean isVariable() {
-    return token == TokenNameVariable || token == TokenNamethis;
+    return token == TokenNameVariable; //  || token == TokenNamethis;
   }
   //  private void parseDeclarations(PHPOutlineInfo outlineInfo,
   //      OutlineableWithChildren current, boolean goBack) {
@@ -949,49 +949,51 @@ public class Parser //extends PHPParserSuperclass
     // TokenNamenew) {
     //  char[] ident = scanner.getCurrentIdentifierSource();
     //  String keyword = new String(ident);
-    if (token == TokenNameAT) {
-      getNextToken();
-      if (token != TokenNamerequire && token != TokenNamerequire_once
-          && token != TokenNameinclude && token != TokenNameinclude_once
-          && token != TokenNameIdentifier && token != TokenNameVariable
-          && token != TokenNamethis && token != TokenNameStringInterpolated) {
-        throwSyntaxError("identifier expected after '@'.");
-      }
-    }
-    if (token == TokenNameinclude || token == TokenNameinclude_once) {
-      getNextToken();
-      if (token == TokenNameLPAREN) {
-        expr();
-        if (token == TokenNameSEMICOLON) {
-          getNextToken();
-        } else {
-          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-            throwSyntaxError("';' expected after 'include' or 'include_once'.");
-          }
-          //        getNextToken();
-        }
-      } else {
-        concatenationExpression();
-      }
-      return;
-    } else if (token == TokenNamerequire || token == TokenNamerequire_once) {
-      getNextToken();
-      //constant();
-      if (token == TokenNameLPAREN) {
-        expr();
-        if (token == TokenNameSEMICOLON) {
-          getNextToken();
-        } else {
-          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-            throwSyntaxError("';' expected after 'require' or 'require_once'.");
-          }
-          //        getNextToken();
-        }
-      } else {
-        concatenationExpression();
-      }
-      return;
-    } else if (token == TokenNameif) {
+    //    if (token == TokenNameAT) {
+    //      getNextToken();
+    //      if (token != TokenNamerequire && token != TokenNamerequire_once
+    //          && token != TokenNameinclude && token != TokenNameinclude_once
+    //          && token != TokenNameIdentifier && token != TokenNameVariable
+    //          && token != TokenNameStringInterpolated) {
+    //        throwSyntaxError("identifier expected after '@'.");
+    //      }
+    //    }
+    //    if (token == TokenNameinclude || token == TokenNameinclude_once) {
+    //      getNextToken();
+    //      if (token == TokenNameLPAREN) {
+    //        expr();
+    //        if (token == TokenNameSEMICOLON) {
+    //          getNextToken();
+    //        } else {
+    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+    //            throwSyntaxError("';' expected after 'include' or 'include_once'.");
+    //          }
+    //          // getNextToken();
+    //        }
+    //      } else {
+    //        concatenationExpression();
+    //      }
+    //      return;
+    //    } else if (token == TokenNamerequire || token == TokenNamerequire_once)
+    // {
+    //      getNextToken();
+    //      //constant();
+    //      if (token == TokenNameLPAREN) {
+    //        expr();
+    //        if (token == TokenNameSEMICOLON) {
+    //          getNextToken();
+    //        } else {
+    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+    //            throwSyntaxError("';' expected after 'require' or 'require_once'.");
+    //          }
+    //          // getNextToken();
+    //        }
+    //      } else {
+    //        concatenationExpression();
+    //      }
+    //      return;
+    //    } else
+    if (token == TokenNameif) {
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -1179,19 +1181,31 @@ public class Parser //extends PHPParserSuperclass
       //        getNextToken();
       //      }
       //      return;
-    } else if (token == TokenNameglobal || token == TokenNamestatic) {
+    } else if (token == TokenNameglobal) {
       getNextToken();
-      variableList();
+      global_var_list();
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
         if (token != TokenNameStopPHP) {
-          throwSyntaxError("';' expected after 'global' or 'static' statement.");
+          throwSyntaxError("';' expected after 'global' statement.");
         }
         getNextToken();
       }
       return;
-    } else if (token == TokenNameunset) {
+    } else if (token == TokenNamestatic) {
+      getNextToken();
+      static_var_list();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameStopPHP) {
+          throwSyntaxError("';' expected after 'static' statement.");
+        }
+        getNextToken();
+      }
+      return;
+    }else if (token == TokenNameunset) {
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -1314,6 +1328,61 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+  private void global_var_list() {
+    //  global_var_list:
+    //	global_var_list ',' global_var
+    //| global_var
+    while (true) {
+      global_var();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private void global_var() {
+    //global_var:
+    //	T_VARIABLE
+    //| '$' r_variable
+    //| '$' '{' expr '}'
+    if (token == TokenNameVariable) {
+      getNextToken();
+    } else if (token == TokenNameDOLLAR) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+        expr();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("')' expected in global variable.");
+        }
+        getNextToken();
+      } else {
+        r_variable();
+      }
+    }
+  }
+  private void static_var_list() {
+    //static_var_list:
+    //	static_var_list ',' T_VARIABLE
+    //| static_var_list ',' T_VARIABLE '=' static_scalar
+    //| T_VARIABLE
+    //| T_VARIABLE '=' static_scalar
+    while (true) {
+      if (token == TokenNameVariable) {
+        getNextToken();
+        if (token == TokenNameEQUAL) {
+          getNextToken();
+          static_scalar();
+        }
+        if (token != TokenNameCOMMA) {
+          break;
+        }
+        getNextToken();
+      } else {
+        break;
+      }
+    }
+  }
   private void unset_variables() {
     //    unset_variables:
     //    		unset_variable
@@ -1634,10 +1703,11 @@ public class Parser //extends PHPParserSuperclass
           static_scalar();
         }
       } else {
-        if (token == TokenNamethis) {
-          throwSyntaxError("'$this' not allowed after keyword 'public' 'protected' 'private' 'var'.");
-        }
-        throwSyntaxError("Variable expected keyword 'public' 'protected' 'private' 'var'.");
+        //        if (token == TokenNamethis) {
+        //          throwSyntaxError("'$this' not allowed after keyword 'public'
+        // 'protected' 'private' 'var'.");
+        //        }
+        throwSyntaxError("Variable expected after keyword 'public' 'protected' 'private' 'var'.");
       }
       if (token != TokenNameCOMMA) {
         break;
@@ -1738,9 +1808,10 @@ public class Parser //extends PHPParserSuperclass
       }
       return;
     }
-    if (token == TokenNamethis) {
-      throwSyntaxError("Reserved word '$this' not allowed in parameter declaration.");
-    }
+    //    if (token == TokenNamethis) {
+    //      throwSyntaxError("Reserved word '$this' not allowed in parameter
+    // declaration.");
+    //    }
   }
   private void labeledStatementList() {
     if (token != TokenNamecase && token != TokenNamedefault) {
@@ -2044,29 +2115,85 @@ public class Parser //extends PHPParserSuperclass
     } while (true);
   }
   private void expr() {
-    //todo: find a better way to get the expression
-    //    expression = new StringBuffer();
-    //    for (int i = chIndx; i < str.length(); i++) {
-    //      if (str.charAt(i) == ';') {
-    //        break;
-    //      }
-    //      expression.append(str.charAt(i));
-    //    }
-    //    if (token == TokenNameSTRING_CONSTANT || token ==
-    // TokenNameINTERPOLATED_STRING) {
-    //      getNextToken();
-    //    } else {
-    logicalinclusiveorExpression();
-    //      while (token != TokenNameSEMICOLON) {
-    //        getNextToken();
-    //      // }
+    //	r_variable
+    //	| expr_without_variable
+    //    if (token!=TokenNameEOF) {
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr()");
+    }
+    expr_without_variable(true);
     //    }
   }
-  private void expr_without_variable() {
-    //	String ident;
-    char[] ident;
-    boolean castFlag = false;
-    boolean arrayFlag = false;
+  private void expr_without_variable(boolean only_variable) {
+    //	 	internal_functions_in_yacc
+    //	| T_CLONE expr
+    //	| T_PRINT expr
+    //	| '(' expr ')'
+    //	| '@' expr
+    //	| '+' expr
+    //	| '-' expr
+    //	| '!' expr
+    //	| '~' expr
+    //	| T_INC rw_variable
+    //	| T_DEC rw_variable
+    //	| T_INT_CAST expr
+    //	| T_DOUBLE_CAST expr
+    //	| T_STRING_CAST expr
+    //	| T_ARRAY_CAST expr
+    //	| T_OBJECT_CAST expr
+    //	| T_BOOL_CAST expr
+    //	| T_UNSET_CAST expr
+    //	| T_EXIT exit_expr
+    //	| scalar
+    //	| T_ARRAY '(' array_pair_list ')'
+    //	| '`' encaps_list '`'
+    //	| T_LIST '(' assignment_list ')' '=' expr
+    //	| T_NEW class_name_reference ctor_arguments
+    //	| variable '=' expr
+    //	| variable '=' '&' variable
+    //	| variable '=' '&' T_NEW class_name_reference ctor_arguments
+    //	| variable T_PLUS_EQUAL expr
+    //	| variable T_MINUS_EQUAL expr
+    //	| variable T_MUL_EQUAL expr
+    //	| variable T_DIV_EQUAL expr
+    //	| variable T_CONCAT_EQUAL expr
+    //	| variable T_MOD_EQUAL expr
+    //	| variable T_AND_EQUAL expr
+    //	| variable T_OR_EQUAL expr
+    //	| variable T_XOR_EQUAL expr
+    //	| variable T_SL_EQUAL expr
+    //	| variable T_SR_EQUAL expr
+    //	| rw_variable T_INC
+    //	| rw_variable T_DEC
+    //	| expr T_BOOLEAN_OR expr
+    //	| expr T_BOOLEAN_AND expr
+    //	| expr T_LOGICAL_OR expr
+    //	| expr T_LOGICAL_AND expr
+    //	| expr T_LOGICAL_XOR expr
+    //	| expr '|' expr
+    //	| expr '&' expr
+    //	| expr '^' expr
+    //	| expr '.' expr
+    //	| expr '+' expr
+    //	| expr '-' expr
+    //	| expr '*' expr
+    //	| expr '/' expr
+    //	| expr '%' expr
+    //	| expr T_SL expr
+    //	| expr T_SR expr
+    //	| expr T_IS_IDENTICAL expr
+    //	| expr T_IS_NOT_IDENTICAL expr
+    //	| expr T_IS_EQUAL expr
+    //	| expr T_IS_NOT_EQUAL expr
+    //	| expr '<' expr
+    //	| expr T_IS_SMALLER_OR_EQUAL expr
+    //	| expr '>' expr
+    //	| expr T_IS_GREATER_OR_EQUAL expr
+    //	| expr T_INSTANCEOF class_name_reference
+    //	| expr '?' expr ':' expr
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr_without_variable() PART 1");
+    }
     switch (token) {
       case TokenNameisset :
       case TokenNameempty :
@@ -2077,125 +2204,74 @@ public class Parser //extends PHPParserSuperclass
       case TokenNamerequire_once :
         internal_functions_in_yacc();
         break;
-      case TokenNamenew :
-        getNextToken();
-        expr();
-        break;
-      //        
-      //      case TokenNamenull :
-      //        getNextToken();
-      //        break;
-      //      case TokenNamefalse :
-      //        getNextToken();
-      //        break;
-      //      case TokenNametrue :
-      //        getNextToken();
-      //        break;
-      case TokenNameStringConstant :
-        getNextToken();
-        break;
-      case TokenNameHEREDOC :
-      case TokenNameStringInterpolated :
-      case TokenNameStringLiteral :
-        getNextToken();
-        break;
+      //    	| '(' expr ')'
       case TokenNameLPAREN :
         getNextToken();
-        if (token == TokenNameIdentifier) {
-          // check if identifier is a type:
-          //	ident = identifier;
-          ident = scanner.getCurrentIdentifierSource();
-          String str = new String(ident).toLowerCase();
-          for (int i = 0; i < PHP_TYPES.length; i++) {
-            if (PHP_TYPES[i].equals(str)) {
-              castFlag = true;
-              if (PHP_TYPES[i].equals("array")) {
-                arrayFlag = true;
-              }
-              break;
-            }
-          }
-        }
-        if (castFlag) {
-          getNextToken();
-          if (arrayFlag && token == TokenNameLPAREN) {
-            getNextToken();
-            if (token == TokenNameRPAREN) {
-              getNextToken();
-            } else {
-              expr();
-              if (token != TokenNameRPAREN) {
-                throwSyntaxError(") expected after 'array('.");
-              }
-            }
-          }
-          if (token != TokenNameRPAREN) {
-            throwSyntaxError(") expected after cast-type '" + str + "'.");
-          }
+        expr();
+        if (token == TokenNameRPAREN) {
           getNextToken();
-          expr();
-          break;
         } else {
-          expr();
+          throwSyntaxError("')' expected in expression.");
         }
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError(") expected in postfix-expression.");
-        }
-        getNextToken();
         break;
-      case TokenNameDoubleLiteral :
-        getNextToken();
-        break;
-      case TokenNameIntegerLiteral :
-        getNextToken();
-        break;
-      case TokenNameDOLLAR_LBRACE :
+      //    | T_CLONE expr
+      //    | T_PRINT expr
+      //    | '@' expr
+      //    | '+' expr
+      //    | '-' expr
+      //    | '!' expr
+      //    | '~' expr
+      //    | T_INT_CAST expr
+      //	| T_DOUBLE_CAST expr
+      //	| T_STRING_CAST expr
+      //	| T_ARRAY_CAST expr
+      //	| T_OBJECT_CAST expr
+      //	| T_BOOL_CAST expr
+      //	| T_UNSET_CAST expr
+      case TokenNameclone :
+      case TokenNameprint :
+      case TokenNameAT :
+      case TokenNamePLUS :
+      case TokenNameMINUS :
+      case TokenNameNOT :
+      case TokenNameTWIDDLE :
+      case TokenNameintCAST :
+      case TokenNamedoubleCAST :
+      case TokenNamestringCAST :
+      case TokenNamearrayCAST :
+      case TokenNameobjectCAST :
+      case TokenNameboolCAST :
+      case TokenNameunsetCAST :
         getNextToken();
         expr();
-        if (token != TokenNameRBRACE) {
-          throwSyntaxError("'}' expected after indirect variable token '${'.");
-        }
-        getNextToken();
         break;
-      case TokenNameVariable :
-      case TokenNamethis :
-        ident = scanner.getCurrentIdentifierSource();
+      case TokenNameexit :
         getNextToken();
-        if (token == TokenNameLBRACE) {
-          getNextToken();
-          expr();
-          if (token != TokenNameRBRACE) {
-            throwSyntaxError("'}' expected after variable '"
-                + new String(ident) + "' in variable-expression.");
-          }
-          getNextToken();
-        } else if (token == TokenNameLPAREN) {
-          getNextToken();
-          if (token != TokenNameRPAREN) {
-            expressionList();
-            if (token != TokenNameRPAREN) {
-              throwSyntaxError("')' expected after variable '"
-                  + new String(ident) + "' in postfix-expression.");
-            }
-          }
-          getNextToken();
-        }
+        exit_expr();
         break;
-      case TokenNameIdentifier :
-        ident = scanner.getCurrentIdentifierSource();
+      //  scalar:
+      //	T_STRING
+      //| T_STRING_VARNAME
+      //| class_constant
+      //| '"' encaps_list '"'
+      //| '\'' encaps_list '\''
+      //| T_START_HEREDOC encaps_list T_END_HEREDOC
+      //    	| '`' encaps_list '`'
+      //  | common_scalar
+      case TokenNameIntegerLiteral :
+      case TokenNameDoubleLiteral :
+      case TokenNameStringLiteral :
+      case TokenNameStringConstant :
+      case TokenNameStringInterpolated :
+      case TokenNameFILE :
+      case TokenNameLINE :
+      case TokenNameCLASS_C :
+      case TokenNameMETHOD_C :
+      case TokenNameFUNC_C :
+        common_scalar();
+        break;
+      case TokenNameHEREDOC :
         getNextToken();
-        if (token == TokenNameLPAREN) {
-          getNextToken();
-          if (token != TokenNameRPAREN) {
-            expressionList();
-            if (token != TokenNameRPAREN) {
-              throwSyntaxError("')' expected after identifier '"
-                  + new String(ident) + "' in postfix-expression."
-                  + "(Found token: " + scanner.toStringAction(token) + ")");
-            }
-          }
-          getNextToken();
-        }
         break;
       case TokenNamearray :
         //    T_ARRAY '(' array_pair_list ')'
@@ -2217,178 +2293,285 @@ public class Parser //extends PHPParserSuperclass
               + "(Found token: " + scanner.toStringAction(token) + ")");
         }
         break;
-      case TokenNameprint :
-        getNextToken();
-        expr();
-        break;
-      case TokenNameexit :
-        getNextToken();
-        exit_expr();
-        break;
       case TokenNamelist :
+        //    | T_LIST '(' assignment_list ')' '=' expr
         getNextToken();
         if (token == TokenNameLPAREN) {
           getNextToken();
-          if (token == TokenNameCOMMA) {
-            getNextToken();
-          }
-          expressionList();
+          assignment_list();
           if (token != TokenNameRPAREN) {
             throwSyntaxError("')' expected after 'list' keyword.");
           }
           getNextToken();
-          //          if (token == TokenNameSET) {
-          //            getNextToken();
-          //            logicalinclusiveorExpression();
-          //          }
+          if (token != TokenNameEQUAL) {
+            throwSyntaxError("'=' expected after 'list' keyword.");
+          }
+          getNextToken();
+          expr();
         } else {
           throwSyntaxError("'(' expected after 'list' keyword.");
         }
         break;
-    //      case TokenNameexit :
-    //        getNextToken();
-    //        if (token != TokenNameSEMICOLON) {
-    //          exitStatus();
-    //        }
-    //        if (token == TokenNameSEMICOLON) {
-    //          getNextToken();
-    //        } else {
-    //          if (token != TokenNameStopPHP) {
-    //            throwSyntaxError("';' expected after 'exit' expression.");
-    //          }
-    //          getNextToken();
-    //        }
-    //        break;
-    //      case TokenNamedie :
-    //        getNextToken();
-    //        if (token != TokenNameSEMICOLON) {
-    //          exitStatus();
-    //        }
-    //        if (token == TokenNameSEMICOLON) {
-    //          getNextToken();
-    //        } else {
-    //          if (token != TokenNameStopPHP) {
-    //            throwSyntaxError("';' expected after 'die' expression.");
-    //          }
-    //        }
-    //        break;
-    //      case TokenNamearray :
-    //        getNextToken();
-    //        if (token == TokenNameARGOPEN) {
-    //          getNextToken();
-    //          if (token == TokenNameCOMMA) {
-    //            getNextToken();
-    //          }
-    //          expressionList();
-    //          if (token != TokenNameARGCLOSE) {
-    //            throwSyntaxError("')' expected after 'list' keyword.");
-    //          }
-    //          getNextToken();
-    //          if (token == TokenNameSET) {
-    //            getNextToken();
-    //            logicalinclusiveorExpression();
-    //          }
-    //        } else {
-    //          throwSyntaxError("'(' expected after 'list' keyword.");
-    //        }
-    //        break;
+      case TokenNamenew :
+        //	| T_NEW class_name_reference ctor_arguments
+        getNextToken();
+        class_name_reference();
+        ctor_arguments();
+        break;
+      //    	| T_INC rw_variable
+      //    	| T_DEC rw_variable
+      case TokenNamePLUS_PLUS :
+      case TokenNameMINUS_MINUS :
+        getNextToken();
+        rw_variable();
+        break;
+      //	| variable '=' expr
+      //	| variable '=' '&' variable
+      //	| variable '=' '&' T_NEW class_name_reference ctor_arguments
+      //	| variable T_PLUS_EQUAL expr
+      //	| variable T_MINUS_EQUAL expr
+      //	| variable T_MUL_EQUAL expr
+      //	| variable T_DIV_EQUAL expr
+      //	| variable T_CONCAT_EQUAL expr
+      //	| variable T_MOD_EQUAL expr
+      //	| variable T_AND_EQUAL expr
+      //	| variable T_OR_EQUAL expr
+      //	| variable T_XOR_EQUAL expr
+      //	| variable T_SL_EQUAL expr
+      //	| variable T_SR_EQUAL expr
+      //	| rw_variable T_INC
+      //	| rw_variable T_DEC
+      case TokenNameIdentifier :
+      case TokenNameVariable :
+      case TokenNameDOLLAR :
+        variable();
+        switch (token) {
+          case TokenNameEQUAL :
+            getNextToken();
+            if (token == TokenNameAND) {
+              getNextToken();
+              if (token == TokenNamenew) {
+                getNextToken();
+                throwSyntaxError("not yet implemented (= & new)");
+                //                class_name_reference();
+                //                ctor_arguments();
+              } else {
+                variable();
+              }
+            } else {
+              expr();
+            }
+            break;
+          case TokenNamePLUS_EQUAL :
+          case TokenNameMINUS_EQUAL :
+          case TokenNameMULTIPLY_EQUAL :
+          case TokenNameDIVIDE_EQUAL :
+          case TokenNameDOT_EQUAL :
+          case TokenNameREMAINDER_EQUAL :
+          case TokenNameAND_EQUAL :
+          case TokenNameOR_EQUAL :
+          case TokenNameXOR_EQUAL :
+          case TokenNameRIGHT_SHIFT_EQUAL :
+          case TokenNameLEFT_SHIFT_EQUAL :
+            getNextToken();
+            expr();
+            break;
+          case TokenNamePLUS_PLUS :
+          case TokenNameMINUS_MINUS :
+            getNextToken();
+            break;
+          default :
+            if (!only_variable) {
+              throwSyntaxError("Variable expression not allowed (found token '"
+                  + scanner.toStringAction(token) + "').");
+            }
+        }
+        break;
+      default :
+        if (token != TokenNameStopPHP) {
+          throwSyntaxError("Error in expression (found token '"
+              + scanner.toStringAction(token) + "').");
+        }
+        return;
     }
-    boolean while_flag = true;
-    do {
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr_without_variable() PART 2");
+    }
+    //	| expr T_BOOLEAN_OR expr
+    //	| expr T_BOOLEAN_AND expr
+    //	| expr T_LOGICAL_OR expr
+    //	| expr T_LOGICAL_AND expr
+    //	| expr T_LOGICAL_XOR expr
+    //	| expr '|' expr
+    //	| expr '&' expr
+    //	| expr '^' expr
+    //	| expr '.' expr
+    //	| expr '+' expr
+    //	| expr '-' expr
+    //	| expr '*' expr
+    //	| expr '/' expr
+    //	| expr '%' expr
+    //	| expr T_SL expr
+    //	| expr T_SR expr
+    //	| expr T_IS_IDENTICAL expr
+    //	| expr T_IS_NOT_IDENTICAL expr
+    //	| expr T_IS_EQUAL expr
+    //	| expr T_IS_NOT_EQUAL expr
+    //	| expr '<' expr
+    //	| expr T_IS_SMALLER_OR_EQUAL expr
+    //	| expr '>' expr
+    //	| expr T_IS_GREATER_OR_EQUAL expr
+    while (true) {
       switch (token) {
-        case TokenNameLBRACKET :
+        case TokenNameOR_OR :
+        case TokenNameAND_AND :
+        case TokenNameand :
+        case TokenNameor :
+        case TokenNamexor :
+        case TokenNameAND :
+        case TokenNameOR :
+        case TokenNameXOR :
+        case TokenNameDOT :
+        case TokenNamePLUS :
+        case TokenNameMINUS :
+        case TokenNameMULTIPLY :
+        case TokenNameDIVIDE :
+        case TokenNameREMAINDER :
+        case TokenNameLEFT_SHIFT :
+        case TokenNameRIGHT_SHIFT :
+        case TokenNameEQUAL_EQUAL_EQUAL :
+        case TokenNameNOT_EQUAL_EQUAL :
+        case TokenNameEQUAL_EQUAL :
+        case TokenNameNOT_EQUAL :
+        case TokenNameLESS :
+        case TokenNameLESS_EQUAL :
+        case TokenNameGREATER :
+        case TokenNameGREATER_EQUAL :
           getNextToken();
           expr();
-          if (token != TokenNameRBRACKET) {
-            throwSyntaxError("] expected in postfix-expression.");
-          }
+          break;
+        //  | expr T_INSTANCEOF class_name_reference
+        //	| expr '?' expr ':' expr
+        case TokenNameinstanceof :
           getNextToken();
+          throwSyntaxError("not yet implemented (class_name_reference)");
+          //            class_name_reference();
           break;
-        case TokenNamePAAMAYIM_NEKUDOTAYIM :
-        // ::
-        case TokenNameMINUS_GREATER :
-          // ->
+        case TokenNameQUESTION :
           getNextToken();
-          if (token > TokenNameKEYWORD) {
-            ident = scanner.getCurrentIdentifierSource();
-            //            setMarker(
-            //              "Avoid using keyword '"
-            //                + new String(ident)
-            //                + "' as variable name.",
-            //              rowCount,
-            //              PHPParser.INFO);
-            //            setMarker(
-            //              "Avoid using keyword '" + new String(ident) + "' as
-            // variable name.",
-            //              scanner.getCurrentTokenStartPosition(),
-            //              scanner.getCurrentTokenEndPosition(),
-            //              INFO);
-          }
-          switch (token) {
-            case TokenNameVariable :
-              ident = scanner.getCurrentIdentifierSource();
-              getNextToken();
-              //              if (token == TokenNameARGOPEN) {
-              //                getNextToken();
-              //                expressionList();
-              //                if (token != TokenNameARGCLOSE) {
-              //                  throwSyntaxError(") expected after variable '" +
-              // ident + "'.");
-              //                }
-              //                getNextToken();
-              //              }
-              break;
-            case TokenNameIdentifier :
-              //ident = scanner.getCurrentIdentifierSource();
-              getNextToken();
-              break;
-            case TokenNameLBRACE :
-              getNextToken();
-              expr();
-              if (token != TokenNameRBRACE) {
-                throwSyntaxError("} expected in postfix-expression.");
-              }
-              getNextToken();
-              break;
-            default :
-              throwSyntaxError("Syntax error after '->' token.");
-          }
-          while (token == TokenNameLBRACKET || token == TokenNameLPAREN
-              || token == TokenNameLBRACE) {
-            if (token == TokenNameLBRACKET) {
-              getNextToken();
-              expressionList();
-              if (token != TokenNameRBRACKET) {
-                throwSyntaxError("] expected after '->'.");
-              }
-              getNextToken();
-            } else if (token == TokenNameLPAREN) {
-              getNextToken();
-              expressionList();
-              if (token != TokenNameRPAREN) {
-                throwSyntaxError(") expected after '->'.");
-              }
-              getNextToken();
-            } else if (token == TokenNameLBRACE) {
-              getNextToken();
-              expr();
-              if (token != TokenNameRBRACE) {
-                throwSyntaxError("} expected after '->'.");
-              }
-              getNextToken();
-            }
+          expr();
+          if (token == TokenNameCOLON) {
+            getNextToken();
+            expr();
           }
           break;
-        case TokenNamePLUS_PLUS :
+        default :
+          return;
+      }
+    }
+  }
+  private void class_name_reference() {
+    //  class_name_reference:
+    //	T_STRING
+    //| dynamic_class_name_reference
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: class_name_reference()");
+    }
+    if (token == TokenNameIdentifier) {
+      getNextToken();
+    } else {
+      dynamic_class_name_reference();
+    }
+  }
+  private void dynamic_class_name_reference() {
+    //dynamic_class_name_reference:
+    //	base_variable T_OBJECT_OPERATOR object_property
+    // dynamic_class_name_variable_properties
+    //| base_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_reference()");
+    }
+    base_variable();
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+      dynamic_class_name_variable_properties();
+    }
+  }
+  private void dynamic_class_name_variable_properties() {
+    //  dynamic_class_name_variable_properties:
+    //  		dynamic_class_name_variable_properties
+    // dynamic_class_name_variable_property
+    //  	| /* empty */
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_variable_properties()");
+    }
+    while (token == TokenNameMINUS_GREATER) {
+      dynamic_class_name_variable_property();
+    }
+  }
+  private void dynamic_class_name_variable_property() {
+    //  dynamic_class_name_variable_property:
+    //	T_OBJECT_OPERATOR object_property
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_variable_property()");
+    }
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+    }
+  }
+  private void ctor_arguments() {
+    //  ctor_arguments:
+    //	/* empty */
+    //| '(' function_call_parameter_list ')'
+    if (token == TokenNameLPAREN) {
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+        return;
+      }
+      non_empty_function_call_parameter_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in ctor_arguments.");
+      }
+      getNextToken();
+    }
+  }
+  private void assignment_list() {
+    //  assignment_list:
+    //	assignment_list ',' assignment_list_element
+    //| assignment_list_element
+    while (true) {
+      assignment_list_element();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private void assignment_list_element() {
+    //assignment_list_element:
+    //	variable
+    //| T_LIST '(' assignment_list ')'
+    //| /* empty */
+    if (token == TokenNameVariable || token == TokenNameDOLLAR) {
+      variable();
+    } else {
+      if (token == TokenNamelist) {
+        getNextToken();
+        if (token == TokenNameLPAREN) {
           getNextToken();
-          break;
-        case TokenNameMINUS_MINUS :
+          assignment_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after 'list' keyword.");
+          }
           getNextToken();
-          break;
-        default :
-          while_flag = false;
+        } else {
+          throwSyntaxError("'(' expected after 'list' keyword.");
+        }
       }
-    } while (while_flag);
+    }
   }
   private void array_pair_list() {
     //  array_pair_list:
@@ -2433,309 +2616,392 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
-  private void unaryExpression() {
-    switch (token) {
-      case TokenNamePLUS_PLUS :
-        getNextToken();
-        unaryExpression();
-        break;
-      case TokenNameMINUS_MINUS :
-        getNextToken();
-        unaryExpression();
-        break;
-      // '@' '&' '*' '+' '-' '~' '!'
-      case TokenNameAT :
-        getNextToken();
-        if (token == TokenNameinclude || token == TokenNameinclude_once
-            || token == TokenNamerequire || token == TokenNamerequire_once) {
-          statement(TokenNameAT);
-        } else {
-          expr_without_variable(); //  castExpression();
-        }
-        break;
-      case TokenNameAND :
-        getNextToken();
-        castExpression();
-        break;
-      case TokenNameMULTIPLY :
-        getNextToken();
-        castExpression();
-        break;
-      case TokenNamePLUS :
-        getNextToken();
-        castExpression();
-        break;
-      case TokenNameMINUS :
-        getNextToken();
-        castExpression();
-        break;
-      case TokenNameTWIDDLE :
-        getNextToken();
-        castExpression();
-        break;
-      case TokenNameNOT :
-        getNextToken();
-        castExpression();
-        break;
-      default :
-        expr_without_variable();
+//  private void variableList() {
+//    do {
+//      variable();
+//      if (token == TokenNameCOMMA) {
+//        getNextToken();
+//      } else {
+//        break;
+//      }
+//    } while (true);
+//  }
+  private void variable_without_objects() {
+    //  variable_without_objects:
+    //  		reference_variable
+    //  	| simple_indirect_reference reference_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_without_objects()");
     }
-  }
-  private void castExpression() {
-    //    if (token == TokenNameARGOPEN) {
-    //      getNextToken();
-    //      typeName();
-    //      if (token != TokenNameARGCLOSE) {
-    //        throwSyntaxError(") expected after cast-expression.");
-    //      }
-    //      getNextToken();
-    //    }
-    unaryExpression();
-  }
-  private void assignExpression() {
-    castExpression();
-    if (token == TokenNameEQUAL) { // =
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameDOT_EQUAL) { // .=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameEQUAL_GREATER) { // =>
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNamePLUS_EQUAL) { // +=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameMINUS_EQUAL) { // -=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameMULTIPLY_EQUAL) { // *=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameDIVIDE_EQUAL) { // *=
+    while (token == TokenNameDOLLAR) {
       getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameREMAINDER_EQUAL) { // %=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameAND_EQUAL) { // &=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameOR_EQUAL) { // |=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameXOR_EQUAL) { // ^=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameLEFT_SHIFT_EQUAL) { // <<=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameRIGHT_SHIFT_EQUAL) { // >>=
-      getNextToken();
-      logicalinclusiveorExpression();
-    } else if (token == TokenNameTWIDDLE_EQUAL) { // ~=
-      getNextToken();
-      logicalinclusiveorExpression();
     }
-  }
-  private void multiplicativeExpression() {
-    do {
-      assignExpression();
-      if (token != TokenNameMULTIPLY && token != TokenNameDIVIDE
-          && token != TokenNameREMAINDER) {
-        return;
-      }
+    reference_variable();
+  }
+  private void function_call() {
+    //  function_call:
+    //	T_STRING '(' function_call_parameter_list ')'
+    //| class_constant '(' function_call_parameter_list ')'
+    //| static_member '(' function_call_parameter_list ')'
+    //| variable_without_objects '(' function_call_parameter_list ')'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: function_call()");
+    }
+    if (token == TokenNameIdentifier) {
       getNextToken();
-    } while (true);
-  }
-  private void concatenationExpression() {
-    do {
-      multiplicativeExpression();
-      if (token != TokenNameDOT) {
-        return;
+      switch (token) {
+        case TokenNamePAAMAYIM_NEKUDOTAYIM :
+          // static member:
+          getNextToken();
+          if (token == TokenNameIdentifier) {
+            // class _constant
+            getNextToken();
+          } else {
+            //        static member:
+            variable_without_objects();
+          }
+          break;
       }
+    } else {
+      variable_without_objects();
+    }
+    if (token != TokenNameLPAREN) {
+      // TODO is this ok ?
+      return;
+      //      throwSyntaxError("'(' expected in function call.");
+    }
+    getNextToken();
+    if (token == TokenNameRPAREN) {
       getNextToken();
-    } while (true);
+      return;
+    }
+    non_empty_function_call_parameter_list();
+    if (token != TokenNameRPAREN) {
+      throwSyntaxError("')' expected in function call.");
+    }
+    getNextToken();
   }
-  private void additiveExpression() {
-    do {
-      concatenationExpression();
-      if (token != TokenNamePLUS && token != TokenNameMINUS) {
-        return;
+  //  private void function_call_parameter_list() {
+  //    function_call_parameter_list:
+  //		non_empty_function_call_parameter_list { $$ = $1; }
+  //	| /* empty */
+  //  }
+  private void non_empty_function_call_parameter_list() {
+    //non_empty_function_call_parameter_list:
+    //		expr_without_variable
+    //	| variable
+    //	| '&' w_variable
+    //	| non_empty_function_call_parameter_list ',' expr_without_variable
+    //	| non_empty_function_call_parameter_list ',' variable
+    //	| non_empty_function_call_parameter_list ',' '&' w_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: non_empty_function_call_parameter_list()");
+    }
+    while (true) {
+      if (token == TokenNameAND) {
+        getNextToken();
+        w_variable();
+      } else {
+//        if (token == TokenNameIdentifier || token == TokenNameVariable
+//            || token == TokenNameDOLLAR) {
+//          variable();
+//        } else {
+          expr_without_variable(true);
+//        }
       }
-      getNextToken();
-    } while (true);
-  }
-  private void shiftExpression() {
-    do {
-      additiveExpression();
-      if (token != TokenNameLEFT_SHIFT && token != TokenNameRIGHT_SHIFT) {
-        return;
+      if (token != TokenNameCOMMA) {
+        break;
       }
       getNextToken();
-    } while (true);
+    }
   }
-  private void relationalExpression() {
-    do {
-      shiftExpression();
-      if (token != TokenNameLESS && token != TokenNameGREATER
-          && token != TokenNameLESS_EQUAL && token != TokenNameGREATER_EQUAL) {
-        return;
-      }
+  private void fully_qualified_class_name() {
+    if (token == TokenNameIdentifier) {
       getNextToken();
-    } while (true);
+    } else {
+      throwSyntaxError("Class name expected.");
+    }
   }
-  private void identicalExpression() {
-    do {
-      relationalExpression();
-      if (token != TokenNameEQUAL_EQUAL_EQUAL
-          && token != TokenNameNOT_EQUAL_EQUAL) {
-        return;
-      }
+  private void static_member() {
+    //  static_member:
+    //	fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM
+    // variable_without_objects
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: static_member()");
+    }
+    fully_qualified_class_name();
+    if (token != TokenNamePAAMAYIM_NEKUDOTAYIM) {
+      throwSyntaxError("'::' expected after class name (static_member).");
+    }
+    getNextToken();
+    variable_without_objects();
+  }
+  private void base_variable_with_function_calls() {
+    //  base_variable_with_function_calls:
+    //	base_variable
+    //| function_call
+    boolean functionCall = false;
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: base_variable_with_function_calls()");
+    }
+    if (token == TokenNameIdentifier) {
+      functionCall = true;
+    } else if (token == TokenNameVariable) {
+      int tempToken = token;
+      int tempPosition = scanner.currentPosition;
       getNextToken();
-    } while (true);
+      if (token == TokenNameLPAREN) {
+        functionCall = true;
+      }
+      token = tempToken;
+      scanner.currentPosition = tempPosition;
+      scanner.phpMode = true;
+    }
+    if (functionCall) {
+      function_call();
+    } else {
+      base_variable();
+    }
   }
-  private void equalityExpression() {
-    do {
-      identicalExpression();
-      if (token != TokenNameEQUAL_EQUAL && token != TokenNameNOT_EQUAL) {
-        return;
+  private void base_variable() {
+    //  base_variable:
+    //  		reference_variable
+    //  	| simple_indirect_reference reference_variable
+    //  	| static_member
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: base_variable()");
+    }
+    if (token == TokenNameIdentifier) {
+      static_member();
+    } else {
+      while (token == TokenNameDOLLAR) {
+        getNextToken();
       }
-      getNextToken();
-    } while (true);
+      reference_variable();
+    }
   }
-  private void ternaryExpression() {
-    equalityExpression();
-    if (token == TokenNameQUESTION) {
-      getNextToken();
-      expr();
-      if (token == TokenNameCOLON) {
+  //  private void simple_indirect_reference() {
+  //    // simple_indirect_reference:
+  //    // '$'
+  //    //| simple_indirect_reference '$'
+  //  }
+  private void reference_variable() {
+    //  reference_variable:
+    //  		reference_variable '[' dim_offset ']'
+    //  	| reference_variable '{' expr '}'
+    //  	| compound_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: reference_variable()");
+    }
+    compound_variable();
+    while (true) {
+      if (token == TokenNameLBRACE) {
         getNextToken();
         expr();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in reference variable.");
+        }
+        getNextToken();
+      } else if (token == TokenNameLBRACKET) {
+        getNextToken();
+        if (token != TokenNameRBRACKET) {
+          expr();
+          //        dim_offset();
+          if (token != TokenNameRBRACKET) {
+            throwSyntaxError("']' expected in reference variable.");
+          }
+        }
+        getNextToken();
       } else {
-        throwSyntaxError("':' expected in ternary operator '? :'.");
+        break;
       }
     }
   }
-  private void andExpression() {
-    do {
-      ternaryExpression();
-      if (token != TokenNameAND) {
-        return;
-      }
-      getNextToken();
-    } while (true);
-  }
-  private void exclusiveorExpression() {
-    do {
-      andExpression();
-      if (token != TokenNameXOR) {
-        return;
-      }
-      getNextToken();
-    } while (true);
-  }
-  private void inclusiveorExpression() {
-    do {
-      exclusiveorExpression();
-      if (token != TokenNameOR) {
-        return;
-      }
-      getNextToken();
-    } while (true);
-  }
-  private void booleanandExpression() {
-    do {
-      inclusiveorExpression();
-      if (token != TokenNameAND_AND) {
-        return;
-      }
-      getNextToken();
-    } while (true);
-  }
-  private void booleanorExpression() {
-    do {
-      booleanandExpression();
-      if (token != TokenNameOR_OR) {
-        return;
-      }
+  private void compound_variable() {
+    //  compound_variable:
+    //  		T_VARIABLE
+    //  	| '$' '{' expr '}'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: compound_variable()");
+    }
+    if (token == TokenNameVariable) {
       getNextToken();
-    } while (true);
-  }
-  private void logicalandExpression() {
-    do {
-      booleanorExpression();
-      if (token != TokenNameAND) {
-        return;
+    } else {
+      // because of simple_indirect_reference
+      while (token == TokenNameDOLLAR) {
+        getNextToken();
       }
-      getNextToken();
-    } while (true);
-  }
-  private void logicalexclusiveorExpression() {
-    do {
-      logicalandExpression();
-      if (token != TokenNameXOR) {
-        return;
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected after compound variable token '$'.");
       }
       getNextToken();
-    } while (true);
-  }
-  private void logicalinclusiveorExpression() {
-    do {
-      logicalexclusiveorExpression();
-      if (token != TokenNameOR) {
-        return;
+      expr();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected after compound variable token '$'.");
       }
       getNextToken();
-    } while (true);
+    }
   }
-  //  public void assignmentExpression() {
-  //    if (token == TokenNameVARIABLE) {
-  //      getNextToken();
-  //      if (token == TokenNameSET) {
-  //        getNextToken();
-  //        logicalinclusiveorExpression();
-  //      }
-  //    } else {
-  //      logicalinclusiveorExpression();
-  //    }
+  //  private void dim_offset() {
+  //    // dim_offset:
+  //    // /* empty */
+  //    // | expr
+  //    expr();
   //  }
-  private void variableList() {
-    do {
-      variable();
-      if (token == TokenNameCOMMA) {
+  private void object_property() {
+    //  object_property:
+    //	object_dim_list
+    //| variable_without_objects
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: object_property()");
+    }
+    if (token == TokenNameVariable || token == TokenNameDOLLAR) {
+      variable_without_objects();
+    } else {
+      object_dim_list();
+    }
+  }
+  private void object_dim_list() {
+    //object_dim_list:
+    //	object_dim_list '[' dim_offset ']'
+    //| object_dim_list '{' expr '}'
+    //| variable_name
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: object_dim_list()");
+    }
+    variable_name();
+    while (true) {
+      if (token == TokenNameLBRACE) {
+        getNextToken();
+        expr();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in object_dim_list.");
+        }
+        getNextToken();
+      } else if (token == TokenNameLBRACKET) {
+        getNextToken();
+        if (token == TokenNameRBRACKET) {
+          getNextToken();
+          continue;
+        }
+        expr();
+        if (token != TokenNameRBRACKET) {
+          throwSyntaxError("']' expected in object_dim_list.");
+        }
         getNextToken();
       } else {
         break;
       }
-    } while (true);
+    }
   }
-  private void variable() {
-    if (token == TokenNameDOLLAR_LBRACE) {
+  private void variable_name() {
+    //variable_name:
+    //	T_STRING
+    //| '{' expr '}'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_name()");
+    }
+    if (token == TokenNameIdentifier) {
+      getNextToken();
+    } else {
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in variable name.");
+      }
       getNextToken();
       expr();
-      ;
       if (token != TokenNameRBRACE) {
-        throwSyntaxError("'}' expected after indirect variable token '${'.");
+        throwSyntaxError("'}' expected in variable name.");
       }
+    }
+  }
+  private void r_variable() {
+    variable();
+  }
+  private void w_variable() {
+    variable();
+  }
+  private void rw_variable() {
+    variable();
+  }
+  private void variable() {
+    //    variable:
+    //		base_variable_with_function_calls T_OBJECT_OPERATOR
+    //			object_property method_or_not variable_properties
+    //	| base_variable_with_function_calls
+    base_variable_with_function_calls();
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+      method_or_not();
+      variable_properties();
+    }
+    //    if (token == TokenNameDOLLAR_LBRACE) {
+    //      getNextToken();
+    //      expr();
+    //      ;
+    //      if (token != TokenNameRBRACE) {
+    //        throwSyntaxError("'}' expected after indirect variable token '${'.");
+    //      }
+    //      getNextToken();
+    //    } else {
+    //      if (token == TokenNameVariable) {
+    //        getNextToken();
+    //        if (token == TokenNameLBRACKET) {
+    //          getNextToken();
+    //          expr();
+    //          if (token != TokenNameRBRACKET) {
+    //            throwSyntaxError("']' expected in variable-list.");
+    //          }
+    //          getNextToken();
+    //        } else if (token == TokenNameEQUAL) {
+    //          getNextToken();
+    //          static_scalar();
+    //        }
+    //      } else {
+    //        throwSyntaxError("$-variable expected in variable-list.");
+    //      }
+    //    }
+  }
+  private void variable_properties() {
+    //  variable_properties:
+    //  		variable_properties variable_property
+    //  	| /* empty */
+    while (token == TokenNameMINUS_GREATER) {
+      variable_property();
+    }
+  }
+  private void variable_property() {
+    //  variable_property:
+    //  		T_OBJECT_OPERATOR object_property method_or_not
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_property()");
+    }
+    if (token == TokenNameMINUS_GREATER) {
       getNextToken();
+      object_property();
+      method_or_not();
     } else {
-      if (token == TokenNameVariable) {
+      throwSyntaxError("'->' expected in variable_property.");
+    }
+  }
+  private void method_or_not() {
+    //  method_or_not:
+    //  		'(' function_call_parameter_list ')'
+    //  	| /* empty */
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: method_or_not()");
+    }
+    if (token == TokenNameLPAREN) {
+      getNextToken();
+      if (token == TokenNameRPAREN) {
         getNextToken();
-        if (token == TokenNameLBRACKET) {
-          getNextToken();
-          expr();
-          if (token != TokenNameRBRACKET) {
-            throwSyntaxError("']' expected in variable-list.");
-          }
-          getNextToken();
-        } else if (token == TokenNameEQUAL) {
-          getNextToken();
-          static_scalar();
-        }
-      } else {
-        throwSyntaxError("$-variable expected in variable-list.");
+        return;
+      }
+      non_empty_function_call_parameter_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in method_or_not.");
       }
+      getNextToken();
     }
   }
   private void exit_expr() {
@@ -2878,6 +3144,17 @@ public class Parser //extends PHPParserSuperclass
     }
     return false;
   }
+  private void scalar() {
+    //  scalar:
+    //	T_STRING
+    //| T_STRING_VARNAME
+    //| class_constant
+    //| common_scalar
+    //| '"' encaps_list '"'
+    //| '\'' encaps_list '\''
+    //| T_START_HEREDOC encaps_list T_END_HEREDOC
+    throwSyntaxError("Not yet implemented (scalar).");
+  }
   private void static_scalar() {
     //    static_scalar: /* compile-time evaluated scalars */
     //		common_scalar
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index bef873a..041fd95 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -131,6 +131,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public char[][] taskTags = null;
   public char[][] taskPriorities = null;
   public static final boolean DEBUG = false;
+  public static final boolean TRACE = false;
   public Scanner() {
     this(false, false);
   }
@@ -675,6 +676,133 @@ public class Scanner implements IScanner, ITerminalSymbols {
       return false;
     }
   }
+  public int getCastOrParen() {
+    int tempPosition = currentPosition;
+    char tempCharacter = currentCharacter;
+    int tempToken = TokenNameLPAREN;
+    boolean found = false;
+    StringBuffer buf = new StringBuffer();
+    try {
+      do {
+        currentCharacter = source[currentPosition++];
+      } while (currentCharacter == ' ' || currentCharacter == '\t');
+      while ((currentCharacter >= 'a' && currentCharacter <= 'z')
+          || (currentCharacter >= 'A' && currentCharacter <= 'Z')) {
+        buf.append(currentCharacter);
+        currentCharacter = source[currentPosition++];
+      }
+      if (buf.length() >= 3 && buf.length() <= 7) {
+        char[] data = buf.toString().toCharArray();
+        int index = 0;
+        switch (data.length) {
+          case 3 :
+            // int
+            if ((data[index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 't')) {
+              found = true;
+              tempToken = TokenNameintCAST;
+            }
+            break;
+          case 4 :
+            // bool real
+            if ((data[index] == 'b') && (data[++index] == 'o')
+                && (data[++index] == 'o') && (data[++index] == 'l')) {
+              found = true;
+              tempToken = TokenNameboolCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 'r') && (data[++index] == 'e')
+                  && (data[++index] == 'a') && (data[++index] == 'l')) {
+                found = true;
+                tempToken = TokenNamedoubleCAST;
+              }
+            }
+            break;
+          case 5 :
+            // array unset float
+            if ((data[index] == 'a') && (data[++index] == 'r')
+                && (data[++index] == 'r') && (data[++index] == 'a')
+                && (data[++index] == 'y')) {
+              found = true;
+              tempToken = TokenNamearrayCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 'u') && (data[++index] == 'n')
+                  && (data[++index] == 's') && (data[++index] == 'e')
+                  && (data[++index] == 't')) {
+                found = true;
+                tempToken = TokenNameunsetCAST;
+              } else {
+                index = 0;
+                if ((data[index] == 'f') && (data[++index] == 'l')
+                    && (data[++index] == 'o') && (data[++index] == 'a')
+                    && (data[++index] == 't')) {
+                  found = true;
+                  tempToken = TokenNamedoubleCAST;
+                }
+              }
+            }
+            break;
+          case 6 :
+            // object string double
+            if ((data[index] == 'o') && (data[++index] == 'b')
+                && (data[++index] == 'j') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 't')) {
+              found = true;
+              tempToken = TokenNameobjectCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 's') && (data[++index] == 't')
+                  && (data[++index] == 'r') && (data[++index] == 'i')
+                  && (data[++index] == 'n') && (data[++index] == 'g')) {
+                found = true;
+                tempToken = TokenNamestringCAST;
+              } else {
+                index = 0;
+                if ((data[index] == 'd') && (data[++index] == 'o')
+                    && (data[++index] == 'u') && (data[++index] == 'b')
+                    && (data[++index] == 'l') && (data[++index] == 'e')) {
+                  found = true;
+                  tempToken = TokenNamedoubleCAST;
+                }
+              }
+            }
+            break;
+          case 7 :
+            // boolean integer
+            if ((data[index] == 'b') && (data[++index] == 'o')
+                && (data[++index] == 'o') && (data[++index] == 'l')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'n')) {
+              found = true;
+              tempToken = TokenNameboolCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 'i') && (data[++index] == 'n')
+                  && (data[++index] == 't') && (data[++index] == 'e')
+                  && (data[++index] == 'g') && (data[++index] == 'e')
+                  && (data[++index] == 'r')) {
+                found = true;
+                tempToken = TokenNameintCAST;
+              }
+            }
+            break;
+        }
+        if (found) {
+          while (currentCharacter == ' ' || currentCharacter == '\t') {
+            currentCharacter = source[currentPosition++];
+          }
+          if (currentCharacter == ')') {
+            return tempToken;
+          }
+        }
+      }
+    } catch (IndexOutOfBoundsException e) {
+    }
+    currentCharacter = tempCharacter;
+    currentPosition = tempPosition;
+    return TokenNameLPAREN;
+  }
   public int getNextToken() throws InvalidInputException {
     int htmlPosition = currentPosition;
     try {
@@ -781,7 +909,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
           // ---------Identify the next token-------------
           switch (currentCharacter) {
             case '(' :
-              return TokenNameLPAREN;
+              return getCastOrParen();
             case ')' :
               return TokenNameRPAREN;
             case '{' :
@@ -797,6 +925,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
             case ',' :
               return TokenNameCOMMA;
             case '.' :
+              if (getNextChar('='))
+                return TokenNameDOT_EQUAL;
               if (getNextCharAsDigit())
                 return scanNumber(true);
               return TokenNameDOT;
@@ -842,56 +972,66 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNameREMAINDER;
             case '<' :
               {
-                int test;
-                if ((test = getNextChar('=', '<')) == 0)
-                  return TokenNameLESS_EQUAL;
-                if (test > 0) {
-                  if (getNextChar('='))
-                    return TokenNameLEFT_SHIFT_EQUAL;
-                  if (getNextChar('<')) {
-                    int heredocStart = currentPosition;
-                    int heredocLength = 0;
-                    currentCharacter = source[currentPosition++];
-                    if (isPHPIdentifierStart(currentCharacter)) {
-                      currentCharacter = source[currentPosition++];
-                    } else {
-                      return TokenNameERROR;
-                    }
-                    while (isPHPIdentifierPart(currentCharacter)) {
+                int oldPosition = currentPosition;
+                try {
+                  currentCharacter = source[currentPosition++];
+                } catch (IndexOutOfBoundsException e) {
+                  currentPosition = oldPosition;
+                  return TokenNameLESS;
+                }
+                switch (currentCharacter) {
+                  case '=' :
+                    return TokenNameLESS_EQUAL;
+                  case '>' :
+                    return TokenNameNOT_EQUAL;
+                  case '<' :
+                    if (getNextChar('='))
+                      return TokenNameLEFT_SHIFT_EQUAL;
+                    if (getNextChar('<')) {
+                      int heredocStart = currentPosition;
+                      int heredocLength = 0;
                       currentCharacter = source[currentPosition++];
-                    }
-                    heredocLength = currentPosition - heredocStart - 1;
-                    // heredoc end-tag determination
-                    boolean endTag = true;
-                    char ch;
-                    do {
-                      ch = source[currentPosition++];
-                      if (ch == '\r' || ch == '\n') {
-                        if (recordLineSeparator) {
-                          pushLineSeparator();
-                        } else {
-                          currentLine = null;
-                        }
-                        for (int i = 0; i < heredocLength; i++) {
-                          if (source[currentPosition + i] != source[heredocStart
-                              + i]) {
-                            endTag = false;
-                            break;
+                      if (isPHPIdentifierStart(currentCharacter)) {
+                        currentCharacter = source[currentPosition++];
+                      } else {
+                        return TokenNameERROR;
+                      }
+                      while (isPHPIdentifierPart(currentCharacter)) {
+                        currentCharacter = source[currentPosition++];
+                      }
+                      heredocLength = currentPosition - heredocStart - 1;
+                      // heredoc end-tag determination
+                      boolean endTag = true;
+                      char ch;
+                      do {
+                        ch = source[currentPosition++];
+                        if (ch == '\r' || ch == '\n') {
+                          if (recordLineSeparator) {
+                            pushLineSeparator();
+                          } else {
+                            currentLine = null;
+                          }
+                          for (int i = 0; i < heredocLength; i++) {
+                            if (source[currentPosition + i] != source[heredocStart
+                                + i]) {
+                              endTag = false;
+                              break;
+                            }
+                          }
+                          if (endTag) {
+                            currentPosition += heredocLength - 1;
+                            currentCharacter = source[currentPosition++];
+                            break; // do...while loop
+                          } else {
+                            endTag = true;
                           }
                         }
-                        if (endTag) {
-                          currentPosition += heredocLength - 1;
-                          currentCharacter = source[currentPosition++];
-                          break; // do...while loop
-                        } else {
-                          endTag = true;
-                        }
-                      }
-                    } while (true);
-                    return TokenNameHEREDOC;
-                  }
-                  return TokenNameLEFT_SHIFT;
+                      } while (true);
+                      return TokenNameHEREDOC;
+                    }
+                    return TokenNameLEFT_SHIFT;
                 }
+                currentPosition = oldPosition;
                 return TokenNameLESS;
               }
             case '>' :
@@ -1330,9 +1470,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
             case '#' :
             case '/' :
               {
+                char startChar = currentCharacter;
+                if (getNextChar('=')) {
+                  return TokenNameDIVIDE_EQUAL;
+                }
                 int test;
-                if ((currentCharacter == '#')
-                    || (test = getNextChar('/', '*')) == 0) {
+                if ((startChar == '#') || (test = getNextChar('/', '*')) == 0) {
                   //line comment
                   int endPositionForLineComment = 0;
                   try { //get the next char
@@ -1546,8 +1689,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   }
                   break;
                 }
-                if (getNextChar('='))
-                  return TokenNameDIVIDE_EQUAL;
                 return TokenNameDIVIDE;
               }
             case '\u001a' :
@@ -1558,13 +1699,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
               throw new InvalidInputException("Ctrl-Z"); //$NON-NLS-1$
             default :
               if (currentCharacter == '$') {
-                while ((currentCharacter = source[currentPosition++]) == '$') {
+                int oldPosition = currentPosition;
+                try {
+                  currentCharacter = source[currentPosition++];
+                  
+                  if (isPHPIdentifierStart(currentCharacter)) {
+                    return scanIdentifierOrKeyword(true);
+                  } else {
+                    currentPosition = oldPosition;
+                    return TokenNameDOLLAR;
+                  }
+                } catch (IndexOutOfBoundsException e) {
+                  currentPosition = oldPosition;
+                  return TokenNameDOLLAR;
                 }
-                if (currentCharacter == '{')
-                  return TokenNameDOLLAR_LBRACE;
-                if (isPHPIdentifierStart(currentCharacter))
-                  return scanIdentifierOrKeyword(true);
-                return TokenNameERROR;
               }
               if (isPHPIdentifierStart(currentCharacter))
                 return scanIdentifierOrKeyword(false);
@@ -2508,9 +2656,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
     while (getNextCharAsJavaIdentifierPart()) {
     };
     if (isVariable) {
-      if (new String(getCurrentTokenSource()).equals("$this")) {
-        return TokenNamethis;
-      }
+      //      if (new String(getCurrentTokenSource()).equals("$this")) {
+      //        return TokenNamethis;
+      //      }
       return TokenNameVariable;
     }
     int index, length;
@@ -2600,7 +2748,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
           case 3 :
             //and
             if ((data[++index] == 'n') && (data[++index] == 'd')) {
-              return TokenNameAND;
+              return TokenNameand;
             } else {
               return TokenNameIdentifier;
             }
@@ -2635,7 +2783,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
             return TokenNameIdentifier;
         }
       case 'c' :
-        //case catch class const continue
+        //case catch class clone const continue
         switch (length) {
           case 4 :
             if ((data[++index] == 'a') && (data[++index] == 's')
@@ -2647,10 +2795,16 @@ public class Scanner implements IScanner, ITerminalSymbols {
             if ((data[++index] == 'a') && (data[++index] == 't')
                 && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNamecatch;
-            if ((data[index] == 'l') && (data[++index] == 'a')
+            index = 0;
+            if ((data[++index] == 'l') && (data[++index] == 'a')
                 && (data[++index] == 's') && (data[++index] == 's'))
               return TokenNameclass;
-            if ((data[index] == 'o') && (data[++index] == 'n')
+            index = 0;
+            if ((data[++index] == 'l') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == 'e'))
+              return TokenNameclone;
+            index = 0;
+            if ((data[++index] == 'o') && (data[++index] == 'n')
                 && (data[++index] == 's') && (data[++index] == 't'))
               return TokenNameconst;
             else
@@ -2793,9 +2947,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
             else
               return TokenNameIdentifier;
           case 5 :
-//            if ((data[++index] == 'a') && (data[++index] == 'l')
-//                && (data[++index] == 's') && (data[++index] == 'e'))
-//              return TokenNamefalse;
+            //            if ((data[++index] == 'a') && (data[++index] == 'l')
+            //                && (data[++index] == 's') && (data[++index] == 'e'))
+            //              return TokenNamefalse;
             if ((data[++index] == 'i') && (data[++index] == 'n')
                 && (data[++index] == 'a') && (data[++index] == 'l'))
               return TokenNamefinal;
@@ -2912,12 +3066,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNamenew;
             else
               return TokenNameIdentifier;
-//          case 4 :
-//            if ((data[++index] == 'u') && (data[++index] == 'l')
-//                && (data[++index] == 'l'))
-//              return TokenNamenull;
-//            else
-//              return TokenNameIdentifier;
+          //          case 4 :
+          //            if ((data[++index] == 'u') && (data[++index] == 'l')
+          //                && (data[++index] == 'l'))
+          //              return TokenNamenull;
+          //            else
+          //              return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
@@ -2925,7 +3079,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
         // or old_function
         if (length == 2) {
           if (data[++index] == 'r') {
-            return TokenNameOR;
+            return TokenNameor;
           }
         }
         //        if (length == 12) {
@@ -3029,12 +3183,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
               return TokenNametry;
             else
               return TokenNameIdentifier;
-//          case 4 :
-//            if ((data[++index] == 'r') && (data[++index] == 'u')
-//                && (data[++index] == 'e'))
-//              return TokenNametrue;
-//            else
-//              return TokenNameIdentifier;
+          //          case 4 :
+          //            if ((data[++index] == 'r') && (data[++index] == 'u')
+          //                && (data[++index] == 'e'))
+          //              return TokenNametrue;
+          //            else
+          //              return TokenNameIdentifier;
           case 5 :
             if ((data[++index] == 'h') && (data[++index] == 'r')
                 && (data[++index] == 'o') && (data[++index] == 'w'))
@@ -3095,7 +3249,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
         switch (length) {
           case 3 :
             if ((data[++index] == 'o') && (data[++index] == 'r'))
-              return TokenNameXOR;
+              return TokenNamexor;
             else
               return TokenNameIdentifier;
           default :
@@ -3325,6 +3479,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "Variable(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameabstract :
         return "abstract"; //$NON-NLS-1$
+      case TokenNameand :
+        return "AND"; //$NON-NLS-1$
       case TokenNamearray :
         return "array"; //$NON-NLS-1$
       case TokenNameas :
@@ -3335,6 +3491,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "case"; //$NON-NLS-1$
       case TokenNameclass :
         return "class"; //$NON-NLS-1$
+      case TokenNameclone :
+        //$NON-NLS-1$
+        return "clone";
+      case TokenNameconst :
+        //$NON-NLS-1$
+        return "const";
       case TokenNamecontinue :
         return "continue"; //$NON-NLS-1$
       case TokenNamedefault :
@@ -3361,8 +3523,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "endwhile"; //$NON-NLS-1$
       case TokenNameextends :
         return "extends"; //$NON-NLS-1$
-//      case TokenNamefalse :
-//        return "false"; //$NON-NLS-1$
+      //      case TokenNamefalse :
+      //        return "false"; //$NON-NLS-1$
       case TokenNamefinal :
         return "final"; //$NON-NLS-1$
       case TokenNamefor :
@@ -3383,12 +3545,16 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "include_once"; //$NON-NLS-1$
       case TokenNameinterface :
         return "interface"; //$NON-NLS-1$
+      case TokenNameisset :
+        return "isset"; //$NON-NLS-1$
       case TokenNamelist :
         return "list"; //$NON-NLS-1$
       case TokenNamenew :
         return "new"; //$NON-NLS-1$
-//      case TokenNamenull :
-//        return "null"; //$NON-NLS-1$
+      //      case TokenNamenull :
+      //        return "null"; //$NON-NLS-1$
+      case TokenNameor :
+        return "OR"; //$NON-NLS-1$
       case TokenNameprint :
         return "print"; //$NON-NLS-1$
       case TokenNameprivate :
@@ -3407,16 +3573,18 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "static"; //$NON-NLS-1$
       case TokenNameswitch :
         return "switch"; //$NON-NLS-1$
-//      case TokenNametrue :
-//        return "true"; //$NON-NLS-1$
+      //      case TokenNametrue :
+      //        return "true"; //$NON-NLS-1$
       case TokenNameunset :
         return "unset"; //$NON-NLS-1$
       case TokenNamevar :
         return "var"; //$NON-NLS-1$
       case TokenNamewhile :
         return "while"; //$NON-NLS-1$
-      case TokenNamethis :
-        return "$this"; //$NON-NLS-1$
+      case TokenNamexor :
+        return "XOR"; //$NON-NLS-1$
+      //      case TokenNamethis :
+      //        return "$this"; //$NON-NLS-1$
       case TokenNameIntegerLiteral :
         return "Integer(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameDoubleLiteral :
@@ -3468,6 +3636,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "^="; //$NON-NLS-1$
       case TokenNameREMAINDER_EQUAL :
         return "%="; //$NON-NLS-1$
+      case TokenNameDOT_EQUAL :
+        return ".="; //$NON-NLS-1$
       case TokenNameLEFT_SHIFT_EQUAL :
         return "<<="; //$NON-NLS-1$
       case TokenNameRIGHT_SHIFT_EQUAL :
@@ -3530,8 +3700,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "="; //$NON-NLS-1$
       case TokenNameAT :
         return "@";
-      case TokenNameDOLLAR_LBRACE :
-        return "${";
+      case TokenNameDOLLAR :
+        return "$";
+      //      case TokenNameDOLLAR_LBRACE :
+      //        return "${";
       case TokenNameEOF :
         return "EOF"; //$NON-NLS-1$
       case TokenNameWHITESPACE :
@@ -3553,7 +3725,17 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case TokenNameMETHOD_C :
         return "__METHOD__"; //$NON-NLS-1$
       case TokenNameFUNC_C :
-        return "__FUNCTION__"; //$NON-NLS-1$
+        return "__FUNCTION__"; //$NON-NLS-1
+      case TokenNameboolCAST :
+        return "( bool )"; //$NON-NLS-1$
+      case TokenNameintCAST :
+        return "( int )"; //$NON-NLS-1$
+      case TokenNamedoubleCAST :
+        return "( double )"; //$NON-NLS-1$
+      case TokenNameobjectCAST :
+        return "( object )"; //$NON-NLS-1$
+      case TokenNamestringCAST :
+        return "( string )"; //$NON-NLS-1$
       default :
         return "not-a-token(" + (new Integer(act)) + ") "
             + new String(getCurrentTokenSource()); //$NON-NLS-1$
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
index 7e1acce..3b07fa2 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
@@ -2697,7 +2697,7 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
           //				case Scanner.TokenNamestrictfp:
           //				case Scanner.TokenNamesynchronized:
           case Scanner.TokenNametry :
-          case Scanner.TokenNamethis :
+//          case Scanner.TokenNamethis :
           //					case Scanner.TokenNametrue :
           case Scanner.TokenNamethrow :
           //				case Scanner.TokenNamethrows:
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
index ecfed39..e48c07c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -9,14 +9,12 @@
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
 package net.sourceforge.phpdt.internal.formatter;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Map;
-
 import net.sourceforge.phpdt.core.ICodeFormatter;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
@@ -25,104 +23,85 @@ import net.sourceforge.phpdt.internal.compiler.ConfigurableOption;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.formatter.impl.FormatterOptions;
 import net.sourceforge.phpdt.internal.formatter.impl.SplitLine;
-
-/** <h2>How to format a piece of code ?</h2>
- * <ul><li>Create an instance of <code>CodeFormatter</code>
- * <li>Use the method <code>void format(aString)</code>
- * on this instance to format <code>aString</code>.
- * It will return the formatted string.</ul>
-*/
+/**
+ * <h2>How to format a piece of code ?</h2>
+ * <ul>
+ * <li>Create an instance of <code>CodeFormatter</code>
+ * <li>Use the method <code>void format(aString)</code> on this instance to
+ * format <code>aString</code>. It will return the formatted string.
+ * </ul>
+ */
 public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
-
   public FormatterOptions options;
-
-  /** 
+  /**
    * Represents a block in the <code>constructions</code> stack.
    */
   public static final int BLOCK = ITerminalSymbols.TokenNameLBRACE;
-
-  /** 
-   * Represents a block following a control statement in the <code>constructions</code> stack.
+  /**
+   * Represents a block following a control statement in the <code>constructions</code>
+   * stack.
    */
   public static final int NONINDENT_BLOCK = -100;
-
-  /** 
+  /**
    * Contains the formatted output.
    */
   StringBuffer formattedSource;
-
-  /** 
-   * Contains the current line.<br>
+  /**
+   * Contains the current line. <br>
    * Will be dumped at the next "newline"
    */
   StringBuffer currentLineBuffer;
-
-  /** 
+  /**
    * Used during the formatting to get each token.
    */
   Scanner scanner;
-
-  /** 
-   * Contains the tokens responsible for the current indentation level
-   * and the blocks not closed yet.
+  /**
+   * Contains the tokens responsible for the current indentation level and the
+   * blocks not closed yet.
    */
   private int[] constructions;
-
-  /** 
+  /**
    * Index in the <code>constructions</code> array.
    */
   private int constructionsCount;
-
-  /** 
-   * Level of indentation of the current token (number of tab char put in front of it).
+  /**
+   * Level of indentation of the current token (number of tab char put in front
+   * of it).
    */
   private int indentationLevel;
-
-  /** 
+  /**
    * Regular level of indentation of all the lines
    */
   private int initialIndentationLevel;
-
-  /** 
+  /**
    * Used to split a line.
    */
   Scanner splitScanner;
-
-  /** 
-   * To remember the offset between the beginning of the line and the
-   * beginning of the comment.
+  /**
+   * To remember the offset between the beginning of the line and the beginning
+   * of the comment.
    */
   int currentCommentOffset;
   int currentLineIndentationLevel;
   int maxLineSize = 30;
   private boolean containsOpenCloseBraces;
   private int indentationLevelForOpenCloseBraces;
-
   /**
    * Collections of positions to map
    */
   private int[] positionsToMap;
-
   /**
    * Collections of mapped positions
    */
   private int[] mappedPositions;
-
   private int indexToMap;
-
   private int indexInMap;
-
   private int globalDelta;
-
   private int lineDelta;
-
   private int splitDelta;
-
   private int beginningOfLineIndex;
-
   private int multipleLineCommentCounter;
-
-  /** 
+  /**
    * Creates a new instance of Code Formatter using the given settings.
    * 
    * @deprecated backport 1.0 internal functionality
@@ -130,47 +109,42 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
   public CodeFormatter(ConfigurableOption[] settings) {
     this(convertConfigurableOptions(settings));
   }
-
-  /** 
-   * Creates a new instance of Code Formatter using the FormattingOptions object
-   * given as argument
+  /**
+   * Creates a new instance of Code Formatter using the FormattingOptions
+   * object given as argument
+   * 
    * @deprecated Use CodeFormatter(ConfigurableOption[]) instead
    */
   public CodeFormatter() {
     this((Map) null);
   }
-  /** 
+  /**
    * Creates a new instance of Code Formatter using the given settings.
    */
   public CodeFormatter(Map settings) {
-
     // initialize internal state
     constructionsCount = 0;
     constructions = new int[10];
     currentLineIndentationLevel = indentationLevel = initialIndentationLevel;
     currentCommentOffset = -1;
-
     // initialize primary and secondary scanners
-    scanner = new Scanner(true /*comment*/
-    , true /*whitespace*/
-    , false /*nls*/
-    , false /*assert*/
+    scanner = new Scanner(true /* comment */
+    , true /* whitespace */
+    , false /* nls */
+    , false /* assert */
     ); // regular scanner for forming lines
     scanner.recordLineSeparator = true;
-
     // to remind of the position of the beginning of the line.
-    splitScanner = new Scanner(true /*comment*/
-    , true /*whitespace*/
-    , false /*nls*/
-    , false /*assert*/
+    splitScanner = new Scanner(true /* comment */
+    , true /* whitespace */
+    , false /* nls */
+    , false /* assert */
     );
     // secondary scanner to split long lines formed by primary scanning
-
     // initialize current line buffer
     currentLineBuffer = new StringBuffer();
     this.options = new FormatterOptions(settings);
   }
-
   /**
    * Returns true if a lineSeparator has to be inserted before <code>operator</code>
    * false otherwise.
@@ -185,52 +159,51 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         return true;
     }
   }
-
-  /** 
-  * @deprecated backport 1.0 internal functionality
-  */
+  /**
+   * @deprecated backport 1.0 internal functionality
+   */
   private static Map convertConfigurableOptions(ConfigurableOption[] settings) {
     Hashtable options = new Hashtable(10);
-
     for (int i = 0; i < settings.length; i++) {
       if (settings[i].getComponentName().equals(CodeFormatter.class.getName())) {
         String optionName = settings[i].getOptionName();
         int valueIndex = settings[i].getCurrentValueIndex();
-
         if (optionName.equals("newline.openingBrace")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.newline.openingBrace", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put(
+              "net.sourceforge.phpdt.core.formatter.newline.openingBrace",
+              valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("newline.controlStatement")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.newline.controlStatement", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put(
+              "net.sourceforge.phpdt.core.formatter.newline.controlStatement",
+              valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("newline.clearAll")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.newline.clearAll", valueIndex == 0 ? "clear all" : "preserve one"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put("net.sourceforge.phpdt.core.formatter.newline.clearAll",
+              valueIndex == 0 ? "clear all" : "preserve one"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("newline.elseIf")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.newline.elseIf", valueIndex == 0 ? "do not insert" : "insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put("net.sourceforge.phpdt.core.formatter.newline.elseIf",
+              valueIndex == 0 ? "do not insert" : "insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("newline.emptyBlock")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.newline.emptyBlock", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put(
+              "net.sourceforge.phpdt.core.formatter.newline.emptyBlock",
+              valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("lineSplit")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.lineSplit", String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
-
+          options.put("net.sourceforge.phpdt.core.formatter.lineSplit", String
+              .valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
         } else if (optionName.equals("style.assignment")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.style.assignment", valueIndex == 0 ? "compact" : "normal"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put("net.sourceforge.phpdt.core.formatter.style.assignment",
+              valueIndex == 0 ? "compact" : "normal"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("tabulation.char")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.tabulation.char", valueIndex == 0 ? "tab" : "space"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+          options.put("net.sourceforge.phpdt.core.formatter.tabulation.char",
+              valueIndex == 0 ? "tab" : "space"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         } else if (optionName.equals("tabulation.size")) { //$NON-NLS-1$
-          options.put("net.sourceforge.phpdt.core.formatter.tabulation.size", String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
+          options.put("net.sourceforge.phpdt.core.formatter.tabulation.size",
+              String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
         }
       }
     }
-
     return options;
   }
-
-  /** 
+  /**
    * Returns the end of the source code.
    */
   private final String copyRemainingSource() {
@@ -243,9 +216,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return (bufr.toString());
   }
-
   /**
-   * Inserts <code>tabCount</code> tab character or their equivalent number of spaces.
+   * Inserts <code>tabCount</code> tab character or their equivalent number
+   * of spaces.
    */
   private void dumpTab(int tabCount) {
     if (options.indentWithTab) {
@@ -260,7 +233,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       }
     }
   }
-
   /**
    * Dumps <code>currentLineBuffer</code> into the formatted string.
    */
@@ -270,14 +242,17 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     beginningOfLineIndex = formattedSource.length();
     if (containsOpenCloseBraces) {
       containsOpenCloseBraces = false;
-      outputLine(currentString, false, indentationLevelForOpenCloseBraces, 0, -1, null, 0);
+      outputLine(currentString, false, indentationLevelForOpenCloseBraces, 0,
+          -1, null, 0);
       indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
     } else {
-      outputLine(currentString, false, currentLineIndentationLevel, 0, -1, null, 0);
+      outputLine(currentString, false, currentLineIndentationLevel, 0, -1,
+          null, 0);
     }
     int scannerSourceLength = scanner.source.length;
     if (scannerSourceLength > 2) {
-      if (scanner.source[scannerSourceLength - 1] == '\n' && scanner.source[scannerSourceLength - 2] == '\r') {
+      if (scanner.source[scannerSourceLength - 1] == '\n'
+          && scanner.source[scannerSourceLength - 2] == '\r') {
         formattedSource.append(options.lineSeparatorSequence);
         increaseGlobalDelta(options.lineSeparatorSequence.length - 2);
       } else if (scanner.source[scannerSourceLength - 1] == '\n') {
@@ -290,8 +265,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     updateMappedPositions(scanner.startPosition);
   }
-
-  /** 
+  /**
    * Formats the input string.
    */
   private void format() {
@@ -300,7 +274,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     int previousCompilableToken = 0;
     int indentationOffset = 0;
     int newLinesInWhitespace = 0;
-
     // number of new lines in the previous whitespace token
     // (used to leave blank lines before comments)
     int pendingNewLines = 0;
@@ -315,36 +288,32 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     boolean inThrowsClause = false;
     boolean inClassOrInterfaceHeader = false;
     int dollarBraceCount = 0;
-
-    // openBracketCount is used to count the number of open brackets not closed yet.
+    // openBracketCount is used to count the number of open brackets not closed
+    // yet.
     int openBracketCount = 0;
     int unarySignModifier = 0;
-
-    // openParenthesis[0] is used to count the parenthesis not belonging to a condition
+    // openParenthesis[0] is used to count the parenthesis not belonging to a
+    // condition
     // (eg foo();). parenthesis in for (...) are count elsewhere in the array.
     int openParenthesisCount = 1;
     int[] openParenthesis = new int[10];
-
-    // tokenBeforeColon is used to know what token goes along with the current :
+    // tokenBeforeColon is used to know what token goes along with the current
+    // :
     // it can be case or ?
     int tokenBeforeColonCount = 0;
     int[] tokenBeforeColon = new int[10];
-
     constructionsCount = 0; // initializes the constructions count.
-
     // contains DO if in a DO..WHILE statement, UNITIALIZED otherwise.
     int nlicsToken = 0;
-
-    // fix for 1FF17XY: LFCOM:ALL - Format problem on not matching } and else 
+    // fix for 1FF17XY: LFCOM:ALL - Format problem on not matching } and else
     boolean specialElse = false;
-
     // OPTION (IndentationLevel): initial indentation level may be non-zero.
     currentLineIndentationLevel += constructionsCount;
-
-    // An InvalidInputException exception might cause the termination of this loop.
+    // An InvalidInputException exception might cause the termination of this
+    // loop.
     try {
       while (true) {
-        // Get the next token.  Catch invalid input and output it
+        // Get the next token. Catch invalid input and output it
         // with minimal formatting, also catch end of input and
         // exit the loop.
         try {
@@ -352,11 +321,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           if (Scanner.DEBUG) {
             int currentEndPosition = scanner.getCurrentTokenEndPosition();
             int currentStartPosition = scanner.getCurrentTokenStartPosition();
-
-            System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
+            System.out.print(currentStartPosition + "," + currentEndPosition
+                + ": ");
             System.out.println(scanner.toStringAction(token));
           }
-
           // Patch for line comment
           // See PR http://dev.eclipse.org/bugs/show_bug.cgi?id=23096
           if (token == ITerminalSymbols.TokenNameCOMMENT_LINE) {
@@ -380,28 +348,30 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         }
         if (token == Scanner.TokenNameEOF)
           break;
-
-        /* ## MODIFYING the indentation level before generating new lines
-        and indentation in the output string
-        */
-
-        // Removes all the indentations made by statements not followed by a block
-        // except if the current token is ELSE, CATCH or if we are in a switch/case
+        /*
+         * ## MODIFYING the indentation level before generating new lines and
+         * indentation in the output string
+         */
+        // Removes all the indentations made by statements not followed by a
+        // block
+        // except if the current token is ELSE, CATCH or if we are in a
+        // switch/case
         if (clearNonBlockIndents && (token != Scanner.TokenNameWHITESPACE)) {
           switch (token) {
             case TokenNameelse :
-              if (constructionsCount > 0 && constructions[constructionsCount - 1] == TokenNameelse) {
+              if (constructionsCount > 0
+                  && constructions[constructionsCount - 1] == TokenNameelse) {
                 pendingNewLines = 1;
                 specialElse = true;
               }
               indentationLevel += popInclusiveUntil(TokenNameif);
               break;
-              //						case TokenNamecatch :
-              //							indentationLevel += popInclusiveUntil(TokenNamecatch);
-              //							break;
-              //						case TokenNamefinally :
-              //							indentationLevel += popInclusiveUntil(TokenNamecatch);
-              //							break;
+            //						case TokenNamecatch :
+            //							indentationLevel += popInclusiveUntil(TokenNamecatch);
+            //							break;
+            //						case TokenNamefinally :
+            //							indentationLevel += popInclusiveUntil(TokenNamecatch);
+            //							break;
             case TokenNamewhile :
               if (nlicsToken == TokenNamedo) {
                 indentationLevel += pop(TokenNamedo);
@@ -409,9 +379,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               }
             default :
               indentationLevel += popExclusiveUntilBlockOrCase();
-              // clear until a CASE, DEFAULT or BLOCK is encountered.
-              // Thus, the indentationLevel is correctly cleared either
-              // in a switch/case statement or in any other situation.
+          // clear until a CASE, DEFAULT or BLOCK is encountered.
+          // Thus, the indentationLevel is correctly cleared either
+          // in a switch/case statement or in any other situation.
           }
           clearNonBlockIndents = false;
         }
@@ -423,15 +393,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         //				if (token == Scanner.TokenNamethrows) {
         //					inThrowsClause = true;
         //				}
-        if ((token == Scanner.TokenNameclass // || token == Scanner.TokenNameinterface
-        )
-          && previousToken != Scanner.TokenNameDOT) {
+        if ((token == Scanner.TokenNameclass // || token ==
+                                             // Scanner.TokenNameinterface
+            ) && previousToken != Scanner.TokenNameDOT) {
           inClassOrInterfaceHeader = true;
         }
-
-        /* ## APPEND newlines and indentations to the output string
-        */
-        // Do not add a new line between ELSE and IF, if the option elseIfOnSameLine is true.
+        /*
+         * ## APPEND newlines and indentations to the output string
+         */
+        // Do not add a new line between ELSE and IF, if the option
+        // elseIfOnSameLine is true.
         // Fix for 1ETLWPZ: IVJCOM:ALL - incorrect "else if" formatting
         //        if (pendingNewlineAfterParen
         //          && previousCompilableToken == TokenNameelse
@@ -447,30 +418,32 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         // Add a newline & indent to the formatted source string if
         // a for/if-else/while statement was scanned and there is no block
         // following it.
-        pendingNewlineAfterParen =
-          pendingNewlineAfterParen || (previousCompilableToken == TokenNameRPAREN && token == TokenNameLBRACE);
+        pendingNewlineAfterParen = pendingNewlineAfterParen
+            || (previousCompilableToken == TokenNameRPAREN && token == TokenNameLBRACE);
         if (pendingNewlineAfterParen && token != Scanner.TokenNameWHITESPACE) {
           pendingNewlineAfterParen = false;
-
           // Do to add a newline & indent sequence if the current token is an
-          // open brace or a period or if the current token is a semi-colon and the
+          // open brace or a period or if the current token is a semi-colon and
+          // the
           // previous token is a close paren.
           // add a new line if a parenthesis belonging to a for() statement
           // has been closed and the current token is not an opening brace
           if (token != TokenNameLBRACE
-            && !isComment(token) // to avoid adding new line between else and a comment
-            && token != TokenNameDOT
-            && !(previousCompilableToken == TokenNameRPAREN && token == TokenNameSEMICOLON)) {
+              && !isComment(token)
+              // to avoid adding new line between else and a comment
+              && token != TokenNameDOT
+              && !(previousCompilableToken == TokenNameRPAREN && token == TokenNameSEMICOLON)) {
             newLine(1);
             currentLineIndentationLevel = indentationLevel;
             pendingNewLines = 0;
             pendingSpace = false;
           } else {
-            if (token == TokenNameLBRACE && options.newLineBeforeOpeningBraceMode) {
+            if (token == TokenNameLBRACE
+                && options.newLineBeforeOpeningBraceMode) {
               newLine(1);
               if (constructionsCount > 0
-                && constructions[constructionsCount - 1] != BLOCK
-                && constructions[constructionsCount - 1] != NONINDENT_BLOCK) {
+                  && constructions[constructionsCount - 1] != BLOCK
+                  && constructions[constructionsCount - 1] != NONINDENT_BLOCK) {
                 currentLineIndentationLevel = indentationLevel - 1;
               } else {
                 currentLineIndentationLevel = indentationLevel;
@@ -480,10 +453,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             }
           }
         }
-        if (token == TokenNameLBRACE
-          && options.newLineBeforeOpeningBraceMode
-          && constructionsCount > 0
-          && constructions[constructionsCount - 1] == TokenNamedo) {
+        if (token == TokenNameLBRACE && options.newLineBeforeOpeningBraceMode
+            && constructionsCount > 0
+            && constructions[constructionsCount - 1] == TokenNamedo) {
           newLine(1);
           currentLineIndentationLevel = indentationLevel - 1;
           pendingNewLines = 0;
@@ -512,59 +484,63 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         // Add pending new lines to the formatted source string.
         // Note: pending new lines are not added if the current token
         // is a single line comment or whitespace.
-        // if the comment is between parenthesis, there is no blank line preservation
+        // if the comment is between parenthesis, there is no blank line
+        // preservation
         // (if it's a one-line comment, a blank line is added after it).
         if (((pendingNewLines > 0 && (!isComment(token)))
-          || (newLinesInWhitespace > 0 && (openParenthesisCount <= 1 && isComment(token)))
-          || (previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE))
-          && token != Scanner.TokenNameWHITESPACE) {
-
+            || (newLinesInWhitespace > 0 && (openParenthesisCount <= 1 && isComment(token))) || (previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE))
+            && token != Scanner.TokenNameWHITESPACE) {
           // Do not add newline & indent between an adjoining close brace and
-          // close paren.  Anonymous inner classes may use this form.
-          boolean closeBraceAndCloseParen = previousToken == TokenNameRBRACE && token == TokenNameRPAREN;
-
+          // close paren. Anonymous inner classes may use this form.
+          boolean closeBraceAndCloseParen = previousToken == TokenNameRBRACE
+              && token == TokenNameRPAREN;
           // OPTION (NewLineInCompoundStatement): do not add newline & indent
           // between close brace and else, (do) while, catch, and finally if
           // newlineInCompoundStatement is true.
-          boolean nlicsOption =
-            previousToken == TokenNameRBRACE
+          boolean nlicsOption = previousToken == TokenNameRBRACE
               && !options.newlineInControlStatementMode
               && (token == TokenNameelse || (token == TokenNamewhile && nlicsToken == TokenNamedo));
           //								|| token == TokenNamecatch
           //								|| token == TokenNamefinally);
-
-          // Do not add a newline & indent between a close brace and semi-colon.
-          boolean semiColonAndCloseBrace = previousToken == TokenNameRBRACE && token == TokenNameSEMICOLON;
-
-          // Do not add a new line & indent between a multiline comment and a opening brace
-          boolean commentAndOpenBrace = previousToken == Scanner.TokenNameCOMMENT_BLOCK && token == TokenNameLBRACE;
-
-          // Do not add a newline & indent between a close brace and a colon (in array assignments, for example).
-          boolean commaAndCloseBrace = previousToken == TokenNameRBRACE && token == TokenNameCOMMA;
-
+          // Do not add a newline & indent between a close brace and
+          // semi-colon.
+          boolean semiColonAndCloseBrace = previousToken == TokenNameRBRACE
+              && token == TokenNameSEMICOLON;
+          // Do not add a new line & indent between a multiline comment and a
+          // opening brace
+          boolean commentAndOpenBrace = previousToken == Scanner.TokenNameCOMMENT_BLOCK
+              && token == TokenNameLBRACE;
+          // Do not add a newline & indent between a close brace and a colon
+          // (in array assignments, for example).
+          boolean commaAndCloseBrace = previousToken == TokenNameRBRACE
+              && token == TokenNameCOMMA;
           // Add a newline and indent, if appropriate.
           if (specialElse
-            || (!commentAndOpenBrace && !closeBraceAndCloseParen && !nlicsOption && !semiColonAndCloseBrace && !commaAndCloseBrace)) {
-
+              || (!commentAndOpenBrace && !closeBraceAndCloseParen
+                  && !nlicsOption && !semiColonAndCloseBrace && !commaAndCloseBrace)) {
             // if clearAllBlankLinesMode=false, leaves the blank lines
             // inserted by the user
             // if clearAllBlankLinesMode=true, removes all of then
             // and insert only blank lines required by the formatting.
             if (!options.clearAllBlankLinesMode) {
               //  (isComment(token))
-              pendingNewLines = (pendingNewLines < newLinesInWhitespace) ? newLinesInWhitespace : pendingNewLines;
+              pendingNewLines = (pendingNewLines < newLinesInWhitespace)
+                  ? newLinesInWhitespace
+                  : pendingNewLines;
               pendingNewLines = (pendingNewLines > 2) ? 2 : pendingNewLines;
             }
-            if (previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE) {
+            if (previousCompilableToken == TokenNameLBRACE
+                && token == TokenNameRBRACE) {
               containsOpenCloseBraces = true;
               indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
               if (isComment(previousToken)) {
                 newLine(pendingNewLines);
               } else {
-                /*  if (!(constructionsCount > 1
-                        && constructions[constructionsCount-1] == NONINDENT_BLOCK
-                        && (constructions[constructionsCount-2] == TokenNamefor 
-                         || constructions[constructionsCount-2] == TokenNamewhile))) {*/
+                /*
+                 * if (!(constructionsCount > 1 &&
+                 * constructions[constructionsCount-1] == NONINDENT_BLOCK &&
+                 * (constructions[constructionsCount-2] == TokenNamefor
+                 */
                 if (options.newLineInEmptyBlockMode) {
                   if (inArrayAssignment) {
                     newLine(1); // array assigment with an empty block
@@ -575,17 +551,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                 // }
               }
             } else {
-              // see PR 1FKKC3U: LFCOM:WINNT - Format problem with a comment before the ';'
-              if (!((previousToken == Scanner.TokenNameCOMMENT_BLOCK || previousToken == Scanner.TokenNameCOMMENT_PHPDOC)
-                && token == TokenNameSEMICOLON)) {
+              // see PR 1FKKC3U: LFCOM:WINNT - Format problem with a comment
+              // before the ';'
+              if (!((previousToken == Scanner.TokenNameCOMMENT_BLOCK || previousToken == Scanner.TokenNameCOMMENT_PHPDOC) && token == TokenNameSEMICOLON)) {
                 newLine(pendingNewLines);
               }
             }
             if (((previousCompilableToken == TokenNameSEMICOLON)
-              || (previousCompilableToken == TokenNameLBRACE)
-              || (previousCompilableToken == TokenNameRBRACE)
-              || (isComment(previousToken)))
-              && (token == TokenNameRBRACE)) {
+                || (previousCompilableToken == TokenNameLBRACE)
+                || (previousCompilableToken == TokenNameRBRACE) || (isComment(previousToken)))
+                && (token == TokenNameRBRACE)) {
               indentationOffset = -1;
               indentationLevel += popExclusiveUntilBlock();
             }
@@ -593,7 +568,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               // PR 1FI5IPO
               currentLineIndentationLevel++;
             } else {
-              currentLineIndentationLevel = indentationLevel + indentationOffset;
+              currentLineIndentationLevel = indentationLevel
+                  + indentationOffset;
             }
             pendingSpace = false;
             indentationOffset = 0;
@@ -601,15 +577,14 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           pendingNewLines = 0;
           newLinesInWhitespace = 0;
           specialElse = false;
-
           if (nlicsToken == TokenNamedo && token == TokenNamewhile) {
             nlicsToken = 0;
           }
         }
         switch (token) {
-          case TokenNameDOLLAR_LBRACE :
-            dollarBraceCount++;
-            break;
+          //          case TokenNameDOLLAR :
+          //            dollarBraceCount++;
+          //            break;
           case TokenNameelse :
             //				case TokenNamefinally :
             expectingOpenBrace = true;
@@ -619,24 +594,18 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           case TokenNamecase :
           case TokenNamedefault :
             if (tokenBeforeColonCount == tokenBeforeColon.length) {
-              System.arraycopy(
-                tokenBeforeColon,
-                0,
-                (tokenBeforeColon = new int[tokenBeforeColonCount * 2]),
-                0,
-                tokenBeforeColonCount);
+              System.arraycopy(tokenBeforeColon, 0,
+                  (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0,
+                  tokenBeforeColonCount);
             }
             tokenBeforeColon[tokenBeforeColonCount++] = TokenNamecase;
             indentationLevel += pushControlStatement(TokenNamecase);
             break;
           case TokenNameQUESTION :
             if (tokenBeforeColonCount == tokenBeforeColon.length) {
-              System.arraycopy(
-                tokenBeforeColon,
-                0,
-                (tokenBeforeColon = new int[tokenBeforeColonCount * 2]),
-                0,
-                tokenBeforeColonCount);
+              System.arraycopy(tokenBeforeColon, 0,
+                  (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0,
+                  tokenBeforeColonCount);
             }
             tokenBeforeColon[tokenBeforeColonCount++] = token;
             break;
@@ -645,23 +614,24 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           case TokenNameif :
           case TokenNamewhile :
             if (openParenthesisCount == openParenthesis.length) {
-              System.arraycopy(openParenthesis, 0, (openParenthesis = new int[openParenthesisCount * 2]), 0, openParenthesisCount);
+              System.arraycopy(openParenthesis, 0,
+                  (openParenthesis = new int[openParenthesisCount * 2]), 0,
+                  openParenthesisCount);
             }
             openParenthesis[openParenthesisCount++] = 0;
             expectingOpenBrace = true;
-
             indentationLevel += pushControlStatement(token);
             break;
-            //					case TokenNametry :
-            //						pendingNewlineAfterParen = true;
-            //					case TokenNamecatch :
-            //						// several CATCH statements can be contiguous.
-            //						// a CATCH is encountered pop until first CATCH (if a CATCH follows a TRY it works the same way,
-            //						// as CATCH and TRY are the same token in the stack).
-            //						expectingOpenBrace = true;
-            //						indentationLevel += pushControlStatement(TokenNamecatch);
-            //						break;
-
+          //					case TokenNametry :
+          //						pendingNewlineAfterParen = true;
+          //					case TokenNamecatch :
+          //						// several CATCH statements can be contiguous.
+          //						// a CATCH is encountered pop until first CATCH (if a CATCH
+          // follows a TRY it works the same way,
+          //						// as CATCH and TRY are the same token in the stack).
+          //						expectingOpenBrace = true;
+          //						indentationLevel += pushControlStatement(TokenNamecatch);
+          //						break;
           case TokenNamedo :
             expectingOpenBrace = true;
             indentationLevel += pushControlStatement(token);
@@ -678,14 +648,13 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             // compliment (eg: !), semi-colon, open brace, close brace,
             // super, or this.
             if (previousCompilableToken != TokenNameLBRACKET
-              && previousToken != TokenNameIdentifier
-              && previousToken != 0
-              && previousToken != TokenNameNOT
-              && previousToken != TokenNameLPAREN
-              && previousToken != TokenNameTWIDDLE
-              && previousToken != TokenNameSEMICOLON
-              && previousToken != TokenNameLBRACE
-              && previousToken != TokenNameRBRACE) {
+                && previousToken != TokenNameIdentifier && previousToken != 0
+                && previousToken != TokenNameNOT
+                && previousToken != TokenNameLPAREN
+                && previousToken != TokenNameTWIDDLE
+                && previousToken != TokenNameSEMICOLON
+                && previousToken != TokenNameLBRACE
+                && previousToken != TokenNameRBRACE) {
               //								&& previousToken != TokenNamesuper
               //								&& previousToken != TokenNamethis) {
               space();
@@ -697,16 +666,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               openParenthesis[openParenthesisCount - 1]++;
             else
               openParenthesis[0]++;
-
             pendingSpace = false;
-            //S			}
+            //S }
             break;
           case TokenNameRPAREN :
-
             // Decrease the parenthesis count
             // if there is no more unclosed parenthesis,
-            // a new line and indent may be append (depending on the next token).
-            if ((openParenthesisCount > 1) && (openParenthesis[openParenthesisCount - 1] > 0)) {
+            // a new line and indent may be append (depending on the next
+            // token).
+            if ((openParenthesisCount > 1)
+                && (openParenthesis[openParenthesisCount - 1] > 0)) {
               openParenthesis[openParenthesisCount - 1]--;
               if (openParenthesis[openParenthesisCount - 1] <= 0) {
                 pendingNewlineAfterParen = true;
@@ -719,7 +688,11 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             pendingSpace = false;
             break;
           case TokenNameLBRACE :
-            if ((previousCompilableToken == TokenNameRBRACKET) || (previousCompilableToken == TokenNameEQUAL)) {
+            if (previousCompilableToken == TokenNameDOLLAR) {
+              dollarBraceCount++;
+            }
+            if ((previousCompilableToken == TokenNameRBRACKET)
+                || (previousCompilableToken == TokenNameEQUAL)) {
               //                  if (previousCompilableToken == TokenNameRBRACKET) {
               inArrayAssignment = true;
               inAssignment = false;
@@ -747,23 +720,23 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             } else {
               pendingNewLines = 1;
               indentationLevel += popInclusiveUntilBlock();
-
               if (previousCompilableToken == TokenNameRPAREN) {
-                // fix for 1FGDDV6: LFCOM:WIN98 - Weird splitting on message expression
+                // fix for 1FGDDV6: LFCOM:WIN98 - Weird splitting on message
+                // expression
                 currentLineBuffer.append(options.lineSeparatorSequence);
                 increaseLineDelta(options.lineSeparatorSequence.length);
               }
               if (constructionsCount > 0) {
                 switch (constructions[constructionsCount - 1]) {
                   case TokenNamefor :
-                    //indentationLevel += popExclusiveUntilBlock();
-                    //break;
+                  //indentationLevel += popExclusiveUntilBlock();
+                  //break;
                   case TokenNameswitch :
                   case TokenNameif :
                   case TokenNameelse :
-                    //									case TokenNametry :
-                    //									case TokenNamecatch :
-                    //									case TokenNamefinally :
+                  //									case TokenNametry :
+                  //									case TokenNamecatch :
+                  //									case TokenNamefinally :
                   case TokenNamewhile :
                   case TokenNamedo :
                     //									case TokenNamesynchronized :
@@ -780,7 +753,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             break;
           case TokenNameRBRACKET :
             openBracketCount -= (openBracketCount > 0) ? 1 : 0;
-            // if there is no left bracket to close, the right bracket is ignored.
+            // if there is no left bracket to close, the right bracket is
+            // ignored.
             pendingSpace = false;
             break;
           case TokenNameCOMMA :
@@ -788,11 +762,12 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             pendingSpace = false;
             break;
           case TokenNameSEMICOLON :
-
             // Do not generate line terminators in the definition of
             // the for statement.
-            // if not in this case, jump a line and reduce indentation after the brace
-            // if the block it closes belongs to a conditional statement (if, while, do...).
+            // if not in this case, jump a line and reduce indentation after
+            // the brace
+            // if the block it closes belongs to a conditional statement (if,
+            // while, do...).
             if (openParenthesisCount <= 1) {
               pendingNewLines = 1;
               if (expectingOpenBrace) {
@@ -805,21 +780,21 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             break;
           case TokenNamePLUS_PLUS :
           case TokenNameMINUS_MINUS :
-
             // Do not put a space between a post-increment/decrement
             // and the identifier being modified.
-            if (previousToken == TokenNameIdentifier || previousToken == TokenNameRBRACKET) {
+            if (previousToken == TokenNameIdentifier
+                || previousToken == TokenNameRBRACKET) {
               pendingSpace = false;
             }
             break;
-          case TokenNamePLUS : // previously ADDITION
+          case TokenNamePLUS :
+          // previously ADDITION
           case TokenNameMINUS :
-
             // Handle the unary operators plus and minus via a flag
             if (!isLiteralToken(previousToken)
-              && previousToken != TokenNameIdentifier
-              && previousToken != TokenNameRPAREN
-              && previousToken != TokenNameRBRACKET) {
+                && previousToken != TokenNameIdentifier
+                && previousToken != TokenNameRPAREN
+                && previousToken != TokenNameRBRACKET) {
               unarySignModifier = 1;
             }
             break;
@@ -848,7 +823,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             pendingNewLines = 1;
             break;
           case Scanner.TokenNameWHITESPACE :
-
             // Count the number of line terminators in the whitespace so
             // line spacing can be preserved near comments.
             char[] source = scanner.source;
@@ -870,30 +844,29 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             }
             increaseLineDelta(scanner.startPosition - scanner.currentPosition);
             break;
-            //          case TokenNameHTML :
-            //            // Add the next token to the formatted source string.
-            //            // outputCurrentToken(token);
-            //            int startPosition = scanner.startPosition;
-            //            flushBuffer();
-            //            for (int i = startPosition, max = scanner.currentPosition; i < max; i++) {
-            //              char currentCharacter = scanner.source[i];
-            //              updateMappedPositions(i);
-            //              currentLineBuffer.append(currentCharacter);
-            //            }
-            //            break;
+          //          case TokenNameHTML :
+          //            // Add the next token to the formatted source string.
+          //            // outputCurrentToken(token);
+          //            int startPosition = scanner.startPosition;
+          //            flushBuffer();
+          //            for (int i = startPosition, max = scanner.currentPosition; i <
+          // max; i++) {
+          //              char currentCharacter = scanner.source[i];
+          //              updateMappedPositions(i);
+          //              currentLineBuffer.append(currentCharacter);
+          //            }
+          //            break;
           default :
             if ((token == TokenNameIdentifier) || isLiteralToken(token)) {
               //							|| token == TokenNamesuper
               //							|| token == TokenNamethis) {
-
               // Do not put a space between a unary operator
               // (eg: ++, --, +, -) and the identifier being modified.
               if (previousToken == TokenNamePLUS_PLUS
-                || previousToken == TokenNameMINUS_MINUS
-				|| (previousToken == TokenNameMINUS_GREATER &&
-									options.compactDereferencingMode) // ->
-                || (previousToken == TokenNamePLUS && unarySignModifier > 0)
-                || (previousToken == TokenNameMINUS && unarySignModifier > 0)) {
+                  || previousToken == TokenNameMINUS_MINUS
+                  || (previousToken == TokenNameMINUS_GREATER && options.compactDereferencingMode) // ->
+                  || (previousToken == TokenNamePLUS && unarySignModifier > 0)
+                  || (previousToken == TokenNameMINUS && unarySignModifier > 0)) {
                 pendingSpace = false;
               }
               unarySignModifier = 0;
@@ -902,35 +875,33 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         }
         // Do not output whitespace tokens.
         if (token != Scanner.TokenNameWHITESPACE) {
-
-          /* Add pending space to the formatted source string.
-          Do not output a space under the following circumstances:
-          1) this is the first pass
-          2) previous token is an open paren
-          3) previous token is a period
-          4) previous token is the logical compliment (eg: !)
-          5) previous token is the bitwise compliment (eg: ~)
-          6) previous token is the open bracket (eg: [)
-          7) in an assignment statement, if the previous token is an 
-          open brace or the current token is a close brace
-          8) previous token is a single line comment
-          9) current token is a '->'
-          */
-		  if (token == TokenNameMINUS_GREATER && 
-		  		options.compactDereferencingMode) pendingSpace = false;
-          
-          boolean openAndCloseBrace = previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE;
-
+          /*
+           * Add pending space to the formatted source string. Do not output a
+           * space under the following circumstances: 1) this is the first pass 2)
+           * previous token is an open paren 3) previous token is a period 4)
+           * previous token is the logical compliment (eg: !) 5) previous token
+           * is the bitwise compliment (eg: ~) 6) previous token is the open
+           * bracket (eg: [) 7) in an assignment statement, if the previous
+           * token is an open brace or the current token is a close brace 8)
+           * previous token is a single line comment 9) current token is a '->'
+           */
+          if (token == TokenNameMINUS_GREATER
+              && options.compactDereferencingMode)
+            pendingSpace = false;
+          boolean openAndCloseBrace = previousCompilableToken == TokenNameLBRACE
+              && token == TokenNameRBRACE;
           if (pendingSpace
-            && insertSpaceAfter(previousToken)
-            && !(inAssignment && (previousToken == TokenNameLBRACE || token == TokenNameRBRACE))
-            && previousToken != Scanner.TokenNameCOMMENT_LINE) {
-            if ((!(options.compactAssignmentMode && token == TokenNameEQUAL)) && !openAndCloseBrace)
+              && insertSpaceAfter(previousToken)
+              && !(inAssignment && (previousToken == TokenNameLBRACE || token == TokenNameRBRACE))
+              && previousToken != Scanner.TokenNameCOMMENT_LINE) {
+            if ((!(options.compactAssignmentMode && token == TokenNameEQUAL))
+                && !openAndCloseBrace)
               space();
           }
           // Add the next token to the formatted source string.
           outputCurrentToken(token);
-          if (token == Scanner.TokenNameCOMMENT_LINE && openParenthesisCount > 1) {
+          if (token == Scanner.TokenNameCOMMENT_LINE
+              && openParenthesisCount > 1) {
             pendingNewLines = 0;
             currentLineBuffer.append(options.lineSeparatorSequence);
             increaseLineDelta(options.lineSeparatorSequence.length);
@@ -941,8 +912,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         if (token != Scanner.TokenNameWHITESPACE) {
           previousToken = token;
           if (token != Scanner.TokenNameCOMMENT_BLOCK
-            && token != Scanner.TokenNameCOMMENT_LINE
-            && token != Scanner.TokenNameCOMMENT_PHPDOC) {
+              && token != Scanner.TokenNameCOMMENT_LINE
+              && token != Scanner.TokenNameCOMMENT_PHPDOC) {
             previousCompilableToken = token;
           }
         }
@@ -956,10 +927,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       // dump the last token of the source in the formatted output.
     }
   }
-
-  /** 
-   * Formats the char array <code>sourceString</code>,
-   * and returns a string containing the formatted version.
+  /**
+   * Formats the char array <code>sourceString</code>, and returns a string
+   * containing the formatted version.
+   * 
    * @return the formatted ouput.
    */
   public String formatSourceString(String sourceString) {
@@ -969,32 +940,37 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     format();
     return formattedSource.toString();
   }
-
-  /** 
-   * Formats the char array <code>sourceString</code>,
-   * and returns a string containing the formatted version.
-   * @param string the string to format
-   * @param indentationLevel the initial indentation level
+  /**
+   * Formats the char array <code>sourceString</code>, and returns a string
+   * containing the formatted version.
+   * 
+   * @param string
+   *            the string to format
+   * @param indentationLevel
+   *            the initial indentation level
    * @return the formatted ouput.
    */
   public String format(String string, int indentationLevel) {
     return format(string, indentationLevel, (int[]) null);
   }
-
-  /** 
-   * Formats the char array <code>sourceString</code>,
-   * and returns a string containing the formatted version.
-   * The positions array is modified to contain the mapped positions.
-   * @param string the string to format
-   * @param indentationLevel the initial indentation level
-   * @param positions the array of positions to map
+  /**
+   * Formats the char array <code>sourceString</code>, and returns a string
+   * containing the formatted version. The positions array is modified to
+   * contain the mapped positions.
+   * 
+   * @param string
+   *            the string to format
+   * @param indentationLevel
+   *            the initial indentation level
+   * @param positions
+   *            the array of positions to map
    * @return the formatted ouput.
    */
   public String format(String string, int indentationLevel, int[] positions) {
     return this.format(string, indentationLevel, positions, null);
   }
-
-  public String format(String string, int indentationLevel, int[] positions, String lineSeparator) {
+  public String format(String string, int indentationLevel, int[] positions,
+      String lineSeparator) {
     if (lineSeparator != null) {
       this.options.setLineSeparator(lineSeparator);
     }
@@ -1010,31 +986,32 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       return this.formatSourceString(string);
     }
   }
-  /** 
-   * Formats the char array <code>sourceString</code>,
-   * and returns a string containing the formatted version. The initial indentation level is 0.
-   * @param string the string to format
+  /**
+   * Formats the char array <code>sourceString</code>, and returns a string
+   * containing the formatted version. The initial indentation level is 0.
+   * 
+   * @param string
+   *            the string to format
    * @return the formatted ouput.
    */
   public String format(String string) {
     return this.format(string, 0, (int[]) null);
   }
-
-  /** 
-   * Formats a given source string, starting indenting it at a particular 
-   * depth and using the given options
+  /**
+   * Formats a given source string, starting indenting it at a particular depth
+   * and using the given options
    * 
    * @deprecated backport 1.0 internal functionality
    */
-  public static String format(String sourceString, int initialIndentationLevel, ConfigurableOption[] options) {
+  public static String format(String sourceString, int initialIndentationLevel,
+      ConfigurableOption[] options) {
     CodeFormatter formatter = new CodeFormatter(options);
     formatter.setInitialIndentationLevel(initialIndentationLevel);
     return formatter.formatSourceString(sourceString);
   }
-
   /**
-   * Returns the number of characters and tab char between the beginning of the line
-   * and the beginning of the comment.
+   * Returns the number of characters and tab char between the beginning of the
+   * line and the beginning of the comment.
    */
   private int getCurrentCommentOffset() {
     int linePtr = scanner.linePtr;
@@ -1045,7 +1022,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     int beginningOfLine = scanner.lineEnds[linePtr];
     int currentStartPosition = scanner.startPosition;
     char[] source = scanner.source;
-
     // find the position of the beginning of the line containing the comment
     while (beginningOfLine > currentStartPosition) {
       if (linePtr > 0) {
@@ -1073,44 +1049,60 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return offset;
   }
-
   /**
-   * Returns an array of descriptions for the configurable options.
-   * The descriptions may be changed and passed back to a different
-   * compiler.
+   * Returns an array of descriptions for the configurable options. The
+   * descriptions may be changed and passed back to a different compiler.
    * 
    * @deprecated backport 1.0 internal functionality
    */
   public static ConfigurableOption[] getDefaultOptions(Locale locale) {
     String componentName = CodeFormatter.class.getName();
     FormatterOptions options = new FormatterOptions();
-    return new ConfigurableOption[] { new ConfigurableOption(componentName, "newline.openingBrace", locale, options.newLineBeforeOpeningBraceMode ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "newline.controlStatement", locale, options.newlineInControlStatementMode ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "newline.clearAll", locale, options.clearAllBlankLinesMode ? 0 : 1), //$NON-NLS-1$
-      //      new ConfigurableOption(componentName, "newline.elseIf", locale, options.compactElseIfMode ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "newline.emptyBlock", locale, options.newLineInEmptyBlockMode ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "line.split", locale, options.maxLineLength), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "style.compactAssignment", locale, options.compactAssignmentMode ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "tabulation.char", locale, options.indentWithTab ? 0 : 1), //$NON-NLS-1$
-      new ConfigurableOption(componentName, "tabulation.size", locale, options.tabSize) //$NON-NLS-1$
+    return new ConfigurableOption[]{
+        new ConfigurableOption(componentName, "newline.openingBrace", locale,
+            options.newLineBeforeOpeningBraceMode ? 0 : 1),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "newline.controlStatement",
+            locale, options.newlineInControlStatementMode ? 0 : 1),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "newline.clearAll", locale,
+            options.clearAllBlankLinesMode ? 0 : 1),
+        //$NON-NLS-1$
+        //      new ConfigurableOption(componentName, "newline.elseIf", locale,
+        // options.compactElseIfMode ? 0 : 1), //$NON-NLS-1$
+        new ConfigurableOption(componentName, "newline.emptyBlock", locale,
+            options.newLineInEmptyBlockMode ? 0 : 1),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "line.split", locale,
+            options.maxLineLength),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "style.compactAssignment",
+            locale, options.compactAssignmentMode ? 0 : 1),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "tabulation.char", locale,
+            options.indentWithTab ? 0 : 1),
+        //$NON-NLS-1$
+        new ConfigurableOption(componentName, "tabulation.size", locale,
+            options.tabSize) //$NON-NLS-1$
     };
   }
-
   /**
-   * Returns the array of mapped positions.
-   * Returns null is no positions have been set.
+   * Returns the array of mapped positions. Returns null is no positions have
+   * been set.
+   * 
    * @return int[]
    * @deprecated There is no need to retrieve the mapped positions anymore.
    */
   public int[] getMappedPositions() {
     return mappedPositions;
   }
-
   /**
-   * Returns the priority of the token given as argument<br>
+   * Returns the priority of the token given as argument <br>
    * The most prioritary the token is, the smallest the return value is.
+   * 
    * @return the priority of <code>token</code>
-   * @param token the token of which the priority is requested
+   * @param token
+   *            the token of which the priority is requested
    */
   private static int getTokenPriority(int token) {
     switch (token) {
@@ -1118,88 +1110,119 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         //			case TokenNameimplements :
         //			case TokenNamethrows :
         return 10;
-      case TokenNameSEMICOLON : // ;
+      case TokenNameSEMICOLON :
+        // ;
         return 20;
-      case TokenNameCOMMA : // ,
+      case TokenNameCOMMA :
+        // ,
         return 25;
-      case TokenNameEQUAL : // =
+      case TokenNameEQUAL :
+        // =
         return 30;
-      case TokenNameAND_AND : // && 
-      case TokenNameOR_OR : // || 
+      case TokenNameAND_AND :
+      // &&
+      case TokenNameOR_OR :
+        // ||
         return 40;
-      case TokenNameQUESTION : // ? 
-      case TokenNameCOLON : // :
+      case TokenNameQUESTION :
+      // ?
+      case TokenNameCOLON :
+        // :
         return 50; // it's better cutting on ?: than on ;
-      case TokenNameEQUAL_EQUAL : // == 
-      case TokenNameEQUAL_EQUAL_EQUAL : // === 
-      case TokenNameNOT_EQUAL : // != 
-			case TokenNameNOT_EQUAL_EQUAL : // != 
+      case TokenNameEQUAL_EQUAL :
+      // ==
+      case TokenNameEQUAL_EQUAL_EQUAL :
+      // ===
+      case TokenNameNOT_EQUAL :
+      // !=
+      case TokenNameNOT_EQUAL_EQUAL :
+        // !=
         return 60;
-      case TokenNameLESS : // < 
-      case TokenNameLESS_EQUAL : // <= 
-      case TokenNameGREATER : // > 
-      case TokenNameGREATER_EQUAL : // >= 
+      case TokenNameLESS :
+      // <
+      case TokenNameLESS_EQUAL :
+      // <=
+      case TokenNameGREATER :
+      // >
+      case TokenNameGREATER_EQUAL :
+        // >=
         //			case TokenNameinstanceof : // instanceof
         return 70;
-      case TokenNamePLUS : // + 
-      case TokenNameMINUS : // - 
+      case TokenNamePLUS :
+      // +
+      case TokenNameMINUS :
+        // -
         return 80;
-      case TokenNameMULTIPLY : // * 
-      case TokenNameDIVIDE : // / 
-      case TokenNameREMAINDER : // % 
+      case TokenNameMULTIPLY :
+      // *
+      case TokenNameDIVIDE :
+      // /
+      case TokenNameREMAINDER :
+        // %
         return 90;
-      case TokenNameLEFT_SHIFT : // << 
-      case TokenNameRIGHT_SHIFT : // >> 
-        //			case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> 
+      case TokenNameLEFT_SHIFT :
+      // <<
+      case TokenNameRIGHT_SHIFT :
+        // >>
+        //			case TokenNameUNSIGNED_RIGHT_SHIFT : // >>>
         return 100;
-      case TokenNameAND : // &
-      case TokenNameOR : // | 
-      case TokenNameXOR : // ^ 
+      case TokenNameAND :
+      // &
+      case TokenNameOR :
+      // |
+      case TokenNameXOR :
+        // ^
         return 110;
-      case TokenNameMULTIPLY_EQUAL : // *= 
-      case TokenNameDIVIDE_EQUAL : // /= 
-      case TokenNameREMAINDER_EQUAL : // %= 
-      case TokenNamePLUS_EQUAL : // += 
-      case TokenNameMINUS_EQUAL : // -= 
-      case TokenNameLEFT_SHIFT_EQUAL : // <<= 
-      case TokenNameRIGHT_SHIFT_EQUAL : // >>= 
-        //			case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
-      case TokenNameAND_EQUAL : // &= 
-      case TokenNameXOR_EQUAL : // ^= 
-      case TokenNameOR_EQUAL : // |= 
+      case TokenNameMULTIPLY_EQUAL :
+      // *=
+      case TokenNameDIVIDE_EQUAL :
+      // /=
+      case TokenNameREMAINDER_EQUAL :
+      // %=
+      case TokenNamePLUS_EQUAL :
+      // +=
+      case TokenNameMINUS_EQUAL :
+      // -=
+      case TokenNameLEFT_SHIFT_EQUAL :
+      // <<=
+      case TokenNameRIGHT_SHIFT_EQUAL :
+      // >>=
+      //			case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
+      case TokenNameAND_EQUAL :
+      // &=
+      case TokenNameXOR_EQUAL :
+      // ^=
+      case TokenNameOR_EQUAL :
+        // |=
         return 120;
-      case TokenNameDOT : // .
+      case TokenNameDOT :
+        // .
         return 130;
       default :
         return Integer.MAX_VALUE;
     }
   }
-
   /**
-   * Handles the exception raised when an invalid token is encountered.
-   * Returns true if the exception has been handled, false otherwise.
+   * Handles the exception raised when an invalid token is encountered. Returns
+   * true if the exception has been handled, false otherwise.
    */
   private boolean handleInvalidToken(Exception e) {
     if (e.getMessage().equals(Scanner.INVALID_CHARACTER_CONSTANT)
-      || e.getMessage().equals(Scanner.INVALID_CHAR_IN_STRING)
-      || e.getMessage().equals(Scanner.INVALID_ESCAPE)) {
+        || e.getMessage().equals(Scanner.INVALID_CHAR_IN_STRING)
+        || e.getMessage().equals(Scanner.INVALID_ESCAPE)) {
       return true;
     }
     return false;
   }
-
   private final void increaseGlobalDelta(int offset) {
     globalDelta += offset;
   }
-
   private final void increaseLineDelta(int offset) {
     lineDelta += offset;
   }
-
   private final void increaseSplitDelta(int offset) {
     splitDelta += offset;
   }
-
   /**
    * Returns true if a space has to be inserted after <code>operator</code>
    * false otherwise.
@@ -1210,7 +1233,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       case TokenNameNOT :
       case TokenNameTWIDDLE :
       case TokenNameDOT :
-      case 0 : // no token
+      case 0 :
+      // no token
       case TokenNameLBRACKET :
       case Scanner.TokenNameCOMMENT_LINE :
         return false;
@@ -1218,12 +1242,11 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         return true;
     }
   }
-
   /**
    * Returns true if a space has to be inserted before <code>operator</code>
-   * false otherwise.<br>
-   * Cannot be static as it uses the code formatter options
-   * (to know if the compact assignment mode is on).
+   * false otherwise. <br>
+   * Cannot be static as it uses the code formatter options (to know if the
+   * compact assignment mode is on).
    */
   private boolean insertSpaceBefore(int token) {
     switch (token) {
@@ -1233,40 +1256,41 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         return false;
     }
   }
-
   private static boolean isComment(int token) {
-    boolean result =
-      token == Scanner.TokenNameCOMMENT_BLOCK || token == Scanner.TokenNameCOMMENT_LINE || token == Scanner.TokenNameCOMMENT_PHPDOC;
+    boolean result = token == Scanner.TokenNameCOMMENT_BLOCK
+        || token == Scanner.TokenNameCOMMENT_LINE
+        || token == Scanner.TokenNameCOMMENT_PHPDOC;
     return result;
   }
-
   private static boolean isLiteralToken(int token) {
     boolean result = token == TokenNameIntegerLiteral
-      //			|| token == TokenNameLongLiteral
-    //			|| token == TokenNameFloatingPointLiteral
-  || token == TokenNameDoubleLiteral
-      //			|| token == TokenNameCharacterLiteral
-  || token == TokenNameStringLiteral;
+    //			|| token == TokenNameLongLiteral
+        //			|| token == TokenNameFloatingPointLiteral
+        || token == TokenNameDoubleLiteral
+        //			|| token == TokenNameCharacterLiteral
+        || token == TokenNameStringLiteral;
     return result;
   }
-
   /**
    * If the length of <code>oneLineBuffer</code> exceeds <code>maxLineLength</code>,
    * it is split and the result is dumped in <code>formattedSource</code>
-   * @param newLineCount the number of new lines to append
+   * 
+   * @param newLineCount
+   *            the number of new lines to append
    */
   private void newLine(int newLineCount) {
-
     // format current line
     splitDelta = 0;
     beginningOfLineIndex = formattedSource.length();
     String currentLine = currentLineBuffer.toString();
     if (containsOpenCloseBraces) {
       containsOpenCloseBraces = false;
-      outputLine(currentLine, false, indentationLevelForOpenCloseBraces, 0, -1, null, 0);
+      outputLine(currentLine, false, indentationLevelForOpenCloseBraces, 0, -1,
+          null, 0);
       indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
     } else {
-      outputLine(currentLine, false, currentLineIndentationLevel, 0, -1, null, 0);
+      outputLine(currentLine, false, currentLineIndentationLevel, 0, -1, null,
+          0);
     }
     // dump line break(s)
     for (int i = 0; i < newLineCount; i++) {
@@ -1275,158 +1299,152 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     // reset formatter for next line
     int currentLength = currentLine.length();
-    currentLineBuffer = new StringBuffer(currentLength > maxLineSize ? maxLineSize = currentLength : maxLineSize);
-
+    currentLineBuffer = new StringBuffer(currentLength > maxLineSize
+        ? maxLineSize = currentLength
+        : maxLineSize);
     increaseGlobalDelta(splitDelta);
     increaseGlobalDelta(lineDelta);
     lineDelta = 0;
     currentLineIndentationLevel = initialIndentationLevel;
   }
-
   private String operatorString(int operator) {
     switch (operator) {
       case TokenNameextends :
         return "extends"; //$NON-NLS-1$
-
-        //			case TokenNameimplements :
-        //				return "implements"; //$NON-NLS-1$
-        //
-        //			case TokenNamethrows :
-        //				return "throws"; //$NON-NLS-1$
-
-      case TokenNameSEMICOLON : // ;
+      //			case TokenNameimplements :
+      //				return "implements"; //$NON-NLS-1$
+      //
+      //			case TokenNamethrows :
+      //				return "throws"; //$NON-NLS-1$
+      case TokenNameSEMICOLON :
+        // ;
         return ";"; //$NON-NLS-1$
-
-      case TokenNameCOMMA : // ,
+      case TokenNameCOMMA :
+        // ,
         return ","; //$NON-NLS-1$
-
-      case TokenNameEQUAL : // =
+      case TokenNameEQUAL :
+        // =
         return "="; //$NON-NLS-1$
-
-      case TokenNameAND_AND : // && (15.22)
+      case TokenNameAND_AND :
+        // && (15.22)
         return "&&"; //$NON-NLS-1$
-
-      case TokenNameOR_OR : // || (15.23)
+      case TokenNameOR_OR :
+        // || (15.23)
         return "||"; //$NON-NLS-1$
-
-      case TokenNameQUESTION : // ? (15.24)
+      case TokenNameQUESTION :
+        // ? (15.24)
         return "?"; //$NON-NLS-1$
-
-      case TokenNameCOLON : // : (15.24)
+      case TokenNameCOLON :
+        // : (15.24)
         return ":"; //$NON-NLS-1$
-
-      case TokenNamePAAMAYIM_NEKUDOTAYIM : // : (15.24)
+      case TokenNamePAAMAYIM_NEKUDOTAYIM :
+        // : (15.24)
         return "::"; //$NON-NLS-1$
-
-      case TokenNameEQUAL_EQUAL : // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+      case TokenNameEQUAL_EQUAL :
+        // == (15.20, 15.20.1, 15.20.2, 15.20.3)
         return "=="; //$NON-NLS-1$
-
-      case TokenNameEQUAL_EQUAL_EQUAL : // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+      case TokenNameEQUAL_EQUAL_EQUAL :
+        // == (15.20, 15.20.1, 15.20.2, 15.20.3)
         return "==="; //$NON-NLS-1$
-
-      case TokenNameEQUAL_GREATER : // -= (15.25.2)
+      case TokenNameEQUAL_GREATER :
+        // -= (15.25.2)
         return "=>"; //$NON-NLS-1$				
-
-      case TokenNameNOT_EQUAL : // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+      case TokenNameNOT_EQUAL :
+        // != (15.20, 15.20.1, 15.20.2, 15.20.3)
         return "!="; //$NON-NLS-1$
-
-			case TokenNameNOT_EQUAL_EQUAL : // != (15.20, 15.20.1, 15.20.2, 15.20.3)
-				return "!=="; //$NON-NLS-1$
-							
-      case TokenNameLESS : // < (15.19.1)
+      case TokenNameNOT_EQUAL_EQUAL :
+        // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+        return "!=="; //$NON-NLS-1$
+      case TokenNameLESS :
+        // < (15.19.1)
         return "<"; //$NON-NLS-1$
-
-      case TokenNameLESS_EQUAL : // <= (15.19.1)
+      case TokenNameLESS_EQUAL :
+        // <= (15.19.1)
         return "<="; //$NON-NLS-1$
-
-      case TokenNameGREATER : // > (15.19.1)
+      case TokenNameGREATER :
+        // > (15.19.1)
         return ">"; //$NON-NLS-1$
-
-      case TokenNameGREATER_EQUAL : // >= (15.19.1)
+      case TokenNameGREATER_EQUAL :
+        // >= (15.19.1)
         return ">="; //$NON-NLS-1$
-
-        //			case TokenNameinstanceof : // instanceof
-        //				return "instanceof"; //$NON-NLS-1$
-
-      case TokenNamePLUS : // + (15.17, 15.17.2)
+      //			case TokenNameinstanceof : // instanceof
+      //				return "instanceof"; //$NON-NLS-1$
+      case TokenNamePLUS :
+        // + (15.17, 15.17.2)
         return "+"; //$NON-NLS-1$
-
-      case TokenNameMINUS : // - (15.17.2)
+      case TokenNameMINUS :
+        // - (15.17.2)
         return "-"; //$NON-NLS-1$
-
-      case TokenNameMULTIPLY : // * (15.16.1)
+      case TokenNameMULTIPLY :
+        // * (15.16.1)
         return "*"; //$NON-NLS-1$
-
-      case TokenNameDIVIDE : // / (15.16.2)
+      case TokenNameDIVIDE :
+        // / (15.16.2)
         return "/"; //$NON-NLS-1$
-
-      case TokenNameREMAINDER : // % (15.16.3)
+      case TokenNameREMAINDER :
+        // % (15.16.3)
         return "%"; //$NON-NLS-1$
-
-      case TokenNameLEFT_SHIFT : // << (15.18)
+      case TokenNameLEFT_SHIFT :
+        // << (15.18)
         return "<<"; //$NON-NLS-1$
-
-      case TokenNameRIGHT_SHIFT : // >> (15.18)
+      case TokenNameRIGHT_SHIFT :
+        // >> (15.18)
         return ">>"; //$NON-NLS-1$
-
-        //			case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
-        //				return ">>>"; //$NON-NLS-1$
-
-      case TokenNameAND : // & (15.21, 15.21.1, 15.21.2)
+      //			case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
+      //				return ">>>"; //$NON-NLS-1$
+      case TokenNameAND :
+        // & (15.21, 15.21.1, 15.21.2)
         return "&"; //$NON-NLS-1$
-
-      case TokenNameOR : // | (15.21, 15.21.1, 15.21.2)
+      case TokenNameOR :
+        // | (15.21, 15.21.1, 15.21.2)
         return "|"; //$NON-NLS-1$
-
-      case TokenNameXOR : // ^ (15.21, 15.21.1, 15.21.2)
+      case TokenNameXOR :
+        // ^ (15.21, 15.21.1, 15.21.2)
         return "^"; //$NON-NLS-1$
-
-      case TokenNameMULTIPLY_EQUAL : // *= (15.25.2)
+      case TokenNameMULTIPLY_EQUAL :
+        // *= (15.25.2)
         return "*="; //$NON-NLS-1$
-
-      case TokenNameDIVIDE_EQUAL : // /= (15.25.2)
+      case TokenNameDIVIDE_EQUAL :
+        // /= (15.25.2)
         return "/="; //$NON-NLS-1$
-
-      case TokenNameREMAINDER_EQUAL : // %= (15.25.2)
+      case TokenNameREMAINDER_EQUAL :
+        // %= (15.25.2)
         return "%="; //$NON-NLS-1$
-
-      case TokenNamePLUS_EQUAL : // += (15.25.2)
+      case TokenNamePLUS_EQUAL :
+        // += (15.25.2)
         return "+="; //$NON-NLS-1$
-
-      case TokenNameMINUS_EQUAL : // -= (15.25.2)
+      case TokenNameMINUS_EQUAL :
+        // -= (15.25.2)
         return "-="; //$NON-NLS-1$
-
-      case TokenNameMINUS_GREATER : // -= (15.25.2)
+      case TokenNameMINUS_GREATER :
+        // -= (15.25.2)
         return "->"; //$NON-NLS-1$
-
-      case TokenNameLEFT_SHIFT_EQUAL : // <<= (15.25.2)
+      case TokenNameLEFT_SHIFT_EQUAL :
+        // <<= (15.25.2)
         return "<<="; //$NON-NLS-1$
-
-      case TokenNameRIGHT_SHIFT_EQUAL : // >>= (15.25.2)
+      case TokenNameRIGHT_SHIFT_EQUAL :
+        // >>= (15.25.2)
         return ">>="; //$NON-NLS-1$
-
-        //			case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
-        //				return ">>>="; //$NON-NLS-1$
-
-      case TokenNameAND_EQUAL : // &= (15.25.2)
+      //			case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
+      //				return ">>>="; //$NON-NLS-1$
+      case TokenNameAND_EQUAL :
+        // &= (15.25.2)
         return "&="; //$NON-NLS-1$
-
-      case TokenNameXOR_EQUAL : // ^= (15.25.2)
+      case TokenNameXOR_EQUAL :
+        // ^= (15.25.2)
         return "^="; //$NON-NLS-1$
-
-      case TokenNameOR_EQUAL : // |= (15.25.2)
+      case TokenNameOR_EQUAL :
+        // |= (15.25.2)
         return "|="; //$NON-NLS-1$
-
-      case TokenNameDOT : // .
+      case TokenNameDOT :
+        // .
         return "."; //$NON-NLS-1$
-
       default :
         return ""; //$NON-NLS-1$
     }
   }
-
-  /** 
-   * Appends <code>stringToOutput</code> to the formatted output.<br>
+  /**
+   * Appends <code>stringToOutput</code> to the formatted output. <br>
    * If it contains \n, append a LINE_SEPARATOR and indent after it.
    */
   private void output(String stringToOutput) {
@@ -1438,15 +1456,14 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       }
     }
   }
-
-  /** 
-   * Appends <code>token</code> to the formatted output.<br>
-   * If it contains <code>\n</code>, append a LINE_SEPARATOR and indent after it.
+  /**
+   * Appends <code>token</code> to the formatted output. <br>
+   * If it contains <code>\n</code>, append a LINE_SEPARATOR and indent
+   * after it.
    */
   private void outputCurrentToken(int token) {
     char[] source = scanner.source;
     int startPosition = scanner.startPosition;
-
     switch (token) {
       case Scanner.TokenNameCOMMENT_PHPDOC :
       case Scanner.TokenNameCOMMENT_BLOCK :
@@ -1486,7 +1503,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                 endOfLine = true;
               }
               if (endOfLine) {
-                // we remove a maximum of currentCommentOffset characters (tabs are converted to space numbers).
+                // we remove a maximum of currentCommentOffset characters (tabs
+                // are converted to space numbers).
                 beginningOfLineSpaces += options.tabSize;
                 if (beginningOfLineSpaces > currentCommentOffset) {
                   currentLineBuffer.append(currentCharacter);
@@ -1506,7 +1524,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                 endOfLine = true;
               }
               if (endOfLine) {
-                // we remove a maximum of currentCommentOffset characters (tabs are converted to space numbers).
+                // we remove a maximum of currentCommentOffset characters (tabs
+                // are converted to space numbers).
                 beginningOfLineSpaces++;
                 if (beginningOfLineSpaces > currentCommentOffset) {
                   currentLineBuffer.append(currentCharacter);
@@ -1542,30 +1561,29 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         }
     }
   }
-
   /**
    * Outputs <code>currentString</code>:<br>
-   * <ul><li>If its length is < maxLineLength, output
-   * <li>Otherwise it is split.</ul>
-   * @param currentString string to output
-   * @param preIndented whether the string to output was pre-indented
-   * @param depth number of indentation to put in front of <code>currentString</code>
-   * @param operator value of the operator belonging to <code>currentString</code>.
+   * <ul>
+   * <li>If its length is < maxLineLength, output
+   * <li>Otherwise it is split.
+   * </ul>
+   * 
+   * @param currentString
+   *            string to output
+   * @param preIndented
+   *            whether the string to output was pre-indented
+   * @param depth
+   *            number of indentation to put in front of <code>currentString</code>
+   * @param operator
+   *            value of the operator belonging to <code>currentString</code>.
    */
-  private void outputLine(
-    String currentString,
-    boolean preIndented,
-    int depth,
-    int operator,
-    int substringIndex,
-    int[] startSubstringIndexes,
-    int offsetInGlobalLine) {
-
+  private void outputLine(String currentString, boolean preIndented, int depth,
+      int operator, int substringIndex, int[] startSubstringIndexes,
+      int offsetInGlobalLine) {
     boolean emptyFirstSubString = false;
     String operatorString = operatorString(operator);
     boolean placeOperatorBehind = !breakLineBeforeOperator(operator);
     boolean placeOperatorAhead = !placeOperatorBehind;
-
     // dump prefix operator?
     if (placeOperatorAhead) {
       if (!preIndented) {
@@ -1579,9 +1597,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         }
         formattedSource.append(operatorString);
         increaseSplitDelta(operatorString.length());
-
         if (insertSpaceAfter(operator) //			&& operator != TokenNameimplements
-        && operator != TokenNameextends) {
+            && operator != TokenNameextends) {
           //			&& operator != TokenNamethrows) {
           formattedSource.append(' ');
           increaseSplitDelta(1);
@@ -1590,10 +1607,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     SplitLine splitLine = null;
     if (options.maxLineLength == 0
-      || getLength(currentString, depth) < options.maxLineLength
-      || (splitLine = split(currentString, offsetInGlobalLine)) == null) {
-
-      // depending on the type of operator, outputs new line before of after dumping it
+        || getLength(currentString, depth) < options.maxLineLength
+        || (splitLine = split(currentString, offsetInGlobalLine)) == null) {
+      // depending on the type of operator, outputs new line before of after
+      // dumping it
       // indent before postfix operator
       // indent also when the line cannot be split
       if (operator == TokenNameextends) {
@@ -1610,12 +1627,13 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       int max = currentString.length();
       if (multipleLineCommentCounter != 0) {
         try {
-          BufferedReader reader = new BufferedReader(new StringReader(currentString));
+          BufferedReader reader = new BufferedReader(new StringReader(
+              currentString));
           String line = reader.readLine();
           while (line != null) {
-            updateMappedPositionsWhileSplitting(
-              beginningOfLineIndex,
-              beginningOfLineIndex + line.length() + options.lineSeparatorSequence.length);
+            updateMappedPositionsWhileSplitting(beginningOfLineIndex,
+                beginningOfLineIndex + line.length()
+                    + options.lineSeparatorSequence.length);
             formattedSource.append(line);
             beginningOfLineIndex = beginningOfLineIndex + line.length();
             if ((line = reader.readLine()) != null) {
@@ -1629,7 +1647,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           e.printStackTrace();
         }
       } else {
-        updateMappedPositionsWhileSplitting(beginningOfLineIndex, beginningOfLineIndex + max);
+        updateMappedPositionsWhileSplitting(beginningOfLineIndex,
+            beginningOfLineIndex + max);
         for (int i = 0; i < max; i++) {
           char currentChar = currentString.charAt(i);
           switch (currentChar) {
@@ -1637,11 +1656,12 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               break;
             case '\n' :
               if (i != max - 1) {
-                // fix for 1FFYL5C: LFCOM:ALL - Incorrect indentation when split with a comment inside a condition
+                // fix for 1FFYL5C: LFCOM:ALL - Incorrect indentation when
+                // split with a comment inside a condition
                 // a substring cannot end with a lineSeparatorSequence,
-                // except if it has been added by format() after a one-line comment
+                // except if it has been added by format() after a one-line
+                // comment
                 formattedSource.append(options.lineSeparatorSequence);
-
                 // 1FGDDV6: LFCOM:WIN98 - Weird splitting on message expression
                 dumpTab(depth - 1);
               }
@@ -1654,13 +1674,15 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       // update positions inside the mappedPositions table
       if (substringIndex != -1) {
         if (multipleLineCommentCounter == 0) {
-          int startPosition = beginningOfLineIndex + startSubstringIndexes[substringIndex];
-          updateMappedPositionsWhileSplitting(startPosition, startPosition + max);
+          int startPosition = beginningOfLineIndex
+              + startSubstringIndexes[substringIndex];
+          updateMappedPositionsWhileSplitting(startPosition, startPosition
+              + max);
         }
-
         // compute the splitDelta resulting with the operator and blank removal
         if (substringIndex + 1 != startSubstringIndexes.length) {
-          increaseSplitDelta(startSubstringIndexes[substringIndex] + max - startSubstringIndexes[substringIndex + 1]);
+          increaseSplitDelta(startSubstringIndexes[substringIndex] + max
+              - startSubstringIndexes[substringIndex + 1]);
         }
       }
       // dump postfix operator?
@@ -1680,7 +1702,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     // fix for 1FG0BA3: LFCOM:WIN98 - Weird splitting on interfaces
     // extends has to stand alone on a line when currentString has been split.
-    if (options.maxLineLength != 0 && splitLine != null && (operator == TokenNameextends)) {
+    if (options.maxLineLength != 0 && splitLine != null
+        && (operator == TokenNameextends)) {
       //				|| operator == TokenNameimplements
       //				|| operator == TokenNamethrows)) {
       formattedSource.append(options.lineSeparatorSequence);
@@ -1697,33 +1720,31 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     // perform actual splitting
     String result[] = splitLine.substrings;
     int[] splitOperators = splitLine.operators;
-
     if (result[0].length() == 0) {
       // when the substring 0 is null, the substring 1 is correctly indented.
       depth--;
       emptyFirstSubString = true;
     }
-    // the operator going in front of the result[0] string is the operator parameter
+    // the operator going in front of the result[0] string is the operator
+    // parameter
     for (int i = 0, max = result.length; i < max; i++) {
       // the new depth is the current one if this is the first substring,
       // the current one + 1 otherwise.
-      // if the substring is a comment, use the current indentation Level instead of the depth
+      // if the substring is a comment, use the current indentation Level
+      // instead of the depth
       // (-1 because the ouputline increases depth).
-      // (fix for 1FFC72R: LFCOM:ALL - Incorrect line split in presence of line comments)
+      // (fix for 1FFC72R: LFCOM:ALL - Incorrect line split in presence of line
+      // comments)
       String currentResult = result[i];
-
       if (currentResult.length() != 0 || splitOperators[i] != 0) {
-          int newDepth = (currentResult.startsWith("/*") //$NON-NLS-1$
-    || currentResult.startsWith("//")) //$NON-NLS-1$ 
-  ? indentationLevel - 1 : depth;
-        outputLine(
-          currentResult,
-          i == 0 || (i == 1 && emptyFirstSubString) ? preIndented : false,
-          i == 0 ? newDepth : newDepth + 1,
-          splitOperators[i],
-          i,
-          splitLine.startSubstringsIndexes,
-          currentString.indexOf(currentResult));
+        int newDepth = (currentResult.startsWith("/*") //$NON-NLS-1$
+        || currentResult.startsWith("//")) //$NON-NLS-1$ 
+            ? indentationLevel - 1 : depth;
+        outputLine(currentResult, i == 0 || (i == 1 && emptyFirstSubString)
+            ? preIndented
+            : false, i == 0 ? newDepth : newDepth + 1, splitOperators[i], i,
+            splitLine.startSubstringsIndexes, currentString
+                .indexOf(currentResult));
         if (i != max - 1) {
           formattedSource.append(options.lineSeparatorSequence);
           increaseSplitDelta(options.lineSeparatorSequence.length);
@@ -1735,7 +1756,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       String lastOperatorString = operatorString(lastOperator);
       formattedSource.append(options.lineSeparatorSequence);
       increaseSplitDelta(options.lineSeparatorSequence.length);
-
       if (breakLineBeforeOperator(lastOperator)) {
         dumpTab(depth + 1);
         if (lastOperator != 0) {
@@ -1745,9 +1765,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           }
           formattedSource.append(lastOperatorString);
           increaseSplitDelta(lastOperatorString.length());
-
-          if (insertSpaceAfter(lastOperator) //					&& lastOperator != TokenNameimplements
-            && lastOperator != TokenNameextends) {
+          if (insertSpaceAfter(lastOperator) //					&& lastOperator !=
+                                             // TokenNameimplements
+              && lastOperator != TokenNameextends) {
             //					&& lastOperator != TokenNamethrows) {
             formattedSource.append(' ');
             increaseSplitDelta(1);
@@ -1764,37 +1784,39 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       //increaseSplitDelta(operatorString.length());
     }
   }
-
   /**
    * Pops the top statement of the stack if it is <code>token</code>
    */
   private int pop(int token) {
     int delta = 0;
-    if ((constructionsCount > 0) && (constructions[constructionsCount - 1] == token)) {
+    if ((constructionsCount > 0)
+        && (constructions[constructionsCount - 1] == token)) {
       delta--;
       constructionsCount--;
     }
     return delta;
   }
-
   /**
-   * Pops the top statement of the stack if it is a <code>BLOCK</code> or a <code>NONINDENT_BLOCK</code>.
+   * Pops the top statement of the stack if it is a <code>BLOCK</code> or a
+   * <code>NONINDENT_BLOCK</code>.
    */
   private int popBlock() {
     int delta = 0;
     if ((constructionsCount > 0)
-      && ((constructions[constructionsCount - 1] == BLOCK) || (constructions[constructionsCount - 1] == NONINDENT_BLOCK))) {
+        && ((constructions[constructionsCount - 1] == BLOCK) || (constructions[constructionsCount - 1] == NONINDENT_BLOCK))) {
       if (constructions[constructionsCount - 1] == BLOCK)
         delta--;
       constructionsCount--;
     }
     return delta;
   }
-
   /**
-   * Pops elements until the stack is empty or the top element is <code>token</code>.<br>
+   * Pops elements until the stack is empty or the top element is <code>token</code>.
+   * <br>
    * Does not remove <code>token</code> from the stack.
-   * @param token the token to be left as the top of the stack
+   * 
+   * @param token
+   *            the token to be left as the top of the stack
    */
   private int popExclusiveUntil(int token) {
     int delta = 0;
@@ -1806,43 +1828,44 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return delta;
   }
-
   /**
-   * Pops elements until the stack is empty or the top element is
-   * a <code>BLOCK</code> or a <code>NONINDENT_BLOCK</code>.<br>
+   * Pops elements until the stack is empty or the top element is a <code>BLOCK</code>
+   * or a <code>NONINDENT_BLOCK</code>.<br>
    * Does not remove it from the stack.
    */
   private int popExclusiveUntilBlock() {
     int startCount = constructionsCount;
     int delta = 0;
-    for (int i = startCount - 1; i >= 0 && constructions[i] != BLOCK && constructions[i] != NONINDENT_BLOCK; i--) {
+    for (int i = startCount - 1; i >= 0 && constructions[i] != BLOCK
+        && constructions[i] != NONINDENT_BLOCK; i--) {
       constructionsCount--;
       delta--;
     }
     return delta;
   }
-
   /**
-   * Pops elements until the stack is empty or the top element is
-   * a <code>BLOCK</code>, a <code>NONINDENT_BLOCK</code> or a <code>CASE</code>.<br>
+   * Pops elements until the stack is empty or the top element is a <code>BLOCK</code>,
+   * a <code>NONINDENT_BLOCK</code> or a <code>CASE</code>.<br>
    * Does not remove it from the stack.
    */
   private int popExclusiveUntilBlockOrCase() {
     int startCount = constructionsCount;
     int delta = 0;
-    for (int i = startCount - 1;
-      i >= 0 && constructions[i] != BLOCK && constructions[i] != NONINDENT_BLOCK && constructions[i] != TokenNamecase;
-      i--) {
+    for (int i = startCount - 1; i >= 0 && constructions[i] != BLOCK
+        && constructions[i] != NONINDENT_BLOCK
+        && constructions[i] != TokenNamecase; i--) {
       constructionsCount--;
       delta--;
     }
     return delta;
   }
-
   /**
-   * Pops elements until the stack is empty or the top element is <code>token</code>.<br>
+   * Pops elements until the stack is empty or the top element is <code>token</code>.
+   * <br>
    * Removes <code>token</code> from the stack too.
-   * @param token the token to remove from the stack
+   * 
+   * @param token
+   *            the token to remove from the stack
    */
   private int popInclusiveUntil(int token) {
     int startCount = constructionsCount;
@@ -1859,16 +1882,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return delta;
   }
-
   /**
-   * Pops elements until the stack is empty or the top element is
-   * a <code>BLOCK</code> or a <code>NONINDENT_BLOCK</code>.<br>
+   * Pops elements until the stack is empty or the top element is a <code>BLOCK</code>
+   * or a <code>NONINDENT_BLOCK</code>.<br>
    * Does not remove it from the stack.
    */
   private int popInclusiveUntilBlock() {
     int startCount = constructionsCount;
     int delta = 0;
-    for (int i = startCount - 1; i >= 0 && (constructions[i] != BLOCK && constructions[i] != NONINDENT_BLOCK); i--) {
+    for (int i = startCount - 1; i >= 0
+        && (constructions[i] != BLOCK && constructions[i] != NONINDENT_BLOCK); i--) {
       delta--;
       constructionsCount--;
     }
@@ -1879,22 +1902,22 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return delta;
   }
-
-  /** 
-   * Pushes a block in the stack.<br>
-   * Pushes a <code>BLOCK</code> if the stack is empty or if the top element is a <code>BLOCK</code>,
-   * pushes <code>NONINDENT_BLOCK</code> otherwise.
-   * Creates a new bigger array if the current one is full.
+  /**
+   * Pushes a block in the stack. <br>
+   * Pushes a <code>BLOCK</code> if the stack is empty or if the top element
+   * is a <code>BLOCK</code>, pushes <code>NONINDENT_BLOCK</code>
+   * otherwise. Creates a new bigger array if the current one is full.
    */
   private int pushBlock() {
     int delta = 0;
     if (constructionsCount == constructions.length)
-      System.arraycopy(constructions, 0, (constructions = new int[constructionsCount * 2]), 0, constructionsCount);
-
+      System.arraycopy(constructions, 0,
+          (constructions = new int[constructionsCount * 2]), 0,
+          constructionsCount);
     if ((constructionsCount == 0)
-      || (constructions[constructionsCount - 1] == BLOCK)
-      || (constructions[constructionsCount - 1] == NONINDENT_BLOCK)
-      || (constructions[constructionsCount - 1] == TokenNamecase)) {
+        || (constructions[constructionsCount - 1] == BLOCK)
+        || (constructions[constructionsCount - 1] == NONINDENT_BLOCK)
+        || (constructions[constructionsCount - 1] == TokenNamecase)) {
       delta++;
       constructions[constructionsCount++] = BLOCK;
     } else {
@@ -1902,33 +1925,33 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return delta;
   }
-
-  /** 
+  /**
    * Pushes <code>token</code>.<br>
    * Creates a new bigger array if the current one is full.
    */
   private int pushControlStatement(int token) {
     if (constructionsCount == constructions.length)
-      System.arraycopy(constructions, 0, (constructions = new int[constructionsCount * 2]), 0, constructionsCount);
+      System.arraycopy(constructions, 0,
+          (constructions = new int[constructionsCount * 2]), 0,
+          constructionsCount);
     constructions[constructionsCount++] = token;
     return 1;
   }
-
   private static boolean separateFirstArgumentOn(int currentToken) {
-    //return (currentToken == TokenNameCOMMA || currentToken == TokenNameSEMICOLON);
-    return currentToken != TokenNameif
-      && currentToken != TokenNameLPAREN
-      && currentToken != TokenNameNOT
-      && currentToken != TokenNamewhile
-      && currentToken != TokenNamefor
-      && currentToken != TokenNameswitch;
+    //return (currentToken == TokenNameCOMMA || currentToken ==
+    // TokenNameSEMICOLON);
+    return currentToken != TokenNameif && currentToken != TokenNameLPAREN
+        && currentToken != TokenNameNOT && currentToken != TokenNamewhile
+        && currentToken != TokenNamefor && currentToken != TokenNameswitch;
   }
-
   /**
-   * Set the positions to map. The mapped positions should be retrieved using the
-   * getMappedPositions() method.
-   * @param positions int[]
-   * @deprecated Set the positions to map using the format(String, int, int[]) method.
+   * Set the positions to map. The mapped positions should be retrieved using
+   * the getMappedPositions() method.
+   * 
+   * @param positions
+   *            int[]
+   * @deprecated Set the positions to map using the format(String, int, int[])
+   *             method.
    * 
    * @see #getMappedPositions()
    */
@@ -1938,37 +1961,36 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     globalDelta = 0;
     mappedPositions = new int[positions.length];
   }
-
-  /** 
+  /**
    * Appends a space character to the current line buffer.
    */
   private void space() {
     currentLineBuffer.append(' ');
     increaseLineDelta(1);
   }
-
   /**
-   * Splits <code>stringToSplit</code> on the top level token<br>
-   * If there are several identical token at the same level,
-   * the string is cut into many pieces.
-   * @return an object containing the operator and all the substrings
-   * or null if the string cannot be split
+   * Splits <code>stringToSplit</code> on the top level token <br>
+   * If there are several identical token at the same level, the string is cut
+   * into many pieces.
+   * 
+   * @return an object containing the operator and all the substrings or null
+   *         if the string cannot be split
    */
   public SplitLine split(String stringToSplit) {
     return split(stringToSplit, 0);
   }
-
   /**
-   * Splits <code>stringToSplit</code> on the top level token<br>
-   * If there are several identical token at the same level,
-   * the string is cut into many pieces.
-   * @return an object containing the operator and all the substrings
-   * or null if the string cannot be split
+   * Splits <code>stringToSplit</code> on the top level token <br>
+   * If there are several identical token at the same level, the string is cut
+   * into many pieces.
+   * 
+   * @return an object containing the operator and all the substrings or null
+   *         if the string cannot be split
    */
   public SplitLine split(String stringToSplit, int offsetInGlobalLine) {
     /*
      * See http://dev.eclipse.org/bugs/show_bug.cgi?id=12540 and
-     * http://dev.eclipse.org/bugs/show_bug.cgi?id=14387 
+     * http://dev.eclipse.org/bugs/show_bug.cgi?id=14387
      */
     if (stringToSplit.indexOf("//$NON-NLS") != -1) { //$NON-NLS-1$
       return null;
@@ -1978,7 +2000,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     int splitTokenType = 0;
     int splitTokenDepth = Integer.MAX_VALUE;
     int splitTokenPriority = Integer.MAX_VALUE;
-
     int[] substringsStartPositions = new int[10];
     // contains the start position of substrings
     int[] substringsEndPositions = new int[10];
@@ -2001,7 +2022,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     int previousToken = -1;
     // to remember the previous token.
     splitScanner.setSource(stringToSplit.toCharArray());
-
     try {
       // start the loop
       while (true) {
@@ -2012,9 +2032,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           currentToken = splitScanner.getNextToken();
           if (Scanner.DEBUG) {
             int currentEndPosition = splitScanner.getCurrentTokenEndPosition();
-            int currentStartPosition = splitScanner.getCurrentTokenStartPosition();
-
-            System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
+            int currentStartPosition = splitScanner
+                .getCurrentTokenStartPosition();
+            System.out.print(currentStartPosition + "," + currentEndPosition
+                + ": ");
             System.out.println(scanner.toStringAction(currentToken));
           }
         } catch (InvalidInputException e) {
@@ -2025,7 +2046,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         }
         if (currentToken == TokenNameEOF)
           break;
-
         if (firstTokenOnLine == -1) {
           firstTokenOnLine = currentToken;
         }
@@ -2033,21 +2053,23 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           case TokenNameRBRACE :
           case TokenNameRPAREN :
             if (openParenthesisPositionCount > 0) {
-              if (openParenthesisPositionCount == 1 && lastOpenParenthesisPosition < openParenthesisPosition[0]) {
+              if (openParenthesisPositionCount == 1
+                  && lastOpenParenthesisPosition < openParenthesisPosition[0]) {
                 lastOpenParenthesisPosition = openParenthesisPosition[0];
-              } else if (
-                (splitTokenDepth == Integer.MAX_VALUE)
+              } else if ((splitTokenDepth == Integer.MAX_VALUE)
                   || (splitTokenDepth > openParenthesisPositionCount && openParenthesisPositionCount == 1)) {
                 splitTokenType = 0;
                 splitTokenDepth = openParenthesisPositionCount;
                 splitTokenPriority = Integer.MAX_VALUE;
                 substringsStartPositions[0] = 0;
-                // better token means the whole line until now is the first substring
+                // better token means the whole line until now is the first
+                // substring
                 substringsCount = 1; // resets the count of substrings
                 substringsEndPositions[0] = openParenthesisPosition[0];
                 // substring ends on operator start
                 position = openParenthesisPosition[0];
-                // the string mustn't be cut before the closing parenthesis but after the opening one.
+                // the string mustn't be cut before the closing parenthesis but
+                // after the opening one.
                 splitOperatorsCount = 1; // resets the count of split operators
                 splitOperators[0] = 0;
               }
@@ -2057,23 +2079,27 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
           case TokenNameLBRACE :
           case TokenNameLPAREN :
             if (openParenthesisPositionCount == openParenthesisPosition.length) {
-              System.arraycopy(
-                openParenthesisPosition,
-                0,
-                (openParenthesisPosition = new int[openParenthesisPositionCount * 2]),
-                0,
-                openParenthesisPositionCount);
+              System
+                  .arraycopy(
+                      openParenthesisPosition,
+                      0,
+                      (openParenthesisPosition = new int[openParenthesisPositionCount * 2]),
+                      0, openParenthesisPositionCount);
             }
             openParenthesisPosition[openParenthesisPositionCount++] = splitScanner.currentPosition;
-            if (currentToken == TokenNameLPAREN && previousToken == TokenNameRPAREN) {
+            if (currentToken == TokenNameLPAREN
+                && previousToken == TokenNameRPAREN) {
               openParenthesisPosition[openParenthesisPositionCount - 1] = splitScanner.startPosition;
             }
             break;
-          case TokenNameSEMICOLON : // ;
-          case TokenNameCOMMA : // ,
-          case TokenNameEQUAL : // =
+          case TokenNameSEMICOLON :
+          // ;
+          case TokenNameCOMMA :
+          // ,
+          case TokenNameEQUAL :
+            // =
             if (openParenthesisPositionCount < splitTokenDepth
-              || (openParenthesisPositionCount == splitTokenDepth && splitTokenPriority > getTokenPriority(currentToken))) {
+                || (openParenthesisPositionCount == splitTokenDepth && splitTokenPriority > getTokenPriority(currentToken))) {
               // the current token is better than the one we currently have
               // (in level or in priority if same level)
               // reset the substringsCount
@@ -2081,11 +2107,11 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               splitTokenType = currentToken;
               splitTokenPriority = getTokenPriority(currentToken);
               substringsStartPositions[0] = 0;
-              // better token means the whole line until now is the first substring
-
-              if (separateFirstArgumentOn(firstTokenOnLine) && openParenthesisPositionCount > 0) {
+              // better token means the whole line until now is the first
+              // substring
+              if (separateFirstArgumentOn(firstTokenOnLine)
+                  && openParenthesisPositionCount > 0) {
                 substringsCount = 2; // resets the count of substrings
-
                 substringsEndPositions[0] = openParenthesisPosition[splitTokenDepth - 1];
                 substringsStartPositions[1] = openParenthesisPosition[splitTokenDepth - 1];
                 substringsEndPositions[1] = splitScanner.startPosition;
@@ -2096,7 +2122,6 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                 // next substring will start from operator end
               } else {
                 substringsCount = 1; // resets the count of substrings
-
                 substringsEndPositions[0] = splitScanner.startPosition;
                 // substring ends on operator start
                 position = splitScanner.currentPosition;
@@ -2106,30 +2131,30 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               }
             } else {
               if ((openParenthesisPositionCount == splitTokenDepth && splitTokenPriority == getTokenPriority(currentToken))
-                && splitTokenType != TokenNameEQUAL
-                && currentToken != TokenNameEQUAL) {
-                // fix for 1FG0BCN: LFCOM:WIN98 - Missing one indentation after split
+                  && splitTokenType != TokenNameEQUAL
+                  && currentToken != TokenNameEQUAL) {
+                // fix for 1FG0BCN: LFCOM:WIN98 - Missing one indentation after
+                // split
                 // take only the 1st = into account.
                 // if another token with the same priority is found,
                 // push the start position of the substring and
                 // push the token into the stack.
                 // create a new array object if the current one is full.
                 if (substringsCount == substringsStartPositions.length) {
-                  System.arraycopy(
-                    substringsStartPositions,
-                    0,
-                    (substringsStartPositions = new int[substringsCount * 2]),
-                    0,
-                    substringsCount);
-                  System.arraycopy(
-                    substringsEndPositions,
-                    0,
-                    (substringsEndPositions = new int[substringsCount * 2]),
-                    0,
-                    substringsCount);
+                  System
+                      .arraycopy(
+                          substringsStartPositions,
+                          0,
+                          (substringsStartPositions = new int[substringsCount * 2]),
+                          0, substringsCount);
+                  System.arraycopy(substringsEndPositions, 0,
+                      (substringsEndPositions = new int[substringsCount * 2]),
+                      0, substringsCount);
                 }
                 if (splitOperatorsCount == splitOperators.length) {
-                  System.arraycopy(splitOperators, 0, (splitOperators = new int[splitOperatorsCount * 2]), 0, splitOperatorsCount);
+                  System.arraycopy(splitOperators, 0,
+                      (splitOperators = new int[splitOperatorsCount * 2]), 0,
+                      splitOperatorsCount);
                 }
                 substringsStartPositions[substringsCount] = position;
                 substringsEndPositions[substringsCount++] = splitScanner.startPosition;
@@ -2140,57 +2165,89 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               }
             }
             break;
-
-          case TokenNameCOLON : // : (15.24)
-            // see 1FK7C5R, we only split on a colon, when it is associated with a question-mark.
-            // indeed it might appear also behind a case statement, and we do not to break at this point.
-            if ((splitOperatorsCount == 0) || splitOperators[splitOperatorsCount - 1] != TokenNameQUESTION) {
+          case TokenNameCOLON :
+            // : (15.24)
+            // see 1FK7C5R, we only split on a colon, when it is associated
+            // with a question-mark.
+            // indeed it might appear also behind a case statement, and we do
+            // not to break at this point.
+            if ((splitOperatorsCount == 0)
+                || splitOperators[splitOperatorsCount - 1] != TokenNameQUESTION) {
               break;
             }
           case TokenNameextends :
-            //			case TokenNameimplements :
-            //			case TokenNamethrows :
-
-          case TokenNameDOT : // .
-          case TokenNameMULTIPLY : // * (15.16.1)
-          case TokenNameDIVIDE : // / (15.16.2)
-          case TokenNameREMAINDER : // % (15.16.3)
-          case TokenNamePLUS : // + (15.17, 15.17.2)
-          case TokenNameMINUS : // - (15.17.2)
-          case TokenNameLEFT_SHIFT : // << (15.18)
-          case TokenNameRIGHT_SHIFT : // >> (15.18)
-            //				case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
-          case TokenNameLESS : // < (15.19.1)
-          case TokenNameLESS_EQUAL : // <= (15.19.1)
-          case TokenNameGREATER : // > (15.19.1)
-          case TokenNameGREATER_EQUAL : // >= (15.19.1)
-            //				case TokenNameinstanceof : // instanceof
-          case TokenNameEQUAL_EQUAL : // == (15.20, 15.20.1, 15.20.2, 15.20.3)
-          case TokenNameEQUAL_EQUAL_EQUAL : // == (15.20, 15.20.1, 15.20.2, 15.20.3)
-          case TokenNameNOT_EQUAL : // != (15.20, 15.20.1, 15.20.2, 15.20.3)
-					case TokenNameNOT_EQUAL_EQUAL : // != (15.20, 15.20.1, 15.20.2, 15.20.3)
-          case TokenNameAND : // & (15.21, 15.21.1, 15.21.2)
-          case TokenNameOR : // | (15.21, 15.21.1, 15.21.2)
-          case TokenNameXOR : // ^ (15.21, 15.21.1, 15.21.2)
-          case TokenNameAND_AND : // && (15.22)
-          case TokenNameOR_OR : // || (15.23)
-          case TokenNameQUESTION : // ? (15.24)
-          case TokenNameMULTIPLY_EQUAL : // *= (15.25.2)
-          case TokenNameDIVIDE_EQUAL : // /= (15.25.2)
-          case TokenNameREMAINDER_EQUAL : // %= (15.25.2)
-          case TokenNamePLUS_EQUAL : // += (15.25.2)
-          case TokenNameMINUS_EQUAL : // -= (15.25.2)
-          case TokenNameLEFT_SHIFT_EQUAL : // <<= (15.25.2)
-          case TokenNameRIGHT_SHIFT_EQUAL : // >>= (15.25.2)
-            //					case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
-          case TokenNameAND_EQUAL : // &= (15.25.2)
-          case TokenNameXOR_EQUAL : // ^= (15.25.2)
-          case TokenNameOR_EQUAL : // |= (15.25.2)
-
-            if ((openParenthesisPositionCount < splitTokenDepth
-              || (openParenthesisPositionCount == splitTokenDepth && splitTokenPriority > getTokenPriority(currentToken)))
-              && !((currentToken == TokenNamePLUS || currentToken == TokenNameMINUS)
-                && (previousToken == TokenNameLBRACE || previousToken == TokenNameLBRACKET || splitScanner.startPosition == 0))) {
+          //			case TokenNameimplements :
+          //			case TokenNamethrows :
+          case TokenNameDOT :
+          // .
+          case TokenNameMULTIPLY :
+          // * (15.16.1)
+          case TokenNameDIVIDE :
+          // / (15.16.2)
+          case TokenNameREMAINDER :
+          // % (15.16.3)
+          case TokenNamePLUS :
+          // + (15.17, 15.17.2)
+          case TokenNameMINUS :
+          // - (15.17.2)
+          case TokenNameLEFT_SHIFT :
+          // << (15.18)
+          case TokenNameRIGHT_SHIFT :
+          // >> (15.18)
+          //				case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
+          case TokenNameLESS :
+          // < (15.19.1)
+          case TokenNameLESS_EQUAL :
+          // <= (15.19.1)
+          case TokenNameGREATER :
+          // > (15.19.1)
+          case TokenNameGREATER_EQUAL :
+          // >= (15.19.1)
+          //				case TokenNameinstanceof : // instanceof
+          case TokenNameEQUAL_EQUAL :
+          // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+          case TokenNameEQUAL_EQUAL_EQUAL :
+          // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+          case TokenNameNOT_EQUAL :
+          // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+          case TokenNameNOT_EQUAL_EQUAL :
+          // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+          case TokenNameAND :
+          // & (15.21, 15.21.1, 15.21.2)
+          case TokenNameOR :
+          // | (15.21, 15.21.1, 15.21.2)
+          case TokenNameXOR :
+          // ^ (15.21, 15.21.1, 15.21.2)
+          case TokenNameAND_AND :
+          // && (15.22)
+          case TokenNameOR_OR :
+          // || (15.23)
+          case TokenNameQUESTION :
+          // ? (15.24)
+          case TokenNameMULTIPLY_EQUAL :
+          // *= (15.25.2)
+          case TokenNameDIVIDE_EQUAL :
+          // /= (15.25.2)
+          case TokenNameREMAINDER_EQUAL :
+          // %= (15.25.2)
+          case TokenNamePLUS_EQUAL :
+          // += (15.25.2)
+          case TokenNameMINUS_EQUAL :
+          // -= (15.25.2)
+          case TokenNameLEFT_SHIFT_EQUAL :
+          // <<= (15.25.2)
+          case TokenNameRIGHT_SHIFT_EQUAL :
+          // >>= (15.25.2)
+          //					case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
+          case TokenNameAND_EQUAL :
+          // &= (15.25.2)
+          case TokenNameXOR_EQUAL :
+          // ^= (15.25.2)
+          case TokenNameOR_EQUAL :
+            // |= (15.25.2)
+            if ((openParenthesisPositionCount < splitTokenDepth || (openParenthesisPositionCount == splitTokenDepth && splitTokenPriority > getTokenPriority(currentToken)))
+                && !((currentToken == TokenNamePLUS || currentToken == TokenNameMINUS) && (previousToken == TokenNameLBRACE
+                    || previousToken == TokenNameLBRACKET || splitScanner.startPosition == 0))) {
               // the current token is better than the one we currently have
               // (in level or in priority if same level)
               // reset the substringsCount
@@ -2198,11 +2255,11 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
               splitTokenType = currentToken;
               splitTokenPriority = getTokenPriority(currentToken);
               substringsStartPositions[0] = 0;
-              // better token means the whole line until now is the first substring
-
-              if (separateFirstArgumentOn(firstTokenOnLine) && openParenthesisPositionCount > 0) {
+              // better token means the whole line until now is the first
+              // substring
+              if (separateFirstArgumentOn(firstTokenOnLine)
+                  && openParenthesisPositionCount > 0) {
                 substringsCount = 2; // resets the count of substrings
-
                 substringsEndPositions[0] = openParenthesisPosition[splitTokenDepth - 1];
                 substringsStartPositions[1] = openParenthesisPosition[splitTokenDepth - 1];
                 substringsEndPositions[1] = splitScanner.startPosition;
@@ -2214,39 +2271,38 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                 // next substring will start from operator end
               } else {
                 substringsCount = 1; // resets the count of substrings
-
                 substringsEndPositions[0] = splitScanner.startPosition;
                 // substring ends on operator start
                 position = splitScanner.currentPosition;
                 // next substring will start from operator end
                 splitOperatorsCount = 2; // resets the count of split operators
                 splitOperators[0] = 0;
-                // nothing for first operand since operator will be inserted in front of the second operand
+                // nothing for first operand since operator will be inserted in
+                // front of the second operand
                 splitOperators[1] = currentToken;
-
               }
             } else {
-              if (openParenthesisPositionCount == splitTokenDepth && splitTokenPriority == getTokenPriority(currentToken)) {
+              if (openParenthesisPositionCount == splitTokenDepth
+                  && splitTokenPriority == getTokenPriority(currentToken)) {
                 // if another token with the same priority is found,
                 // push the start position of the substring and
                 // push the token into the stack.
                 // create a new array object if the current one is full.
                 if (substringsCount == substringsStartPositions.length) {
-                  System.arraycopy(
-                    substringsStartPositions,
-                    0,
-                    (substringsStartPositions = new int[substringsCount * 2]),
-                    0,
-                    substringsCount);
-                  System.arraycopy(
-                    substringsEndPositions,
-                    0,
-                    (substringsEndPositions = new int[substringsCount * 2]),
-                    0,
-                    substringsCount);
+                  System
+                      .arraycopy(
+                          substringsStartPositions,
+                          0,
+                          (substringsStartPositions = new int[substringsCount * 2]),
+                          0, substringsCount);
+                  System.arraycopy(substringsEndPositions, 0,
+                      (substringsEndPositions = new int[substringsCount * 2]),
+                      0, substringsCount);
                 }
                 if (splitOperatorsCount == splitOperators.length) {
-                  System.arraycopy(splitOperators, 0, (splitOperators = new int[splitOperatorsCount * 2]), 0, splitOperatorsCount);
+                  System.arraycopy(splitOperators, 0,
+                      (splitOperators = new int[splitOperatorsCount * 2]), 0,
+                      splitOperatorsCount);
                 }
                 substringsStartPositions[substringsCount] = position;
                 substringsEndPositions[substringsCount++] = splitScanner.startPosition;
@@ -2271,32 +2327,30 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     // if the string cannot be split, return null.
     if (splitOperatorsCount == 0)
       return null;
-
     // ## SPECIAL CASES BEGIN
-    if (((splitOperatorsCount == 2
-      && splitOperators[1] == TokenNameDOT
-      && splitTokenDepth == 0
-      && lastOpenParenthesisPosition > -1)
-      || (splitOperatorsCount > 2
-        && splitOperators[1] == TokenNameDOT
-        && splitTokenDepth == 0
-        && lastOpenParenthesisPosition > -1
-        && lastOpenParenthesisPosition <= options.maxLineLength)
-      || (separateFirstArgumentOn(firstTokenOnLine) && splitTokenDepth > 0 && lastOpenParenthesisPosition > -1))
-      && (lastOpenParenthesisPosition < splitScanner.source.length && splitScanner.source[lastOpenParenthesisPosition] != ')')) {
-      // fix for 1FH4J2H: LFCOM:WINNT - Formatter - Empty parenthesis should not be broken on two lines
+    if (((splitOperatorsCount == 2 && splitOperators[1] == TokenNameDOT
+        && splitTokenDepth == 0 && lastOpenParenthesisPosition > -1)
+        || (splitOperatorsCount > 2 && splitOperators[1] == TokenNameDOT
+            && splitTokenDepth == 0 && lastOpenParenthesisPosition > -1 && lastOpenParenthesisPosition <= options.maxLineLength) || (separateFirstArgumentOn(firstTokenOnLine)
+        && splitTokenDepth > 0 && lastOpenParenthesisPosition > -1))
+        && (lastOpenParenthesisPosition < splitScanner.source.length && splitScanner.source[lastOpenParenthesisPosition] != ')')) {
+      // fix for 1FH4J2H: LFCOM:WINNT - Formatter - Empty parenthesis should
+      // not be broken on two lines
       // only one split on a top level .
-      // or more than one split on . and substring before open parenthesis fits one line.
+      // or more than one split on . and substring before open parenthesis fits
+      // one line.
       // or split inside parenthesis and first token is not a for/while/if
-      SplitLine sl = split(stringToSplit.substring(lastOpenParenthesisPosition), lastOpenParenthesisPosition);
+      SplitLine sl = split(
+          stringToSplit.substring(lastOpenParenthesisPosition),
+          lastOpenParenthesisPosition);
       if (sl == null || sl.operators[0] != TokenNameCOMMA) {
-        // trim() is used to remove the extra blanks at the end of the substring. See PR 1FGYPI1
-        return new SplitLine(
-          new int[] { 0, 0 },
-          new String[] {
+        // trim() is used to remove the extra blanks at the end of the
+        // substring. See PR 1FGYPI1
+        return new SplitLine(new int[]{0, 0}, new String[]{
             stringToSplit.substring(0, lastOpenParenthesisPosition).trim(),
-            stringToSplit.substring(lastOpenParenthesisPosition)},
-          new int[] { offsetInGlobalLine, lastOpenParenthesisPosition + offsetInGlobalLine });
+            stringToSplit.substring(lastOpenParenthesisPosition)}, new int[]{
+            offsetInGlobalLine,
+            lastOpenParenthesisPosition + offsetInGlobalLine});
       } else {
         // right substring can be split and is split on comma
         // copy substrings and operators
@@ -2307,23 +2361,26 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         int[] startIndexes = new int[subStringsLength];
         int operatorsLength = sl.operators.length + 1 - startIndex;
         int[] operators = new int[operatorsLength];
-
         result[0] = stringToSplit.substring(0, lastOpenParenthesisPosition);
         operators[0] = 0;
-
-        System.arraycopy(sl.startSubstringsIndexes, startIndex, startIndexes, 1, subStringsLength - 1);
+        System.arraycopy(sl.startSubstringsIndexes, startIndex, startIndexes,
+            1, subStringsLength - 1);
         for (int i = subStringsLength - 1; i >= 0; i--) {
           startIndexes[i] += offsetInGlobalLine;
         }
-        System.arraycopy(sl.substrings, startIndex, result, 1, subStringsLength - 1);
-        System.arraycopy(sl.operators, startIndex, operators, 1, operatorsLength - 1);
-
+        System.arraycopy(sl.substrings, startIndex, result, 1,
+            subStringsLength - 1);
+        System.arraycopy(sl.operators, startIndex, operators, 1,
+            operatorsLength - 1);
         return new SplitLine(operators, result, startIndexes);
       }
     }
-    // if the last token is a comment and the substring before the comment fits on a line,
+    // if the last token is a comment and the substring before the comment fits
+    // on a line,
     // split before the comment and return the result.
-    if (lastCommentStartPosition > -1 && lastCommentStartPosition < options.maxLineLength && splitTokenPriority > 50) {
+    if (lastCommentStartPosition > -1
+        && lastCommentStartPosition < options.maxLineLength
+        && splitTokenPriority > 50) {
       int end = lastCommentStartPosition;
       int start = lastCommentStartPosition;
       if (stringToSplit.charAt(end - 1) == ' ') {
@@ -2332,31 +2389,31 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       if (start != end && stringToSplit.charAt(start) == ' ') {
         start++;
       }
-      return new SplitLine(
-        new int[] { 0, 0 },
-        new String[] { stringToSplit.substring(0, end), stringToSplit.substring(start)},
-        new int[] { 0, start });
+      return new SplitLine(new int[]{0, 0}, new String[]{
+          stringToSplit.substring(0, end), stringToSplit.substring(start)},
+          new int[]{0, start});
     }
     if (position != stringToSplit.length()) {
       if (substringsCount == substringsStartPositions.length) {
-        System.arraycopy(
-          substringsStartPositions,
-          0,
-          (substringsStartPositions = new int[substringsCount * 2]),
-          0,
-          substringsCount);
-        System.arraycopy(substringsEndPositions, 0, (substringsEndPositions = new int[substringsCount * 2]), 0, substringsCount);
+        System.arraycopy(substringsStartPositions, 0,
+            (substringsStartPositions = new int[substringsCount * 2]), 0,
+            substringsCount);
+        System.arraycopy(substringsEndPositions, 0,
+            (substringsEndPositions = new int[substringsCount * 2]), 0,
+            substringsCount);
       }
       // avoid empty extra substring, e.g. line terminated with a semi-colon
       substringsStartPositions[substringsCount] = position;
       substringsEndPositions[substringsCount++] = stringToSplit.length();
     }
     if (splitOperatorsCount == splitOperators.length) {
-      System.arraycopy(splitOperators, 0, (splitOperators = new int[splitOperatorsCount * 2]), 0, splitOperatorsCount);
+      System.arraycopy(splitOperators, 0,
+          (splitOperators = new int[splitOperatorsCount * 2]), 0,
+          splitOperatorsCount);
     }
     splitOperators[splitOperatorsCount] = 0;
-
-    // the last element of the stack is the position of the end of StringToSPlit
+    // the last element of the stack is the position of the end of
+    // StringToSPlit
     // +1 because the substring method excludes the last character
     String[] result = new String[substringsCount];
     for (int i = 0; i < substringsCount; i++) {
@@ -2373,29 +2430,41 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       substringsStartPositions[i] += offsetInGlobalLine;
     }
     if (splitOperatorsCount > substringsCount) {
-      System.arraycopy(substringsStartPositions, 0, (substringsStartPositions = new int[splitOperatorsCount]), 0, substringsCount);
-      System.arraycopy(substringsEndPositions, 0, (substringsEndPositions = new int[splitOperatorsCount]), 0, substringsCount);
+      System.arraycopy(substringsStartPositions, 0,
+          (substringsStartPositions = new int[splitOperatorsCount]), 0,
+          substringsCount);
+      System.arraycopy(substringsEndPositions, 0,
+          (substringsEndPositions = new int[splitOperatorsCount]), 0,
+          substringsCount);
       for (int i = substringsCount; i < splitOperatorsCount; i++) {
         substringsStartPositions[i] = position;
         substringsEndPositions[i] = position;
       }
-      System.arraycopy(splitOperators, 0, (splitOperators = new int[splitOperatorsCount]), 0, splitOperatorsCount);
+      System.arraycopy(splitOperators, 0,
+          (splitOperators = new int[splitOperatorsCount]), 0,
+          splitOperatorsCount);
     } else {
-      System.arraycopy(substringsStartPositions, 0, (substringsStartPositions = new int[substringsCount]), 0, substringsCount);
-      System.arraycopy(substringsEndPositions, 0, (substringsEndPositions = new int[substringsCount]), 0, substringsCount);
-      System.arraycopy(splitOperators, 0, (splitOperators = new int[substringsCount]), 0, substringsCount);
+      System.arraycopy(substringsStartPositions, 0,
+          (substringsStartPositions = new int[substringsCount]), 0,
+          substringsCount);
+      System.arraycopy(substringsEndPositions, 0,
+          (substringsEndPositions = new int[substringsCount]), 0,
+          substringsCount);
+      System.arraycopy(splitOperators, 0,
+          (splitOperators = new int[substringsCount]), 0, substringsCount);
     }
-    SplitLine splitLine = new SplitLine(splitOperators, result, substringsStartPositions);
+    SplitLine splitLine = new SplitLine(splitOperators, result,
+        substringsStartPositions);
     return splitLine;
   }
-
   private void updateMappedPositions(int startPosition) {
     if (positionsToMap == null) {
       return;
     }
     char[] source = scanner.source;
     int sourceLength = source.length;
-    while (indexToMap < positionsToMap.length && positionsToMap[indexToMap] <= startPosition) {
+    while (indexToMap < positionsToMap.length
+        && positionsToMap[indexToMap] <= startPosition) {
       int posToMap = positionsToMap[indexToMap];
       if (posToMap < 0 || posToMap >= sourceLength) {
         // protection against out of bounds position
@@ -2417,20 +2486,17 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
       indexToMap++;
     }
   }
-
-  private void updateMappedPositionsWhileSplitting(int startPosition, int endPosition) {
+  private void updateMappedPositionsWhileSplitting(int startPosition,
+      int endPosition) {
     if (mappedPositions == null || mappedPositions.length == indexInMap)
       return;
-
     while (indexInMap < mappedPositions.length
-      && startPosition <= mappedPositions[indexInMap]
-      && mappedPositions[indexInMap] < endPosition
-      && indexInMap < indexToMap) {
+        && startPosition <= mappedPositions[indexInMap]
+        && mappedPositions[indexInMap] < endPosition && indexInMap < indexToMap) {
       mappedPositions[indexInMap] += splitDelta;
       indexInMap++;
     }
   }
-
   private int getLength(String s, int tabDepth) {
     int length = 0;
     for (int i = 0; i < tabDepth; i++) {
@@ -2448,13 +2514,14 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     }
     return length;
   }
-
-  /** 
-  * Sets the initial indentation level
-  * @param indentationLevel new indentation level
-  * 
-  * @deprecated
-  */
+  /**
+   * Sets the initial indentation level
+   * 
+   * @param indentationLevel
+   *            new indentation level
+   * 
+   * @deprecated
+   */
   public void setInitialIndentationLevel(int newIndentationLevel) {
     this.initialIndentationLevel = currentLineIndentationLevel = indentationLevel = newIndentationLevel;
   }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationEngine.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationEngine.java
index 91ce5e7..f3f9132 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationEngine.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationEngine.java
@@ -124,7 +124,7 @@ public class DeclarationEngine {
                 continue; // for loop
               }
               break;
-            case ITerminalSymbols.TokenNamethis :
+            case ITerminalSymbols.TokenNameVariable :
               if (type != PHPIdentifierLocation.METHOD && type != PHPIdentifierLocation.VARIABLE) {
                 continue; // for loop
               }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
index 056edbe..fbabccb 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
@@ -172,8 +172,7 @@ public class IdentifierIndexManager {
                 }
               }
             }
-          } else if ((fToken == TokenNameLBRACE)
-              || (fToken == TokenNameDOLLAR_LBRACE)) {
+          } else if (fToken == TokenNameLBRACE) {
             getNextToken();
             counter++;
           } else if (fToken == TokenNameRBRACE) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
index dcd9a6e..ab2d8f9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
@@ -142,7 +142,7 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
           }
 
           getNextToken();
-        } else if ((fToken == TokenNameLBRACE) || (fToken == TokenNameDOLLAR_LBRACE)) {
+        } else if (fToken == TokenNameLBRACE) {
           getNextToken();
           counter++;
         } else if (fToken == TokenNameRBRACE) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index b0ba0b8..de0473e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -224,8 +224,8 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           case ITerminalSymbols.TokenNameMINUS_GREATER :
             // dereferencing operator '->' found
             lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
-            if (beforeLastToken == ITerminalSymbols.TokenNamethis) {
-              lastSignificantToken = ITerminalSymbols.TokenNamethis;
+            if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
+              lastSignificantToken = ITerminalSymbols.TokenNameVariable;
             }
             break;
           case ITerminalSymbols.TokenNamenew :
@@ -270,7 +270,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     int lastSignificantToken = getLastToken(viewer, offset, context);
     boolean useClassMembers =
       (lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER) || 
-      (lastSignificantToken == ITerminalSymbols.TokenNamethis) ||
+      (lastSignificantToken == ITerminalSymbols.TokenNameVariable) ||
 		  (lastSignificantToken == ITerminalSymbols.TokenNamenew);
     boolean emptyPrefix = prefix == null || prefix.equals("");
 
-- 
1.7.1


From 89ec47da99aac77201eb11be31ad8f6b6c2e4f4a Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Mon, 22 Mar 2004 21:11:35 +0000
Subject: [PATCH 05/16] misc changes in  the internal builder

---
 .../sourceforge/phpdt/core/IJavaModelMarker.java   |    9 +-
 .../src/net/sourceforge/phpdt/core/JavaCore.java   | 6440 +++++++++++---------
 .../net/sourceforge/phpdt/core/ToolFactory.java    |    7 +-
 .../phpdt/core/compiler/ITerminalSymbols.java      |    2 +-
 .../phpdt/internal/compiler/parser/Parser.java     |  151 +-
 .../phpdt/internal/compiler/parser/Scanner.java    |    6 +-
 .../phpdt/internal/core/ClasspathEntry.java        |   12 +-
 .../core/CompilationUnitProblemFinder.java         |    4 +-
 .../core/CopyResourceElementsOperation.java        |    6 +-
 .../phpdt/internal/core/DeltaProcessor.java        |    6 +-
 .../phpdt/internal/core/JavaModelManager.java      |   46 +-
 .../phpdt/internal/core/JavaModelStatus.java       |   16 +-
 .../phpdt/internal/core/JavaProject.java           |   28 +-
 .../phpdt/internal/core/NameLookup.java            |    4 +-
 .../phpdt/internal/core/PackageFragmentRoot.java   |    4 +-
 .../net/sourceforge/phpdt/internal/core/Util.java  |    8 +-
 .../phpdt/internal/core/WorkingCopy.java           |    4 +-
 .../core/builder/AbstractImageBuilder.java         |   10 +-
 .../internal/core/builder/BatchImageBuilder.java   |    6 +-
 .../core/builder/IncrementalImageBuilder.java      |  290 +-
 .../internal/core/builder/NameEnvironment.java     |    6 +-
 .../phpdt/internal/core/builder/PHPBuilder.java    |   16 +-
 .../phpdt/internal/core/builder/State.java         |  485 +-
 .../phpdt/internal/core/jdom/DOMBuilder.java       |    4 +-
 .../phpdt/internal/core/jdom/SimpleDOMBuilder.java |    4 +-
 .../ui/actions/WorkbenchRunnableAdapter.java       |    4 +-
 .../preferences/CodeFormatterPreferencePage.java   |   48 +-
 .../ui/preferences/PHPEditorPreferencePage.java    |    4 +-
 .../phpdt/internal/ui/util/PHPProjectSelector.java |    4 +-
 .../src/net/sourceforge/phpdt/ui/JavaUI.java       |    4 +-
 .../ui/StandardJavaElementContentProvider.java     |    6 +-
 .../phpdt/ui/wizards/NewContainerWizardPage.java   |    8 +-
 .../src/net/sourceforge/phpeclipse/PHPCore.java    | 3780 ------------
 .../sourceforge/phpeclipse/PHPeclipsePlugin.java   |  461 +-
 .../phpeclipse/phpeditor/JavaMarkerAnnotation.java |   13 +-
 .../phpeclipse/phpeditor/JavaOutlinePage.java      |    8 +-
 .../phpeditor/JavaSelectMarkerRulerAction.java     |    2 -
 .../phpeclipse/phpeditor/PHPDocumentProvider.java  |    4 +-
 .../phpeclipse/phpeditor/PHPEditor.java            |    4 +-
 .../phpeditor/PHPSourceViewerConfiguration.java    |    5 +-
 .../phpeclipse/phpeditor/PHPUnitEditor.java        |    4 +-
 .../resourcesview/ResourceAdapterFactory.java      |   10 +-
 .../wizards/NewProjectCreationWizard.java          |    4 +-
 .../phpeclipse/wizards/TempnewPHPProject.java      |    4 +-
 44 files changed, 4356 insertions(+), 7595 deletions(-)
 delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPCore.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IJavaModelMarker.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IJavaModelMarker.java
index 22cce48..e31c253 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IJavaModelMarker.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IJavaModelMarker.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
-import net.sourceforge.phpeclipse.PHPCore;
 
 /**
  * Markers used by the Java model.
@@ -26,7 +25,7 @@ public interface IJavaModelMarker {
 	 * This can be used to recognize those markers in the workspace that flag problems 
 	 * detected by the Java tooling during compilation.
 	 */
-	public static final String JAVA_MODEL_PROBLEM_MARKER = PHPCore.PLUGIN_ID + ".problem"; //$NON-NLS-1$
+	public static final String JAVA_MODEL_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".problem"; //$NON-NLS-1$
 
 
 	/**
@@ -35,7 +34,7 @@ public interface IJavaModelMarker {
 	 * problems detected by the Java tooling (such as a problem
 	 * detected by the outliner, or a problem detected during a code completion)
 	 */
-	public static final String TRANSIENT_PROBLEM = PHPCore.PLUGIN_ID + ".transient_problem"; //$NON-NLS-1$
+	public static final String TRANSIENT_PROBLEM = JavaCore.PLUGIN_ID + ".transient_problem"; //$NON-NLS-1$
 
 	/**
 	 * Java model task marker type (value <code>"org.eclipse.jdt.core.task"</code>).
@@ -45,7 +44,7 @@ public interface IJavaModelMarker {
 	 * option <code>"org.eclipse.jdt.core.compiler.taskTag"</code>.
 	 * @since 2.1
 	 */
-	public static final String TASK_MARKER = PHPCore.PLUGIN_ID + ".task"; //$NON-NLS-1$
+	public static final String TASK_MARKER = JavaCore.PLUGIN_ID + ".task"; //$NON-NLS-1$
 
     
     /** 
@@ -81,7 +80,7 @@ public interface IJavaModelMarker {
 	 * This can be used to recognize those markers in the workspace that flag problems 
 	 * detected by the Java tooling during classpath setting.
 	 */
-	public static final String BUILDPATH_PROBLEM_MARKER = PHPCore.PLUGIN_ID + ".buildpath_problem"; //$NON-NLS-1$
+	public static final String BUILDPATH_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".buildpath_problem"; //$NON-NLS-1$
 	
 	/** 
 	 * Classpath file format marker attribute (value <code>"classpathFileFormat"</code>).
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
index 6e8531b..440e421 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
@@ -1,55 +1,29 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     IBM Corporation - added the following constants:
- *                                 COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE
- *                                 COMPILER_PB_STATIC_ACCESS_RECEIVER
- *                                 COMPILER_TASK_TAGS
- *                                 CORE_CIRCULAR_CLASSPATH
- *                                 CORE_INCOMPLETE_CLASSPATH
- *     IBM Corporation - added run(IWorkspaceRunnable, IProgressMonitor)
- *     IBM Corporation - added exclusion patterns to source classpath entries
- *     IBM Corporation - added specific output location to source classpath entries
- *     IBM Corporation - added the following constants:
- *                                 CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER
- *                                 CLEAN
- *     IBM Corporation - added getClasspathContainerInitializer(String)
- *     IBM Corporation - added the following constants:
- *                                 CODEASSIST_ARGUMENT_PREFIXES
- *                                 CODEASSIST_ARGUMENT_SUFFIXES
- *                                 CODEASSIST_FIELD_PREFIXES
- *                                 CODEASSIST_FIELD_SUFFIXES
- *                                 CODEASSIST_LOCAL_PREFIXES
- *                                 CODEASSIST_LOCAL_SUFFIXES
- *                                 CODEASSIST_STATIC_FIELD_PREFIXES
- *                                 CODEASSIST_STATIC_FIELD_SUFFIXES
- *                                 COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION
- *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 
 import net.sourceforge.phpdt.internal.core.BatchOperation;
 import net.sourceforge.phpdt.internal.core.BufferManager;
+import net.sourceforge.phpdt.internal.core.ClasspathEntry;
 import net.sourceforge.phpdt.internal.core.JavaModel;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.Region;
+import net.sourceforge.phpdt.internal.corext.Assert;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IMarkerDelta;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IWorkspace;
@@ -58,3181 +32,3739 @@ import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
 
+public class JavaCore {
+
+//  public static HashSet OptionNames = new HashSet(20);
+  /**
+   * The plug-in identifier of the Java core support
+   * (value <code>"org.phpeclipse.phpdt.core"</code>).
+   */
+//  public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.core"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = PHPeclipsePlugin.PLUGIN_ID;
+  /**
+     * Possible  configurable option ID.
+     * @see #getDefaultOptions
+     * @since 2.0
+     */
+  public static final String CORE_ENCODING = PLUGIN_ID + ".encoding"; //$NON-NLS-1$
+
+  /**
+     * Possible  configurable option ID.
+     * @see #getDefaultOptions
+     * @since 2.0
+     */
+  public static final String FORMATTER_NEWLINE_OPENING_BRACE = PLUGIN_ID + ".formatter.newline.openingBrace"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_NEWLINE_CONTROL = PLUGIN_ID + ".formatter.newline.controlStatement"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_NEWLINE_ELSE_IF = PLUGIN_ID + ".formatter.newline.elseIf"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_NEWLINE_EMPTY_BLOCK = PLUGIN_ID + ".formatter.newline.emptyBlock"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_CLEAR_BLANK_LINES = PLUGIN_ID + ".formatter.newline.clearAll"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_LINE_SPLIT = PLUGIN_ID + ".formatter.lineSplit"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_COMPACT_ASSIGNMENT = PLUGIN_ID + ".formatter.style.assignment"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_TAB_CHAR = PLUGIN_ID + ".formatter.tabulation.char"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option ID.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String FORMATTER_TAB_SIZE = PLUGIN_ID + ".formatter.tabulation.size"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String INSERT = "insert"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String DO_NOT_INSERT = "do not insert"; //$NON-NLS-1$
+
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String PRESERVE_ONE = "preserve one"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String CLEAR_ALL = "clear all"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String NORMAL = "normal"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String COMPACT = "compact"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String TAB = "tab"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String SPACE = "space"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String ENABLED = "enabled"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.0
+   */
+  public static final String DISABLED = "disabled"; //$NON-NLS-1$
+  /**
+   * Possible  configurable option value.
+   * @see #getDefaultOptions
+   * @since 2.1
+   */
+  public static final String CLEAN = "clean"; //$NON-NLS-1$
+
+  /**
+  	 * Possible  configurable option ID.
+  	 * @see #getDefaultOptions
+  	 * @since 2.1
+  	 */
+  public static final String COMPILER_TASK_TAGS = PLUGIN_ID + ".compiler.taskTags"; //$NON-NLS-1$
+
+	/**
+		 * Name of the handle id attribute in a Java marker.
+		 */
+		protected static final String ATT_HANDLE_ID =
+			"net.sourceforge.phpdt.internal.core.JavaModelManager.handleId" ; //$NON-NLS-1$
+
+		// *************** Possible IDs for configurable options. ********************
+
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions()
+		 */
+		public static final String COMPILER_LOCAL_VARIABLE_ATTR = PLUGIN_ID + ".compiler.debug.localVariable"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions()
+		 */
+		public static final String COMPILER_LINE_NUMBER_ATTR = PLUGIN_ID + ".compiler.debug.lineNumber"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_SOURCE_FILE_ATTR = PLUGIN_ID + ".compiler.debug.sourceFile"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_CODEGEN_UNUSED_LOCAL = PLUGIN_ID + ".compiler.codegen.unusedLocal"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_CODEGEN_TARGET_PLATFORM = PLUGIN_ID + ".compiler.codegen.targetPlatform"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_UNREACHABLE_CODE = PLUGIN_ID + ".compiler.problem.unreachableCode"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_INVALID_IMPORT = PLUGIN_ID + ".compiler.problem.invalidImport"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD = PLUGIN_ID + ".compiler.problem.overridingPackageDefaultMethod"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME = PLUGIN_ID + ".compiler.problem.methodWithConstructorName"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_DEPRECATION = PLUGIN_ID + ".compiler.problem.deprecation"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE = PLUGIN_ID + ".compiler.problem.deprecationInDeprecatedCode"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_HIDDEN_CATCH_BLOCK = PLUGIN_ID + ".compiler.problem.hiddenCatchBlock"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_UNUSED_LOCAL = PLUGIN_ID + ".compiler.problem.unusedLocal"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_UNUSED_PARAMETER = PLUGIN_ID + ".compiler.problem.unusedParameter"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT = PLUGIN_ID + ".compiler.problem.unusedParameterWhenImplementingAbstract"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE = PLUGIN_ID + ".compiler.problem.unusedParameterWhenOverridingConcrete"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_PB_UNUSED_IMPORT = PLUGIN_ID + ".compiler.problem.unusedImport"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPILER_PB_SYNTHETIC_ACCESS_EMULATION = PLUGIN_ID + ".compiler.problem.syntheticAccessEmulation"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_PB_NON_NLS_STRING_LITERAL = PLUGIN_ID + ".compiler.problem.nonExternalizedStringLiteral"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_PB_ASSERT_IDENTIFIER = PLUGIN_ID + ".compiler.problem.assertIdentifier"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_STATIC_ACCESS_RECEIVER = PLUGIN_ID + ".compiler.problem.staticAccessReceiver"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_NO_EFFECT_ASSIGNMENT = PLUGIN_ID + ".compiler.problem.noEffectAssignment"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD = PLUGIN_ID + ".compiler.problem.incompatibleNonInheritedInterfaceMethod"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION = PLUGIN_ID + ".compiler.problem.noImplicitStringConversion"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_PB_MAX_PER_UNIT = PLUGIN_ID + ".compiler.maxProblemPerUnit"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_SOURCE = PLUGIN_ID + ".compiler.source"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String COMPILER_COMPLIANCE = PLUGIN_ID + ".compiler.compliance"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_TASK_PRIORITIES = PLUGIN_ID + ".compiler.taskPriorities"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_TASK_PRIORITY_HIGH = "HIGH"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_TASK_PRIORITY_LOW = "LOW"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String COMPILER_TASK_PRIORITY_NORMAL = "NORMAL"; //$NON-NLS-1$
+				/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 */
+		public static final String CORE_JAVA_BUILD_ORDER = PLUGIN_ID + ".computeJavaBuildOrder"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String CORE_JAVA_BUILD_RESOURCE_COPY_FILTER = PLUGIN_ID + ".builder.resourceCopyExclusionFilter"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CORE_JAVA_BUILD_DUPLICATE_RESOURCE = PLUGIN_ID + ".builder.duplicateResourceTask"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER = PLUGIN_ID + ".builder.cleanOutputFolder"; //$NON-NLS-1$	 	
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CORE_INCOMPLETE_CLASSPATH = PLUGIN_ID + ".incompleteClasspath"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CORE_CIRCULAR_CLASSPATH = PLUGIN_ID + ".circularClasspath"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String CORE_JAVA_BUILD_INVALID_CLASSPATH = PLUGIN_ID + ".builder.invalidClasspath"; //$NON-NLS-1$
+			/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1 
+		 */
+		public static final String CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS = PLUGIN_ID + ".classpath.exclusionPatterns"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS = PLUGIN_ID + ".classpath.multipleOutputLocations"; //$NON-NLS-1$
+		/**
+		 * Default task tag
+		 * @since 2.1
+		 */
+		public static final String DEFAULT_TASK_TAG = "TODO"; //$NON-NLS-1$
+		/**
+		 * Default task priority
+		 * @since 2.1
+		 */
+		public static final String DEFAULT_TASK_PRIORITY = "NORMAL"; //$NON-NLS-1$
+		/**
+		 * Possible configurable option ID
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String FORMATTER_SPACE_CASTEXPRESSION = PLUGIN_ID + ".formatter.space.castexpression"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String CODEASSIST_VISIBILITY_CHECK = PLUGIN_ID + ".codeComplete.visibilityCheck"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String CODEASSIST_IMPLICIT_QUALIFICATION = PLUGIN_ID + ".codeComplete.forceImplicitQualification"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.fieldPrefixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_STATIC_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.staticFieldPrefixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_LOCAL_PREFIXES = PLUGIN_ID + ".codeComplete.localPrefixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_ARGUMENT_PREFIXES = PLUGIN_ID + ".codeComplete.argumentPrefixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.fieldSuffixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_STATIC_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.staticFieldSuffixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_LOCAL_SUFFIXES = PLUGIN_ID + ".codeComplete.localSuffixes"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option ID.
+		 * @see #getDefaultOptions
+		 * @since 2.1
+		 */
+		public static final String CODEASSIST_ARGUMENT_SUFFIXES = PLUGIN_ID + ".codeComplete.argumentSuffixes"; //$NON-NLS-1$
+
+		// *************** Possible values for configurable options. ********************
+	
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String GENERATE = "generate"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String DO_NOT_GENERATE = "do not generate"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String PRESERVE = "preserve"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String OPTIMIZE_OUT = "optimize out"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String VERSION_1_1 = "1.1"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String VERSION_1_2 = "1.2"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String VERSION_1_3 = "1.3"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String VERSION_1_4 = "1.4"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+		public static final String ABORT = "abort"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String ERROR = "error"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String WARNING = "warning"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String IGNORE = "ignore"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 */
+		public static final String COMPUTE = "compute"; //$NON-NLS-1$
+		/**
+		 * Possible  configurable option value.
+		 * @see #getDefaultOptions
+		 * @since 2.0
+		 */
+
+	
+  /**
+   * Returns a table of all known configurable options with their default values.
+   * These options allow to configure the behaviour of the underlying components.
+   * The client may safely use the result as a template that they can modify and
+   * then pass to <code>setOptions</code>.
+   * 
+   * Helper constants have been defined on JavaCore for each of the option ID and 
+   * their possible constant values.
+   * 
+   * Note: more options might be added in further releases.
+   * <pre>
+   * RECOGNIZED OPTIONS:
+   * COMPILER / Generating Local Variable Debug Attribute
+   *    When generated, this attribute will enable local variable names 
+   *    to be displayed in debugger, only in place where variables are 
+   *    definitely assigned (.class file is then bigger)
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.localVariable"
+   *     - possible values:   { "generate", "do not generate" }
+   *     - default:           "generate"
+   *
+   * COMPILER / Generating Line Number Debug Attribute 
+   *    When generated, this attribute will enable source code highlighting in debugger 
+   *    (.class file is then bigger).
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.lineNumber"
+   *     - possible values:   { "generate", "do not generate" }
+   *     - default:           "generate"
+   *    
+   * COMPILER / Generating Source Debug Attribute 
+   *    When generated, this attribute will enable the debugger to present the 
+   *    corresponding source code.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.sourceFile"
+   *     - possible values:   { "generate", "do not generate" }
+   *     - default:           "generate"
+   *    
+   * COMPILER / Preserving Unused Local Variables
+   *    Unless requested to preserve unused local variables (i.e. never read), the 
+   *    compiler will optimize them out, potentially altering debugging
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.codegen.unusedLocal"
+   *     - possible values:   { "preserve", "optimize out" }
+   *     - default:           "preserve"
+   * 
+   * COMPILER / Defining Target Java Platform
+   *    For binary compatibility reason, .class files can be tagged to with certain VM versions and later.
+   *    Note that "1.4" target require to toggle compliance mode to "1.4" too.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.codegen.targetPlatform"
+   *     - possible values:   { "1.1", "1.2", "1.3", "1.4" }
+   *     - default:           "1.1"
+   *
+   * COMPILER / Reporting Unreachable Code
+   *    Unreachable code can optionally be reported as an error, warning or simply 
+   *    ignored. The bytecode generation will always optimized it out.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unreachableCode"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "error"
+   *
+   * COMPILER / Reporting Invalid Import
+   *    An import statement that cannot be resolved might optionally be reported 
+   *    as an error, as a warning or ignored.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.invalidImport"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "error"
+   *
+   * COMPILER / Reporting Attempt to Override Package-Default Method
+   *    A package default method is not visible in a different package, and thus 
+   *    cannot be overridden. When enabling this option, the compiler will signal 
+   *    such scenarii either as an error or a warning.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.overridingPackageDefaultMethod"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   *
+   * COMPILER / Reporting Method With Constructor Name
+   *    Naming a method with a constructor name is generally considered poor 
+   *    style programming. When enabling this option, the compiler will signal such 
+   *    scenarii either as an error or a warning.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.methodWithConstructorName"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   *
+   * COMPILER / Reporting Deprecation
+   *    When enabled, the compiler will signal use of deprecated API either as an 
+   *    error or a warning.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.deprecation"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   *
+   * COMPILER / Reporting Deprecation Inside Deprecated Code
+   *    When enabled, the compiler will signal use of deprecated API inside deprecated code.
+   *    The severity of the problem is controlled with option "org.phpeclipse.phpdt.core.compiler.problem.deprecation".
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.deprecationInDeprecatedCode"
+   *     - possible values:   { "enabled", "disabled" }
+   *     - default:           "disabled"
+   *
+   * COMPILER / Reporting Hidden Catch Block
+   *    Locally to a try statement, some catch blocks may hide others , e.g.
+   *      try {  throw new java.io.CharConversionException();
+   *      } catch (java.io.CharConversionException e) {
+   *      } catch (java.io.IOException e) {}. 
+   *    When enabling this option, the compiler will issue an error or a warning for hidden 
+   *    catch blocks corresponding to checked exceptions
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.hiddenCatchBlock"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   *
+   * COMPILER / Reporting Unused Local
+   *    When enabled, the compiler will issue an error or a warning for unused local 
+   *    variables (i.e. variables never read from)
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedLocal"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "ignore"
+   *
+   * COMPILER / Reporting Unused Parameter
+   *    When enabled, the compiler will issue an error or a warning for unused method 
+   *    parameters (i.e. parameters never read from)
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedParameter"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "ignore"
+   *
+   * COMPILER / Reporting Unused Import
+   *    When enabled, the compiler will issue an error or a warning for unused import 
+   *    reference 
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedImport"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   *
+   * COMPILER / Reporting Synthetic Access Emulation
+   *    When enabled, the compiler will issue an error or a warning whenever it emulates 
+   *    access to a non-accessible member of an enclosing type. Such access can have
+   *    performance implications.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.syntheticAccessEmulation"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "ignore"
+   *
+   * COMPILER / Reporting Non-Externalized String Literal
+   *    When enabled, the compiler will issue an error or a warning for non externalized 
+   *    String literal (i.e. non tagged with //$NON-NLS-<n>$). 
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.nonExternalizedStringLiteral"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "ignore"
+   * 
+   * COMPILER / Reporting Usage of 'assert' Identifier
+   *    When enabled, the compiler will issue an error or a warning whenever 'assert' is 
+   *    used as an identifier (reserved keyword in 1.4)
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.assertIdentifier"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "ignore"
+   * 
+   * COMPILER / Reporting Usage of expression receiver on static invocation/field access
+   *    When enabled, the compiler will issue an error or a warning whenever a static field
+   *    or method is accessed with an expression receiver.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.staticAccessReceiver"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   * 
+   * COMPILER / Reporting Assignment with no effect
+   *    When enabled, the compiler will issue an error or a warning whenever an assignment
+   *    has no effect (e.g 'x = x').
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.noEffectAssignment"
+   *     - possible values:   { "error", "warning", "ignore" }
+   *     - default:           "warning"
+   * 
+   * COMPILER / Setting Source Compatibility Mode
+   *    Specify whether source is 1.3 or 1.4 compatible. From 1.4 on, 'assert' is a keyword
+   *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
+   *   level should be set to "1.4" and the compliance mode should be "1.4".
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.source"
+   *     - possible values:   { "1.3", "1.4" }
+   *     - default:           "1.3"
+   * 
+   * COMPILER / Setting Compliance Level
+   *    Select the compliance level for the compiler. In "1.3" mode, source and target settings
+   *    should not go beyond "1.3" level.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.compliance"
+   *     - possible values:   { "1.3", "1.4" }
+   *     - default:           "1.3"
+   * 
+   * COMPILER / Maximum number of problems reported per compilation unit
+   *    Specify the maximum number of problems reported on each compilation unit.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.maxProblemPerUnit"
+   *     - possible values:	"<n>" where <n> is zero or a positive integer (if zero then all problems are reported).
+   *     - default:           "100"
+   * 
+   * COMPILER / Define the Automatic Task Tags
+   *    When the tag is non empty, the compiler will issue a task marker whenever it encounters
+   *    one of the corresponding tag inside any comment in Java source code.
+   *    Generated task messages will include the tag, and range until the next line separator or comment ending, and will be trimmed.
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.taskTags"
+   *     - possible values:   { "<tag>[,<tag>]*" } where <tag> is a String without any wild-card 
+   *     - default:           ""
+   * COMPILER / Define the Automatic Task Priorities
+   *    In parallel with the Automatic Task Tags, this list defines the priorities (high, normal or low)
+   *    of the task markers issued by the compiler.
+   *    If the default is specified, the priority of each task marker is "NORMAL".
+   *     - option id:         "org.phpeclipse.phpdt.core.compiler.taskPriorities"
+   *     - possible values:   { "<priority>[,<priority>]*" } where <priority> is one of "HIGH", "NORMAL" or "LOW"
+   *     - default:           ""
+   * 
+   * BUILDER / Specifying Filters for Resource Copying Control
+   *    Allow to specify some filters to control the resource copy process.
+   *     - option id:         "org.phpeclipse.phpdt.core.builder.resourceCopyExclusionFilter"
+   *     - possible values:   { "<name>[,<name>]* } where <name> is a file name pattern (* and ? wild-cards allowed)
+   *       or the name of a folder which ends with '/'
+   *     - default:           ""
+   * 
+   * BUILDER / Abort if Invalid Classpath
+   *    Allow to toggle the builder to abort if the classpath is invalid
+   *     - option id:         "org.phpeclipse.phpdt.core.builder.invalidClasspath"
+   *     - possible values:   { "abort", "ignore" }
+   *     - default:           "ignore"
+   * 
+   * BUILDER / Cleaning Output Folder(s)
+   *    Indicate whether the JavaBuilder is allowed to clean the output folders
+   *    when performing full build operations.
+   *     - option id:         "org.phpeclipse.phpdt.core.builder.cleanOutputFolder"
+   *     - possible values:   { "clean", "ignore" }
+   *     - default:           "clean"
+   * 
+   * JAVACORE / Computing Project Build Order
+   *    Indicate whether JavaCore should enforce the project build order to be based on
+   *    the classpath prerequisite chain. When requesting to compute, this takes over
+   *    the platform default order (based on project references).
+   *     - option id:         "org.phpeclipse.phpdt.core.computeJavaBuildOrder"
+   *     - possible values:   { "compute", "ignore" }
+   *     - default:           "ignore"	 
+   * 
+   * JAVACORE / Specify Default Source Encoding Format
+   *    Get the encoding format for compiled sources. This setting is read-only, it is equivalent
+   *    to 'ResourcesPlugin.getEncoding()'.
+   *     - option id:         "org.phpeclipse.phpdt.core.encoding"
+   *     - possible values:   { any of the supported encoding name}.
+   *     - default:           <platform default>
+   * 
+   * JAVACORE / Reporting Incomplete Classpath
+   *    An entry on the classpath doesn't exist or is not visible (e.g. a referenced project is closed).
+   *     - option id:         "org.phpeclipse.phpdt.core.incompleteClasspath"
+   *     - possible values:   { "error", "warning"}
+   *     - default:           "error"
+   * 
+   * JAVACORE / Reporting Classpath Cycle
+   *    A project is involved in a cycle.
+   *     - option id:         "org.phpeclipse.phpdt.core.circularClasspath"
+   *     - possible values:   { "error", "warning" }
+   *     - default:           "error"
+   * 
+   *	FORMATTER / Inserting New Line Before Opening Brace
+   *    When Insert, a new line is inserted before an opening brace, otherwise nothing
+   *    is inserted
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.openingBrace"
+   *     - possible values:   { "insert", "do not insert" }
+   *     - default:           "do not insert"
+   * 
+   *	FORMATTER / Inserting New Line Inside Control Statement
+   *    When Insert, a new line is inserted between } and following else, catch, finally
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.controlStatement"
+   *     - possible values:   { "insert", "do not insert" }
+   *     - default:           "do not insert"
+   * 
+   *	FORMATTER / Clearing Blank Lines
+   *    When Clear all, all blank lines are removed. When Preserve one, only one is kept
+   *    and all others removed.
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.clearAll"
+   *     - possible values:   { "clear all", "preserve one" }
+   *     - default:           "preserve one"
+   * 
+   *	FORMATTER / Inserting New Line Between Else/If 
+   *    When Insert, a blank line is inserted between an else and an if when they are 
+   *    contiguous. When choosing to not insert, else-if will be kept on the same
+   *    line when possible.
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.elseIf"
+   *     - possible values:   { "insert", "do not insert" }
+   *     - default:           "do not insert"
+   * 
+   *	FORMATTER / Inserting New Line In Empty Block
+   *    When insert, a line break is inserted between contiguous { and }, if } is not followed
+   *    by a keyword.
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.emptyBlock"
+   *     - possible values:   { "insert", "do not insert" }
+   *     - default:           "insert"
+   * 
+   *	FORMATTER / Splitting Lines Exceeding Length
+   *    Enable splitting of long lines (exceeding the configurable length). Length of 0 will
+   *    disable line splitting
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.lineSplit"
+   *     - possible values:	"<n>", where n is zero or a positive integer
+   *     - default:           "80"
+   * 
+   *	FORMATTER / Compacting Assignment
+   *    Assignments can be formatted asymmetrically, e.g. 'int x= 2;', when Normal, a space
+   *    is inserted before the assignment operator
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.style.assignment"
+   *     - possible values:   { "compact", "normal" }
+   *     - default:           "normal"
+   * 
+   *	FORMATTER / Defining Indentation Character
+   *    Either choose to indent with tab characters or spaces
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.tabulation.char"
+   *     - possible values:   { "tab", "space" }
+   *     - default:           "tab"
+   * 
+   *	FORMATTER / Defining Space Indentation Length
+   *    When using spaces, set the amount of space characters to use for each 
+   *    indentation mark.
+   *     - option id:         "org.phpeclipse.phpdt.core.formatter.tabulation.size"
+   *     - possible values:	"<n>", where n is a positive integer
+   *     - default:           "4"
+   * 
+   *	CODEASSIST / Activate Visibility Sensitive Completion
+   *    When active, completion doesn't show that you can not see
+   *    (e.g. you can not see private methods of a super class).
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.visibilityCheck"
+   *     - possible values:   { "enabled", "disabled" }
+   *     - default:           "disabled"
+   * 
+   *	CODEASSIST / Automatic Qualification of Implicit Members
+   *    When active, completion automatically qualifies completion on implicit
+   *    field references and message expressions.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.forceImplicitQualification"
+   *     - possible values:   { "enabled", "disabled" }
+   *     - default:           "disabled"
+   * 
+   *  CODEASSIST / Define the Prefixes for Field Name
+   *    When the prefixes is non empty, completion for field name will begin with
+   *    one of the proposed prefixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.fieldPrefixes"
+   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Prefixes for Static Field Name
+   *    When the prefixes is non empty, completion for static field name will begin with
+   *    one of the proposed prefixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.staticFieldPrefixes"
+   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Prefixes for Local Variable Name
+   *    When the prefixes is non empty, completion for local variable name will begin with
+   *    one of the proposed prefixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.localPrefixes"
+   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Prefixes for Argument Name
+   *    When the prefixes is non empty, completion for argument name will begin with
+   *    one of the proposed prefixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.argumentPrefixes"
+   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Suffixes for Field Name
+   *    When the suffixes is non empty, completion for field name will end with
+   *    one of the proposed suffixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.fieldSuffixes"
+   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Suffixes for Static Field Name
+   *    When the suffixes is non empty, completion for static field name will end with
+   *    one of the proposed suffixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.staticFieldSuffixes"
+   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Suffixes for Local Variable Name
+   *    When the suffixes is non empty, completion for local variable name will end with
+   *    one of the proposed suffixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.localSuffixes"
+   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+   *     - default:           ""
+   * 
+   *  CODEASSIST / Define the Suffixes for Argument Name
+   *    When the suffixes is non empty, completion for argument name will end with
+   *    one of the proposed suffixes.
+   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.argumentSuffixes"
+   *     - possible values:   { "<suffix>[,<suffix>]*" } where <prefix> is a String without any wild-card 
+   *     - default:           ""
+   * </pre>
+   * 
+   * @return a mutable table containing the default settings of all known options
+   *   (key type: <code>String</code>; value type: <code>String</code>)
+   * @see #setOptions
+   */
+//  public static Hashtable getDefaultOptions() {
+//
+//    Hashtable defaultOptions = new Hashtable(10);
+//
+//    // see #initializeDefaultPluginPreferences() for changing default settings
+//    Preferences preferences = getPlugin().getPluginPreferences();
+//    HashSet optionNames = OptionNames;
+//
+//    // get preferences set to their default
+//    String[] defaultPropertyNames = preferences.defaultPropertyNames();
+//    for (int i = 0; i < defaultPropertyNames.length; i++) {
+//      String propertyName = defaultPropertyNames[i];
+//      if (optionNames.contains(propertyName)) {
+//        defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+//      }
+//    }
+//    // get preferences not set to their default
+//    String[] propertyNames = preferences.propertyNames();
+//    for (int i = 0; i < propertyNames.length; i++) {
+//      String propertyName = propertyNames[i];
+//      if (optionNames.contains(propertyName)) {
+//        defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+//      }
+//    }
+//    // get encoding through resource plugin
+//    defaultOptions.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
+//
+//    return defaultOptions;
+//  }
+  /**
+   * Helper method for returning one option value only. Equivalent to <code>(String)JavaCore.getOptions().get(optionName)</code>
+   * Note that it may answer <code>null</code> if this option does not exist.
+   * <p>
+   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+   * </p>
+   * 
+   * @param optionName the name of an option
+   * @return the String value of a given option
+   * @see JavaCore#getDefaultOptions
+   * @since 2.0
+   */
+//  public static String getOption(String optionName) {
+//
+//    if (CORE_ENCODING.equals(optionName)) {
+//      return ResourcesPlugin.getEncoding();
+//    }
+//    if (OptionNames.contains(optionName)) {
+//      Preferences preferences = getPlugin().getPluginPreferences();
+//      return preferences.getString(optionName).trim();
+//    }
+//    return null;
+//  }
+
+  /**
+   * Returns the table of the current options. Initially, all options have their default values,
+   * and this method returns a table that includes all known options.
+   * <p>
+   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+   * </p>
+   * 
+   * @return table of current settings of all options 
+   *   (key type: <code>String</code>; value type: <code>String</code>)
+   * @see JavaCore#getDefaultOptions
+   */
+//  public static Hashtable getOptions() {
+//
+//    Hashtable options = new Hashtable(10);
+//
+//    // see #initializeDefaultPluginPreferences() for changing default settings
+//    Plugin plugin = getPlugin();
+//    if (plugin != null) {
+//      Preferences preferences = getPlugin().getPluginPreferences();
+//      HashSet optionNames = OptionNames;
+//
+//      // get preferences set to their default
+//      String[] defaultPropertyNames = preferences.defaultPropertyNames();
+//      for (int i = 0; i < defaultPropertyNames.length; i++) {
+//        String propertyName = defaultPropertyNames[i];
+//        if (optionNames.contains(propertyName)) {
+//          options.put(propertyName, preferences.getDefaultString(propertyName));
+//        }
+//      }
+//      // get preferences not set to their default
+//      String[] propertyNames = preferences.propertyNames();
+//      for (int i = 0; i < propertyNames.length; i++) {
+//        String propertyName = propertyNames[i];
+//        if (optionNames.contains(propertyName)) {
+//          options.put(propertyName, preferences.getString(propertyName).trim());
+//        }
+//      }
+//      // get encoding through resource plugin
+//      options.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
+//    }
+//    return options;
+//  }
+  /**
+   * Sets the current table of options. All and only the options explicitly included in the given table 
+   * are remembered; all previous option settings are forgotten, including ones not explicitly
+   * mentioned.
+   * <p>
+   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+   * </p>
+   * 
+   * @param newOptions the new options (key type: <code>String</code>; value type: <code>String</code>),
+   *   or <code>null</code> to reset all options to their default values
+   * @see JavaCore#getDefaultOptions
+   */
+//  public static void setOptions(Hashtable newOptions) {
+//
+//    // see #initializeDefaultPluginPreferences() for changing default settings
+//    Preferences preferences = getPlugin().getPluginPreferences();
+//
+//    if (newOptions == null) {
+//      newOptions = getDefaultOptions();
+//    }
+//    Enumeration keys = newOptions.keys();
+//    while (keys.hasMoreElements()) {
+//      String key = (String) keys.nextElement();
+//      if (!OptionNames.contains(key))
+//        continue; // unrecognized option
+//      if (key.equals(CORE_ENCODING))
+//        continue; // skipped, contributed by resource prefs
+//      String value = (String) newOptions.get(key);
+//      preferences.setValue(key, value);
+//    }
+//
+//    // persist options
+//    getPlugin().savePluginPreferences();
+//  }
+  public static IProject[] getPHPProjects() {
+    List phpProjectsList = new ArrayList();
+    IProject[] workspaceProjects = PHPeclipsePlugin.getWorkspace().getRoot().getProjects();
+
+    for (int i = 0; i < workspaceProjects.length; i++) {
+      IProject iProject = workspaceProjects[i];
+      if (isPHPProject(iProject))
+        phpProjectsList.add(iProject);
+    }
+
+    IProject[] phpProjects = new IProject[phpProjectsList.size()];
+    return (IProject[]) phpProjectsList.toArray(phpProjects);
+  }
+
+//  public static PHPProject getPHPProject(String name) {
+//    IProject aProject = PHPeclipsePlugin.getWorkspace().getRoot().getProject(name);
+//    if (isPHPProject(aProject)) {
+//      PHPProject thePHPProject = new PHPProject();
+//      thePHPProject.setProject(aProject);
+//      return thePHPProject;
+//    }
+//    return null;
+//  }
+
+  public static boolean isPHPProject(IProject aProject) {
+    try {
+      return aProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID);
+    } catch (CoreException e) {
+    }
+
+    return false;
+  }
+
+//  public static PHPFile create(IFile aFile) {
+//    if (PHPFile.EXTENSION.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//    if (PHPFile.EXTENSION1.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//    if (PHPFile.EXTENSION2.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//    if (PHPFile.EXTENSION3.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//    if (PHPFile.EXTENSION4.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//    if (PHPFile.EXTENSION5.equalsIgnoreCase(aFile.getFileExtension()))
+//      return new PHPFile(aFile);
+//
+//    return null;
+//  }
+
+//  public static PHPProject create(IProject aProject) {
+//	
+//    try {
+//      if (aProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
+//        PHPProject project = new PHPProject();
+//        project.setProject(aProject);
+//        return project;
+//      }
+//    } catch (CoreException e) {
+//      System.err.println("Exception occurred in PHPCore#create(IProject): " + e.toString());
+//    }
+//
+//    return null;
+//  }
+
+  public static void addPHPNature(IProject project, IProgressMonitor monitor) throws CoreException {
+    if (!project.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
+      IProjectDescription description = project.getDescription();
+      String[] prevNatures = description.getNatureIds();
+      String[] newNatures = new String[prevNatures.length + 1];
+      System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+      newNatures[prevNatures.length] = PHPeclipsePlugin.PHP_NATURE_ID;
+      description.setNatureIds(newNatures);
+      project.setDescription(description, monitor);
+    }
+  }
+
+  /**
+   * Returns the single instance of the PHP core plug-in runtime class.
+   * 
+   * @return the single instance of the PHP core plug-in runtime class
+   */
+  public static Plugin getPlugin() {
+    return PHPeclipsePlugin.getDefault();
+  }
+
+  /**
+     * Initializes the default preferences settings for this plug-in.
+     */
+ 
+  /**
+  	 * Runs the given action as an atomic Java model operation.
+  	 * <p>
+  	 * After running a method that modifies Java elements,
+  	 * registered listeners receive after-the-fact notification of
+  	 * what just transpired, in the form of a element changed event.
+  	 * This method allows clients to call a number of
+  	 * methods that modify java elements and only have element
+  	 * changed event notifications reported at the end of the entire
+  	 * batch.
+  	 * </p>
+  	 * <p>
+  	 * If this method is called outside the dynamic scope of another such
+  	 * call, this method runs the action and then reports a single
+  	 * element changed event describing the net effect of all changes
+  	 * done to java elements by the action.
+  	 * </p>
+  	 * <p>
+  	 * If this method is called in the dynamic scope of another such
+  	 * call, this method simply runs the action.
+  	 * </p>
+  	 *
+  	 * @param action the action to perform
+  	 * @param monitor a progress monitor, or <code>null</code> if progress
+  	 *    reporting and cancellation are not desired
+  	 * @exception CoreException if the operation failed.
+  	 * @since 2.1
+  	 */
+  public static void run(IWorkspaceRunnable action, IProgressMonitor monitor) throws CoreException {
+    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+    if (workspace.isTreeLocked()) {
+      new BatchOperation(action).run(monitor);
+    } else {
+      // use IWorkspace.run(...) to ensure that a build will be done in autobuild mode
+      workspace.run(new BatchOperation(action), monitor);
+    }
+  }
+  
+/**
+ * Adds the given listener for changes to Java elements.
+ * Has no effect if an identical listener is already registered.
+ *
+ * This listener will only be notified during the POST_CHANGE resource change notification
+ * and any reconcile operation (POST_RECONCILE).
+ * For finer control of the notification, use <code>addElementChangedListener(IElementChangedListener,int)</code>,
+ * which allows to specify a different eventMask.
+ * 
+ * @see ElementChangedEvent
+ * @param listener the listener
+ */
+public static void addElementChangedListener(IElementChangedListener listener) {
+	addElementChangedListener(listener, ElementChangedEvent.POST_CHANGE | ElementChangedEvent.POST_RECONCILE);
+}
 
 /**
- * The plug-in runtime class for the Java model plug-in containing the core
- * (UI-free) support for Java projects.
+ * Adds the given listener for changes to Java elements.
+ * Has no effect if an identical listener is already registered.
+ * After completion of this method, the given listener will be registered for exactly
+ * the specified events.  If they were previously registered for other events, they
+ * will be deregistered.  
  * <p>
- * Like all plug-in runtime classes (subclasses of <code>Plugin</code>), this
- * class is automatically instantiated by the platform when the plug-in gets
- * activated. Clients must not attempt to instantiate plug-in runtime classes
- * directly.
+ * Once registered, a listener starts receiving notification of changes to
+ * java elements in the model. The listener continues to receive 
+ * notifications until it is replaced or removed. 
  * </p>
  * <p>
- * The single instance of this class can be accessed from any plug-in declaring
- * the Java model plug-in as a prerequisite via 
- * <code>JavaCore.getJavaCore()</code>. The Java model plug-in will be activated
- * automatically if not already active.
+ * Listeners can listen for several types of event as defined in <code>ElementChangeEvent</code>.
+ * Clients are free to register for any number of event types however if they register
+ * for more than one, it is their responsibility to ensure they correctly handle the
+ * case where the same java element change shows up in multiple notifications.  
+ * Clients are guaranteed to receive only the events for which they are registered.
  * </p>
+ * 
+ * @param listener the listener
+ * @param eventMask the bit-wise OR of all event types of interest to the listener
+ * @see IElementChangedListener
+ * @see ElementChangedEvent
+ * @see #removeElementChangedListener(IElementChangedListener)
+ * @since 2.0
  */
-public final class JavaCore extends Plugin implements IExecutableExtension {
-
-	private static Plugin JAVA_CORE_PLUGIN = null; 
-	/**
-	 * The plug-in identifier of the Java core support
-	 * (value <code>"org.eclipse.jdt.core"</code>).
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.jdt.core" ; //$NON-NLS-1$
-
-	/**
-	 * The identifier for the Java builder
-	 * (value <code>"org.eclipse.jdt.core.javabuilder"</code>).
-	 */
-	public static final String BUILDER_ID = PLUGIN_ID + ".javabuilder" ; //$NON-NLS-1$
-
-	/**
-	 * The identifier for the Java model
-	 * (value <code>"org.eclipse.jdt.core.javamodel"</code>).
-	 */
-	public static final String MODEL_ID = PLUGIN_ID + ".javamodel" ; //$NON-NLS-1$
-
-	/**
-	 * The identifier for the Java nature
-	 * (value <code>"org.eclipse.jdt.core.javanature"</code>).
-	 * The presence of this nature on a project indicates that it is 
-	 * Java-capable.
-	 *
-	 * @see org.eclipse.core.resources.IProject#hasNature(java.lang.String)
-	 */
-	public static final String NATURE_ID = PLUGIN_ID + ".javanature" ; //$NON-NLS-1$
-
-	/**
-	 * Name of the handle id attribute in a Java marker.
-	 */
-	protected static final String ATT_HANDLE_ID =
-		"org.eclipse.jdt.internal.core.JavaModelManager.handleId" ; //$NON-NLS-1$
-
-	// *************** Possible IDs for configurable options. ********************
-
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions()
-	 */
-	public static final String COMPILER_LOCAL_VARIABLE_ATTR = PLUGIN_ID + ".compiler.debug.localVariable"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions()
-	 */
-	public static final String COMPILER_LINE_NUMBER_ATTR = PLUGIN_ID + ".compiler.debug.lineNumber"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_SOURCE_FILE_ATTR = PLUGIN_ID + ".compiler.debug.sourceFile"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_CODEGEN_UNUSED_LOCAL = PLUGIN_ID + ".compiler.codegen.unusedLocal"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_CODEGEN_TARGET_PLATFORM = PLUGIN_ID + ".compiler.codegen.targetPlatform"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_UNREACHABLE_CODE = PLUGIN_ID + ".compiler.problem.unreachableCode"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_INVALID_IMPORT = PLUGIN_ID + ".compiler.problem.invalidImport"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD = PLUGIN_ID + ".compiler.problem.overridingPackageDefaultMethod"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME = PLUGIN_ID + ".compiler.problem.methodWithConstructorName"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_DEPRECATION = PLUGIN_ID + ".compiler.problem.deprecation"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE = PLUGIN_ID + ".compiler.problem.deprecationInDeprecatedCode"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_HIDDEN_CATCH_BLOCK = PLUGIN_ID + ".compiler.problem.hiddenCatchBlock"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_UNUSED_LOCAL = PLUGIN_ID + ".compiler.problem.unusedLocal"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_UNUSED_PARAMETER = PLUGIN_ID + ".compiler.problem.unusedParameter"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT = PLUGIN_ID + ".compiler.problem.unusedParameterWhenImplementingAbstract"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE = PLUGIN_ID + ".compiler.problem.unusedParameterWhenOverridingConcrete"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_PB_UNUSED_IMPORT = PLUGIN_ID + ".compiler.problem.unusedImport"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPILER_PB_SYNTHETIC_ACCESS_EMULATION = PLUGIN_ID + ".compiler.problem.syntheticAccessEmulation"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_PB_NON_NLS_STRING_LITERAL = PLUGIN_ID + ".compiler.problem.nonExternalizedStringLiteral"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_PB_ASSERT_IDENTIFIER = PLUGIN_ID + ".compiler.problem.assertIdentifier"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_STATIC_ACCESS_RECEIVER = PLUGIN_ID + ".compiler.problem.staticAccessReceiver"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_NO_EFFECT_ASSIGNMENT = PLUGIN_ID + ".compiler.problem.noEffectAssignment"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD = PLUGIN_ID + ".compiler.problem.incompatibleNonInheritedInterfaceMethod"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION = PLUGIN_ID + ".compiler.problem.noImplicitStringConversion"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_PB_MAX_PER_UNIT = PLUGIN_ID + ".compiler.maxProblemPerUnit"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_SOURCE = PLUGIN_ID + ".compiler.source"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPILER_COMPLIANCE = PLUGIN_ID + ".compiler.compliance"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_TASK_PRIORITIES = PLUGIN_ID + ".compiler.taskPriorities"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_TASK_PRIORITY_HIGH = "HIGH"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_TASK_PRIORITY_LOW = "LOW"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_TASK_PRIORITY_NORMAL = "NORMAL"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String COMPILER_TASK_TAGS = PLUGIN_ID + ".compiler.taskTags"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 */
-	public static final String CORE_JAVA_BUILD_ORDER = PLUGIN_ID + ".computeJavaBuildOrder"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CORE_JAVA_BUILD_RESOURCE_COPY_FILTER = PLUGIN_ID + ".builder.resourceCopyExclusionFilter"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CORE_JAVA_BUILD_DUPLICATE_RESOURCE = PLUGIN_ID + ".builder.duplicateResourceTask"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER = PLUGIN_ID + ".builder.cleanOutputFolder"; //$NON-NLS-1$	 	
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CORE_INCOMPLETE_CLASSPATH = PLUGIN_ID + ".incompleteClasspath"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CORE_CIRCULAR_CLASSPATH = PLUGIN_ID + ".circularClasspath"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CORE_JAVA_BUILD_INVALID_CLASSPATH = PLUGIN_ID + ".builder.invalidClasspath"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CORE_ENCODING = PLUGIN_ID + ".encoding"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1 
-	 */
-	public static final String CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS = PLUGIN_ID + ".classpath.exclusionPatterns"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS = PLUGIN_ID + ".classpath.multipleOutputLocations"; //$NON-NLS-1$
-	/**
-	 * Default task tag
-	 * @since 2.1
-	 */
-	public static final String DEFAULT_TASK_TAG = "TODO"; //$NON-NLS-1$
-	/**
-	 * Default task priority
-	 * @since 2.1
-	 */
-	public static final String DEFAULT_TASK_PRIORITY = "NORMAL"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_NEWLINE_OPENING_BRACE = PLUGIN_ID + ".formatter.newline.openingBrace"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_NEWLINE_CONTROL = PLUGIN_ID + ".formatter.newline.controlStatement"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_NEWLINE_ELSE_IF = PLUGIN_ID + ".formatter.newline.elseIf"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_NEWLINE_EMPTY_BLOCK = PLUGIN_ID + ".formatter.newline.emptyBlock"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_CLEAR_BLANK_LINES = PLUGIN_ID + ".formatter.newline.clearAll"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_LINE_SPLIT = PLUGIN_ID + ".formatter.lineSplit"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_COMPACT_ASSIGNMENT = PLUGIN_ID + ".formatter.style.assignment"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_TAB_CHAR = PLUGIN_ID + ".formatter.tabulation.char"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String FORMATTER_TAB_SIZE = PLUGIN_ID + ".formatter.tabulation.size"; //$NON-NLS-1$
-	/**
-	 * Possible configurable option ID
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String FORMATTER_SPACE_CASTEXPRESSION = PLUGIN_ID + ".formatter.space.castexpression"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CODEASSIST_VISIBILITY_CHECK = PLUGIN_ID + ".codeComplete.visibilityCheck"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CODEASSIST_IMPLICIT_QUALIFICATION = PLUGIN_ID + ".codeComplete.forceImplicitQualification"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.fieldPrefixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_STATIC_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.staticFieldPrefixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_LOCAL_PREFIXES = PLUGIN_ID + ".codeComplete.localPrefixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_ARGUMENT_PREFIXES = PLUGIN_ID + ".codeComplete.argumentPrefixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.fieldSuffixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_STATIC_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.staticFieldSuffixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_LOCAL_SUFFIXES = PLUGIN_ID + ".codeComplete.localSuffixes"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CODEASSIST_ARGUMENT_SUFFIXES = PLUGIN_ID + ".codeComplete.argumentSuffixes"; //$NON-NLS-1$
-
-	// *************** Possible values for configurable options. ********************
-	
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String GENERATE = "generate"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String DO_NOT_GENERATE = "do not generate"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String PRESERVE = "preserve"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String OPTIMIZE_OUT = "optimize out"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String VERSION_1_1 = "1.1"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String VERSION_1_2 = "1.2"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String VERSION_1_3 = "1.3"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String VERSION_1_4 = "1.4"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String ABORT = "abort"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String ERROR = "error"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String WARNING = "warning"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String IGNORE = "ignore"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 */
-	public static final String COMPUTE = "compute"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String INSERT = "insert"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String DO_NOT_INSERT = "do not insert"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String PRESERVE_ONE = "preserve one"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String CLEAR_ALL = "clear all"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String NORMAL = "normal"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String COMPACT = "compact"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String TAB = "tab"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String SPACE = "space"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String ENABLED = "enabled"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.0
-	 */
-	public static final String DISABLED = "disabled"; //$NON-NLS-1$
-	/**
-	 * Possible  configurable option value.
-	 * @see #getDefaultOptions
-	 * @since 2.1
-	 */
-	public static final String CLEAN = "clean"; //$NON-NLS-1$
-	
-	/**
-	 * Creates the Java core plug-in.
-	 * @since 2.1
-	 */
-	public JavaCore(IPluginDescriptor pluginDescriptor) {
-		super(pluginDescriptor);
-		JAVA_CORE_PLUGIN = this;
-	}
+public static void addElementChangedListener(IElementChangedListener listener, int eventMask) {
+	JavaModelManager.getJavaModelManager().addElementChangedListener(listener, eventMask);
+}
 
-	/**
-	 * Adds the given listener for changes to Java elements.
-	 * Has no effect if an identical listener is already registered.
-	 *
-	 * This listener will only be notified during the POST_CHANGE resource change notification
-	 * and any reconcile operation (POST_RECONCILE).
-	 * For finer control of the notification, use <code>addElementChangedListener(IElementChangedListener,int)</code>,
-	 * which allows to specify a different eventMask.
-	 * 
-	 * @see ElementChangedEvent
-	 * @param listener the listener
-	 */
-	public static void addElementChangedListener(IElementChangedListener listener) {
-		addElementChangedListener(listener, ElementChangedEvent.POST_CHANGE | ElementChangedEvent.POST_RECONCILE);
-	}
-
-	/**
-	 * Adds the given listener for changes to Java elements.
-	 * Has no effect if an identical listener is already registered.
-	 * After completion of this method, the given listener will be registered for exactly
-	 * the specified events.  If they were previously registered for other events, they
-	 * will be deregistered.  
-	 * <p>
-	 * Once registered, a listener starts receiving notification of changes to
-	 * java elements in the model. The listener continues to receive 
-	 * notifications until it is replaced or removed. 
-	 * </p>
-	 * <p>
-	 * Listeners can listen for several types of event as defined in <code>ElementChangeEvent</code>.
-	 * Clients are free to register for any number of event types however if they register
-	 * for more than one, it is their responsibility to ensure they correctly handle the
-	 * case where the same java element change shows up in multiple notifications.  
-	 * Clients are guaranteed to receive only the events for which they are registered.
-	 * </p>
-	 * 
-	 * @param listener the listener
-	 * @param eventMask the bit-wise OR of all event types of interest to the listener
-	 * @see IElementChangedListener
-	 * @see ElementChangedEvent
-	 * @see #removeElementChangedListener(IElementChangedListener)
-	 * @since 2.0
-	 */
-	public static void addElementChangedListener(IElementChangedListener listener, int eventMask) {
-		JavaModelManager.getJavaModelManager().addElementChangedListener(listener, eventMask);
-	}
-
-	/**
-	 * Configures the given marker attribute map for the given Java element.
-	 * Used for markers, which denote a Java element rather than a resource.
-	 *
-	 * @param attributes the mutable marker attribute map (key type: <code>String</code>,
-	 *   value type: <code>String</code>)
-	 * @param element the Java element for which the marker needs to be configured
-	 */
-	public static void addJavaElementMarkerAttributes(
-		Map attributes,
-		IJavaElement element) {
-//		if (element instanceof IMember)
-//			element = ((IMember) element).getClassFile();
-		if (attributes != null && element != null)
-			attributes.put(ATT_HANDLE_ID, element.getHandleIdentifier());
-	}
+/**
+ * Configures the given marker attribute map for the given Java element.
+ * Used for markers, which denote a Java element rather than a resource.
+ *
+ * @param attributes the mutable marker attribute map (key type: <code>String</code>,
+ *   value type: <code>String</code>)
+ * @param element the Java element for which the marker needs to be configured
+ */
+public static void addJavaElementMarkerAttributes(
+	Map attributes,
+	IJavaElement element) {
+//	if (element instanceof IMember)
+//		element = ((IMember) element).getClassFile();
+	if (attributes != null && element != null)
+		attributes.put(ATT_HANDLE_ID, element.getHandleIdentifier());
+}
 	
-	/**
-	 * Configures the given marker for the given Java element.
-	 * Used for markers, which denote a Java element rather than a resource.
-	 *
-	 * @param marker the marker to be configured
-	 * @param element the Java element for which the marker needs to be configured
-	 * @exception CoreException if the <code>IMarker.setAttribute</code> on the marker fails
-	 */
-	public void configureJavaElementMarker(IMarker marker, IJavaElement element)
-		throws CoreException {
-//		if (element instanceof IMember)
-//			element = ((IMember) element).getClassFile();
-		if (marker != null && element != null)
-			marker.setAttribute(ATT_HANDLE_ID, element.getHandleIdentifier());
-	}
+/**
+ * Configures the given marker for the given Java element.
+ * Used for markers, which denote a Java element rather than a resource.
+ *
+ * @param marker the marker to be configured
+ * @param element the Java element for which the marker needs to be configured
+ * @exception CoreException if the <code>IMarker.setAttribute</code> on the marker fails
+ */
+public void configureJavaElementMarker(IMarker marker, IJavaElement element)
+	throws CoreException {
+//	if (element instanceof IMember)
+//		element = ((IMember) element).getClassFile();
+	if (marker != null && element != null)
+		marker.setAttribute(ATT_HANDLE_ID, element.getHandleIdentifier());
+}
 	
-	/**
-	 * Returns the Java model element corresponding to the given handle identifier
-	 * generated by <code>IJavaElement.getHandleIdentifier()</code>, or
-	 * <code>null</code> if unable to create the associated element.
-	 */
-	public static IJavaElement create(String handleIdentifier) {
-		if (handleIdentifier == null) {
-			return null;
-		}
-		try {
-			return JavaModelManager.getJavaModelManager().getHandleFromMemento(handleIdentifier);
-		} catch (JavaModelException e) {
-			return null;
-		}
-	}
-	/**
-	 * Returns the Java element corresponding to the given file, or
-	 * <code>null</code> if unable to associate the given file
-	 * with a Java element.
-	 *
-	 * <p>The file must be one of:<ul>
-	 *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
-	 *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
-	 *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
-	 *	</ul>
-	 * <p>
-	 * Creating a Java element has the side effect of creating and opening all of the
-	 * element's parents if they are not yet open.
-	 * 
-	 * @param the given file
-	 * @return the Java element corresponding to the given file, or
-	 * <code>null</code> if unable to associate the given file
-	 * with a Java element
-	 */
-	public static IJavaElement create(IFile file) {
-		return JavaModelManager.create(file, null);
-	}
-	/**
-	 * Returns the package fragment or package fragment root corresponding to the given folder, or
-	 * <code>null</code> if unable to associate the given folder with a Java element.
-	 * <p>
-	 * Note that a package fragment root is returned rather than a default package.
-	 * <p>
-	 * Creating a Java element has the side effect of creating and opening all of the
-	 * element's parents if they are not yet open.
-	 * 
-	 * @param the given folder
-	 * @return the package fragment or package fragment root corresponding to the given folder, or
-	 * <code>null</code> if unable to associate the given folder with a Java element
-	 */
-	public static IJavaElement create(IFolder folder) {
-		return JavaModelManager.create(folder, null);
-	}
-	/**
-	 * Returns the Java project corresponding to the given project.
-	 * <p>
-	 * Creating a Java Project has the side effect of creating and opening all of the
-	 * project's parents if they are not yet open.
-	 * <p>
-	 * Note that no check is done at this time on the existence or the java nature of this project.
-	 * 
-	 * @param project the given project
-	 * @return the Java project corresponding to the given project, null if the given project is null
-	 */
-	public static IJavaProject create(IProject project) {
-		if (project == null) {
-			return null;
-		}
-		JavaModel javaModel = JavaModelManager.getJavaModelManager().getJavaModel();
-		return javaModel.getJavaProject(project);
+/**
+ * Returns the Java model element corresponding to the given handle identifier
+ * generated by <code>IJavaElement.getHandleIdentifier()</code>, or
+ * <code>null</code> if unable to create the associated element.
+ */
+public static IJavaElement create(String handleIdentifier) {
+	if (handleIdentifier == null) {
+		return null;
 	}
-	/**
-	 * Returns the Java element corresponding to the given resource, or
-	 * <code>null</code> if unable to associate the given resource
-	 * with a Java element.
-	 * <p>
-	 * The resource must be one of:<ul>
-	 *	<li>a project - the element returned is the corresponding <code>IJavaProject</code></li>
-	 *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
-	 *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
-	 *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
-	 *  <li>a folder - the element returned is the corresponding <code>IPackageFragmentRoot</code>
-	 *    	or <code>IPackageFragment</code></li>
-	 *  <li>the workspace root resource - the element returned is the <code>IJavaModel</code></li>
-	 *	</ul>
-	 * <p>
-	 * Creating a Java element has the side effect of creating and opening all of the
-	 * element's parents if they are not yet open.
-	 * 
-	 * @param resource the given resource
-	 * @return the Java element corresponding to the given resource, or
-	 * <code>null</code> if unable to associate the given resource
-	 * with a Java element
-	 */
-	public static IJavaElement create(IResource resource) {
-		return JavaModelManager.create(resource, null);
+	try {
+		return JavaModelManager.getJavaModelManager().getHandleFromMemento(handleIdentifier);
+	} catch (JavaModelException e) {
+		return null;
 	}
-	/**
-	 * Returns the Java model.
-	 * 
-	 * @param root the given root
-	 * @return the Java model, or <code>null</code> if the root is null
-	 */
-	public static IJavaModel create(IWorkspaceRoot root) {
-		if (root == null) {
-			return null;
-		}
-		return JavaModelManager.getJavaModelManager().getJavaModel();
+}
+/**
+ * Returns the Java element corresponding to the given file, or
+ * <code>null</code> if unable to associate the given file
+ * with a Java element.
+ *
+ * <p>The file must be one of:<ul>
+ *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
+ *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
+ *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
+ *	</ul>
+ * <p>
+ * Creating a Java element has the side effect of creating and opening all of the
+ * element's parents if they are not yet open.
+ * 
+ * @param the given file
+ * @return the Java element corresponding to the given file, or
+ * <code>null</code> if unable to associate the given file
+ * with a Java element
+ */
+public static IJavaElement create(IFile file) {
+	return JavaModelManager.create(file, null);
+}
+/**
+ * Returns the package fragment or package fragment root corresponding to the given folder, or
+ * <code>null</code> if unable to associate the given folder with a Java element.
+ * <p>
+ * Note that a package fragment root is returned rather than a default package.
+ * <p>
+ * Creating a Java element has the side effect of creating and opening all of the
+ * element's parents if they are not yet open.
+ * 
+ * @param the given folder
+ * @return the package fragment or package fragment root corresponding to the given folder, or
+ * <code>null</code> if unable to associate the given folder with a Java element
+ */
+public static IJavaElement create(IFolder folder) {
+	return JavaModelManager.create(folder, null);
+}
+/**
+ * Returns the Java project corresponding to the given project.
+ * <p>
+ * Creating a Java Project has the side effect of creating and opening all of the
+ * project's parents if they are not yet open.
+ * <p>
+ * Note that no check is done at this time on the existence or the java nature of this project.
+ * 
+ * @param project the given project
+ * @return the Java project corresponding to the given project, null if the given project is null
+ */
+public static IJavaProject create(IProject project) {
+	if (project == null) {
+		return null;
 	}
-	/**
-	 * Creates and returns a class file element for
-	 * the given <code>.class</code> file. Returns <code>null</code> if unable
-	 * to recognize the class file.
-	 * 
-	 * @param file the given <code>.class</code> file
-	 * @return a class file element for the given <code>.class</code> file, or <code>null</code> if unable
-	 * to recognize the class file
-	 */
-//	public static IClassFile createClassFileFrom(IFile file) {
-//		return JavaModelManager.createClassFileFrom(file, null);
-//	}
-	/**
-	 * Creates and returns a compilation unit element for
-	 * the given <code>.java</code> file. Returns <code>null</code> if unable
-	 * to recognize the compilation unit.
-	 * 
-	 * @param file the given <code>.java</code> file
-	 * @return a compilation unit element for the given <code>.java</code> file, or <code>null</code> if unable
-	 * to recognize the compilation unit
-	 */
-	public static ICompilationUnit createCompilationUnitFrom(IFile file) {
-		return JavaModelManager.createCompilationUnitFrom(file, null);
+	JavaModel javaModel = JavaModelManager.getJavaModelManager().getJavaModel();
+	return javaModel.getJavaProject(project);
+}
+/**
+ * Returns the Java element corresponding to the given resource, or
+ * <code>null</code> if unable to associate the given resource
+ * with a Java element.
+ * <p>
+ * The resource must be one of:<ul>
+ *	<li>a project - the element returned is the corresponding <code>IJavaProject</code></li>
+ *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
+ *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
+ *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
+ *  <li>a folder - the element returned is the corresponding <code>IPackageFragmentRoot</code>
+ *    	or <code>IPackageFragment</code></li>
+ *  <li>the workspace root resource - the element returned is the <code>IJavaModel</code></li>
+ *	</ul>
+ * <p>
+ * Creating a Java element has the side effect of creating and opening all of the
+ * element's parents if they are not yet open.
+ * 
+ * @param resource the given resource
+ * @return the Java element corresponding to the given resource, or
+ * <code>null</code> if unable to associate the given resource
+ * with a Java element
+ */
+public static IJavaElement create(IResource resource) {
+	return JavaModelManager.create(resource, null);
+}
+/**
+ * Returns the Java model.
+ * 
+ * @param root the given root
+ * @return the Java model, or <code>null</code> if the root is null
+ */
+public static IJavaModel create(IWorkspaceRoot root) {
+	if (root == null) {
+		return null;
 	}
-	/**
-	 * Creates and returns a handle for the given JAR file.
-	 * The Java model associated with the JAR's project may be
-	 * created as a side effect. 
-	 * 
-	 * @param file the given JAR file
-	 * @return a handle for the given JAR file, or <code>null</code> if unable to create a JAR package fragment root.
-	 * (for example, if the JAR file represents a non-Java resource)
-	 */
-//	public static IPackageFragmentRoot createJarPackageFragmentRootFrom(IFile file) {
-//		return JavaModelManager.createJarPackageFragmentRootFrom(file, null);
-//	}
-
-	/** 
-	 * Answers the project specific value for a given classpath container.
-	 * In case this container path could not be resolved, then will answer <code>null</code>.
-	 * Both the container path and the project context are supposed to be non-null.
-	 * <p>
-	 * The containerPath is a formed by a first ID segment followed with extra segments, which can be 
-	 * used as additional hints for resolution. If no container was ever recorded for this container path 
-	 * onto this project (using <code>setClasspathContainer</code>, then a 
-	 * <code>ClasspathContainerInitializer</code> will be activated if any was registered for this container 
-	 * ID onto the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
-	 * <p>
-	 * There is no assumption that the returned container must answer the exact same containerPath
-	 * when requested <code>IClasspathContainer#getPath</code>. 
-	 * Indeed, the containerPath is just an indication for resolving it to an actual container object.
-	 * <p>
-	 * Classpath container values are persisted locally to the workspace, but 
-	 * are not preserved from a session to another. It is thus highly recommended to register a 
-	 * <code>ClasspathContainerInitializer</code> for each referenced container 
-	 * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
-	 * <p>
-	 * @param containerPath the name of the container, which needs to be resolved
-	 * @param project a specific project in which the container is being resolved
-	 * @return the corresponding classpath container or <code>null</code> if unable to find one.
-	 * 
-	 * @exception JavaModelException if an exception occurred while resolving the container, or if the resolved container
-	 *   contains illegal entries (contains CPE_CONTAINER entries or null entries).	 
-	 * 
-	 * @see ClasspathContainerInitializer
-	 * @see IClasspathContainer
-	 * @see #setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
-	 * @since 2.0
-	 */
-//	public static IClasspathContainer getClasspathContainer(final IPath containerPath, final IJavaProject project) throws JavaModelException {
-//
-//		IClasspathContainer container = JavaModelManager.containerGet(project, containerPath);
-//		if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
-//
-//		if (container == null){
-//			final ClasspathContainerInitializer initializer = JavaCore.getClasspathContainerInitializer(containerPath.segment(0));
-//			if (initializer != null){
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.println("CPContainer INIT - triggering initialization of: ["+project.getElementName()+"] " + containerPath + " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-//					new Exception("FAKE exception for dumping current CPContainer (["+project.getElementName()+"] "+ containerPath+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-//				}
-//				JavaModelManager.containerPut(project, containerPath, JavaModelManager.ContainerInitializationInProgress); // avoid initialization cycles
-//				boolean ok = false;
-//				try {
-//					// wrap initializer call with Safe runnable in case initializer would be causing some grief
-//					Platform.run(new ISafeRunnable() {
-//						public void handleException(Throwable exception) {
-//							Util.log(exception, "Exception occurred in classpath container initializer: "+initializer); //$NON-NLS-1$
-//						}
-//						public void run() throws Exception {
-//							initializer.initialize(containerPath, project);
-//						}
-//					});
-//					
-//					// retrieve value (if initialization was successful)
-//					container = JavaModelManager.containerGet(project, containerPath);
-//					if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
-//					ok = true;
-//				} finally {
-//					if (!ok) JavaModelManager.containerPut(project, containerPath, null); // flush cache
-//				}
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.print("CPContainer INIT - after resolution: ["+project.getElementName()+"] " + containerPath + " --> "); //$NON-NLS-2$//$NON-NLS-1$//$NON-NLS-3$
-//					if (container != null){
-//						System.out.print("container: "+container.getDescription()+" {"); //$NON-NLS-2$//$NON-NLS-1$
-//						IClasspathEntry[] entries = container.getClasspathEntries();
-//						if (entries != null){
-//							for (int i = 0; i < entries.length; i++){
-//								if (i > 0) System.out.println(", ");//$NON-NLS-1$
-//								System.out.println(entries[i]);
-//							}
-//						}
-//						System.out.println("}");//$NON-NLS-1$
-//					} else {
-//						System.out.println("{unbound}");//$NON-NLS-1$
-//					}
-//				}
-//			} else {
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.println("CPContainer INIT - no initializer found for: "+project.getElementName()+"] " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
-//				}
-//			}
-//		}
-//		return container;			
-//	}
-
-	/**
-	 * Helper method finding the classpath container initializer registered for a given classpath container ID 
-	 * or <code>null</code> if none was found while iterating over the contributions to extension point to
-	 * the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
-	 * <p>
-	 * A containerID is the first segment of any container path, used to identify the registered container initializer.
-	 * <p>
-	 * @param String - a containerID identifying a registered initializer
-	 * @return ClasspathContainerInitializer - the registered classpath container initializer or <code>null</code> if 
-	 * none was found.
-	 * @since 2.1
-	 */
-//	public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID){
-//		
-//		Plugin jdtCorePlugin = JavaCore.getPlugin();
-//		if (jdtCorePlugin == null) return null;
+	return JavaModelManager.getJavaModelManager().getJavaModel();
+}
+/**
+ * Creates and returns a class file element for
+ * the given <code>.class</code> file. Returns <code>null</code> if unable
+ * to recognize the class file.
+ * 
+ * @param file the given <code>.class</code> file
+ * @return a class file element for the given <code>.class</code> file, or <code>null</code> if unable
+ * to recognize the class file
+ */
+//public static IClassFile createClassFileFrom(IFile file) {
+//	return JavaModelManager.createClassFileFrom(file, null);
+//}
+/**
+ * Creates and returns a compilation unit element for
+ * the given <code>.java</code> file. Returns <code>null</code> if unable
+ * to recognize the compilation unit.
+ * 
+ * @param file the given <code>.java</code> file
+ * @return a compilation unit element for the given <code>.java</code> file, or <code>null</code> if unable
+ * to recognize the compilation unit
+ */
+public static ICompilationUnit createCompilationUnitFrom(IFile file) {
+	return JavaModelManager.createCompilationUnitFrom(file, null);
+}
+/**
+ * Creates and returns a handle for the given JAR file.
+ * The Java model associated with the JAR's project may be
+ * created as a side effect. 
+ * 
+ * @param file the given JAR file
+ * @return a handle for the given JAR file, or <code>null</code> if unable to create a JAR package fragment root.
+ * (for example, if the JAR file represents a non-Java resource)
+ */
+//public static IPackageFragmentRoot createJarPackageFragmentRootFrom(IFile file) {
+//	return JavaModelManager.createJarPackageFragmentRootFrom(file, null);
+//}
+
+/** 
+ * Answers the project specific value for a given classpath container.
+ * In case this container path could not be resolved, then will answer <code>null</code>.
+ * Both the container path and the project context are supposed to be non-null.
+ * <p>
+ * The containerPath is a formed by a first ID segment followed with extra segments, which can be 
+ * used as additional hints for resolution. If no container was ever recorded for this container path 
+ * onto this project (using <code>setClasspathContainer</code>, then a 
+ * <code>ClasspathContainerInitializer</code> will be activated if any was registered for this container 
+ * ID onto the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
+ * <p>
+ * There is no assumption that the returned container must answer the exact same containerPath
+ * when requested <code>IClasspathContainer#getPath</code>. 
+ * Indeed, the containerPath is just an indication for resolving it to an actual container object.
+ * <p>
+ * Classpath container values are persisted locally to the workspace, but 
+ * are not preserved from a session to another. It is thus highly recommended to register a 
+ * <code>ClasspathContainerInitializer</code> for each referenced container 
+ * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
+ * <p>
+ * @param containerPath the name of the container, which needs to be resolved
+ * @param project a specific project in which the container is being resolved
+ * @return the corresponding classpath container or <code>null</code> if unable to find one.
+ * 
+ * @exception JavaModelException if an exception occurred while resolving the container, or if the resolved container
+ *   contains illegal entries (contains CPE_CONTAINER entries or null entries).	 
+ * 
+ * @see ClasspathContainerInitializer
+ * @see IClasspathContainer
+ * @see #setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
+ * @since 2.0
+ */
+//public static IClasspathContainer getClasspathContainer(final IPath containerPath, final IJavaProject project) throws JavaModelException {
 //
-//		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
-//		if (extension != null) {
-//			IExtension[] extensions =  extension.getExtensions();
-//			for(int i = 0; i < extensions.length; i++){
-//				IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
-//				for(int j = 0; j < configElements.length; j++){
-//					String initializerID = configElements[j].getAttribute("id"); //$NON-NLS-1$
-//					if (initializerID != null && initializerID.equals(containerID)){
-//						if (JavaModelManager.CP_RESOLVE_VERBOSE) {
-//							System.out.println("CPContainer INIT - found initializer: "+containerID +" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-//						}						
-//						try {
-//							Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
-//							if (execExt instanceof ClasspathContainerInitializer){
-//								return (ClasspathContainerInitializer)execExt;
-//							}
-//						} catch(CoreException e) {
-//						}
-//					}
-//				}
-//			}	
-//		}
-//		return null;
-//	}
-
-	/**
-	 * Returns the path held in the given classpath variable.
-	 * Returns <node>null</code> if unable to bind.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 * Note that classpath variables can be contributed registered initializers for,
-	 * using the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
-	 * If an initializer is registered for a variable, its persisted value will be ignored:
-	 * its initializer will thus get the opportunity to rebind the variable differently on
-	 * each session.
-	 *
-	 * @param variableName the name of the classpath variable
-	 * @return the path, or <code>null</code> if none 
-	 * @see #setClasspathVariable
-	 */
-//	public static IPath getClasspathVariable(final String variableName) {
-//	
-//		IPath variablePath = JavaModelManager.variableGet(variableName);
-//		if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle
-//		
-//		if (variablePath != null) {
-//			return variablePath;
-//		}
+//	IClasspathContainer container = JavaModelManager.containerGet(project, containerPath);
+//	if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
 //
-//		// even if persisted value exists, initializer is given priority, only if no initializer is found the persisted value is reused
-//		final ClasspathVariableInitializer initializer = JavaCore.getClasspathVariableInitializer(variableName);
+//	if (container == null){
+//		final ClasspathContainerInitializer initializer = JavaCore.getClasspathContainerInitializer(containerPath.segment(0));
 //		if (initializer != null){
 //			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPVariable INIT - triggering initialization of: " + variableName+ " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$
-//				new Exception("FAKE exception for dumping current CPVariable ("+variableName+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$
+//				System.out.println("CPContainer INIT - triggering initialization of: ["+project.getElementName()+"] " + containerPath + " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+//				new Exception("FAKE exception for dumping current CPContainer (["+project.getElementName()+"] "+ containerPath+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 //			}
-//			JavaModelManager.variablePut(variableName, JavaModelManager.VariableInitializationInProgress); // avoid initialization cycles
+//			JavaModelManager.containerPut(project, containerPath, JavaModelManager.ContainerInitializationInProgress); // avoid initialization cycles
 //			boolean ok = false;
 //			try {
 //				// wrap initializer call with Safe runnable in case initializer would be causing some grief
 //				Platform.run(new ISafeRunnable() {
 //					public void handleException(Throwable exception) {
-//						Util.log(exception, "Exception occurred in classpath variable initializer: "+initializer+" while initializing variable: "+variableName); //$NON-NLS-1$ //$NON-NLS-2$
+//						Util.log(exception, "Exception occurred in classpath container initializer: "+initializer); //$NON-NLS-1$
 //					}
 //					public void run() throws Exception {
-//						initializer.initialize(variableName);
+//						initializer.initialize(containerPath, project);
 //					}
 //				});
-//				variablePath = (IPath) JavaModelManager.variableGet(variableName); // initializer should have performed side-effect
-//				if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle (initializer did not init or reentering call)
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.println("CPVariable INIT - after initialization: " + variableName + " --> " + variablePath); //$NON-NLS-2$//$NON-NLS-1$
-//				}
+//					
+//				// retrieve value (if initialization was successful)
+//				container = JavaModelManager.containerGet(project, containerPath);
+//				if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
 //				ok = true;
 //			} finally {
-//				if (!ok) JavaModelManager.variablePut(variableName, null); // flush cache
+//				if (!ok) JavaModelManager.containerPut(project, containerPath, null); // flush cache
+//			}
+//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//				System.out.print("CPContainer INIT - after resolution: ["+project.getElementName()+"] " + containerPath + " --> "); //$NON-NLS-2$//$NON-NLS-1$//$NON-NLS-3$
+//				if (container != null){
+//					System.out.print("container: "+container.getDescription()+" {"); //$NON-NLS-2$//$NON-NLS-1$
+//					IClasspathEntry[] entries = container.getClasspathEntries();
+//					if (entries != null){
+//						for (int i = 0; i < entries.length; i++){
+//							if (i > 0) System.out.println(", ");//$NON-NLS-1$
+//							System.out.println(entries[i]);
+//						}
+//					}
+//					System.out.println("}");//$NON-NLS-1$
+//				} else {
+//					System.out.println("{unbound}");//$NON-NLS-1$
+//				}
 //			}
 //		} else {
 //			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPVariable INIT - no initializer found for: " + variableName); //$NON-NLS-1$
+//				System.out.println("CPContainer INIT - no initializer found for: "+project.getElementName()+"] " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
 //			}
 //		}
-//		return variablePath;
 //	}
+//	return container;			
+//}
 
-	/**
-	 * Helper method finding the classpath variable initializer registered for a given classpath variable name 
-	 * or <code>null</code> if none was found while iterating over the contributions to extension point to
-	 * the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
-	 * <p>
- 	 * @param the given variable
- 	 * @return ClasspathVariableInitializer - the registered classpath variable initializer or <code>null</code> if 
-	 * none was found.
-	 * @since 2.1
- 	 */
-//	public static ClasspathVariableInitializer getClasspathVariableInitializer(String variable){
+/**
+ * Helper method finding the classpath container initializer registered for a given classpath container ID 
+ * or <code>null</code> if none was found while iterating over the contributions to extension point to
+ * the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
+ * <p>
+ * A containerID is the first segment of any container path, used to identify the registered container initializer.
+ * <p>
+ * @param String - a containerID identifying a registered initializer
+ * @return ClasspathContainerInitializer - the registered classpath container initializer or <code>null</code> if 
+ * none was found.
+ * @since 2.1
+ */
+//public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID){
 //		
-//		Plugin jdtCorePlugin = JavaCore.getPlugin();
-//		if (jdtCorePlugin == null) return null;
+//	Plugin jdtCorePlugin = JavaCore.getPlugin();
+//	if (jdtCorePlugin == null) return null;
 //
-//		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
-//		if (extension != null) {
-//			IExtension[] extensions =  extension.getExtensions();
-//			for(int i = 0; i < extensions.length; i++){
-//				IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
-//				for(int j = 0; j < configElements.length; j++){
+//	IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
+//	if (extension != null) {
+//		IExtension[] extensions =  extension.getExtensions();
+//		for(int i = 0; i < extensions.length; i++){
+//			IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
+//			for(int j = 0; j < configElements.length; j++){
+//				String initializerID = configElements[j].getAttribute("id"); //$NON-NLS-1$
+//				if (initializerID != null && initializerID.equals(containerID)){
+//					if (JavaModelManager.CP_RESOLVE_VERBOSE) {
+//						System.out.println("CPContainer INIT - found initializer: "+containerID +" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
+//					}						
 //					try {
-//						String varAttribute = configElements[j].getAttribute("variable"); //$NON-NLS-1$
-//						if (variable.equals(varAttribute)) {
-//							if (JavaModelManager.CP_RESOLVE_VERBOSE) {
-//								System.out.println("CPVariable INIT - found initializer: "+variable+" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-//							}						
-//							Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
-//							if (execExt instanceof ClasspathVariableInitializer){
-//								return (ClasspathVariableInitializer)execExt;
-//							}
+//						Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
+//						if (execExt instanceof ClasspathContainerInitializer){
+//							return (ClasspathContainerInitializer)execExt;
 //						}
-//					} catch(CoreException e){
-//					}
+//					} catch(CoreException e) {
 //					}
-//			}	
-//		}
-//		return null;
-//	}	
+//				}
+//			}
+//		}	
+//	}
+//	return null;
+//}
+
+/**
+ * Returns the path held in the given classpath variable.
+ * Returns <node>null</code> if unable to bind.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ * Note that classpath variables can be contributed registered initializers for,
+ * using the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
+ * If an initializer is registered for a variable, its persisted value will be ignored:
+ * its initializer will thus get the opportunity to rebind the variable differently on
+ * each session.
+ *
+ * @param variableName the name of the classpath variable
+ * @return the path, or <code>null</code> if none 
+ * @see #setClasspathVariable
+ */
+public static IPath getClasspathVariable(final String variableName) {
 	
-	/**
-	 * Returns the names of all known classpath variables.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 *
-	 * @return the list of classpath variable names
-	 * @see #setClasspathVariable
-	 */
-//	public static String[] getClasspathVariableNames() {
-//		return JavaModelManager.variableNames();
+	IPath variablePath = JavaModelManager.variableGet(variableName);
+	if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle
+		
+	if (variablePath != null) {
+		return variablePath;
+	}
+
+	// even if persisted value exists, initializer is given priority, only if no initializer is found the persisted value is reused
+//	final ClasspathVariableInitializer initializer = PHPCore.getClasspathVariableInitializer(variableName);
+//	if (initializer != null){ 
+//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//			System.out.println("CPVariable INIT - triggering initialization of: " + variableName+ " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$
+//			new Exception("FAKE exception for dumping current CPVariable ("+variableName+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$
+//		}
+//		JavaModelManager.variablePut(variableName, JavaModelManager.VariableInitializationInProgress); // avoid initialization cycles
+//		boolean ok = false;
+//		try {
+//			// wrap initializer call with Safe runnable in case initializer would be causing some grief
+//			Platform.run(new ISafeRunnable() {
+//				public void handleException(Throwable exception) {
+//					Util.log(exception, "Exception occurred in classpath variable initializer: "+initializer+" while initializing variable: "+variableName); //$NON-NLS-1$ //$NON-NLS-2$
+//				}
+//				public void run() throws Exception {
+//					initializer.initialize(variableName);
+//				}
+//			});
+//			variablePath = (IPath) JavaModelManager.variableGet(variableName); // initializer should have performed side-effect
+//			if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle (initializer did not init or reentering call)
+//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//				System.out.println("CPVariable INIT - after initialization: " + variableName + " --> " + variablePath); //$NON-NLS-2$//$NON-NLS-1$
+//			}
+//			ok = true;
+//		} finally {
+//			if (!ok) JavaModelManager.variablePut(variableName, null); // flush cache
+//		}
+//	} else {
+//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//			System.out.println("CPVariable INIT - no initializer found for: " + variableName); //$NON-NLS-1$
+//		}
 //	}
+	return variablePath;
+}
 
-	/**
-	 * Returns a table of all known configurable options with their default values.
-	 * These options allow to configure the behaviour of the underlying components.
-	 * The client may safely use the result as a template that they can modify and
-	 * then pass to <code>setOptions</code>.
-	 * 
-	 * Helper constants have been defined on JavaCore for each of the option ID and 
-	 * their possible constant values.
-	 * 
-	 * Note: more options might be added in further releases.
-	 * <pre>
-	 * RECOGNIZED OPTIONS:
-	 * COMPILER / Generating Local Variable Debug Attribute
- 	 *    When generated, this attribute will enable local variable names 
-	 *    to be displayed in debugger, only in place where variables are 
-	 *    definitely assigned (.class file is then bigger)
-	 *     - option id:         "org.eclipse.jdt.core.compiler.debug.localVariable"
-	 *     - possible values:   { "generate", "do not generate" }
-	 *     - default:           "generate"
-	 *
-	 * COMPILER / Generating Line Number Debug Attribute 
-	 *    When generated, this attribute will enable source code highlighting in debugger 
-	 *    (.class file is then bigger).
-	 *     - option id:         "org.eclipse.jdt.core.compiler.debug.lineNumber"
-	 *     - possible values:   { "generate", "do not generate" }
-	 *     - default:           "generate"
-	 *    
-	 * COMPILER / Generating Source Debug Attribute 
-	 *    When generated, this attribute will enable the debugger to present the 
-	 *    corresponding source code.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.debug.sourceFile"
-	 *     - possible values:   { "generate", "do not generate" }
-	 *     - default:           "generate"
-	 *    
-	 * COMPILER / Preserving Unused Local Variables
-	 *    Unless requested to preserve unused local variables (that is, never read), the 
-	 *    compiler will optimize them out, potentially altering debugging
-	 *     - option id:         "org.eclipse.jdt.core.compiler.codegen.unusedLocal"
-	 *     - possible values:   { "preserve", "optimize out" }
-	 *     - default:           "preserve"
-	 * 
-	 * COMPILER / Defining Target Java Platform
-	 *    For binary compatibility reason, .class files can be tagged to with certain VM versions and later.
-	 *    Note that "1.4" target require to toggle compliance mode to "1.4" too.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-	 *     - possible values:   { "1.1", "1.2", "1.3", "1.4" }
-	 *     - default:           "1.1"
-	 *
-	 * COMPILER / Reporting Unreachable Code
-	 *    Unreachable code can optionally be reported as an error, warning or simply 
-	 *    ignored. The bytecode generation will always optimized it out.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unreachableCode"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "error"
-	 *
-	 * COMPILER / Reporting Invalid Import
-	 *    An import statement that cannot be resolved might optionally be reported 
-	 *    as an error, as a warning or ignored.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.invalidImport"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "error"
-	 *
-	 * COMPILER / Reporting Attempt to Override Package-Default Method
-	 *    A package default method is not visible in a different package, and thus 
-	 *    cannot be overridden. When enabling this option, the compiler will signal 
-	 *    such scenarii either as an error or a warning.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Reporting Method With Constructor Name
-	 *    Naming a method with a constructor name is generally considered poor 
-	 *    style programming. When enabling this option, the compiler will signal such 
-	 *    scenarii either as an error or a warning.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.methodWithConstructorName"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Reporting Deprecation
-	 *    When enabled, the compiler will signal use of deprecated API either as an 
-	 *    error or a warning.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecation"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Reporting Deprecation Inside Deprecated Code
-	 *    When enabled, the compiler will signal use of deprecated API inside deprecated code.
-	 *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.deprecation".
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "disabled"
-	 *
-	 * COMPILER / Reporting Hidden Catch Block
-	 *    Locally to a try statement, some catch blocks may hide others . For example,
-	 *      try {  throw new java.io.CharConversionException();
-	 *      } catch (java.io.CharConversionException e) {
-	 *      } catch (java.io.IOException e) {}. 
-	 *    When enabling this option, the compiler will issue an error or a warning for hidden 
-	 *    catch blocks corresponding to checked exceptions
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Reporting Unused Local
-	 *    When enabled, the compiler will issue an error or a warning for unused local 
-	 *    variables (that is, variables never read from)
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedLocal"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 *
-	 * COMPILER / Reporting Unused Parameter
-	 *    When enabled, the compiler will issue an error or a warning for unused method 
-	 *    parameters (that is, parameters never read from)
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameter"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 *
-	 * COMPILER / Reporting Unused Parameter if Implementing Abstract Method
-	 *    When enabled, the compiler will signal unused parameters in abstract method implementations.
-	 *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "disabled"
-	 *
-	 * COMPILER / Reporting Unused Parameter if Overriding Concrete Method
-	 *    When enabled, the compiler will signal unused parameters in methods overriding concrete ones.
-	 *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "disabled"
-	 *
-	 * COMPILER / Reporting Unused Import
-	 *    When enabled, the compiler will issue an error or a warning for unused import 
-	 *    reference 
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedImport"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Reporting Unused Private Members
-	 *    When enabled, the compiler will issue an error or a warning whenever a private 
-	 *    method or field is declared but never used within the same unit.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedPrivateMember"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 *
-	 * COMPILER / Reporting Synthetic Access Emulation
-	 *    When enabled, the compiler will issue an error or a warning whenever it emulates 
-	 *    access to a non-accessible member of an enclosing type. Such access can have
-	 *    performance implications.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 *
-	 * COMPILER / Reporting Non-Externalized String Literal
-	 *    When enabled, the compiler will issue an error or a warning for non externalized 
-	 *    String literal (that is, not tagged with //$NON-NLS-<n>$). 
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 * 
-	 * COMPILER / Reporting Usage of 'assert' Identifier
-	 *    When enabled, the compiler will issue an error or a warning whenever 'assert' is 
-	 *    used as an identifier (reserved keyword in 1.4)
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.assertIdentifier"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "ignore"
-	 * 
-	 * COMPILER / Reporting Non-Static Reference to a Static Member
-	 *    When enabled, the compiler will issue an error or a warning whenever a static field
-	 *    or method is accessed with an expression receiver. A reference to a static member should
-	 *    be qualified with a type name.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.staticAccessReceiver"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 * 
-	 * COMPILER / Reporting Assignment with no Effect
-	 *    When enabled, the compiler will issue an error or a warning whenever an assignment
-	 *    has no effect (e.g 'x = x').
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.noEffectAssignment"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 * 
-	 * COMPILER / Reporting Interface Method not Compatible with non-Inherited Methods
-	 *    When enabled, the compiler will issue an error or a warning whenever an interface
-	 *    defines a method incompatible with a non-inherited Object method. Until this conflict
-	 *    is resolved, such an interface cannot be implemented, For example, 
-	 *      interface I { 
-	 *         int clone();
-	 *      } 
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 * 
-	 * COMPILER / Reporting Usage of char[] Expressions in String Concatenations
-	 *    When enabled, the compiler will issue an error or a warning whenever a char[] expression
-	 *    is used in String concatenations (for example, "hello" + new char[]{'w','o','r','l','d'}).
-	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion"
-	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
-	 *
-	 * COMPILER / Setting Source Compatibility Mode
-	 *    Specify whether source is 1.3 or 1.4 compatible. From 1.4 on, 'assert' is a keyword
-	 *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
-	 *   level should be set to "1.4" and the compliance mode should be "1.4".
-	 *     - option id:         "org.eclipse.jdt.core.compiler.source"
-	 *     - possible values:   { "1.3", "1.4" }
-	 *     - default:           "1.3"
-	 * 
-	 * COMPILER / Setting Compliance Level
-	 *    Select the compliance level for the compiler. In "1.3" mode, source and target settings
-	 *    should not go beyond "1.3" level.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.compliance"
-	 *     - possible values:   { "1.3", "1.4" }
-	 *     - default:           "1.3"
-	 * 
-	 * COMPILER / Maximum number of problems reported per compilation unit
-	 *    Specify the maximum number of problems reported on each compilation unit.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.maxProblemPerUnit"
-	 *     - possible values:	"<n>" where <n> is zero or a positive integer (if zero then all problems are reported).
-	 *     - default:           "100"
-	 * 
-	 * COMPILER / Define the Automatic Task Tags
-	 *    When the tag list is not empty, the compiler will issue a task marker whenever it encounters
-	 *    one of the corresponding tag inside any comment in Java source code.
-	 *    Generated task messages will include the tag, and range until the next line separator or comment ending.
-	 *    Note that tasks messages are trimmed.
-	 *     - option id:         "org.eclipse.jdt.core.compiler.taskTags"
-	 *     - possible values:   { "<tag>[,<tag>]*" } where <tag> is a String without any wild-card or leading/trailing spaces 
-	 *     - default:           ""
-	 * 
-	 * COMPILER / Define the Automatic Task Priorities
-	 *    In parallel with the Automatic Task Tags, this list defines the priorities (high, normal or low)
-	 *    of the task markers issued by the compiler.
-	 *    If the default is specified, the priority of each task marker is "NORMAL".
-	 *     - option id:         "org.eclipse.jdt.core.compiler.taskPriorities"
-	 *     - possible values:   { "<priority>[,<priority>]*" } where <priority> is one of "HIGH", "NORMAL" or "LOW"
-	 *     - default:           ""
-	 *
-	 * BUILDER / Specifying Filters for Resource Copying Control
-	 *    Allow to specify some filters to control the resource copy process.
-	 *     - option id:         "org.eclipse.jdt.core.builder.resourceCopyExclusionFilter"
-	 *     - possible values:   { "<name>[,<name>]* } where <name> is a file name pattern (* and ? wild-cards allowed)
-	 *       or the name of a folder which ends with '/'
-	 *     - default:           ""
-	 * 
-	 * BUILDER / Abort if Invalid Classpath
-	 *    Allow to toggle the builder to abort if the classpath is invalid
-	 *     - option id:         "org.eclipse.jdt.core.builder.invalidClasspath"
-	 *     - possible values:   { "abort", "ignore" }
-	 *     - default:           "abort"
-	 * 
-	 * BUILDER / Cleaning Output Folder(s)
-	 *    Indicate whether the JavaBuilder is allowed to clean the output folders
-	 *    when performing full build operations.
-	 *     - option id:         "org.eclipse.jdt.core.builder.cleanOutputFolder"
-	 *     - possible values:   { "clean", "ignore" }
-	 *     - default:           "clean"
-	 * 
-	 * BUILDER / Reporting Duplicate Resources
-	 *    Indicate the severity of the problem reported when more than one occurrence
-	 *    of a resource is to be copied into the output location.
-	 *     - option id:         "org.eclipse.jdt.core.builder.duplicateResourceTask"
-	 *     - possible values:   { "error", "warning" }
-	 *     - default:           "warning"
-	 * 
-	 * JAVACORE / Computing Project Build Order
-	 *    Indicate whether JavaCore should enforce the project build order to be based on
-	 *    the classpath prerequisite chain. When requesting to compute, this takes over
-	 *    the platform default order (based on project references).
-	 *     - option id:         "org.eclipse.jdt.core.computeJavaBuildOrder"
-	 *     - possible values:   { "compute", "ignore" }
-	 *     - default:           "ignore"	 
-	 * 
-	 * JAVACORE / Specify Default Source Encoding Format
-	 *    Get the encoding format for compiled sources. This setting is read-only, it is equivalent
-	 *    to 'ResourcesPlugin.getEncoding()'.
-	 *     - option id:         "org.eclipse.jdt.core.encoding"
-	 *     - possible values:   { any of the supported encoding name}.
-	 *     - default:           <platform default>
-	 * 
-	 * JAVACORE / Reporting Incomplete Classpath
-	 *    Indicate the severity of the problem reported when an entry on the classpath does not exist, 
-	 *    is not legite or is not visible (for example, a referenced project is closed).
-	 *     - option id:         "org.eclipse.jdt.core.incompleteClasspath"
-	 *     - possible values:   { "error", "warning"}
-	 *     - default:           "error"
-	 * 
-	 * JAVACORE / Reporting Classpath Cycle
-	 *    Indicate the severity of the problem reported when a project is involved in a cycle.
-	 *     - option id:         "org.eclipse.jdt.core.circularClasspath"
-	 *     - possible values:   { "error", "warning" }
-	 *     - default:           "error"
-	 * 
-	 * JAVACORE / Enabling Usage of Classpath Exclusion Patterns
-	 *    When disabled, no entry on a project classpath can be associated with
-	 *    an exclusion pattern.
-	 *     - option id:         "org.eclipse.jdt.core.classpath.exclusionPatterns"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "enabled"
-	 * 
-	 * JAVACORE / Enabling Usage of Classpath Multiple Output Locations
-	 *    When disabled, no entry on a project classpath can be associated with
-	 *    a specific output location, preventing thus usage of multiple output locations.
-	 *     - option id:         "org.eclipse.jdt.core.classpath.multipleOutputLocations"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "enabled"
-	 * 
-	 *	FORMATTER / Inserting New Line Before Opening Brace
-	 *    When Insert, a new line is inserted before an opening brace, otherwise nothing
-	 *    is inserted
-	 *     - option id:         "org.eclipse.jdt.core.formatter.newline.openingBrace"
-	 *     - possible values:   { "insert", "do not insert" }
-	 *     - default:           "do not insert"
-	 * 
-	 *	FORMATTER / Inserting New Line Inside Control Statement
-	 *    When Insert, a new line is inserted between } and following else, catch, finally
-	 *     - option id:         "org.eclipse.jdt.core.formatter.newline.controlStatement"
-	 *     - possible values:   { "insert", "do not insert" }
-	 *     - default:           "do not insert"
-	 * 
-	 *	FORMATTER / Clearing Blank Lines
-	 *    When Clear all, all blank lines are removed. When Preserve one, only one is kept
-	 *    and all others removed.
-	 *     - option id:         "org.eclipse.jdt.core.formatter.newline.clearAll"
-	 *     - possible values:   { "clear all", "preserve one" }
-	 *     - default:           "preserve one"
-	 * 
-	 *	FORMATTER / Inserting New Line Between Else/If 
-	 *    When Insert, a blank line is inserted between an else and an if when they are 
-	 *    contiguous. When choosing to not insert, else-if will be kept on the same
-	 *    line when possible.
-	 *     - option id:         "org.eclipse.jdt.core.formatter.newline.elseIf"
-	 *     - possible values:   { "insert", "do not insert" }
-	 *     - default:           "do not insert"
-	 * 
-	 *	FORMATTER / Inserting New Line In Empty Block
-	 *    When insert, a line break is inserted between contiguous { and }, if } is not followed
-	 *    by a keyword.
-	 *     - option id:         "org.eclipse.jdt.core.formatter.newline.emptyBlock"
-	 *     - possible values:   { "insert", "do not insert" }
-	 *     - default:           "insert"
-	 * 
-	 *	FORMATTER / Splitting Lines Exceeding Length
-	 *    Enable splitting of long lines (exceeding the configurable length). Length of 0 will
-	 *    disable line splitting
-	 *     - option id:         "org.eclipse.jdt.core.formatter.lineSplit"
-	 *     - possible values:	"<n>", where n is zero or a positive integer
-	 *     - default:           "80"
-	 * 
-	 *	FORMATTER / Compacting Assignment
-	 *    Assignments can be formatted asymmetrically, for example 'int x= 2;', when Normal, a space
-	 *    is inserted before the assignment operator
-	 *     - option id:         "org.eclipse.jdt.core.formatter.style.assignment"
-	 *     - possible values:   { "compact", "normal" }
-	 *     - default:           "normal"
-	 * 
-	 *	FORMATTER / Defining Indentation Character
-	 *    Either choose to indent with tab characters or spaces
-	 *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.char"
-	 *     - possible values:   { "tab", "space" }
-	 *     - default:           "tab"
-	 * 
-	 *	FORMATTER / Defining Space Indentation Length
-	 *    When using spaces, set the amount of space characters to use for each 
-	 *    indentation mark.
-	 *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.size"
-	 *     - possible values:	"<n>", where n is a positive integer
-	 *     - default:           "4"
-	 * 
-	 *	FORMATTER / Inserting space in cast expression
-	 *    When Insert, a space is added between the type and the expression in a cast expression.
-	 *     - option id:         "org.eclipse.jdt.core.formatter.space.castexpression"
-	 *     - possible values:   { "insert", "do not insert" }
-	 *     - default:           "insert"
-	 * 
-	 *	CODEASSIST / Activate Visibility Sensitive Completion
-	 *    When active, completion doesn't show that you can not see
-	 *    (for example, you can not see private methods of a super class).
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.visibilityCheck"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "disabled"
-	 * 
-	 *	CODEASSIST / Automatic Qualification of Implicit Members
-	 *    When active, completion automatically qualifies completion on implicit
-	 *    field references and message expressions.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.forceImplicitQualification"
-	 *     - possible values:   { "enabled", "disabled" }
-	 *     - default:           "disabled"
-	 * 
-	 *  CODEASSIST / Define the Prefixes for Field Name
-	 *    When the prefixes is non empty, completion for field name will begin with
-	 *    one of the proposed prefixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldPrefixes"
-	 *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Prefixes for Static Field Name
-	 *    When the prefixes is non empty, completion for static field name will begin with
-	 *    one of the proposed prefixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldPrefixes"
-	 *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Prefixes for Local Variable Name
-	 *    When the prefixes is non empty, completion for local variable name will begin with
-	 *    one of the proposed prefixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.localPrefixes"
-	 *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Prefixes for Argument Name
-	 *    When the prefixes is non empty, completion for argument name will begin with
-	 *    one of the proposed prefixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentPrefixes"
-	 *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Suffixes for Field Name
-	 *    When the suffixes is non empty, completion for field name will end with
-	 *    one of the proposed suffixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldSuffixes"
-	 *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Suffixes for Static Field Name
-	 *    When the suffixes is non empty, completion for static field name will end with
-	 *    one of the proposed suffixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldSuffixes"
-	 *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Suffixes for Local Variable Name
-	 *    When the suffixes is non empty, completion for local variable name will end with
-	 *    one of the proposed suffixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.localSuffixes"
-	 *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-	 *     - default:           ""
-	 * 
-	 *  CODEASSIST / Define the Suffixes for Argument Name
-	 *    When the suffixes is non empty, completion for argument name will end with
-	 *    one of the proposed suffixes.
-	 *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentSuffixes"
-	 *     - possible values:   { "<suffix>[,<suffix>]*" } where <prefix> is a String without any wild-card 
-	 *     - default:           ""
-	 * </pre>
-	 * 
-	 * @return a mutable table containing the default settings of all known options
-	 *   (key type: <code>String</code>; value type: <code>String</code>)
-	 * @see #setOptions
-	 */
- 	public static Hashtable getDefaultOptions(){
+/**
+ * Helper method finding the classpath variable initializer registered for a given classpath variable name 
+ * or <code>null</code> if none was found while iterating over the contributions to extension point to
+ * the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
+ * <p>
+ * @param the given variable
+ * @return ClasspathVariableInitializer - the registered classpath variable initializer or <code>null</code> if 
+ * none was found.
+ * @since 2.1
+ */
+public static ClasspathVariableInitializer getClasspathVariableInitializer(String variable){
+		
+	Plugin jdtCorePlugin = JavaCore.getPlugin();
+	if (jdtCorePlugin == null) return null;
+
+//	IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
+//	if (extension != null) {
+//		IExtension[] extensions =  extension.getExtensions();
+//		for(int i = 0; i < extensions.length; i++){
+//			IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
+//			for(int j = 0; j < configElements.length; j++){
+//				try {
+//					String varAttribute = configElements[j].getAttribute("variable"); //$NON-NLS-1$
+//					if (variable.equals(varAttribute)) {
+//						if (JavaModelManager.CP_RESOLVE_VERBOSE) {
+//							System.out.println("CPVariable INIT - found initializer: "+variable+" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
+//						}						
+//						Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
+//						if (execExt instanceof ClasspathVariableInitializer){
+//							return (ClasspathVariableInitializer)execExt;
+//						}
+//					}
+//				} catch(CoreException e){
+//				}
+//				}
+//		}	
+//	}
+	return null;
+}	
 	
-		Hashtable defaultOptions = new Hashtable(10);
+/**
+ * Returns the names of all known classpath variables.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ *
+ * @return the list of classpath variable names
+ * @see #setClasspathVariable
+ */
+//public static String[] getClasspathVariableNames() {
+//	return JavaModelManager.variableNames();
+//}
 
-		// see #initializeDefaultPluginPreferences() for changing default settings
+/**
+ * Returns a table of all known configurable options with their default values.
+ * These options allow to configure the behaviour of the underlying components.
+ * The client may safely use the result as a template that they can modify and
+ * then pass to <code>setOptions</code>.
+ * 
+ * Helper constants have been defined on JavaCore for each of the option ID and 
+ * their possible constant values.
+ * 
+ * Note: more options might be added in further releases.
+ * <pre>
+ * RECOGNIZED OPTIONS:
+ * COMPILER / Generating Local Variable Debug Attribute
+ *    When generated, this attribute will enable local variable names 
+ *    to be displayed in debugger, only in place where variables are 
+ *    definitely assigned (.class file is then bigger)
+ *     - option id:         "org.eclipse.jdt.core.compiler.debug.localVariable"
+ *     - possible values:   { "generate", "do not generate" }
+ *     - default:           "generate"
+ *
+ * COMPILER / Generating Line Number Debug Attribute 
+ *    When generated, this attribute will enable source code highlighting in debugger 
+ *    (.class file is then bigger).
+ *     - option id:         "org.eclipse.jdt.core.compiler.debug.lineNumber"
+ *     - possible values:   { "generate", "do not generate" }
+ *     - default:           "generate"
+ *    
+ * COMPILER / Generating Source Debug Attribute 
+ *    When generated, this attribute will enable the debugger to present the 
+ *    corresponding source code.
+ *     - option id:         "org.eclipse.jdt.core.compiler.debug.sourceFile"
+ *     - possible values:   { "generate", "do not generate" }
+ *     - default:           "generate"
+ *    
+ * COMPILER / Preserving Unused Local Variables
+ *    Unless requested to preserve unused local variables (that is, never read), the 
+ *    compiler will optimize them out, potentially altering debugging
+ *     - option id:         "org.eclipse.jdt.core.compiler.codegen.unusedLocal"
+ *     - possible values:   { "preserve", "optimize out" }
+ *     - default:           "preserve"
+ * 
+ * COMPILER / Defining Target Java Platform
+ *    For binary compatibility reason, .class files can be tagged to with certain VM versions and later.
+ *    Note that "1.4" target require to toggle compliance mode to "1.4" too.
+ *     - option id:         "org.eclipse.jdt.core.compiler.codegen.targetPlatform"
+ *     - possible values:   { "1.1", "1.2", "1.3", "1.4" }
+ *     - default:           "1.1"
+ *
+ * COMPILER / Reporting Unreachable Code
+ *    Unreachable code can optionally be reported as an error, warning or simply 
+ *    ignored. The bytecode generation will always optimized it out.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unreachableCode"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "error"
+ *
+ * COMPILER / Reporting Invalid Import
+ *    An import statement that cannot be resolved might optionally be reported 
+ *    as an error, as a warning or ignored.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.invalidImport"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "error"
+ *
+ * COMPILER / Reporting Attempt to Override Package-Default Method
+ *    A package default method is not visible in a different package, and thus 
+ *    cannot be overridden. When enabling this option, the compiler will signal 
+ *    such scenarii either as an error or a warning.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Reporting Method With Constructor Name
+ *    Naming a method with a constructor name is generally considered poor 
+ *    style programming. When enabling this option, the compiler will signal such 
+ *    scenarii either as an error or a warning.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.methodWithConstructorName"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Reporting Deprecation
+ *    When enabled, the compiler will signal use of deprecated API either as an 
+ *    error or a warning.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecation"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Reporting Deprecation Inside Deprecated Code
+ *    When enabled, the compiler will signal use of deprecated API inside deprecated code.
+ *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.deprecation".
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "disabled"
+ *
+ * COMPILER / Reporting Hidden Catch Block
+ *    Locally to a try statement, some catch blocks may hide others . For example,
+ *      try {  throw new java.io.CharConversionException();
+ *      } catch (java.io.CharConversionException e) {
+ *      } catch (java.io.IOException e) {}. 
+ *    When enabling this option, the compiler will issue an error or a warning for hidden 
+ *    catch blocks corresponding to checked exceptions
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Reporting Unused Local
+ *    When enabled, the compiler will issue an error or a warning for unused local 
+ *    variables (that is, variables never read from)
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedLocal"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ *
+ * COMPILER / Reporting Unused Parameter
+ *    When enabled, the compiler will issue an error or a warning for unused method 
+ *    parameters (that is, parameters never read from)
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameter"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ *
+ * COMPILER / Reporting Unused Parameter if Implementing Abstract Method
+ *    When enabled, the compiler will signal unused parameters in abstract method implementations.
+ *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "disabled"
+ *
+ * COMPILER / Reporting Unused Parameter if Overriding Concrete Method
+ *    When enabled, the compiler will signal unused parameters in methods overriding concrete ones.
+ *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "disabled"
+ *
+ * COMPILER / Reporting Unused Import
+ *    When enabled, the compiler will issue an error or a warning for unused import 
+ *    reference 
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedImport"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Reporting Unused Private Members
+ *    When enabled, the compiler will issue an error or a warning whenever a private 
+ *    method or field is declared but never used within the same unit.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedPrivateMember"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ *
+ * COMPILER / Reporting Synthetic Access Emulation
+ *    When enabled, the compiler will issue an error or a warning whenever it emulates 
+ *    access to a non-accessible member of an enclosing type. Such access can have
+ *    performance implications.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ *
+ * COMPILER / Reporting Non-Externalized String Literal
+ *    When enabled, the compiler will issue an error or a warning for non externalized 
+ *    String literal (that is, not tagged with //$NON-NLS-<n>$). 
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ * 
+ * COMPILER / Reporting Usage of 'assert' Identifier
+ *    When enabled, the compiler will issue an error or a warning whenever 'assert' is 
+ *    used as an identifier (reserved keyword in 1.4)
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.assertIdentifier"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "ignore"
+ * 
+ * COMPILER / Reporting Non-Static Reference to a Static Member
+ *    When enabled, the compiler will issue an error or a warning whenever a static field
+ *    or method is accessed with an expression receiver. A reference to a static member should
+ *    be qualified with a type name.
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.staticAccessReceiver"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ * 
+ * COMPILER / Reporting Assignment with no Effect
+ *    When enabled, the compiler will issue an error or a warning whenever an assignment
+ *    has no effect (e.g 'x = x').
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.noEffectAssignment"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ * 
+ * COMPILER / Reporting Interface Method not Compatible with non-Inherited Methods
+ *    When enabled, the compiler will issue an error or a warning whenever an interface
+ *    defines a method incompatible with a non-inherited Object method. Until this conflict
+ *    is resolved, such an interface cannot be implemented, For example, 
+ *      interface I { 
+ *         int clone();
+ *      } 
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ * 
+ * COMPILER / Reporting Usage of char[] Expressions in String Concatenations
+ *    When enabled, the compiler will issue an error or a warning whenever a char[] expression
+ *    is used in String concatenations (for example, "hello" + new char[]{'w','o','r','l','d'}).
+ *     - option id:         "org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion"
+ *     - possible values:   { "error", "warning", "ignore" }
+ *     - default:           "warning"
+ *
+ * COMPILER / Setting Source Compatibility Mode
+ *    Specify whether source is 1.3 or 1.4 compatible. From 1.4 on, 'assert' is a keyword
+ *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
+ *   level should be set to "1.4" and the compliance mode should be "1.4".
+ *     - option id:         "org.eclipse.jdt.core.compiler.source"
+ *     - possible values:   { "1.3", "1.4" }
+ *     - default:           "1.3"
+ * 
+ * COMPILER / Setting Compliance Level
+ *    Select the compliance level for the compiler. In "1.3" mode, source and target settings
+ *    should not go beyond "1.3" level.
+ *     - option id:         "org.eclipse.jdt.core.compiler.compliance"
+ *     - possible values:   { "1.3", "1.4" }
+ *     - default:           "1.3"
+ * 
+ * COMPILER / Maximum number of problems reported per compilation unit
+ *    Specify the maximum number of problems reported on each compilation unit.
+ *     - option id:         "org.eclipse.jdt.core.compiler.maxProblemPerUnit"
+ *     - possible values:	"<n>" where <n> is zero or a positive integer (if zero then all problems are reported).
+ *     - default:           "100"
+ * 
+ * COMPILER / Define the Automatic Task Tags
+ *    When the tag list is not empty, the compiler will issue a task marker whenever it encounters
+ *    one of the corresponding tag inside any comment in Java source code.
+ *    Generated task messages will include the tag, and range until the next line separator or comment ending.
+ *    Note that tasks messages are trimmed.
+ *     - option id:         "org.eclipse.jdt.core.compiler.taskTags"
+ *     - possible values:   { "<tag>[,<tag>]*" } where <tag> is a String without any wild-card or leading/trailing spaces 
+ *     - default:           ""
+ * 
+ * COMPILER / Define the Automatic Task Priorities
+ *    In parallel with the Automatic Task Tags, this list defines the priorities (high, normal or low)
+ *    of the task markers issued by the compiler.
+ *    If the default is specified, the priority of each task marker is "NORMAL".
+ *     - option id:         "org.eclipse.jdt.core.compiler.taskPriorities"
+ *     - possible values:   { "<priority>[,<priority>]*" } where <priority> is one of "HIGH", "NORMAL" or "LOW"
+ *     - default:           ""
+ *
+ * BUILDER / Specifying Filters for Resource Copying Control
+ *    Allow to specify some filters to control the resource copy process.
+ *     - option id:         "org.eclipse.jdt.core.builder.resourceCopyExclusionFilter"
+ *     - possible values:   { "<name>[,<name>]* } where <name> is a file name pattern (* and ? wild-cards allowed)
+ *       or the name of a folder which ends with '/'
+ *     - default:           ""
+ * 
+ * BUILDER / Abort if Invalid Classpath
+ *    Allow to toggle the builder to abort if the classpath is invalid
+ *     - option id:         "org.eclipse.jdt.core.builder.invalidClasspath"
+ *     - possible values:   { "abort", "ignore" }
+ *     - default:           "abort"
+ * 
+ * BUILDER / Cleaning Output Folder(s)
+ *    Indicate whether the JavaBuilder is allowed to clean the output folders
+ *    when performing full build operations.
+ *     - option id:         "org.eclipse.jdt.core.builder.cleanOutputFolder"
+ *     - possible values:   { "clean", "ignore" }
+ *     - default:           "clean"
+ * 
+ * BUILDER / Reporting Duplicate Resources
+ *    Indicate the severity of the problem reported when more than one occurrence
+ *    of a resource is to be copied into the output location.
+ *     - option id:         "org.eclipse.jdt.core.builder.duplicateResourceTask"
+ *     - possible values:   { "error", "warning" }
+ *     - default:           "warning"
+ * 
+ * JAVACORE / Computing Project Build Order
+ *    Indicate whether JavaCore should enforce the project build order to be based on
+ *    the classpath prerequisite chain. When requesting to compute, this takes over
+ *    the platform default order (based on project references).
+ *     - option id:         "org.eclipse.jdt.core.computeJavaBuildOrder"
+ *     - possible values:   { "compute", "ignore" }
+ *     - default:           "ignore"	 
+ * 
+ * JAVACORE / Specify Default Source Encoding Format
+ *    Get the encoding format for compiled sources. This setting is read-only, it is equivalent
+ *    to 'ResourcesPlugin.getEncoding()'.
+ *     - option id:         "org.eclipse.jdt.core.encoding"
+ *     - possible values:   { any of the supported encoding name}.
+ *     - default:           <platform default>
+ * 
+ * JAVACORE / Reporting Incomplete Classpath
+ *    Indicate the severity of the problem reported when an entry on the classpath does not exist, 
+ *    is not legite or is not visible (for example, a referenced project is closed).
+ *     - option id:         "org.eclipse.jdt.core.incompleteClasspath"
+ *     - possible values:   { "error", "warning"}
+ *     - default:           "error"
+ * 
+ * JAVACORE / Reporting Classpath Cycle
+ *    Indicate the severity of the problem reported when a project is involved in a cycle.
+ *     - option id:         "org.eclipse.jdt.core.circularClasspath"
+ *     - possible values:   { "error", "warning" }
+ *     - default:           "error"
+ * 
+ * JAVACORE / Enabling Usage of Classpath Exclusion Patterns
+ *    When disabled, no entry on a project classpath can be associated with
+ *    an exclusion pattern.
+ *     - option id:         "org.eclipse.jdt.core.classpath.exclusionPatterns"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "enabled"
+ * 
+ * JAVACORE / Enabling Usage of Classpath Multiple Output Locations
+ *    When disabled, no entry on a project classpath can be associated with
+ *    a specific output location, preventing thus usage of multiple output locations.
+ *     - option id:         "org.eclipse.jdt.core.classpath.multipleOutputLocations"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "enabled"
+ * 
+ *	FORMATTER / Inserting New Line Before Opening Brace
+ *    When Insert, a new line is inserted before an opening brace, otherwise nothing
+ *    is inserted
+ *     - option id:         "org.eclipse.jdt.core.formatter.newline.openingBrace"
+ *     - possible values:   { "insert", "do not insert" }
+ *     - default:           "do not insert"
+ * 
+ *	FORMATTER / Inserting New Line Inside Control Statement
+ *    When Insert, a new line is inserted between } and following else, catch, finally
+ *     - option id:         "org.eclipse.jdt.core.formatter.newline.controlStatement"
+ *     - possible values:   { "insert", "do not insert" }
+ *     - default:           "do not insert"
+ * 
+ *	FORMATTER / Clearing Blank Lines
+ *    When Clear all, all blank lines are removed. When Preserve one, only one is kept
+ *    and all others removed.
+ *     - option id:         "org.eclipse.jdt.core.formatter.newline.clearAll"
+ *     - possible values:   { "clear all", "preserve one" }
+ *     - default:           "preserve one"
+ * 
+ *	FORMATTER / Inserting New Line Between Else/If 
+ *    When Insert, a blank line is inserted between an else and an if when they are 
+ *    contiguous. When choosing to not insert, else-if will be kept on the same
+ *    line when possible.
+ *     - option id:         "org.eclipse.jdt.core.formatter.newline.elseIf"
+ *     - possible values:   { "insert", "do not insert" }
+ *     - default:           "do not insert"
+ * 
+ *	FORMATTER / Inserting New Line In Empty Block
+ *    When insert, a line break is inserted between contiguous { and }, if } is not followed
+ *    by a keyword.
+ *     - option id:         "org.eclipse.jdt.core.formatter.newline.emptyBlock"
+ *     - possible values:   { "insert", "do not insert" }
+ *     - default:           "insert"
+ * 
+ *	FORMATTER / Splitting Lines Exceeding Length
+ *    Enable splitting of long lines (exceeding the configurable length). Length of 0 will
+ *    disable line splitting
+ *     - option id:         "org.eclipse.jdt.core.formatter.lineSplit"
+ *     - possible values:	"<n>", where n is zero or a positive integer
+ *     - default:           "80"
+ * 
+ *	FORMATTER / Compacting Assignment
+ *    Assignments can be formatted asymmetrically, for example 'int x= 2;', when Normal, a space
+ *    is inserted before the assignment operator
+ *     - option id:         "org.eclipse.jdt.core.formatter.style.assignment"
+ *     - possible values:   { "compact", "normal" }
+ *     - default:           "normal"
+ * 
+ *	FORMATTER / Defining Indentation Character
+ *    Either choose to indent with tab characters or spaces
+ *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.char"
+ *     - possible values:   { "tab", "space" }
+ *     - default:           "tab"
+ * 
+ *	FORMATTER / Defining Space Indentation Length
+ *    When using spaces, set the amount of space characters to use for each 
+ *    indentation mark.
+ *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.size"
+ *     - possible values:	"<n>", where n is a positive integer
+ *     - default:           "4"
+ * 
+ *	FORMATTER / Inserting space in cast expression
+ *    When Insert, a space is added between the type and the expression in a cast expression.
+ *     - option id:         "org.eclipse.jdt.core.formatter.space.castexpression"
+ *     - possible values:   { "insert", "do not insert" }
+ *     - default:           "insert"
+ * 
+ *	CODEASSIST / Activate Visibility Sensitive Completion
+ *    When active, completion doesn't show that you can not see
+ *    (for example, you can not see private methods of a super class).
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.visibilityCheck"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "disabled"
+ * 
+ *	CODEASSIST / Automatic Qualification of Implicit Members
+ *    When active, completion automatically qualifies completion on implicit
+ *    field references and message expressions.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.forceImplicitQualification"
+ *     - possible values:   { "enabled", "disabled" }
+ *     - default:           "disabled"
+ * 
+ *  CODEASSIST / Define the Prefixes for Field Name
+ *    When the prefixes is non empty, completion for field name will begin with
+ *    one of the proposed prefixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldPrefixes"
+ *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Prefixes for Static Field Name
+ *    When the prefixes is non empty, completion for static field name will begin with
+ *    one of the proposed prefixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldPrefixes"
+ *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Prefixes for Local Variable Name
+ *    When the prefixes is non empty, completion for local variable name will begin with
+ *    one of the proposed prefixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.localPrefixes"
+ *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Prefixes for Argument Name
+ *    When the prefixes is non empty, completion for argument name will begin with
+ *    one of the proposed prefixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentPrefixes"
+ *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Suffixes for Field Name
+ *    When the suffixes is non empty, completion for field name will end with
+ *    one of the proposed suffixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldSuffixes"
+ *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Suffixes for Static Field Name
+ *    When the suffixes is non empty, completion for static field name will end with
+ *    one of the proposed suffixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldSuffixes"
+ *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Suffixes for Local Variable Name
+ *    When the suffixes is non empty, completion for local variable name will end with
+ *    one of the proposed suffixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.localSuffixes"
+ *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
+ *     - default:           ""
+ * 
+ *  CODEASSIST / Define the Suffixes for Argument Name
+ *    When the suffixes is non empty, completion for argument name will end with
+ *    one of the proposed suffixes.
+ *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentSuffixes"
+ *     - possible values:   { "<suffix>[,<suffix>]*" } where <prefix> is a String without any wild-card 
+ *     - default:           ""
+ * </pre>
+ * 
+ * @return a mutable table containing the default settings of all known options
+ *   (key type: <code>String</code>; value type: <code>String</code>)
+ * @see #setOptions
+ */
+public static Hashtable getDefaultOptions(){
+	
+	Hashtable defaultOptions = new Hashtable(10);
+
+	// see #initializeDefaultPluginPreferences() for changing default settings
+	Preferences preferences = getPlugin().getPluginPreferences();
+	HashSet optionNames = JavaModelManager.OptionNames;
+		
+	// get preferences set to their default
+	String[] defaultPropertyNames = preferences.defaultPropertyNames();
+	for (int i = 0; i < defaultPropertyNames.length; i++){
+		String propertyName = defaultPropertyNames[i];
+		if (optionNames.contains(propertyName)) {
+			defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+		}
+	}		
+	// get preferences not set to their default
+	String[] propertyNames = preferences.propertyNames();
+	for (int i = 0; i < propertyNames.length; i++){
+		String propertyName = propertyNames[i];
+		if (optionNames.contains(propertyName)) {
+			defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+		}
+	}		
+	// get encoding through resource plugin
+	defaultOptions.put(CORE_ENCODING, ResourcesPlugin.getEncoding()); 
+		
+	return defaultOptions;
+}
+
+/**
+ * Returns the single instance of the Java core plug-in runtime class.
+ * Equivalent to <code>(JavaCore) getPlugin()</code>.
+ * 
+ * @return the single instance of the Java core plug-in runtime class
+ */
+public static PHPeclipsePlugin getJavaCore() {
+	return (PHPeclipsePlugin) getPlugin();
+}
+	
+/**
+ * Helper method for returning one option value only. Equivalent to <code>(String)JavaCore.getOptions().get(optionName)</code>
+ * Note that it may answer <code>null</code> if this option does not exist.
+ * <p>
+ * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+ * </p>
+ * 
+ * @param optionName the name of an option
+ * @return the String value of a given option
+ * @see JavaCore#getDefaultOptions
+ * @since 2.0
+ */
+public static String getOption(String optionName) {
+		
+	if (CORE_ENCODING.equals(optionName)){
+		return ResourcesPlugin.getEncoding();
+	}
+	if (JavaModelManager.OptionNames.contains(optionName)){
 		Preferences preferences = getPlugin().getPluginPreferences();
-		HashSet optionNames = JavaModelManager.OptionNames;
+		return preferences.getString(optionName).trim();
+	}
+	return null;
+}
+	
+/**
+ * Returns the table of the current options. Initially, all options have their default values,
+ * and this method returns a table that includes all known options.
+ * <p>
+ * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+ * </p>
+ * 
+ * @return table of current settings of all options 
+ *   (key type: <code>String</code>; value type: <code>String</code>)
+ * @see JavaCore#getDefaultOptions
+ */
+public static Hashtable getOptions() {
 		
+	Hashtable options = new Hashtable(10);
+
+	// see #initializeDefaultPluginPreferences() for changing default settings
+	Plugin plugin = getPlugin();
+	if (plugin != null) {
+		Preferences preferences = getPlugin().getPluginPreferences();
+		HashSet optionNames = JavaModelManager.OptionNames;
+			
 		// get preferences set to their default
 		String[] defaultPropertyNames = preferences.defaultPropertyNames();
 		for (int i = 0; i < defaultPropertyNames.length; i++){
 			String propertyName = defaultPropertyNames[i];
-			if (optionNames.contains(propertyName)) {
-				defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+			if (optionNames.contains(propertyName)){
+				options.put(propertyName, preferences.getDefaultString(propertyName));
 			}
 		}		
 		// get preferences not set to their default
 		String[] propertyNames = preferences.propertyNames();
 		for (int i = 0; i < propertyNames.length; i++){
 			String propertyName = propertyNames[i];
-			if (optionNames.contains(propertyName)) {
-				defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
+			if (optionNames.contains(propertyName)){
+				options.put(propertyName, preferences.getString(propertyName).trim());
 			}
 		}		
 		// get encoding through resource plugin
-		defaultOptions.put(CORE_ENCODING, ResourcesPlugin.getEncoding()); 
-		
-		return defaultOptions;
+		options.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
 	}
-
-	/**
-	 * Returns the single instance of the Java core plug-in runtime class.
-	 * Equivalent to <code>(JavaCore) getPlugin()</code>.
-	 * 
-	 * @return the single instance of the Java core plug-in runtime class
-	 */
-	public static JavaCore getJavaCore() {
-		return (JavaCore) getPlugin();
-	}
-	
-	/**
-	 * Helper method for returning one option value only. Equivalent to <code>(String)JavaCore.getOptions().get(optionName)</code>
-	 * Note that it may answer <code>null</code> if this option does not exist.
-	 * <p>
-	 * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-	 * </p>
-	 * 
-	 * @param optionName the name of an option
-	 * @return the String value of a given option
-	 * @see JavaCore#getDefaultOptions
-	 * @since 2.0
-	 */
-	public static String getOption(String optionName) {
+	return options;
+}
 		
-		if (CORE_ENCODING.equals(optionName)){
-			return ResourcesPlugin.getEncoding();
-		}
-		if (JavaModelManager.OptionNames.contains(optionName)){
-			Preferences preferences = getPlugin().getPluginPreferences();
-			return preferences.getString(optionName).trim();
-		}
+/**
+ * This is a helper method, which returns the resolved classpath entry denoted 
+ * by a given entry (if it is a variable entry). It is obtained by resolving the variable 
+ * reference in the first segment. Returns <node>null</code> if unable to resolve using 
+ * the following algorithm:
+ * <ul>
+ * <li> if variable segment cannot be resolved, returns <code>null</code></li>
+ * <li> finds a project, JAR or binary folder in the workspace at the resolved path location</li>
+ * <li> if none finds an external JAR file or folder outside the workspace at the resolved path location </li>
+ * <li> if none returns <code>null</code></li>
+ * </ul>
+ * <p>
+ * Variable source attachment path and root path are also resolved and recorded in the resulting classpath entry.
+ * <p>
+ * NOTE: This helper method does not handle classpath containers, for which should rather be used
+ * <code>JavaCore#getClasspathContainer(IPath, IJavaProject)</code>.
+ * <p>
+ * 
+ * @param entry the given variable entry
+ * @return the resolved library or project classpath entry, or <code>null</code>
+ *   if the given variable entry could not be resolved to a valid classpath entry
+ */
+public static IClasspathEntry getResolvedClasspathEntry(IClasspathEntry entry) {
+	
+	if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE)
+		return entry;
+	
+	IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+	IPath resolvedPath = JavaCore.getResolvedVariablePath(entry.getPath());
+	if (resolvedPath == null)
 		return null;
-	}
 	
-	/**
-	 * Returns the table of the current options. Initially, all options have their default values,
-	 * and this method returns a table that includes all known options.
-	 * <p>
-	 * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-	 * </p>
-	 * 
-	 * @return table of current settings of all options 
-	 *   (key type: <code>String</code>; value type: <code>String</code>)
-	 * @see JavaCore#getDefaultOptions
-	 */
-	public static Hashtable getOptions() {
-		
-		Hashtable options = new Hashtable(10);
-
-		// see #initializeDefaultPluginPreferences() for changing default settings
-		Plugin plugin = getPlugin();
-		if (plugin != null) {
-			Preferences preferences = getPlugin().getPluginPreferences();
-			HashSet optionNames = JavaModelManager.OptionNames;
-			
-			// get preferences set to their default
-			String[] defaultPropertyNames = preferences.defaultPropertyNames();
-			for (int i = 0; i < defaultPropertyNames.length; i++){
-				String propertyName = defaultPropertyNames[i];
-				if (optionNames.contains(propertyName)){
-					options.put(propertyName, preferences.getDefaultString(propertyName));
-				}
-			}		
-			// get preferences not set to their default
-			String[] propertyNames = preferences.propertyNames();
-			for (int i = 0; i < propertyNames.length; i++){
-				String propertyName = propertyNames[i];
-				if (optionNames.contains(propertyName)){
-					options.put(propertyName, preferences.getString(propertyName).trim());
-				}
-			}		
-			// get encoding through resource plugin
-			options.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
-		}
-		return options;
-	}
-		
-	/**
-	 * Returns the single instance of the Java core plug-in runtime class.
-	 * 
-	 * @return the single instance of the Java core plug-in runtime class
-	 */
-	public static Plugin getPlugin() {
-		return JAVA_CORE_PLUGIN;
-	}
-
-	/**
-	 * This is a helper method, which returns the resolved classpath entry denoted 
-	 * by a given entry (if it is a variable entry). It is obtained by resolving the variable 
-	 * reference in the first segment. Returns <node>null</code> if unable to resolve using 
-	 * the following algorithm:
-	 * <ul>
-	 * <li> if variable segment cannot be resolved, returns <code>null</code></li>
-	 * <li> finds a project, JAR or binary folder in the workspace at the resolved path location</li>
-	 * <li> if none finds an external JAR file or folder outside the workspace at the resolved path location </li>
-	 * <li> if none returns <code>null</code></li>
-	 * </ul>
-	 * <p>
-	 * Variable source attachment path and root path are also resolved and recorded in the resulting classpath entry.
-	 * <p>
-	 * NOTE: This helper method does not handle classpath containers, for which should rather be used
-	 * <code>JavaCore#getClasspathContainer(IPath, IJavaProject)</code>.
-	 * <p>
-	 * 
-	 * @param entry the given variable entry
-	 * @return the resolved library or project classpath entry, or <code>null</code>
-	 *   if the given variable entry could not be resolved to a valid classpath entry
-	 */
-//	public static IClasspathEntry getResolvedClasspathEntry(IClasspathEntry entry) {
-//	
-//		if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE)
-//			return entry;
-//	
-//		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-//		IPath resolvedPath = JavaCore.getResolvedVariablePath(entry.getPath());
-//		if (resolvedPath == null)
-//			return null;
-//	
-//		Object target = JavaModel.getTarget(workspaceRoot, resolvedPath, false);
-//		if (target == null)
-//			return null;
-//	
-//		// inside the workspace
-//		if (target instanceof IResource) {
-//			IResource resolvedResource = (IResource) target;
-//			if (resolvedResource != null) {
-//				switch (resolvedResource.getType()) {
-//					
-//					case IResource.PROJECT :  
-//						// internal project
-//						return JavaCore.newProjectEntry(resolvedPath, entry.isExported());
-//						
-//					case IResource.FILE : 
-//						if (Util.isArchiveFileName(resolvedResource.getName())) {
-//							// internal binary archive
-//							return JavaCore.newLibraryEntry(
-//									resolvedPath,
-//									getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//									getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//									entry.isExported());
-//						}
-//						break;
-//						
-//					case IResource.FOLDER : 
-//						// internal binary folder
+	Object target = JavaModel.getTarget(workspaceRoot, resolvedPath, false);
+	if (target == null)
+		return null;
+	
+	// inside the workspace
+	if (target instanceof IResource) {
+		IResource resolvedResource = (IResource) target;
+		if (resolvedResource != null) {
+			switch (resolvedResource.getType()) {
+					
+				case IResource.PROJECT :  
+					// internal project
+					return JavaCore.newProjectEntry(resolvedPath, entry.isExported());
+						
+				case IResource.FILE : 
+//					if (Util.isArchiveFileName(resolvedResource.getName())) {
+//						// internal binary archive
 //						return JavaCore.newLibraryEntry(
 //								resolvedPath,
 //								getResolvedVariablePath(entry.getSourceAttachmentPath()),
 //								getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
 //								entry.isExported());
-//				}
-//			}
-//		}
-//		// outside the workspace
-//		if (target instanceof File) {
-//			File externalFile = (File) target;
-//			if (externalFile.isFile()) {
-//				String fileName = externalFile.getName().toLowerCase();
-//				if (fileName.endsWith(".jar"  //$NON-NLS-1$
-//					) || fileName.endsWith(".zip"  //$NON-NLS-1$
-//					)) { // external binary archive
-//					return JavaCore.newLibraryEntry(
-//							resolvedPath,
-//							getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//							getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//							entry.isExported());
-//				}
-//			} else { // external binary folder
-//				if (resolvedPath.isAbsolute()){
+//					}
+					break;
+						
+				case IResource.FOLDER : 
+					// internal binary folder
 //					return JavaCore.newLibraryEntry(
 //							resolvedPath,
 //							getResolvedVariablePath(entry.getSourceAttachmentPath()),
 //							getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
 //							entry.isExported());
-//				}
+          break;
+			}
+		}
+	}
+	// outside the workspace
+	if (target instanceof File) {
+		File externalFile = (File) target;
+		if (externalFile.isFile()) {
+			String fileName = externalFile.getName().toLowerCase();
+//			if (fileName.endsWith(".jar"  //$NON-NLS-1$
+//				) || fileName.endsWith(".zip"  //$NON-NLS-1$
+//				)) { // external binary archive
+//				return JavaCore.newLibraryEntry(
+//						resolvedPath,
+//						getResolvedVariablePath(entry.getSourceAttachmentPath()),
+//						getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
+//						entry.isExported());
 //			}
-//		}
-//		return null;
-//	}
+		} else { // external binary folder
+			if (resolvedPath.isAbsolute()){
+//				return JavaCore.newLibraryEntry(
+//						resolvedPath,
+//						getResolvedVariablePath(entry.getSourceAttachmentPath()),
+//						getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
+//						entry.isExported());
+			}
+		}
+	}
+	return null;
+}
 
 
-	/**
-	 * Resolve a variable path (helper method).
-	 * 
-	 * @param variablePath the given variable path
-	 * @return the resolved variable path or <code>null</code> if none
-	 */
-//	public static IPath getResolvedVariablePath(IPath variablePath) {
-//	
-//		if (variablePath == null)
-//			return null;
-//		int count = variablePath.segmentCount();
-//		if (count == 0)
-//			return null;
-//	
-//		// lookup variable	
-//		String variableName = variablePath.segment(0);
-//		IPath resolvedPath = JavaCore.getClasspathVariable(variableName);
-//		if (resolvedPath == null)
-//			return null;
-//	
-//		// append path suffix
-//		if (count > 1) {
-//			resolvedPath = resolvedPath.append(variablePath.removeFirstSegments(1));
-//		}
-//		return resolvedPath; 
-//	}
+/**
+ * Resolve a variable path (helper method).
+ * 
+ * @param variablePath the given variable path
+ * @return the resolved variable path or <code>null</code> if none
+ */
+public static IPath getResolvedVariablePath(IPath variablePath) {
+	
+	if (variablePath == null)
+		return null;
+	int count = variablePath.segmentCount();
+	if (count == 0)
+		return null;
+	
+	// lookup variable	
+	String variableName = variablePath.segment(0);
+	IPath resolvedPath = JavaCore.getClasspathVariable(variableName);
+	if (resolvedPath == null)
+		return null;
+	
+	// append path suffix
+	if (count > 1) {
+		resolvedPath = resolvedPath.append(variablePath.removeFirstSegments(1));
+	}
+	return resolvedPath; 
+}
 
-	/**
-	 * Answers the shared working copies currently registered for this buffer factory. 
-	 * Working copies can be shared by several clients using the same buffer factory,see 
-	 * <code>IWorkingCopy.getSharedWorkingCopy</code>.
-	 * 
-	 * @param factory the given buffer factory
-	 * @return the list of shared working copies for a given buffer factory
-	 * @see IWorkingCopy
-	 * @since 2.0
-	 */
-	public static IWorkingCopy[] getSharedWorkingCopies(IBufferFactory factory){
+/**
+ * Answers the shared working copies currently registered for this buffer factory. 
+ * Working copies can be shared by several clients using the same buffer factory,see 
+ * <code>IWorkingCopy.getSharedWorkingCopy</code>.
+ * 
+ * @param factory the given buffer factory
+ * @return the list of shared working copies for a given buffer factory
+ * @see IWorkingCopy
+ * @since 2.0
+ */
+public static IWorkingCopy[] getSharedWorkingCopies(IBufferFactory factory){
 		
-		// if factory is null, default factory must be used
-		if (factory == null) factory = BufferManager.getDefaultBufferManager().getDefaultBufferFactory();
-		Map sharedWorkingCopies = JavaModelManager.getJavaModelManager().sharedWorkingCopies;
+	// if factory is null, default factory must be used
+	if (factory == null) factory = BufferManager.getDefaultBufferManager().getDefaultBufferFactory();
+	Map sharedWorkingCopies = JavaModelManager.getJavaModelManager().sharedWorkingCopies;
 		
-		Map perFactoryWorkingCopies = (Map) sharedWorkingCopies.get(factory);
-		if (perFactoryWorkingCopies == null) return JavaModelManager.NoWorkingCopy;
-		Collection copies = perFactoryWorkingCopies.values();
-		IWorkingCopy[] result = new IWorkingCopy[copies.size()];
-		copies.toArray(result);
-		return result;
-	}
+	Map perFactoryWorkingCopies = (Map) sharedWorkingCopies.get(factory);
+	if (perFactoryWorkingCopies == null) return JavaModelManager.NoWorkingCopy;
+	Collection copies = perFactoryWorkingCopies.values();
+	IWorkingCopy[] result = new IWorkingCopy[copies.size()];
+	copies.toArray(result);
+	return result;
+}
 	
-	/**
-	 * Initializes the default preferences settings for this plug-in.
-	 */
-	protected void initializeDefaultPluginPreferences() {
+/**
+ * Initializes the default preferences settings for this plug-in.
+ */
+public static void initializeDefaultPluginPreferences() {
 		
-		Preferences preferences = getPluginPreferences();
-		HashSet optionNames = JavaModelManager.OptionNames;
+	Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences();
+	HashSet optionNames = JavaModelManager.OptionNames;
 		
-		// Compiler settings
-		preferences.setDefault(COMPILER_LOCAL_VARIABLE_ATTR, GENERATE);
-		optionNames.add(COMPILER_LOCAL_VARIABLE_ATTR);
+	// Compiler settings
+	preferences.setDefault(COMPILER_LOCAL_VARIABLE_ATTR, GENERATE);
+	optionNames.add(COMPILER_LOCAL_VARIABLE_ATTR);
 
-		preferences.setDefault(COMPILER_LINE_NUMBER_ATTR, GENERATE); 
-		optionNames.add(COMPILER_LINE_NUMBER_ATTR);
+	preferences.setDefault(COMPILER_LINE_NUMBER_ATTR, GENERATE); 
+	optionNames.add(COMPILER_LINE_NUMBER_ATTR);
 
-		preferences.setDefault(COMPILER_SOURCE_FILE_ATTR, GENERATE); 
-		optionNames.add(COMPILER_SOURCE_FILE_ATTR);
+	preferences.setDefault(COMPILER_SOURCE_FILE_ATTR, GENERATE); 
+	optionNames.add(COMPILER_SOURCE_FILE_ATTR);
 
-		preferences.setDefault(COMPILER_CODEGEN_UNUSED_LOCAL, PRESERVE); 
-		optionNames.add(COMPILER_CODEGEN_UNUSED_LOCAL);
+	preferences.setDefault(COMPILER_CODEGEN_UNUSED_LOCAL, PRESERVE); 
+	optionNames.add(COMPILER_CODEGEN_UNUSED_LOCAL);
 
-		preferences.setDefault(COMPILER_CODEGEN_TARGET_PLATFORM, VERSION_1_1); 
-		optionNames.add(COMPILER_CODEGEN_TARGET_PLATFORM);
+	preferences.setDefault(COMPILER_CODEGEN_TARGET_PLATFORM, VERSION_1_1); 
+	optionNames.add(COMPILER_CODEGEN_TARGET_PLATFORM);
 
-		preferences.setDefault(COMPILER_PB_UNREACHABLE_CODE, ERROR); 
-		optionNames.add(COMPILER_PB_UNREACHABLE_CODE);
+	preferences.setDefault(COMPILER_PB_UNREACHABLE_CODE, ERROR); 
+	optionNames.add(COMPILER_PB_UNREACHABLE_CODE);
 
-		preferences.setDefault(COMPILER_PB_INVALID_IMPORT, ERROR); 
-		optionNames.add(COMPILER_PB_INVALID_IMPORT);
+	preferences.setDefault(COMPILER_PB_INVALID_IMPORT, ERROR); 
+	optionNames.add(COMPILER_PB_INVALID_IMPORT);
 
-		preferences.setDefault(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD, WARNING); 
-		optionNames.add(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD);
+	preferences.setDefault(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD, WARNING); 
+	optionNames.add(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD);
 
-		preferences.setDefault(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME, WARNING); 
-		optionNames.add(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME);
+	preferences.setDefault(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME, WARNING); 
+	optionNames.add(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME);
 
-		preferences.setDefault(COMPILER_PB_DEPRECATION, WARNING);
-		optionNames.add(COMPILER_PB_DEPRECATION);
+	preferences.setDefault(COMPILER_PB_DEPRECATION, WARNING);
+	optionNames.add(COMPILER_PB_DEPRECATION);
 
-		preferences.setDefault(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, DISABLED);
-		optionNames.add(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE);
+	preferences.setDefault(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, DISABLED);
+	optionNames.add(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE);
 
-		preferences.setDefault(COMPILER_PB_HIDDEN_CATCH_BLOCK, WARNING); 
-		optionNames.add(COMPILER_PB_HIDDEN_CATCH_BLOCK);
+	preferences.setDefault(COMPILER_PB_HIDDEN_CATCH_BLOCK, WARNING); 
+	optionNames.add(COMPILER_PB_HIDDEN_CATCH_BLOCK);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_LOCAL, IGNORE); 
-		optionNames.add(COMPILER_PB_UNUSED_LOCAL);
+	preferences.setDefault(COMPILER_PB_UNUSED_LOCAL, IGNORE); 
+	optionNames.add(COMPILER_PB_UNUSED_LOCAL);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER, IGNORE); 
-		optionNames.add(COMPILER_PB_UNUSED_PARAMETER);
+	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER, IGNORE); 
+	optionNames.add(COMPILER_PB_UNUSED_PARAMETER);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT, DISABLED); 
-		optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT);
+	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT, DISABLED); 
+	optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE, DISABLED); 
-		optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE);
+	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE, DISABLED); 
+	optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_IMPORT, WARNING); 
-		optionNames.add(COMPILER_PB_UNUSED_IMPORT);
+	preferences.setDefault(COMPILER_PB_UNUSED_IMPORT, WARNING); 
+	optionNames.add(COMPILER_PB_UNUSED_IMPORT);
 
-		preferences.setDefault(COMPILER_PB_UNUSED_PRIVATE_MEMBER, IGNORE); 
-		optionNames.add(COMPILER_PB_UNUSED_PRIVATE_MEMBER);
+	preferences.setDefault(COMPILER_PB_UNUSED_PRIVATE_MEMBER, IGNORE); 
+	optionNames.add(COMPILER_PB_UNUSED_PRIVATE_MEMBER);
 
-		preferences.setDefault(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, IGNORE); 
-		optionNames.add(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION);
+	preferences.setDefault(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, IGNORE); 
+	optionNames.add(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION);
 
-		preferences.setDefault(COMPILER_PB_NON_NLS_STRING_LITERAL, IGNORE); 
-		optionNames.add(COMPILER_PB_NON_NLS_STRING_LITERAL);
+	preferences.setDefault(COMPILER_PB_NON_NLS_STRING_LITERAL, IGNORE); 
+	optionNames.add(COMPILER_PB_NON_NLS_STRING_LITERAL);
 
-		preferences.setDefault(COMPILER_PB_ASSERT_IDENTIFIER, IGNORE); 
-		optionNames.add(COMPILER_PB_ASSERT_IDENTIFIER);
+	preferences.setDefault(COMPILER_PB_ASSERT_IDENTIFIER, IGNORE); 
+	optionNames.add(COMPILER_PB_ASSERT_IDENTIFIER);
 
-		preferences.setDefault(COMPILER_PB_STATIC_ACCESS_RECEIVER, WARNING); 
-		optionNames.add(COMPILER_PB_STATIC_ACCESS_RECEIVER);
+	preferences.setDefault(COMPILER_PB_STATIC_ACCESS_RECEIVER, WARNING); 
+	optionNames.add(COMPILER_PB_STATIC_ACCESS_RECEIVER);
 
-		preferences.setDefault(COMPILER_PB_NO_EFFECT_ASSIGNMENT, WARNING); 
-		optionNames.add(COMPILER_PB_NO_EFFECT_ASSIGNMENT);
+	preferences.setDefault(COMPILER_PB_NO_EFFECT_ASSIGNMENT, WARNING); 
+	optionNames.add(COMPILER_PB_NO_EFFECT_ASSIGNMENT);
 
-		preferences.setDefault(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD, WARNING); 
-		optionNames.add(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD);
+	preferences.setDefault(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD, WARNING); 
+	optionNames.add(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD);
 
-		preferences.setDefault(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION, WARNING); 
-		optionNames.add(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION);
+	preferences.setDefault(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION, WARNING); 
+	optionNames.add(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION);
 
-		preferences.setDefault(COMPILER_TASK_TAGS, DEFAULT_TASK_TAG); //$NON-NLS-1$
-		optionNames.add(COMPILER_TASK_TAGS);
+	preferences.setDefault(COMPILER_TASK_TAGS, DEFAULT_TASK_TAG); //$NON-NLS-1$
+	optionNames.add(COMPILER_TASK_TAGS);
 
-		preferences.setDefault(COMPILER_TASK_PRIORITIES, DEFAULT_TASK_PRIORITY); //$NON-NLS-1$
-		optionNames.add(COMPILER_TASK_PRIORITIES);
+	preferences.setDefault(COMPILER_TASK_PRIORITIES, DEFAULT_TASK_PRIORITY); //$NON-NLS-1$
+	optionNames.add(COMPILER_TASK_PRIORITIES);
 
-		preferences.setDefault(COMPILER_SOURCE, VERSION_1_3);
-		optionNames.add(COMPILER_SOURCE);
+	preferences.setDefault(COMPILER_SOURCE, VERSION_1_3);
+	optionNames.add(COMPILER_SOURCE);
 
-		preferences.setDefault(COMPILER_COMPLIANCE, VERSION_1_3); 
-		optionNames.add(COMPILER_COMPLIANCE);
+	preferences.setDefault(COMPILER_COMPLIANCE, VERSION_1_3); 
+	optionNames.add(COMPILER_COMPLIANCE);
 
-		preferences.setDefault(COMPILER_PB_MAX_PER_UNIT, "100"); //$NON-NLS-1$
-		optionNames.add(COMPILER_PB_MAX_PER_UNIT);
+	preferences.setDefault(COMPILER_PB_MAX_PER_UNIT, "100"); //$NON-NLS-1$
+	optionNames.add(COMPILER_PB_MAX_PER_UNIT);
 		
-		// Builder settings
-		preferences.setDefault(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, ""); //$NON-NLS-1$
-		optionNames.add(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER);
+	// Builder settings
+	preferences.setDefault(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, ""); //$NON-NLS-1$
+	optionNames.add(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER);
 
-		preferences.setDefault(CORE_JAVA_BUILD_INVALID_CLASSPATH, ABORT); 
-		optionNames.add(CORE_JAVA_BUILD_INVALID_CLASSPATH);
+	preferences.setDefault(CORE_JAVA_BUILD_INVALID_CLASSPATH, ABORT); 
+	optionNames.add(CORE_JAVA_BUILD_INVALID_CLASSPATH);
 	
-		preferences.setDefault(CORE_JAVA_BUILD_DUPLICATE_RESOURCE, WARNING); 
-		optionNames.add(CORE_JAVA_BUILD_DUPLICATE_RESOURCE);
+	preferences.setDefault(CORE_JAVA_BUILD_DUPLICATE_RESOURCE, WARNING); 
+	optionNames.add(CORE_JAVA_BUILD_DUPLICATE_RESOURCE);
 		
-		preferences.setDefault(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, CLEAN); 
-		optionNames.add(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER);
+	preferences.setDefault(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, CLEAN); 
+	optionNames.add(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER);
 
-		// JavaCore settings
-		preferences.setDefault(CORE_JAVA_BUILD_ORDER, IGNORE); 
-		optionNames.add(CORE_JAVA_BUILD_ORDER);
+	// JavaCore settings
+	preferences.setDefault(CORE_JAVA_BUILD_ORDER, IGNORE); 
+	optionNames.add(CORE_JAVA_BUILD_ORDER);
 	
-		preferences.setDefault(CORE_CIRCULAR_CLASSPATH, ERROR); 
-		optionNames.add(CORE_CIRCULAR_CLASSPATH);
+	preferences.setDefault(CORE_CIRCULAR_CLASSPATH, ERROR); 
+	optionNames.add(CORE_CIRCULAR_CLASSPATH);
 		
-		preferences.setDefault(CORE_INCOMPLETE_CLASSPATH, ERROR); 
-		optionNames.add(CORE_INCOMPLETE_CLASSPATH);
+	preferences.setDefault(CORE_INCOMPLETE_CLASSPATH, ERROR); 
+	optionNames.add(CORE_INCOMPLETE_CLASSPATH);
 		
-		preferences.setDefault(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, ENABLED); 
-		optionNames.add(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS);
+	preferences.setDefault(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, ENABLED); 
+	optionNames.add(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS);
 
-		preferences.setDefault(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS, ENABLED); 
-		optionNames.add(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS);
+	preferences.setDefault(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS, ENABLED); 
+	optionNames.add(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS);
 
-		// encoding setting comes from resource plug-in
-		optionNames.add(CORE_ENCODING);
+	// encoding setting comes from resource plug-in
+	optionNames.add(CORE_ENCODING);
 		
-		// Formatter settings
-		preferences.setDefault(FORMATTER_NEWLINE_OPENING_BRACE, DO_NOT_INSERT); 
-		optionNames.add(FORMATTER_NEWLINE_OPENING_BRACE);
+	// Formatter settings
+	preferences.setDefault(FORMATTER_NEWLINE_OPENING_BRACE, DO_NOT_INSERT); 
+	optionNames.add(FORMATTER_NEWLINE_OPENING_BRACE);
 
-		preferences.setDefault(FORMATTER_NEWLINE_CONTROL, DO_NOT_INSERT);
-		optionNames.add(FORMATTER_NEWLINE_CONTROL);
+	preferences.setDefault(FORMATTER_NEWLINE_CONTROL, DO_NOT_INSERT);
+	optionNames.add(FORMATTER_NEWLINE_CONTROL);
 
-		preferences.setDefault(FORMATTER_CLEAR_BLANK_LINES, PRESERVE_ONE); 
-		optionNames.add(FORMATTER_CLEAR_BLANK_LINES);
+	preferences.setDefault(FORMATTER_CLEAR_BLANK_LINES, PRESERVE_ONE); 
+	optionNames.add(FORMATTER_CLEAR_BLANK_LINES);
 
-		preferences.setDefault(FORMATTER_NEWLINE_ELSE_IF, DO_NOT_INSERT);
-		optionNames.add(FORMATTER_NEWLINE_ELSE_IF);
+	preferences.setDefault(FORMATTER_NEWLINE_ELSE_IF, DO_NOT_INSERT);
+	optionNames.add(FORMATTER_NEWLINE_ELSE_IF);
 
-		preferences.setDefault(FORMATTER_NEWLINE_EMPTY_BLOCK, INSERT); 
-		optionNames.add(FORMATTER_NEWLINE_EMPTY_BLOCK);
+	preferences.setDefault(FORMATTER_NEWLINE_EMPTY_BLOCK, INSERT); 
+	optionNames.add(FORMATTER_NEWLINE_EMPTY_BLOCK);
 
-		preferences.setDefault(FORMATTER_LINE_SPLIT, "80"); //$NON-NLS-1$
-		optionNames.add(FORMATTER_LINE_SPLIT);
+	preferences.setDefault(FORMATTER_LINE_SPLIT, "80"); //$NON-NLS-1$
+	optionNames.add(FORMATTER_LINE_SPLIT);
 
-		preferences.setDefault(FORMATTER_COMPACT_ASSIGNMENT, NORMAL); 
-		optionNames.add(FORMATTER_COMPACT_ASSIGNMENT);
+	preferences.setDefault(FORMATTER_COMPACT_ASSIGNMENT, NORMAL); 
+	optionNames.add(FORMATTER_COMPACT_ASSIGNMENT);
 
-		preferences.setDefault(FORMATTER_TAB_CHAR, TAB); 
-		optionNames.add(FORMATTER_TAB_CHAR);
+	preferences.setDefault(FORMATTER_TAB_CHAR, TAB); 
+	optionNames.add(FORMATTER_TAB_CHAR);
 
-		preferences.setDefault(FORMATTER_TAB_SIZE, "4"); //$NON-NLS-1$ 
-		optionNames.add(FORMATTER_TAB_SIZE);
+	preferences.setDefault(FORMATTER_TAB_SIZE, "4"); //$NON-NLS-1$ 
+	optionNames.add(FORMATTER_TAB_SIZE);
 		
-		preferences.setDefault(FORMATTER_SPACE_CASTEXPRESSION, INSERT); //$NON-NLS-1$ 
-		optionNames.add(FORMATTER_SPACE_CASTEXPRESSION);
+	preferences.setDefault(FORMATTER_SPACE_CASTEXPRESSION, INSERT); //$NON-NLS-1$ 
+	optionNames.add(FORMATTER_SPACE_CASTEXPRESSION);
 
-		// CodeAssist settings
-		preferences.setDefault(CODEASSIST_VISIBILITY_CHECK, DISABLED); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_VISIBILITY_CHECK);
+	// CodeAssist settings
+	preferences.setDefault(CODEASSIST_VISIBILITY_CHECK, DISABLED); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_VISIBILITY_CHECK);
 
-		preferences.setDefault(CODEASSIST_IMPLICIT_QUALIFICATION, DISABLED); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_IMPLICIT_QUALIFICATION);
+	preferences.setDefault(CODEASSIST_IMPLICIT_QUALIFICATION, DISABLED); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_IMPLICIT_QUALIFICATION);
 		
-		preferences.setDefault(CODEASSIST_FIELD_PREFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_FIELD_PREFIXES);
+	preferences.setDefault(CODEASSIST_FIELD_PREFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_FIELD_PREFIXES);
 		
-		preferences.setDefault(CODEASSIST_STATIC_FIELD_PREFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_STATIC_FIELD_PREFIXES);
+	preferences.setDefault(CODEASSIST_STATIC_FIELD_PREFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_STATIC_FIELD_PREFIXES);
 		
-		preferences.setDefault(CODEASSIST_LOCAL_PREFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_LOCAL_PREFIXES);
+	preferences.setDefault(CODEASSIST_LOCAL_PREFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_LOCAL_PREFIXES);
 		
-		preferences.setDefault(CODEASSIST_ARGUMENT_PREFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_ARGUMENT_PREFIXES);
+	preferences.setDefault(CODEASSIST_ARGUMENT_PREFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_ARGUMENT_PREFIXES);
 		
-		preferences.setDefault(CODEASSIST_FIELD_SUFFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_FIELD_SUFFIXES);
+	preferences.setDefault(CODEASSIST_FIELD_SUFFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_FIELD_SUFFIXES);
 		
-		preferences.setDefault(CODEASSIST_STATIC_FIELD_SUFFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_STATIC_FIELD_SUFFIXES);
+	preferences.setDefault(CODEASSIST_STATIC_FIELD_SUFFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_STATIC_FIELD_SUFFIXES);
 		
-		preferences.setDefault(CODEASSIST_LOCAL_SUFFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_LOCAL_SUFFIXES);
+	preferences.setDefault(CODEASSIST_LOCAL_SUFFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_LOCAL_SUFFIXES);
 		
-		preferences.setDefault(CODEASSIST_ARGUMENT_SUFFIXES, ""); //$NON-NLS-1$
-		optionNames.add(CODEASSIST_ARGUMENT_SUFFIXES);
-	}
+	preferences.setDefault(CODEASSIST_ARGUMENT_SUFFIXES, ""); //$NON-NLS-1$
+	optionNames.add(CODEASSIST_ARGUMENT_SUFFIXES);
+}
 	
-	/**
-	 * Returns whether the given marker references the given Java element.
-	 * Used for markers, which denote a Java element rather than a resource.
-	 *
-	 * @param element the element
-	 * @param marker the marker
-	 * @return <code>true</code> if the marker references the element, false otherwise
-	 * @exception CoreException if the <code>IMarker.getAttribute</code> on the marker fails 	 
-	 */
-	public static boolean isReferencedBy(IJavaElement element, IMarker marker) throws CoreException {
+/**
+ * Returns whether the given marker references the given Java element.
+ * Used for markers, which denote a Java element rather than a resource.
+ *
+ * @param element the element
+ * @param marker the marker
+ * @return <code>true</code> if the marker references the element, false otherwise
+ * @exception CoreException if the <code>IMarker.getAttribute</code> on the marker fails 	 
+ */
+public static boolean isReferencedBy(IJavaElement element, IMarker marker) throws CoreException {
 		
-		// only match units or classfiles
-		if (element instanceof IMember){
-			IMember member = (IMember) element;
-			if (member.isBinary()){
-				element = null; //member.getClassFile();
-			} else {
-				element = member.getCompilationUnit();
-			}
+	// only match units or classfiles
+	if (element instanceof IMember){
+		IMember member = (IMember) element;
+		if (member.isBinary()){
+			element = null; //member.getClassFile();
+		} else {
+			element = member.getCompilationUnit();
 		}
-		if (element == null) return false;			
-		if (marker == null) return false;
+	}
+	if (element == null) return false;			
+	if (marker == null) return false;
 
-		String markerHandleId = (String)marker.getAttribute(ATT_HANDLE_ID);
-		if (markerHandleId == null) return false;
+	String markerHandleId = (String)marker.getAttribute(ATT_HANDLE_ID);
+	if (markerHandleId == null) return false;
 		
-		IJavaElement markerElement = JavaCore.create(markerHandleId);
-//		while (true){
-			if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
+	IJavaElement markerElement = JavaCore.create(markerHandleId);
+//	while (true){
+		if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
 			
-			// cycle through enclosing types in case marker is associated with a classfile (15568)
-//			if (markerElement instanceof IClassFile){
-//				IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
-//				if (enclosingType != null){
-//					markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
-//					continue;
-//				}
+		// cycle through enclosing types in case marker is associated with a classfile (15568)
+//		if (markerElement instanceof IClassFile){
+//			IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
+//			if (enclosingType != null){
+//				markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
+//				continue;
 //			}
-//			break;
 //		}
-		return false;
-	}
+//		break;
+//	}
+	return false;
+}
 
-	/**
-	 * Returns whether the given marker delta references the given Java element.
-	 * Used for markers deltas, which denote a Java element rather than a resource.
-	 *
-	 * @param element the element
-	 * @param markerDelta the marker delta
-	 * @return <code>true</code> if the marker delta references the element
-	 * @exception CoreException if the  <code>IMarkerDelta.getAttribute</code> on the marker delta fails 	 
-	 */
-	public static boolean isReferencedBy(IJavaElement element, IMarkerDelta markerDelta) throws CoreException {
+/**
+ * Returns whether the given marker delta references the given Java element.
+ * Used for markers deltas, which denote a Java element rather than a resource.
+ *
+ * @param element the element
+ * @param markerDelta the marker delta
+ * @return <code>true</code> if the marker delta references the element
+ * @exception CoreException if the  <code>IMarkerDelta.getAttribute</code> on the marker delta fails 	 
+ */
+public static boolean isReferencedBy(IJavaElement element, IMarkerDelta markerDelta) throws CoreException {
 		
-		// only match units or classfiles
-		if (element instanceof IMember){
-			IMember member = (IMember) element;
-			if (member.isBinary()){
-				element = null; //member.getClassFile();
-			} else {
-				element = member.getCompilationUnit();
-			}
+	// only match units or classfiles
+	if (element instanceof IMember){
+		IMember member = (IMember) element;
+		if (member.isBinary()){
+			element = null; //member.getClassFile();
+		} else {
+			element = member.getCompilationUnit();
 		}
-		if (element == null) return false;			
-		if (markerDelta == null) return false;
+	}
+	if (element == null) return false;			
+	if (markerDelta == null) return false;
 
-		String markerDeltarHandleId = (String)markerDelta.getAttribute(ATT_HANDLE_ID);
-		if (markerDeltarHandleId == null) return false;
+	String markerDeltarHandleId = (String)markerDelta.getAttribute(ATT_HANDLE_ID);
+	if (markerDeltarHandleId == null) return false;
 		
-		IJavaElement markerElement = JavaCore.create(markerDeltarHandleId);
-//		while (true){
-			if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
+	IJavaElement markerElement = JavaCore.create(markerDeltarHandleId);
+//	while (true){
+		if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
 			
-			// cycle through enclosing types in case marker is associated with a classfile (15568)
-//			if (markerElement instanceof IClassFile){
-//				IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
-//				if (enclosingType != null){
-//					markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
-//					continue;
-//				}
+		// cycle through enclosing types in case marker is associated with a classfile (15568)
+//		if (markerElement instanceof IClassFile){
+//			IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
+//			if (enclosingType != null){
+//				markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
+//				continue;
 //			}
-//			break;
 //		}
-		return false;
-	}
-
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
-	 * for the given path. The path of the container will be used during resolution so as to map this
-	 * container entry to a set of other classpath entries the container is acting for.
-	 * <p>
-	 * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
-	 * which can be interpreted differently for each Java project where it is used.
-	 * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
-	 * and updated with <code>JavaCore.classpathContainerChanged</code>
-	 * <p>
-	 * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
-	 * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
-	 * <p>
-	 * A container path must be formed of at least one segment, where: <ul>
-	 * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
-	 * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
-	 * <li> the remaining segments will be passed onto the initializer, and can be used as additional
-	 * 	hints during the initialization phase. </li>
-	 * </ul>
-	 * <p>
-	 * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
-	 * 
-	 * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
-	 * 
-	 * <extension
-	 *    point="org.eclipse.jdt.core.classpathContainerInitializer">
-	 *    <containerInitializer
-	 *       id="MyProvidedJDK"
-	 *       class="com.example.MyInitializer"/> 
-	 * <p>
-	 * Note that this operation does not attempt to validate classpath containers
-	 * or access the resources at the given paths.
-	 * <p>
-	 * The resulting entry is not exported to dependent projects. This method is equivalent to
-	 * <code>newContainerEntry(-,false)</code>.
-	 * <p>
-	 * @param containerPath the path identifying the container, it must be formed of two
-	 * 	segments
-	 * @return a new container classpath entry
-	 * 
-	 * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
-	 * @see JavaCore#newContainerEntry(IPath, boolean)
-	 * @since 2.0
-	 */
-//	public static IClasspathEntry newContainerEntry(IPath containerPath) {
-//			
-//		return newContainerEntry(containerPath, false);
+//		break;
 //	}
+	return false;
+}
 
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
-	 * for the given path. The path of the container will be used during resolution so as to map this
-	 * container entry to a set of other classpath entries the container is acting for.
-	 * <p>
-	 * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
-	 * which can be interpreted differently for each Java project where it is used.
-	 * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
-	 * and updated with <code>JavaCore.classpathContainerChanged</code>
-	 * <p>
-	 * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
-	 * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
-	 * <p>
-	 * A container path must be formed of at least one segment, where: <ul>
-	 * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
-	 * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
-	 * <li> the remaining segments will be passed onto the initializer, and can be used as additional
-	 * 	hints during the initialization phase. </li>
-	 * </ul>
-	 * <p>
-	 * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
-	 * 
-	 * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
-	 * 
-	 * <extension
-	 *    point="org.eclipse.jdt.core.classpathContainerInitializer">
-	 *    <containerInitializer
-	 *       id="MyProvidedJDK"
-	 *       class="com.example.MyInitializer"/> 
-	 * <p>
-	 * Note that this operation does not attempt to validate classpath containers
-	 * or access the resources at the given paths.
-	 * <p>
-	 * @param containerPath the path identifying the container, it must be formed of at least
-	 * 	one segment (ID+hints)
-	 * @param isExported a boolean indicating whether this entry is contributed to dependent
-	 *    projects in addition to the output location
-	 * @return a new container classpath entry
-	 * 
-	 * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
-	 * @see JavaCore#setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
-	 * @see JavaCore#newContainerEntry(IPath, boolean)
-	 * @since 2.0
-	 */
-//	public static IClasspathEntry newContainerEntry(IPath containerPath, boolean isExported) {
-//			
-//		if (containerPath == null || containerPath.segmentCount() < 1) {
-//			Assert.isTrue(
-//				false,
-//				"Illegal classpath container path: \'" + containerPath.makeRelative().toString() + "\', must have at least one segment (containerID+hints)"); //$NON-NLS-1$//$NON-NLS-2$
-//		}
-//		return new ClasspathEntry(
-//			IPackageFragmentRoot.K_SOURCE,
-//			IClasspathEntry.CPE_CONTAINER,
-//			containerPath,
-//			ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//			null, // source attachment
-//			null, // source attachment root
-//			null, // specific output folder
-//			isExported);
-//	}
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
+ * for the given path. The path of the container will be used during resolution so as to map this
+ * container entry to a set of other classpath entries the container is acting for.
+ * <p>
+ * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
+ * which can be interpreted differently for each Java project where it is used.
+ * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
+ * and updated with <code>JavaCore.classpathContainerChanged</code>
+ * <p>
+ * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
+ * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
+ * <p>
+ * A container path must be formed of at least one segment, where: <ul>
+ * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
+ * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
+ * <li> the remaining segments will be passed onto the initializer, and can be used as additional
+ * 	hints during the initialization phase. </li>
+ * </ul>
+ * <p>
+ * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
+ * 
+ * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
+ * 
+ * <extension
+ *    point="org.eclipse.jdt.core.classpathContainerInitializer">
+ *    <containerInitializer
+ *       id="MyProvidedJDK"
+ *       class="com.example.MyInitializer"/> 
+ * <p>
+ * Note that this operation does not attempt to validate classpath containers
+ * or access the resources at the given paths.
+ * <p>
+ * The resulting entry is not exported to dependent projects. This method is equivalent to
+ * <code>newContainerEntry(-,false)</code>.
+ * <p>
+ * @param containerPath the path identifying the container, it must be formed of two
+ * 	segments
+ * @return a new container classpath entry
+ * 
+ * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
+ * @see JavaCore#newContainerEntry(IPath, boolean)
+ * @since 2.0
+ */
+public static IClasspathEntry newContainerEntry(IPath containerPath) {
+			
+	return newContainerEntry(containerPath, false);
+}
 
-	/**
-	 * Creates and returns a new non-exported classpath entry of kind <code>CPE_LIBRARY</code> for the 
-	 * JAR or folder identified by the given absolute path. This specifies that all package fragments 
-	 * within the root will have children of type <code>IClassFile</code>.
-	 * <p>
-	 * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
-	 * The target JAR or folder can either be defined internally to the workspace (absolute path relative
-	 * to the workspace root) or externally to the workspace (absolute path in the file system).
-	 * <p>
-	 * e.g. Here are some examples of binary path usage<ul>
-	 *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
-	 *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
-	 *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
-	 * </ul>
-	 * Note that this operation does not attempt to validate or access the 
-	 * resources at the given paths.
-	 * <p>
-	 * The resulting entry is not exported to dependent projects. This method is equivalent to
-	 * <code>newLibraryEntry(-,-,-,false)</code>.
-	 * <p>
-	 * 
-	 * @param path the absolute path of the binary archive
-	 * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
-	 *    or <code>null</code> if none
-	 * @param sourceAttachmentRootPath the location of the root within the source archive or folder
-	 *    or <code>null</code> if this location should be automatically detected.
-	 * @return a new library classpath entry
-	 * 
-	 * @see #newLibraryEntry(IPath, IPath, IPath, boolean)
-	 */
-//	public static IClasspathEntry newLibraryEntry(
-//		IPath path,
-//		IPath sourceAttachmentPath,
-//		IPath sourceAttachmentRootPath) {
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
+ * for the given path. The path of the container will be used during resolution so as to map this
+ * container entry to a set of other classpath entries the container is acting for.
+ * <p>
+ * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
+ * which can be interpreted differently for each Java project where it is used.
+ * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
+ * and updated with <code>JavaCore.classpathContainerChanged</code>
+ * <p>
+ * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
+ * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
+ * <p>
+ * A container path must be formed of at least one segment, where: <ul>
+ * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
+ * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
+ * <li> the remaining segments will be passed onto the initializer, and can be used as additional
+ * 	hints during the initialization phase. </li>
+ * </ul>
+ * <p>
+ * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
+ * 
+ * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
+ * 
+ * <extension
+ *    point="org.eclipse.jdt.core.classpathContainerInitializer">
+ *    <containerInitializer
+ *       id="MyProvidedJDK"
+ *       class="com.example.MyInitializer"/> 
+ * <p>
+ * Note that this operation does not attempt to validate classpath containers
+ * or access the resources at the given paths.
+ * <p>
+ * @param containerPath the path identifying the container, it must be formed of at least
+ * 	one segment (ID+hints)
+ * @param isExported a boolean indicating whether this entry is contributed to dependent
+ *    projects in addition to the output location
+ * @return a new container classpath entry
+ * 
+ * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
+ * @see JavaCore#setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
+ * @see JavaCore#newContainerEntry(IPath, boolean)
+ * @since 2.0
+ */
+public static IClasspathEntry newContainerEntry(IPath containerPath, boolean isExported) {
+			
+	if (containerPath == null || containerPath.segmentCount() < 1) {
+		Assert.isTrue(
+			false,
+			"Illegal classpath container path: \'" + containerPath.makeRelative().toString() + "\', must have at least one segment (containerID+hints)"); //$NON-NLS-1$//$NON-NLS-2$
+	}
+	return new ClasspathEntry(
+		IPackageFragmentRoot.K_SOURCE,
+		IClasspathEntry.CPE_CONTAINER,
+		containerPath,
+		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
+		null, // source attachment
+		null, // source attachment root
+		null, // specific output folder
+		isExported);
+}
+
+/**
+ * Creates and returns a new non-exported classpath entry of kind <code>CPE_LIBRARY</code> for the 
+ * JAR or folder identified by the given absolute path. This specifies that all package fragments 
+ * within the root will have children of type <code>IClassFile</code>.
+ * <p>
+ * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
+ * The target JAR or folder can either be defined internally to the workspace (absolute path relative
+ * to the workspace root) or externally to the workspace (absolute path in the file system).
+ * <p>
+ * e.g. Here are some examples of binary path usage<ul>
+ *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
+ *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
+ *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
+ * </ul>
+ * Note that this operation does not attempt to validate or access the 
+ * resources at the given paths.
+ * <p>
+ * The resulting entry is not exported to dependent projects. This method is equivalent to
+ * <code>newLibraryEntry(-,-,-,false)</code>.
+ * <p>
+ * 
+ * @param path the absolute path of the binary archive
+ * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
+ *    or <code>null</code> if none
+ * @param sourceAttachmentRootPath the location of the root within the source archive or folder
+ *    or <code>null</code> if this location should be automatically detected.
+ * @return a new library classpath entry
+ * 
+ * @see #newLibraryEntry(IPath, IPath, IPath, boolean)
+ */
+//public static IClasspathEntry newLibraryEntry(
+//	IPath path,
+//	IPath sourceAttachmentPath,
+//	IPath sourceAttachmentRootPath) {
 //			
-//		return newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath, false);
-//	}
+//	return newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath, false);
+//}
 
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_LIBRARY</code> for the JAR or folder
-	 * identified by the given absolute path. This specifies that all package fragments within the root 
-	 * will have children of type <code>IClassFile</code>.
-	 * <p>
-	 * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
-	 * The target JAR or folder can either be defined internally to the workspace (absolute path relative
-	 * to the workspace root) or externally to the workspace (absolute path in the file system).
-	 *	<p>
-	 * e.g. Here are some examples of binary path usage<ul>
-	 *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
-	 *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
-	 *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
-	 * </ul>
-	 * Note that this operation does not attempt to validate or access the 
-	 * resources at the given paths.
-	 * <p>
-	 * 
-	 * @param path the absolute path of the binary archive
-	 * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
-	 *    or <code>null</code> if none
-	 * @param sourceAttachmentRootPath the location of the root within the source archive or folder
-	 *    or <code>null</code> if this location should be automatically detected.
-	 * @param isExported indicates whether this entry is contributed to dependent
-	 * 	  projects in addition to the output location
-	 * @return a new library classpath entry
-	 * @since 2.0
-	 */
-//	public static IClasspathEntry newLibraryEntry(
-//		IPath path,
-//		IPath sourceAttachmentPath,
-//		IPath sourceAttachmentRootPath,
-//		boolean isExported) {
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_LIBRARY</code> for the JAR or folder
+ * identified by the given absolute path. This specifies that all package fragments within the root 
+ * will have children of type <code>IClassFile</code>.
+ * <p>
+ * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
+ * The target JAR or folder can either be defined internally to the workspace (absolute path relative
+ * to the workspace root) or externally to the workspace (absolute path in the file system).
+ *	<p>
+ * e.g. Here are some examples of binary path usage<ul>
+ *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
+ *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
+ *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
+ * </ul>
+ * Note that this operation does not attempt to validate or access the 
+ * resources at the given paths.
+ * <p>
+ * 
+ * @param path the absolute path of the binary archive
+ * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
+ *    or <code>null</code> if none
+ * @param sourceAttachmentRootPath the location of the root within the source archive or folder
+ *    or <code>null</code> if this location should be automatically detected.
+ * @param isExported indicates whether this entry is contributed to dependent
+ * 	  projects in addition to the output location
+ * @return a new library classpath entry
+ * @since 2.0
+ */
+//public static IClasspathEntry newLibraryEntry(
+//	IPath path,
+//	IPath sourceAttachmentPath,
+//	IPath sourceAttachmentRootPath,
+//	boolean isExported) {
 //			
-//		if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
+//	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
 //
-//		return new ClasspathEntry(
-//			IPackageFragmentRoot.K_BINARY,
-//			IClasspathEntry.CPE_LIBRARY,
-//			JavaProject.canonicalizedPath(path),
-//			ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//			sourceAttachmentPath,
-//			sourceAttachmentRootPath,
-//			null, // specific output folder
-//			isExported);
-//	}
+//	return new ClasspathEntry(
+//		IPackageFragmentRoot.K_BINARY,
+//		IClasspathEntry.CPE_LIBRARY,
+//		JavaProject.canonicalizedPath(path),
+//		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
+//		sourceAttachmentPath,
+//		sourceAttachmentRootPath,
+//		null, // specific output folder
+//		isExported);
+//}
 
-	/**
-	 * Creates and returns a new non-exported classpath entry of kind <code>CPE_PROJECT</code>
-	 * for the project identified by the given absolute path.
-	 * <p>
-	 * A project entry is used to denote a prerequisite project on a classpath.
-	 * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
-	 * contributes all its package fragment roots) or as binaries (when building, it contributes its 
-	 * whole output location).
-	 * <p>
-	 * A project reference allows to indirect through another project, independently from its internal layout. 
-	 * <p>
-	 * The prerequisite project is referred to using an absolute path relative to the workspace root.
-	 * <p>
-	 * The resulting entry is not exported to dependent projects. This method is equivalent to
-	 * <code>newProjectEntry(_,false)</code>.
-	 * <p>
-	 * 
-	 * @param path the absolute path of the binary archive
-	 * @return a new project classpath entry
-	 * 
-	 * @see JavaCore#newProjectEntry(IPath, boolean)
-	 */
-//	public static IClasspathEntry newProjectEntry(IPath path) {
-//		return newProjectEntry(path, false);
-//	}
+/**
+ * Creates and returns a new non-exported classpath entry of kind <code>CPE_PROJECT</code>
+ * for the project identified by the given absolute path.
+ * <p>
+ * A project entry is used to denote a prerequisite project on a classpath.
+ * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
+ * contributes all its package fragment roots) or as binaries (when building, it contributes its 
+ * whole output location).
+ * <p>
+ * A project reference allows to indirect through another project, independently from its internal layout. 
+ * <p>
+ * The prerequisite project is referred to using an absolute path relative to the workspace root.
+ * <p>
+ * The resulting entry is not exported to dependent projects. This method is equivalent to
+ * <code>newProjectEntry(_,false)</code>.
+ * <p>
+ * 
+ * @param path the absolute path of the binary archive
+ * @return a new project classpath entry
+ * 
+ * @see JavaCore#newProjectEntry(IPath, boolean)
+ */
+public static IClasspathEntry newProjectEntry(IPath path) {
+	return newProjectEntry(path, false);
+}
 	
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_PROJECT</code>
-	 * for the project identified by the given absolute path.
-	 * <p>
-	 * A project entry is used to denote a prerequisite project on a classpath.
-	 * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
-	 * contributes all its package fragment roots) or as binaries (when building, it contributes its 
-	 * whole output location).
-	 * <p>
-	 * A project reference allows to indirect through another project, independently from its internal layout. 
-	 * <p>
-	 * The prerequisite project is referred to using an absolute path relative to the workspace root.
-	 * <p>
-	 * 
-	 * @param path the absolute path of the prerequisite project
-	 * @param isExported indicates whether this entry is contributed to dependent
-	 * 	  projects in addition to the output location
-	 * @return a new project classpath entry
-	 * @since 2.0
-	 */
-//	public static IClasspathEntry newProjectEntry(IPath path, boolean isExported) {
-//		
-//		if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
-//		
-//		return new ClasspathEntry(
-//			IPackageFragmentRoot.K_SOURCE,
-//			IClasspathEntry.CPE_PROJECT,
-//			path,
-//			ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//			null, // source attachment
-//			null, // source attachment root
-//			null, // specific output folder
-//			isExported);
-//	}
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_PROJECT</code>
+ * for the project identified by the given absolute path.
+ * <p>
+ * A project entry is used to denote a prerequisite project on a classpath.
+ * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
+ * contributes all its package fragment roots) or as binaries (when building, it contributes its 
+ * whole output location).
+ * <p>
+ * A project reference allows to indirect through another project, independently from its internal layout. 
+ * <p>
+ * The prerequisite project is referred to using an absolute path relative to the workspace root.
+ * <p>
+ * 
+ * @param path the absolute path of the prerequisite project
+ * @param isExported indicates whether this entry is contributed to dependent
+ * 	  projects in addition to the output location
+ * @return a new project classpath entry
+ * @since 2.0
+ */
+public static IClasspathEntry newProjectEntry(IPath path, boolean isExported) {
+		
+	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
+		
+	return new ClasspathEntry(
+		IPackageFragmentRoot.K_SOURCE,
+		IClasspathEntry.CPE_PROJECT,
+		path,
+		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
+		null, // source attachment
+		null, // source attachment root
+		null, // specific output folder
+		isExported);
+}
 
-	/**
-	 * Returns a new empty region.
-	 * 
-	 * @return a new empty region
-	 */
-	public static IRegion newRegion() {
-		return new Region();
-	}
+/**
+ * Returns a new empty region.
+ * 
+ * @return a new empty region
+ */
+public static IRegion newRegion() {
+	return new Region();
+}
 
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
-	 * for the project's source folder identified by the given absolute 
-	 * workspace-relative path. This specifies that all package fragments
-	 * within the root will have children of type <code>ICompilationUnit</code>.
-	 * <p>
-	 * The source folder is referred to using an absolute path relative to the
-	 * workspace root, e.g. <code>/Project/src</code>. A project's source 
-	 * folders are located with that project. That is, a source classpath
-	 * entry specifying the path <code>/P1/src</code> is only usable for
-	 * project <code>P1</code>.
-	 * </p>
-	 * <p>
-	 * The source classpath entry created by this method includes all source
-	 * files below the given workspace-relative path. To selectively exclude
-	 * some of these source files, use the factory method 
-	 * <code>JavaCore.newSourceEntry(IPath,IPath[])</code> instead.
-	 * </p>
-	 * <p>
-	 * Note that all sources/binaries inside a project are contributed as a whole through
-	 * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
-	 * source entries cannot be selectively exported.
-	 * </p>
-	 * 
-	 * @param path the absolute workspace-relative path of a source folder
-	 * @return a new source classpath entry with not exclusion patterns
-	 * 
-	 * @see #newSourceEntry(org.eclipse.core.runtime.IPath,org.eclipse.core.runtime.IPath[])
-	 */
-//	public static IClasspathEntry newSourceEntry(IPath path) {
-//
-//		return newSourceEntry(path, ClasspathEntry.NO_EXCLUSION_PATTERNS, null /*output location*/);
-//	}
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
+ * for the project's source folder identified by the given absolute 
+ * workspace-relative path. This specifies that all package fragments
+ * within the root will have children of type <code>ICompilationUnit</code>.
+ * <p>
+ * The source folder is referred to using an absolute path relative to the
+ * workspace root, e.g. <code>/Project/src</code>. A project's source 
+ * folders are located with that project. That is, a source classpath
+ * entry specifying the path <code>/P1/src</code> is only usable for
+ * project <code>P1</code>.
+ * </p>
+ * <p>
+ * The source classpath entry created by this method includes all source
+ * files below the given workspace-relative path. To selectively exclude
+ * some of these source files, use the factory method 
+ * <code>JavaCore.newSourceEntry(IPath,IPath[])</code> instead.
+ * </p>
+ * <p>
+ * Note that all sources/binaries inside a project are contributed as a whole through
+ * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
+ * source entries cannot be selectively exported.
+ * </p>
+ * 
+ * @param path the absolute workspace-relative path of a source folder
+ * @return a new source classpath entry with not exclusion patterns
+ * 
+ * @see #newSourceEntry(org.eclipse.core.runtime.IPath,org.eclipse.core.runtime.IPath[])
+ */
+public static IClasspathEntry newSourceEntry(IPath path) {
+
+	return newSourceEntry(path, ClasspathEntry.NO_EXCLUSION_PATTERNS, null /*output location*/);
+}
 	
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
-	 * for the project's source folder identified by the given absolute 
-	 * workspace-relative path but excluding all source files with paths
-	 * matching any of the given patterns. This specifies that all package
-	 * fragments within the root will have children of type 
-	 * <code>ICompilationUnit</code>.
-	 * <p>
-	 * The source folder is referred to using an absolute path relative to the
-	 * workspace root, e.g. <code>/Project/src</code>. A project's source 
-	 * folders are located with that project. That is, a source classpath
-	 * entry specifying the path <code>/P1/src</code> is only usable for
-	 * project <code>P1</code>.
-	 * </p>
-	 * <p>
-	 * The source classpath entry created by this method includes all source
-	 * files below the given workspace-relative path except for those matched
-	 * by one (or more) of the given exclusion patterns. Each exclusion pattern
-	 * is represented by a relative path, which is interpreted as relative to
-	 * the source folder. For example, if the source folder path is 
-	 * <code>/Project/src</code> and the exclusion pattern is 
-	 * <code>com/xyz/tests/&#42;&#42;</code>, then source files
-	 * like <code>/Project/src/com/xyz/Foo.java</code>
-	 * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
-	 * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
-	 * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
-	 * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
-	 * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
-	 * for the full description of the syntax and semantics of exclusion
-	 * patterns.
-	 * </p>
-	 * If the empty list of exclusion patterns is specified, the source folder
-	 * will automatically include all resources located inside the source
-	 * folder. In that case, the result is entirely equivalent to using the
-	 * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
-	 * </p>
-	 * <p>
-	 * Note that all sources/binaries inside a project are contributed as a whole through
-	 * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
-	 * source entries cannot be selectively exported.
-	 * </p>
-	 *
-	 * @param path the absolute workspace-relative path of a source folder
-	 * @param exclusionPatterns the possibly empty list of exclusion patterns
-	 *    represented as relative paths
-	 * @return a new source classpath entry with the given exclusion patterns
-	 * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
-	 * @see IClasspathEntry#getExclusionPatterns
-	 * 
-	 * @since 2.1
-	 */
-//	public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns) {
-//
-//		return newSourceEntry(path, exclusionPatterns, null /*output location*/); 
-//	}
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
+ * for the project's source folder identified by the given absolute 
+ * workspace-relative path but excluding all source files with paths
+ * matching any of the given patterns. This specifies that all package
+ * fragments within the root will have children of type 
+ * <code>ICompilationUnit</code>.
+ * <p>
+ * The source folder is referred to using an absolute path relative to the
+ * workspace root, e.g. <code>/Project/src</code>. A project's source 
+ * folders are located with that project. That is, a source classpath
+ * entry specifying the path <code>/P1/src</code> is only usable for
+ * project <code>P1</code>.
+ * </p>
+ * <p>
+ * The source classpath entry created by this method includes all source
+ * files below the given workspace-relative path except for those matched
+ * by one (or more) of the given exclusion patterns. Each exclusion pattern
+ * is represented by a relative path, which is interpreted as relative to
+ * the source folder. For example, if the source folder path is 
+ * <code>/Project/src</code> and the exclusion pattern is 
+ * <code>com/xyz/tests/&#42;&#42;</code>, then source files
+ * like <code>/Project/src/com/xyz/Foo.java</code>
+ * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
+ * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
+ * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
+ * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
+ * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
+ * for the full description of the syntax and semantics of exclusion
+ * patterns.
+ * </p>
+ * If the empty list of exclusion patterns is specified, the source folder
+ * will automatically include all resources located inside the source
+ * folder. In that case, the result is entirely equivalent to using the
+ * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
+ * </p>
+ * <p>
+ * Note that all sources/binaries inside a project are contributed as a whole through
+ * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
+ * source entries cannot be selectively exported.
+ * </p>
+ *
+ * @param path the absolute workspace-relative path of a source folder
+ * @param exclusionPatterns the possibly empty list of exclusion patterns
+ *    represented as relative paths
+ * @return a new source classpath entry with the given exclusion patterns
+ * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
+ * @see IClasspathEntry#getExclusionPatterns
+ * 
+ * @since 2.1
+ */
+public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns) {
 
-	/**
-	 * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
-	 * for the project's source folder identified by the given absolute 
-	 * workspace-relative path but excluding all source files with paths
-	 * matching any of the given patterns, and associated with a specific output location
-	 * (that is, ".class" files are not going to the project default output location). 
-	 * All package fragments within the root will have children of type 
-	 * <code>ICompilationUnit</code>.
-	 * <p>
-	 * The source folder is referred to using an absolute path relative to the
-	 * workspace root, e.g. <code>/Project/src</code>. A project's source 
-	 * folders are located with that project. That is, a source classpath
-	 * entry specifying the path <code>/P1/src</code> is only usable for
-	 * project <code>P1</code>.
-	 * </p>
-	 * <p>
-	 * The source classpath entry created by this method includes all source
-	 * files below the given workspace-relative path except for those matched
-	 * by one (or more) of the given exclusion patterns. Each exclusion pattern
-	 * is represented by a relative path, which is interpreted as relative to
-	 * the source folder. For example, if the source folder path is 
-	 * <code>/Project/src</code> and the exclusion pattern is 
-	 * <code>com/xyz/tests/&#42;&#42;</code>, then source files
-	 * like <code>/Project/src/com/xyz/Foo.java</code>
-	 * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
-	 * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
-	 * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
-	 * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
-	 * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
-	 * for the full description of the syntax and semantics of exclusion
-	 * patterns.
-	 * </p>
-	 * If the empty list of exclusion patterns is specified, the source folder
-	 * will automatically include all resources located inside the source
-	 * folder. In that case, the result is entirely equivalent to using the
-	 * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
-	 * </p>
-	 * <p>
-	 * Additionally, a source entry can be associated with a specific output location. 
-	 * By doing so, the Java builder will ensure that the generated ".class" files will 
-	 * be issued inside this output location, as opposed to be generated into the 
-	 * project default output location (when output location is <code>null</code>). 
-	 * Note that multiple source entries may target the same output location.
-	 * The output location is referred to using an absolute path relative to the 
-	 * workspace root, e.g. <code>"/Project/bin"</code>, it must be located inside 
-	 * the same project as the source folder.
-	 * </p>
-	 * <p>
-	 * Also note that all sources/binaries inside a project are contributed as a whole through
-	 * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
-	 * source entries cannot be selectively exported.
-	 * </p>
-	 *
-	 * @param path the absolute workspace-relative path of a source folder
-	 * @param exclusionPatterns the possibly empty list of exclusion patterns
-	 *    represented as relative paths
-	 * @param outputLocation the specific output location for this source entry (<code>null</code> if using project default ouput location)
-	 * @return a new source classpath entry with the given exclusion patterns
-	 * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
-	 * @see IClasspathEntry#getExclusionPatterns
-	 * @see IClasspathEntry#getOutputLocation()
-	 * 
-	 * @since 2.1
-	 */
-//	public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns, IPath specificOutputLocation) {
-//
-//		if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
-//		if (exclusionPatterns == null) Assert.isTrue(false, "Exclusion pattern set cannot be null"); //$NON-NLS-1$
-//
-//		return new ClasspathEntry(
-//			IPackageFragmentRoot.K_SOURCE,
-//			IClasspathEntry.CPE_SOURCE,
-//			path,
-//			exclusionPatterns,
-//			null, // source attachment
-//			null, // source attachment root
-//			specificOutputLocation, // custom output location
-//			false);
-//	}
+	return newSourceEntry(path, exclusionPatterns, null /*output location*/); 
+}
+
+/**
+ * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
+ * for the project's source folder identified by the given absolute 
+ * workspace-relative path but excluding all source files with paths
+ * matching any of the given patterns, and associated with a specific output location
+ * (that is, ".class" files are not going to the project default output location). 
+ * All package fragments within the root will have children of type 
+ * <code>ICompilationUnit</code>.
+ * <p>
+ * The source folder is referred to using an absolute path relative to the
+ * workspace root, e.g. <code>/Project/src</code>. A project's source 
+ * folders are located with that project. That is, a source classpath
+ * entry specifying the path <code>/P1/src</code> is only usable for
+ * project <code>P1</code>.
+ * </p>
+ * <p>
+ * The source classpath entry created by this method includes all source
+ * files below the given workspace-relative path except for those matched
+ * by one (or more) of the given exclusion patterns. Each exclusion pattern
+ * is represented by a relative path, which is interpreted as relative to
+ * the source folder. For example, if the source folder path is 
+ * <code>/Project/src</code> and the exclusion pattern is 
+ * <code>com/xyz/tests/&#42;&#42;</code>, then source files
+ * like <code>/Project/src/com/xyz/Foo.java</code>
+ * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
+ * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
+ * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
+ * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
+ * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
+ * for the full description of the syntax and semantics of exclusion
+ * patterns.
+ * </p>
+ * If the empty list of exclusion patterns is specified, the source folder
+ * will automatically include all resources located inside the source
+ * folder. In that case, the result is entirely equivalent to using the
+ * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
+ * </p>
+ * <p>
+ * Additionally, a source entry can be associated with a specific output location. 
+ * By doing so, the Java builder will ensure that the generated ".class" files will 
+ * be issued inside this output location, as opposed to be generated into the 
+ * project default output location (when output location is <code>null</code>). 
+ * Note that multiple source entries may target the same output location.
+ * The output location is referred to using an absolute path relative to the 
+ * workspace root, e.g. <code>"/Project/bin"</code>, it must be located inside 
+ * the same project as the source folder.
+ * </p>
+ * <p>
+ * Also note that all sources/binaries inside a project are contributed as a whole through
+ * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
+ * source entries cannot be selectively exported.
+ * </p>
+ *
+ * @param path the absolute workspace-relative path of a source folder
+ * @param exclusionPatterns the possibly empty list of exclusion patterns
+ *    represented as relative paths
+ * @param outputLocation the specific output location for this source entry (<code>null</code> if using project default ouput location)
+ * @return a new source classpath entry with the given exclusion patterns
+ * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
+ * @see IClasspathEntry#getExclusionPatterns
+ * @see IClasspathEntry#getOutputLocation()
+ * 
+ * @since 2.1
+ */
+public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns, IPath specificOutputLocation) {
+
+	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
+	if (exclusionPatterns == null) Assert.isTrue(false, "Exclusion pattern set cannot be null"); //$NON-NLS-1$
+
+	return new ClasspathEntry(
+		IPackageFragmentRoot.K_SOURCE,
+		IClasspathEntry.CPE_SOURCE,
+		path,
+		exclusionPatterns,
+		null, // source attachment
+		null, // source attachment root
+		specificOutputLocation, // custom output location
+		false);
+}
 		
-	/**
-	 * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
-	 * for the given path. The first segment of the path is the name of a classpath variable.
-	 * The trailing segments of the path will be appended to resolved variable path.
-	 * <p>
-	 * A variable entry allows to express indirect references on a classpath to other projects or libraries,
-	 * depending on what the classpath variable is referring.
-	 * <p>
-	 *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
-	 * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
-	 * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
-	 * <p>
-	 * e.g. Here are some examples of variable path usage<ul>
-	 * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
-	 *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
-	 * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
-	 *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
-	 * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
-	 *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
-	 * </ul>
-	 * Note that this operation does not attempt to validate classpath variables
-	 * or access the resources at the given paths.
-	 * <p>
-	 * The resulting entry is not exported to dependent projects. This method is equivalent to
-	 * <code>newVariableEntry(-,-,-,false)</code>.
-	 * <p>
-	 * 
-	 * @param variablePath the path of the binary archive; first segment is the
-	 *   name of a classpath variable
-	 * @param variableSourceAttachmentPath the path of the corresponding source archive, 
-	 *    or <code>null</code> if none; if present, the first segment is the
-	 *    name of a classpath variable (not necessarily the same variable
-	 *    as the one that begins <code>variablePath</code>)
-	 * @param sourceAttachmentRootPath the location of the root within the source archive
-	 *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
-	 * @return a new library classpath entry
-	 * 
-	 * @see JavaCore#newVariableEntry(IPath, IPath, IPath, boolean)
-	 */
-//	public static IClasspathEntry newVariableEntry(
-//		IPath variablePath,
-//		IPath variableSourceAttachmentPath,
-//		IPath sourceAttachmentRootPath) {
+/**
+ * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
+ * for the given path. The first segment of the path is the name of a classpath variable.
+ * The trailing segments of the path will be appended to resolved variable path.
+ * <p>
+ * A variable entry allows to express indirect references on a classpath to other projects or libraries,
+ * depending on what the classpath variable is referring.
+ * <p>
+ *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
+ * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
+ * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
+ * <p>
+ * e.g. Here are some examples of variable path usage<ul>
+ * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
+ *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
+ * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
+ *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
+ * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
+ *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
+ * </ul>
+ * Note that this operation does not attempt to validate classpath variables
+ * or access the resources at the given paths.
+ * <p>
+ * The resulting entry is not exported to dependent projects. This method is equivalent to
+ * <code>newVariableEntry(-,-,-,false)</code>.
+ * <p>
+ * 
+ * @param variablePath the path of the binary archive; first segment is the
+ *   name of a classpath variable
+ * @param variableSourceAttachmentPath the path of the corresponding source archive, 
+ *    or <code>null</code> if none; if present, the first segment is the
+ *    name of a classpath variable (not necessarily the same variable
+ *    as the one that begins <code>variablePath</code>)
+ * @param sourceAttachmentRootPath the location of the root within the source archive
+ *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
+ * @return a new library classpath entry
+ * 
+ * @see JavaCore#newVariableEntry(IPath, IPath, IPath, boolean)
+ */
+//public static IClasspathEntry newVariableEntry(
+//	IPath variablePath,
+//	IPath variableSourceAttachmentPath,
+//	IPath sourceAttachmentRootPath) {
 //
-//		return newVariableEntry(variablePath, variableSourceAttachmentPath, sourceAttachmentRootPath, false);
-//	}
+//	return newVariableEntry(variablePath, variableSourceAttachmentPath, sourceAttachmentRootPath, false);
+//}
 
-	/**
-	 * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
-	 * for the given path. The first segment of the path is the name of a classpath variable.
-	 * The trailing segments of the path will be appended to resolved variable path.
-	 * <p>
-	 * A variable entry allows to express indirect references on a classpath to other projects or libraries,
-	 * depending on what the classpath variable is referring.
-	 * <p>
-	 *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
-	 * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
-	 * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
-	 * <p>
-	 * e.g. Here are some examples of variable path usage<ul>
-	 * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
-	 *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
-	 * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
-	 *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
-	 * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
-	 *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
-	 * </ul>
-	 * Note that this operation does not attempt to validate classpath variables
-	 * or access the resources at the given paths.
-	 * <p>
-	 *
-	 * @param variablePath the path of the binary archive; first segment is the
-	 *   name of a classpath variable
-	 * @param variableSourceAttachmentPath the path of the corresponding source archive, 
-	 *    or <code>null</code> if none; if present, the first segment is the
-	 *    name of a classpath variable (not necessarily the same variable
-	 *    as the one that begins <code>variablePath</code>)
-	 * @param sourceAttachmentRootPath the location of the root within the source archive
-	 *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
-	 * @param isExported indicates whether this entry is contributed to dependent
-	 * 	  projects in addition to the output location
-	 * @return a new variable classpath entry
-	 * @since 2.0
-	 */
-//	public static IClasspathEntry newVariableEntry(
-//		IPath variablePath,
-//		IPath variableSourceAttachmentPath,
-//		IPath variableSourceAttachmentRootPath,
-//		boolean isExported) {
+/**
+ * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
+ * for the given path. The first segment of the path is the name of a classpath variable.
+ * The trailing segments of the path will be appended to resolved variable path.
+ * <p>
+ * A variable entry allows to express indirect references on a classpath to other projects or libraries,
+ * depending on what the classpath variable is referring.
+ * <p>
+ *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
+ * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
+ * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
+ * <p>
+ * e.g. Here are some examples of variable path usage<ul>
+ * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
+ *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
+ * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
+ *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
+ * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
+ *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
+ * </ul>
+ * Note that this operation does not attempt to validate classpath variables
+ * or access the resources at the given paths.
+ * <p>
+ *
+ * @param variablePath the path of the binary archive; first segment is the
+ *   name of a classpath variable
+ * @param variableSourceAttachmentPath the path of the corresponding source archive, 
+ *    or <code>null</code> if none; if present, the first segment is the
+ *    name of a classpath variable (not necessarily the same variable
+ *    as the one that begins <code>variablePath</code>)
+ * @param sourceAttachmentRootPath the location of the root within the source archive
+ *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
+ * @param isExported indicates whether this entry is contributed to dependent
+ * 	  projects in addition to the output location
+ * @return a new variable classpath entry
+ * @since 2.0
+ */
+//public static IClasspathEntry newVariableEntry(
+//	IPath variablePath,
+//	IPath variableSourceAttachmentPath,
+//	IPath variableSourceAttachmentRootPath,
+//	boolean isExported) {
 //			
-//		if (variablePath == null || variablePath.segmentCount() < 1) {
-//			Assert.isTrue(
-//				false,
-//				"Illegal classpath variable path: \'" + variablePath.makeRelative().toString() + "\', must have at least one segment"); //$NON-NLS-1$//$NON-NLS-2$
-//		}
-//	
-//		return new ClasspathEntry(
-//			IPackageFragmentRoot.K_SOURCE,
-//			IClasspathEntry.CPE_VARIABLE,
-//			variablePath,
-//			ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//			variableSourceAttachmentPath, // source attachment
-//			variableSourceAttachmentRootPath, // source attachment root			
-//			null, // specific output folder
-//			isExported);
+//	if (variablePath == null || variablePath.segmentCount() < 1) {
+//		Assert.isTrue(
+//			false,
+//			"Illegal classpath variable path: \'" + variablePath.makeRelative().toString() + "\', must have at least one segment"); //$NON-NLS-1$//$NON-NLS-2$
 //	}
+//	
+//	return new ClasspathEntry(
+//		IPackageFragmentRoot.K_SOURCE,
+//		IClasspathEntry.CPE_VARIABLE,
+//		variablePath,
+//		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
+//		variableSourceAttachmentPath, // source attachment
+//		variableSourceAttachmentRootPath, // source attachment root			
+//		null, // specific output folder
+//		isExported);
+//}
 
-	/**
-	 * Removed the given classpath variable. Does nothing if no value was
-	 * set for this classpath variable.
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 *
-	 * @param variableName the name of the classpath variable
-	 * @see #setClasspathVariable
-	 *
-	 * @deprecated - use version with extra IProgressMonitor
-	 */
-//	public static void removeClasspathVariable(String variableName) {
-//		removeClasspathVariable(variableName, null);
-//	}
+/**
+ * Removed the given classpath variable. Does nothing if no value was
+ * set for this classpath variable.
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ *
+ * @param variableName the name of the classpath variable
+ * @see #setClasspathVariable
+ *
+ * @deprecated - use version with extra IProgressMonitor
+ */
+//public static void removeClasspathVariable(String variableName) {
+//	removeClasspathVariable(variableName, null);
+//}
 
-	/**
-	 * Removed the given classpath variable. Does nothing if no value was
-	 * set for this classpath variable.
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 *
-	 * @param variableName the name of the classpath variable
-	 * @param monitor the progress monitor to report progress
-	 * @see #setClasspathVariable
-	 */
-//	public static void removeClasspathVariable(
-//		String variableName,
-//		IProgressMonitor monitor) {
+/**
+ * Removed the given classpath variable. Does nothing if no value was
+ * set for this classpath variable.
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ *
+ * @param variableName the name of the classpath variable
+ * @param monitor the progress monitor to report progress
+ * @see #setClasspathVariable
+ */
+//public static void removeClasspathVariable(
+//	String variableName,
+//	IProgressMonitor monitor) {
 //
-//		try {
-//			updateVariableValues(new String[]{ variableName}, new IPath[]{ null }, monitor);
-//		} catch (JavaModelException e) {
-//		}
+//	try {
+//		updateVariableValues(new String[]{ variableName}, new IPath[]{ null }, monitor);
+//	} catch (JavaModelException e) {
 //	}
+//}
 
-	/**
-	 * Removes the given element changed listener.
-	 * Has no affect if an identical listener is not registered.
-	 *
-	 * @param listener the listener
-	 */
-	public static void removeElementChangedListener(IElementChangedListener listener) {
-		JavaModelManager.getJavaModelManager().removeElementChangedListener(listener);
-	}
-	/**
-	 * Runs the given action as an atomic Java model operation.
-	 * <p>
-	 * After running a method that modifies Java elements,
-	 * registered listeners receive after-the-fact notification of
-	 * what just transpired, in the form of a element changed event.
-	 * This method allows clients to call a number of
-	 * methods that modify java elements and only have element
-	 * changed event notifications reported at the end of the entire
-	 * batch.
-	 * </p>
-	 * <p>
-	 * If this method is called outside the dynamic scope of another such
-	 * call, this method runs the action and then reports a single
-	 * element changed event describing the net effect of all changes
-	 * done to java elements by the action.
-	 * </p>
-	 * <p>
-	 * If this method is called in the dynamic scope of another such
-	 * call, this method simply runs the action.
-	 * </p>
-	 *
-	 * @param action the action to perform
-	 * @param monitor a progress monitor, or <code>null</code> if progress
-	 *    reporting and cancellation are not desired
-	 * @exception CoreException if the operation failed.
-	 * @since 2.1
-	 */
-	public static void run(IWorkspaceRunnable action, IProgressMonitor monitor) throws CoreException {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		if (workspace.isTreeLocked()) {
-			new BatchOperation(action).run(monitor);
-		} else {
-			// use IWorkspace.run(...) to ensure that a build will be done in autobuild mode
-			workspace.run(new BatchOperation(action), monitor);
-		}
-	}
-	/** 
-	 * Bind a container reference path to some actual containers (<code>IClasspathContainer</code>).
-	 * This API must be invoked whenever changes in container need to be reflected onto the JavaModel.
-	 * Containers can have distinct values in different projects, therefore this API considers a
-	 * set of projects with their respective containers.
-	 * <p>
-	 * <code>containerPath</code> is the path under which these values can be referenced through
-	 * container classpath entries (<code>IClasspathEntry#CPE_CONTAINER</code>). A container path 
-	 * is formed by a first ID segment followed with extra segments, which can be used as additional hints
-	 * for the resolution. The container ID is used to identify a <code>ClasspathContainerInitializer</code> 
-	 * registered on the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
-	 * <p>
-	 * There is no assumption that each individual container value passed in argument 
-	 * (<code>respectiveContainers</code>) must answer the exact same path when requested 
-	 * <code>IClasspathContainer#getPath</code>. 
-	 * Indeed, the containerPath is just an indication for resolving it to an actual container object. It can be 
-	 * delegated to a <code>ClasspathContainerInitializer</code>, which can be activated through the extension
-	 * point "org.eclipse.jdt.core.ClasspathContainerInitializer"). 
-	 * <p>
-	 * In reaction to changing container values, the JavaModel will be updated to reflect the new
-	 * state of the updated container. 
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath container values are persisted locally to the workspace, but 
-	 * are not preserved from a session to another. It is thus highly recommended to register a 
-	 * <code>ClasspathContainerInitializer</code> for each referenced container 
-	 * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
-	 * <p>
-	 * Note: setting a container to <code>null</code> will cause it to be lazily resolved again whenever
-	 * its value is required. In particular, this will cause a registered initializer to be invoked
-	 * again.
-	 * <p>
-	 * @param containerPath - the name of the container reference, which is being updated
-	 * @param affectedProjects - the set of projects for which this container is being bound
-	 * @param respectiveContainers - the set of respective containers for the affected projects
-	 * @param monitor a monitor to report progress
-	 * 
-	 * @see ClasspathContainerInitializer
-	 * @see #getClasspathContainer(IPath, IJavaProject)
-	 * @see IClasspathContainer
-	 * @since 2.0
-	 */
-//	public static void setClasspathContainer(final IPath containerPath, IJavaProject[] affectedProjects, IClasspathContainer[] respectiveContainers, IProgressMonitor monitor) throws JavaModelException {
+/**
+ * Removes the given element changed listener.
+ * Has no affect if an identical listener is not registered.
+ *
+ * @param listener the listener
+ */
+public static void removeElementChangedListener(IElementChangedListener listener) {
+	JavaModelManager.getJavaModelManager().removeElementChangedListener(listener);
+}
+
+/** 
+ * Bind a container reference path to some actual containers (<code>IClasspathContainer</code>).
+ * This API must be invoked whenever changes in container need to be reflected onto the JavaModel.
+ * Containers can have distinct values in different projects, therefore this API considers a
+ * set of projects with their respective containers.
+ * <p>
+ * <code>containerPath</code> is the path under which these values can be referenced through
+ * container classpath entries (<code>IClasspathEntry#CPE_CONTAINER</code>). A container path 
+ * is formed by a first ID segment followed with extra segments, which can be used as additional hints
+ * for the resolution. The container ID is used to identify a <code>ClasspathContainerInitializer</code> 
+ * registered on the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
+ * <p>
+ * There is no assumption that each individual container value passed in argument 
+ * (<code>respectiveContainers</code>) must answer the exact same path when requested 
+ * <code>IClasspathContainer#getPath</code>. 
+ * Indeed, the containerPath is just an indication for resolving it to an actual container object. It can be 
+ * delegated to a <code>ClasspathContainerInitializer</code>, which can be activated through the extension
+ * point "org.eclipse.jdt.core.ClasspathContainerInitializer"). 
+ * <p>
+ * In reaction to changing container values, the JavaModel will be updated to reflect the new
+ * state of the updated container. 
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath container values are persisted locally to the workspace, but 
+ * are not preserved from a session to another. It is thus highly recommended to register a 
+ * <code>ClasspathContainerInitializer</code> for each referenced container 
+ * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
+ * <p>
+ * Note: setting a container to <code>null</code> will cause it to be lazily resolved again whenever
+ * its value is required. In particular, this will cause a registered initializer to be invoked
+ * again.
+ * <p>
+ * @param containerPath - the name of the container reference, which is being updated
+ * @param affectedProjects - the set of projects for which this container is being bound
+ * @param respectiveContainers - the set of respective containers for the affected projects
+ * @param monitor a monitor to report progress
+ * 
+ * @see ClasspathContainerInitializer
+ * @see #getClasspathContainer(IPath, IJavaProject)
+ * @see IClasspathContainer
+ * @since 2.0
+ */
+//public static void setClasspathContainer(final IPath containerPath, IJavaProject[] affectedProjects, IClasspathContainer[] respectiveContainers, IProgressMonitor monitor) throws JavaModelException {
 //
-//		if (affectedProjects.length != respectiveContainers.length) Assert.isTrue(false, "Projects and containers collections should have the same size"); //$NON-NLS-1$
+//	if (affectedProjects.length != respectiveContainers.length) Assert.isTrue(false, "Projects and containers collections should have the same size"); //$NON-NLS-1$
 //	
-//		if (monitor != null && monitor.isCanceled()) return;
+//	if (monitor != null && monitor.isCanceled()) return;
 //	
-//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//			System.out.println("CPContainer SET  - setting container: ["+containerPath+"] for projects: {" //$NON-NLS-1$ //$NON-NLS-2$
-//				+ (Util.toString(affectedProjects, 
-//						new Util.Displayable(){ 
-//							public String displayString(Object o) { return ((IJavaProject) o).getElementName(); }
-//						}))
-//				+ "} with values: " //$NON-NLS-1$
-//				+ (Util.toString(respectiveContainers, 
-//						new Util.Displayable(){ 
-//							public String displayString(Object o) { return ((IClasspathContainer) o).getDescription(); }
-//						}))
-//					);
-//		}
+//	if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//		System.out.println("CPContainer SET  - setting container: ["+containerPath+"] for projects: {" //$NON-NLS-1$ //$NON-NLS-2$
+//			+ (Util.toString(affectedProjects, 
+//					new Util.Displayable(){ 
+//						public String displayString(Object o) { return ((IJavaProject) o).getElementName(); }
+//					}))
+//			+ "} with values: " //$NON-NLS-1$
+//			+ (Util.toString(respectiveContainers, 
+//					new Util.Displayable(){ 
+//						public String displayString(Object o) { return ((IClasspathContainer) o).getDescription(); }
+//					}))
+//				);
+//	}
 //
-//		final int projectLength = affectedProjects.length;
-//		final IJavaProject[] modifiedProjects;
-//		System.arraycopy(affectedProjects, 0, modifiedProjects = new IJavaProject[projectLength], 0, projectLength);
-//		final IClasspathEntry[][] oldResolvedPaths = new IClasspathEntry[projectLength][];
+//	final int projectLength = affectedProjects.length;
+//	final IJavaProject[] modifiedProjects;
+//	System.arraycopy(affectedProjects, 0, modifiedProjects = new IJavaProject[projectLength], 0, projectLength);
+//	final IClasspathEntry[][] oldResolvedPaths = new IClasspathEntry[projectLength][];
 //			
-//		// filter out unmodified project containers
-//		int remaining = 0;
-//		for (int i = 0; i < projectLength; i++){
+//	// filter out unmodified project containers
+//	int remaining = 0;
+//	for (int i = 0; i < projectLength; i++){
 //	
-//			if (monitor != null && monitor.isCanceled()) return;
+//		if (monitor != null && monitor.isCanceled()) return;
 //	
-//			IJavaProject affectedProject = affectedProjects[i];
-//			IClasspathContainer newContainer = respectiveContainers[i];
-//			if (newContainer == null) newContainer = JavaModelManager.ContainerInitializationInProgress; // 30920 - prevent infinite loop
-//			boolean found = false;
-//			if (JavaProject.hasJavaNature(affectedProject.getProject())){
-//				IClasspathEntry[] rawClasspath = affectedProject.getRawClasspath();
-//				for (int j = 0, cpLength = rawClasspath.length; j <cpLength; j++) {
-//					IClasspathEntry entry = rawClasspath[j];
-//					if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER && entry.getPath().equals(containerPath)){
-//						found = true;
-//						break;
-//					}
+//		IJavaProject affectedProject = affectedProjects[i];
+//		IClasspathContainer newContainer = respectiveContainers[i];
+//		if (newContainer == null) newContainer = JavaModelManager.ContainerInitializationInProgress; // 30920 - prevent infinite loop
+//		boolean found = false;
+//		if (JavaProject.hasJavaNature(affectedProject.getProject())){
+//			IClasspathEntry[] rawClasspath = affectedProject.getRawClasspath();
+//			for (int j = 0, cpLength = rawClasspath.length; j <cpLength; j++) {
+//				IClasspathEntry entry = rawClasspath[j];
+//				if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER && entry.getPath().equals(containerPath)){
+//					found = true;
+//					break;
 //				}
 //			}
-//			if (!found){
-//				modifiedProjects[i] = null; // filter out this project - does not reference the container path, or isnt't yet Java project
-//				JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
-//				continue;
-//			}
-//			IClasspathContainer oldContainer = JavaModelManager.containerGet(affectedProject, containerPath);
-//			if (oldContainer == JavaModelManager.ContainerInitializationInProgress) {
-//				Map previousContainerValues = (Map)JavaModelManager.PreviousSessionContainers.get(affectedProject);
-//				if (previousContainerValues != null){
-//					IClasspathContainer previousContainer = (IClasspathContainer)previousContainerValues.get(containerPath);
-//					if (previousContainer != null) {
-//						if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//							System.out.println("CPContainer INIT - reentering access to project container: ["+affectedProject.getElementName()+"] " + containerPath + " during its initialization, will see previous value: "+ previousContainer.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-//						}
-//						JavaModelManager.containerPut(affectedProject, containerPath, previousContainer); 
+//		}
+//		if (!found){
+//			modifiedProjects[i] = null; // filter out this project - does not reference the container path, or isnt't yet Java project
+//			JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
+//			continue;
+//		}
+//		IClasspathContainer oldContainer = JavaModelManager.containerGet(affectedProject, containerPath);
+//		if (oldContainer == JavaModelManager.ContainerInitializationInProgress) {
+//			Map previousContainerValues = (Map)JavaModelManager.PreviousSessionContainers.get(affectedProject);
+//			if (previousContainerValues != null){
+//				IClasspathContainer previousContainer = (IClasspathContainer)previousContainerValues.get(containerPath);
+//				if (previousContainer != null) {
+//					if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//						System.out.println("CPContainer INIT - reentering access to project container: ["+affectedProject.getElementName()+"] " + containerPath + " during its initialization, will see previous value: "+ previousContainer.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 //					}
-//					oldContainer = null; //33695 - cannot filter out restored container, must update affected project to reset cached CP
-//				} else {
-//					oldContainer = null;
+//					JavaModelManager.containerPut(affectedProject, containerPath, previousContainer); 
 //				}
+//				oldContainer = null; //33695 - cannot filter out restored container, must update affected project to reset cached CP
+//			} else {
+//				oldContainer = null;
 //			}
-//			if (oldContainer != null && oldContainer.equals(respectiveContainers[i])){// TODO: could improve to only compare entries
-//				modifiedProjects[i] = null; // filter out this project - container did not change
-//				continue;
-//			}
-//			remaining++; 
-//			oldResolvedPaths[i] = affectedProject.getResolvedClasspath(true);
-//			JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
 //		}
+//		if (oldContainer != null && oldContainer.equals(respectiveContainers[i])){// TODO: could improve to only compare entries
+//			modifiedProjects[i] = null; // filter out this project - container did not change
+//			continue;
+//		}
+//		remaining++; 
+//		oldResolvedPaths[i] = affectedProject.getResolvedClasspath(true);
+//		JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
+//	}
 //		
-//		if (remaining == 0) return;
+//	if (remaining == 0) return;
 //		
-//		// trigger model refresh
-//		try {
-//			JavaCore.run(new IWorkspaceRunnable() {
-//				public void run(IProgressMonitor monitor) throws CoreException {
-//					for(int i = 0; i < projectLength; i++){
+//	// trigger model refresh
+//	try {
+//		JavaCore.run(new IWorkspaceRunnable() {
+//			public void run(IProgressMonitor monitor) throws CoreException {
+//				for(int i = 0; i < projectLength; i++){
 //		
-//						if (monitor != null && monitor.isCanceled()) return;
+//					if (monitor != null && monitor.isCanceled()) return;
 //		
-//						JavaProject affectedProject = (JavaProject)modifiedProjects[i];
-//						if (affectedProject == null) continue; // was filtered out
+//					JavaProject affectedProject = (JavaProject)modifiedProjects[i];
+//					if (affectedProject == null) continue; // was filtered out
 //						
-//						if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//							System.out.println("CPContainer SET  - updating affected project: ["+affectedProject.getElementName()+"] due to setting container: " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
-//						}
-//
-//						// force a refresh of the affected project (will compute deltas)
-//						affectedProject.setRawClasspath(
-//								affectedProject.getRawClasspath(),
-//								SetClasspathOperation.ReuseOutputLocation,
-//								monitor,
-//								!ResourcesPlugin.getWorkspace().isTreeLocked(), // can save resources
-//								oldResolvedPaths[i],
-//								false, // updating - no validation
-//								false); // updating - no need to save
+//					if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//						System.out.println("CPContainer SET  - updating affected project: ["+affectedProject.getElementName()+"] due to setting container: " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
 //					}
+//
+//					// force a refresh of the affected project (will compute deltas)
+//					affectedProject.setRawClasspath(
+//							affectedProject.getRawClasspath(),
+//							SetClasspathOperation.ReuseOutputLocation,
+//							monitor,
+//							!ResourcesPlugin.getWorkspace().isTreeLocked(), // can save resources
+//							oldResolvedPaths[i],
+//							false, // updating - no validation
+//							false); // updating - no need to save
 //				}
-//			},
-//			monitor);
-//		} catch(CoreException e) {
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPContainer SET  - FAILED DUE TO EXCEPTION: "+containerPath); //$NON-NLS-1$
-//				e.printStackTrace();
 //			}
-//			if (e instanceof JavaModelException) {
-//				throw (JavaModelException)e;
-//			} else {
-//				throw new JavaModelException(e);
-//			}
-//		} finally {
-//			for (int i = 0; i < projectLength; i++) {
-//				if (respectiveContainers[i] == null) {
-//					JavaModelManager.containerPut(affectedProjects[i], containerPath, null); // reset init in progress marker
-//				}
+//		},
+//		monitor);
+//	} catch(CoreException e) {
+//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//			System.out.println("CPContainer SET  - FAILED DUE TO EXCEPTION: "+containerPath); //$NON-NLS-1$
+//			e.printStackTrace();
+//		}
+//		if (e instanceof JavaModelException) {
+//			throw (JavaModelException)e;
+//		} else {
+//			throw new JavaModelException(e);
+//		}
+//	} finally {
+//		for (int i = 0; i < projectLength; i++) {
+//			if (respectiveContainers[i] == null) {
+//				JavaModelManager.containerPut(affectedProjects[i], containerPath, null); // reset init in progress marker
 //			}
 //		}
-//					
 //	}
+//					
+//}
 
-	/**
-	 * Sets the value of the given classpath variable.
-	 * The path must have at least one segment.
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 *
-	 * @param variableName the name of the classpath variable
-	 * @param path the path
-	 * @see #getClasspathVariable
-	 *
-	 * @deprecated - use API with IProgressMonitor
-	 */
-//	public static void setClasspathVariable(String variableName, IPath path)
-//		throws JavaModelException {
+/**
+ * Sets the value of the given classpath variable.
+ * The path must have at least one segment.
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ *
+ * @param variableName the name of the classpath variable
+ * @param path the path
+ * @see #getClasspathVariable
+ *
+ * @deprecated - use API with IProgressMonitor
+ */
+//public static void setClasspathVariable(String variableName, IPath path)
+//	throws JavaModelException {
 //
-//		setClasspathVariable(variableName, path, null);
-//	}
+//	setClasspathVariable(variableName, path, null);
+//}
 
-	/**
-	 * Sets the value of the given classpath variable.
-	 * The path must not be null.
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 * Updating a variable with the same value has no effect.
-	 *
-	 * @param variableName the name of the classpath variable
-	 * @param path the path
-	 * @param monitor a monitor to report progress
-	 * @see #getClasspathVariable
-	 */
-//	public static void setClasspathVariable(
-//		String variableName,
-//		IPath path,
-//		IProgressMonitor monitor)
-//		throws JavaModelException {
+/**
+ * Sets the value of the given classpath variable.
+ * The path must not be null.
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ * Updating a variable with the same value has no effect.
+ *
+ * @param variableName the name of the classpath variable
+ * @param path the path
+ * @param monitor a monitor to report progress
+ * @see #getClasspathVariable
+ */
+//public static void setClasspathVariable(
+//	String variableName,
+//	IPath path,
+//	IProgressMonitor monitor)
+//	throws JavaModelException {
 //
-//		if (path == null) Assert.isTrue(false, "Variable path cannot be null"); //$NON-NLS-1$
-//		setClasspathVariables(new String[]{variableName}, new IPath[]{ path }, monitor);
-//	}
+//	if (path == null) Assert.isTrue(false, "Variable path cannot be null"); //$NON-NLS-1$
+//	setClasspathVariables(new String[]{variableName}, new IPath[]{ path }, monitor);
+//}
 
-	/**
-	 * Sets the values of all the given classpath variables at once.
-	 * Null paths can be used to request corresponding variable removal.
-	 * <p>
-	 * This functionality cannot be used while the resource tree is locked.
-	 * <p>
-	 * Classpath variable values are persisted locally to the workspace, and 
-	 * are preserved from session to session.
-	 * <p>
-	 * Updating a variable with the same value has no effect.
-	 * 
-	 * @param variableNames an array of names for the updated classpath variables
-	 * @param paths an array of path updates for the modified classpath variables (null
-	 *       meaning that the corresponding value will be removed
-	 * @param monitor a monitor to report progress
-	 * @see #getClasspathVariable
-	 * @since 2.0
-	 */
-//	public static void setClasspathVariables(
-//		String[] variableNames,
-//		IPath[] paths,
-//		IProgressMonitor monitor)
-//		throws JavaModelException {
+/**
+ * Sets the values of all the given classpath variables at once.
+ * Null paths can be used to request corresponding variable removal.
+ * <p>
+ * This functionality cannot be used while the resource tree is locked.
+ * <p>
+ * Classpath variable values are persisted locally to the workspace, and 
+ * are preserved from session to session.
+ * <p>
+ * Updating a variable with the same value has no effect.
+ * 
+ * @param variableNames an array of names for the updated classpath variables
+ * @param paths an array of path updates for the modified classpath variables (null
+ *       meaning that the corresponding value will be removed
+ * @param monitor a monitor to report progress
+ * @see #getClasspathVariable
+ * @since 2.0
+ */
+//public static void setClasspathVariables(
+//	String[] variableNames,
+//	IPath[] paths,
+//	IProgressMonitor monitor)
+//	throws JavaModelException {
 //
-//		if (variableNames.length != paths.length)	Assert.isTrue(false, "Variable names and paths collections should have the same size"); //$NON-NLS-1$
-//		//TODO: should check that null cannot be used as variable paths
-//		updateVariableValues(variableNames, paths, monitor);
-//	}
-
-	/* (non-Javadoc)
-	 * Method declared on IExecutableExtension.
-	 * Record any necessary initialization data from the plugin.
-	 */
-	public void setInitializationData(
-		IConfigurationElement cfig,
-		String propertyName,
-		Object data)
-		throws CoreException {
-	}
+//	if (variableNames.length != paths.length)	Assert.isTrue(false, "Variable names and paths collections should have the same size"); //$NON-NLS-1$
+//	//TODO: should check that null cannot be used as variable paths
+//	updateVariableValues(variableNames, paths, monitor);
+//}
+
+/* (non-Javadoc)
+ * Method declared on IExecutableExtension.
+ * Record any necessary initialization data from the plugin.
+ */
+public void setInitializationData(
+	IConfigurationElement cfig,
+	String propertyName,
+	Object data)
+	throws CoreException {
+}
 
-	/**
-	 * Sets the current table of options. All and only the options explicitly included in the given table 
-	 * are remembered; all previous option settings are forgotten, including ones not explicitly
-	 * mentioned.
-	 * <p>
-	 * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-	 * </p>
-	 * 
-	 * @param newOptions the new options (key type: <code>String</code>; value type: <code>String</code>),
-	 *   or <code>null</code> to reset all options to their default values
-	 * @see JavaCore#getDefaultOptions
-	 */
-	public static void setOptions(Hashtable newOptions) {
+/**
+ * Sets the current table of options. All and only the options explicitly included in the given table 
+ * are remembered; all previous option settings are forgotten, including ones not explicitly
+ * mentioned.
+ * <p>
+ * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
+ * </p>
+ * 
+ * @param newOptions the new options (key type: <code>String</code>; value type: <code>String</code>),
+ *   or <code>null</code> to reset all options to their default values
+ * @see JavaCore#getDefaultOptions
+ */
+public static void setOptions(Hashtable newOptions) {
 		
-		// see #initializeDefaultPluginPreferences() for changing default settings
-		Preferences preferences = getPlugin().getPluginPreferences();
+	// see #initializeDefaultPluginPreferences() for changing default settings
+	Preferences preferences = getPlugin().getPluginPreferences();
 
-		if (newOptions == null){
-			newOptions = JavaCore.getDefaultOptions();
-		}
-		Enumeration keys = newOptions.keys();
-		while (keys.hasMoreElements()){
-			String key = (String)keys.nextElement();
-			if (!JavaModelManager.OptionNames.contains(key)) continue; // unrecognized option
-			if (key.equals(CORE_ENCODING)) continue; // skipped, contributed by resource prefs
-			String value = (String)newOptions.get(key);
-			preferences.setValue(key, value);
-		}
-		
-		// persist options
-		getPlugin().savePluginPreferences();
+	if (newOptions == null){
+		newOptions = JavaCore.getDefaultOptions();
 	}
-	
-	/**
-	 * Shutdown the JavaCore plug-in.
-	 * <p>
-	 * De-registers the JavaModelManager as a resource changed listener and save participant.
-	 * <p>
-	 * @see org.eclipse.core.runtime.Plugin#shutdown()
-	 */
-	public void shutdown() {
-
-		savePluginPreferences();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaProcessor);
-		workspace.removeSaveParticipant(this);
-
-		((JavaModelManager) JavaModelManager.getJavaModelManager()).shutdown();
+	Enumeration keys = newOptions.keys();
+	while (keys.hasMoreElements()){
+		String key = (String)keys.nextElement();
+		if (!JavaModelManager.OptionNames.contains(key)) continue; // unrecognized option
+		if (key.equals(CORE_ENCODING)) continue; // skipped, contributed by resource prefs
+		String value = (String)newOptions.get(key);
+		preferences.setValue(key, value);
 	}
+		
+	// persist options
+	getPlugin().savePluginPreferences();
+}
+	
+/**
+ * Shutdown the JavaCore plug-in.
+ * <p>
+ * De-registers the JavaModelManager as a resource changed listener and save participant.
+ * <p>
+ * @see org.eclipse.core.runtime.Plugin#shutdown()
+ */
+// moved to PHPeclipsePlugin#shutdown()
+//public void shutdown() {
+//
+//	//savePluginPreferences();
+//	getPlugin().savePluginPreferences();
+//	IWorkspace workspace = ResourcesPlugin.getWorkspace();
+//	workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaProcessor);
+//	workspace.removeSaveParticipant(PHPeclipsePlugin.getDefault());
+//
+//	((JavaModelManager) JavaModelManager.getJavaModelManager()).shutdown();
+//}
 
-	/**
-	 * Initiate the background indexing process.
-	 * This should be deferred after the plugin activation.
-	 */
-//	private void startIndexing() {
+/**
+ * Initiate the background indexing process.
+ * This should be deferred after the plugin activation.
+ */
+//private void startIndexing() {
 //
-//		JavaModelManager.getJavaModelManager().getIndexManager().reset();
-//	}
+//	JavaModelManager.getJavaModelManager().getIndexManager().reset();
+//}
 
-	/**
-	 * Startup of the JavaCore plug-in.
-	 * <p>
-	 * Registers the JavaModelManager as a resource changed listener and save participant.
-	 * Starts the background indexing, and restore saved classpath variable values.
-	 * <p>
-	 * @see org.eclipse.core.runtime.Plugin#startup()
-	 */
-	public void startup() {
-		
-		JavaModelManager manager = JavaModelManager.getJavaModelManager();
-		try {
-			manager.configurePluginDebugOptions();
-
-			// request state folder creation (workaround 19885)
-			JavaCore.getPlugin().getStateLocation();
-
-			// retrieve variable values
-			JavaCore.getPlugin().getPluginPreferences().addPropertyChangeListener(new JavaModelManager.PluginPreferencesListener());
-//		TODO khartlage temp-del
-//			manager.loadVariablesAndContainers();
-
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			workspace.addResourceChangeListener(
-				manager.deltaProcessor,
-				IResourceChangeEvent.PRE_AUTO_BUILD
-					| IResourceChangeEvent.POST_AUTO_BUILD
-					| IResourceChangeEvent.POST_CHANGE
-					| IResourceChangeEvent.PRE_DELETE
-					| IResourceChangeEvent.PRE_CLOSE);
-
-//			startIndexing();
-			workspace.addSaveParticipant(this, manager);
-			
-		} catch (CoreException e) {
-		} catch (RuntimeException e) {
-			manager.shutdown();
-			throw e;
-		}
-	}
+/**
+ * Startup of the JavaCore plug-in.
+ * <p>
+ * Registers the JavaModelManager as a resource changed listener and save participant.
+ * Starts the background indexing, and restore saved classpath variable values.
+ * <p>
+ * @see org.eclipse.core.runtime.Plugin#startup()
+ */
 
+// moved to PHPeclipsePlugin#startup()
+//public void startup() {
+//		
+//	JavaModelManager manager = JavaModelManager.getJavaModelManager();
+//	try {
+//		manager.configurePluginDebugOptions();
+//
+//		// request state folder creation (workaround 19885)
+//		JavaCore.getPlugin().getStateLocation();
+//
+//		// retrieve variable values
+//		JavaCore.getPlugin().getPluginPreferences().addPropertyChangeListener(new JavaModelManager.PluginPreferencesListener());
+////	TODO khartlage temp-del
+////		manager.loadVariablesAndContainers();
+//
+//		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+//		workspace.addResourceChangeListener(
+//			manager.deltaProcessor,
+//			IResourceChangeEvent.PRE_AUTO_BUILD
+//				| IResourceChangeEvent.POST_AUTO_BUILD
+//				| IResourceChangeEvent.POST_CHANGE
+//				| IResourceChangeEvent.PRE_DELETE
+//				| IResourceChangeEvent.PRE_CLOSE);
+//
+////		startIndexing();
+//		workspace.addSaveParticipant(PHPeclipsePlugin.getDefault(), manager);
+//			
+//	} catch (CoreException e) {
+//	} catch (RuntimeException e) {
+//		manager.shutdown();
+//		throw e;
+//	}
+//}
 
-	/**
-	 * Internal updating of a variable values (null path meaning removal), allowing to change multiple variable values at once.
-	 */
-//	private static void updateVariableValues(
-//		String[] variableNames,
-//		IPath[] variablePaths,
-//		IProgressMonitor monitor) throws JavaModelException {
+
+/**
+ * Internal updating of a variable values (null path meaning removal), allowing to change multiple variable values at once.
+ */
+//private static void updateVariableValues(
+//	String[] variableNames,
+//	IPath[] variablePaths,
+//	IProgressMonitor monitor) throws JavaModelException {
 //	
-//		if (monitor != null && monitor.isCanceled()) return;
+//	if (monitor != null && monitor.isCanceled()) return;
 //		
-//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//			System.out.println("CPVariable SET  - setting variables: {" + Util.toString(variableNames)  //$NON-NLS-1$
-//				+ "} with values: " + Util.toString(variablePaths)); //$NON-NLS-1$
-//		}
+//	if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//		System.out.println("CPVariable SET  - setting variables: {" + Util.toString(variableNames)  //$NON-NLS-1$
+//			+ "} with values: " + Util.toString(variablePaths)); //$NON-NLS-1$
+//	}
 //
-//		int varLength = variableNames.length;
+//	int varLength = variableNames.length;
 //		
-//		// gather classpath information for updating
-//		final HashMap affectedProjects = new HashMap(5);
-//		JavaModelManager manager = JavaModelManager.getJavaModelManager();
-//		IJavaModel model = manager.getJavaModel();
+//	// gather classpath information for updating
+//	final HashMap affectedProjects = new HashMap(5);
+//	JavaModelManager manager = JavaModelManager.getJavaModelManager();
+//	IJavaModel model = manager.getJavaModel();
 //	
-//		// filter out unmodified variables
-//		int discardCount = 0;
-//		for (int i = 0; i < varLength; i++){
-//			String variableName = variableNames[i];
-//			IPath oldPath = (IPath)JavaModelManager.variableGet(variableName); // if reentering will provide previous session value 
-//			if (oldPath == JavaModelManager.VariableInitializationInProgress){
-//				IPath previousPath = (IPath)JavaModelManager.PreviousSessionVariables.get(variableName);
-//				if (previousPath != null){
-//					if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//						System.out.println("CPVariable INIT - reentering access to variable: " + variableName+ " during its initialization, will see previous value: "+ previousPath); //$NON-NLS-1$ //$NON-NLS-2$
-//					}
-//					JavaModelManager.variablePut(variableName, previousPath); // replace value so reentering calls are seeing old value
+//	// filter out unmodified variables
+//	int discardCount = 0;
+//	for (int i = 0; i < varLength; i++){
+//		String variableName = variableNames[i];
+//		IPath oldPath = (IPath)JavaModelManager.variableGet(variableName); // if reentering will provide previous session value 
+//		if (oldPath == JavaModelManager.VariableInitializationInProgress){
+//			IPath previousPath = (IPath)JavaModelManager.PreviousSessionVariables.get(variableName);
+//			if (previousPath != null){
+//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//					System.out.println("CPVariable INIT - reentering access to variable: " + variableName+ " during its initialization, will see previous value: "+ previousPath); //$NON-NLS-1$ //$NON-NLS-2$
 //				}
-//				oldPath = null;  //33695 - cannot filter out restored variable, must update affected project to reset cached CP
-//			}
-//			if (oldPath != null && oldPath.equals(variablePaths[i])){
-//				variableNames[i] = null;
-//				discardCount++;
+//				JavaModelManager.variablePut(variableName, previousPath); // replace value so reentering calls are seeing old value
 //			}
+//			oldPath = null;  //33695 - cannot filter out restored variable, must update affected project to reset cached CP
 //		}
-//		if (discardCount > 0){
-//			if (discardCount == varLength) return;
-//			int changedLength = varLength - discardCount;
-//			String[] changedVariableNames = new String[changedLength];
-//			IPath[] changedVariablePaths = new IPath[changedLength];
-//			for (int i = 0, index = 0; i < varLength; i++){
-//				if (variableNames[i] != null){
-//					changedVariableNames[index] = variableNames[i];
-//					changedVariablePaths[index] = variablePaths[i];
-//					index++;
-//				}
+//		if (oldPath != null && oldPath.equals(variablePaths[i])){
+//			variableNames[i] = null;
+//			discardCount++;
+//		}
+//	}
+//	if (discardCount > 0){
+//		if (discardCount == varLength) return;
+//		int changedLength = varLength - discardCount;
+//		String[] changedVariableNames = new String[changedLength];
+//		IPath[] changedVariablePaths = new IPath[changedLength];
+//		for (int i = 0, index = 0; i < varLength; i++){
+//			if (variableNames[i] != null){
+//				changedVariableNames[index] = variableNames[i];
+//				changedVariablePaths[index] = variablePaths[i];
+//				index++;
 //			}
-//			variableNames = changedVariableNames;
-//			variablePaths = changedVariablePaths;
-//			varLength = changedLength;
 //		}
+//		variableNames = changedVariableNames;
+//		variablePaths = changedVariablePaths;
+//		varLength = changedLength;
+//	}
 //		
-//		if (monitor != null && monitor.isCanceled()) return;
+//	if (monitor != null && monitor.isCanceled()) return;
 //
-//		if (model != null) {
-//			IJavaProject[] projects = model.getJavaProjects();
-//			nextProject : for (int i = 0, projectLength = projects.length; i < projectLength; i++){
-//				IJavaProject project = projects[i];
+//	if (model != null) {
+//		IJavaProject[] projects = model.getJavaProjects();
+//		nextProject : for (int i = 0, projectLength = projects.length; i < projectLength; i++){
+//			IJavaProject project = projects[i];
 //						
-//				// check to see if any of the modified variables is present on the classpath
-//				IClasspathEntry[] classpath = project.getRawClasspath();
-//				for (int j = 0, cpLength = classpath.length; j < cpLength; j++){
+//			// check to see if any of the modified variables is present on the classpath
+//			IClasspathEntry[] classpath = project.getRawClasspath();
+//			for (int j = 0, cpLength = classpath.length; j < cpLength; j++){
 //					
-//					IClasspathEntry entry = classpath[j];
-//					for (int k = 0; k < varLength; k++){
+//				IClasspathEntry entry = classpath[j];
+//				for (int k = 0; k < varLength; k++){
 //	
-//						String variableName = variableNames[k];						
-//						if (entry.getEntryKind() ==  IClasspathEntry.CPE_VARIABLE){
+//					String variableName = variableNames[k];						
+//					if (entry.getEntryKind() ==  IClasspathEntry.CPE_VARIABLE){
 //	
-//							if (variableName.equals(entry.getPath().segment(0))){
-//								affectedProjects.put(project, project.getResolvedClasspath(true));
-//								continue nextProject;
-//							}
-//							IPath sourcePath, sourceRootPath;
-//							if (((sourcePath = entry.getSourceAttachmentPath()) != null	&& variableName.equals(sourcePath.segment(0)))
-//								|| ((sourceRootPath = entry.getSourceAttachmentRootPath()) != null	&& variableName.equals(sourceRootPath.segment(0)))) {
+//						if (variableName.equals(entry.getPath().segment(0))){
+//							affectedProjects.put(project, project.getResolvedClasspath(true));
+//							continue nextProject;
+//						}
+//						IPath sourcePath, sourceRootPath;
+//						if (((sourcePath = entry.getSourceAttachmentPath()) != null	&& variableName.equals(sourcePath.segment(0)))
+//							|| ((sourceRootPath = entry.getSourceAttachmentRootPath()) != null	&& variableName.equals(sourceRootPath.segment(0)))) {
 //	
-//								affectedProjects.put(project, project.getResolvedClasspath(true));
-//								continue nextProject;
-//							}
-//						}												
-//					}
+//							affectedProjects.put(project, project.getResolvedClasspath(true));
+//							continue nextProject;
+//						}
+//					}												
 //				}
 //			}
 //		}
-//		// update variables
-//		for (int i = 0; i < varLength; i++){
-//			JavaModelManager.variablePut(variableNames[i], variablePaths[i]);
-//		}
-//		final String[] dbgVariableNames = variableNames;
+//	}
+//	// update variables
+//	for (int i = 0; i < varLength; i++){
+//		JavaModelManager.variablePut(variableNames[i], variablePaths[i]);
+//	}
+//	final String[] dbgVariableNames = variableNames;
 //				
-//		// update affected project classpaths
-//		if (!affectedProjects.isEmpty()) {
-//			try {
-//				JavaCore.run(
-//					new IWorkspaceRunnable() {
-//						public void run(IProgressMonitor monitor) throws CoreException {
-//							// propagate classpath change
-//							Iterator projectsToUpdate = affectedProjects.keySet().iterator();
-//							while (projectsToUpdate.hasNext()) {
+//	// update affected project classpaths
+//	if (!affectedProjects.isEmpty()) {
+//		try {
+//			JavaCore_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt.run(
+//				new IWorkspaceRunnable() {
+//					public void run(IProgressMonitor monitor) throws CoreException {
+//						// propagate classpath change
+//						Iterator projectsToUpdate = affectedProjects.keySet().iterator();
+//						while (projectsToUpdate.hasNext()) {
 //			
-//								if (monitor != null && monitor.isCanceled()) return;
+//							if (monitor != null && monitor.isCanceled()) return;
 //			
-//								JavaProject project = (JavaProject) projectsToUpdate.next();
+//							JavaProject project = (JavaProject) projectsToUpdate.next();
 //
-//								if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//									System.out.println("CPVariable SET  - updating affected project: ["+project.getElementName()+"] due to setting variables: "+ Util.toString(dbgVariableNames)); //$NON-NLS-1$ //$NON-NLS-2$
-//								}
-//								
-//								project
-//									.setRawClasspath(
-//										project.getRawClasspath(),
-//										SetClasspathOperation.ReuseOutputLocation,
-//										null, // don't call beginTask on the monitor (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=3717)
-//										!ResourcesPlugin.getWorkspace().isTreeLocked(), // can change resources
-//										(IClasspathEntry[]) affectedProjects.get(project),
-//										false, // updating - no validation
-//										false); // updating - no need to save
+//							if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//								System.out.println("CPVariable SET  - updating affected project: ["+project.getElementName()+"] due to setting variables: "+ Util.toString(dbgVariableNames)); //$NON-NLS-1$ //$NON-NLS-2$
 //							}
+//								
+//							project
+//								.setRawClasspath(
+//									project.getRawClasspath(),
+//									SetClasspathOperation.ReuseOutputLocation,
+//									null, // don't call beginTask on the monitor (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=3717)
+//									!ResourcesPlugin.getWorkspace().isTreeLocked(), // can change resources
+//									(IClasspathEntry[]) affectedProjects.get(project),
+//									false, // updating - no validation
+//									false); // updating - no need to save
 //						}
-//					},
-//					monitor);
-//			} catch (CoreException e) {
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.println("CPVariable SET  - FAILED DUE TO EXCEPTION: "+Util.toString(dbgVariableNames)); //$NON-NLS-1$
-//					e.printStackTrace();
-//				}
-//				if (e instanceof JavaModelException) {
-//					throw (JavaModelException)e;
-//				} else {
-//					throw new JavaModelException(e);
-//				}
+//					}
+//				},
+//				monitor);
+//		} catch (CoreException e) {
+//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
+//				System.out.println("CPVariable SET  - FAILED DUE TO EXCEPTION: "+Util.toString(dbgVariableNames)); //$NON-NLS-1$
+//				e.printStackTrace();
+//			}
+//			if (e instanceof JavaModelException) {
+//				throw (JavaModelException)e;
+//			} else {
+//				throw new JavaModelException(e);
 //			}
 //		}
 //	}
+//}
 }
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
index 9f8a201..e008a21 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
@@ -10,12 +10,11 @@
  *     IBM Corporation - added #createScanner allowing to make comment check stricter
  ******************************************************************************/
 package net.sourceforge.phpdt.core;
-
+ 
 import java.util.Map;
 
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.runtime.Plugin;
 
@@ -40,7 +39,7 @@ public class ToolFactory {
 	 */
 	public static ICodeFormatter createCodeFormatter(){
 		
-			Plugin jdtCorePlugin = PHPCore.getPlugin();
+			Plugin jdtCorePlugin = JavaCore.getPlugin();
 			if (jdtCorePlugin == null) return null;
 		
 //			IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.FORMATTER_EXTPOINT_ID);
@@ -79,7 +78,7 @@ public class ToolFactory {
 	 */
 	public static ICodeFormatter createDefaultCodeFormatter(Map options){
 
-		if (options == null) options = PHPCore.getOptions();
+		if (options == null) options = JavaCore.getOptions();
 		return new CodeFormatter(options);
 	}
 	
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index 62feaeb..7d6e6b7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -43,7 +43,7 @@ public interface ITerminalSymbols {
 
   final static int TokenNameEOF = 0;
   final static int TokenNameERROR = 1;
-  final static int TokenNameStopPHP = 2;
+  final static int TokenNameINLINE_HTML = 2;
 
   final static int TokenNameREMAINDER = 30;
   final static int TokenNameNOT = 31;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 2a0e2c1..820b0c7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -23,7 +23,7 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclarati
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.phpeditor.PHPString;
+
 import org.eclipse.core.resources.IFile;
 public class Parser //extends PHPParserSuperclass
     implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
@@ -1111,7 +1111,7 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after do-while statement.");
         }
         getNextToken();
@@ -1151,7 +1151,7 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after 'continue', 'break' or 'return'.");
         }
         getNextToken();
@@ -1163,12 +1163,15 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after 'echo' statement.");
         }
         getNextToken();
       }
       return;
+    } else if (token == TokenNameINLINE_HTML) {
+      getNextToken();
+      return;
       //    } else if (token == TokenNameprint) {
       //      getNextToken();
       //      expression();
@@ -1187,7 +1190,7 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after 'global' statement.");
         }
         getNextToken();
@@ -1199,7 +1202,7 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after 'static' statement.");
         }
         getNextToken();
@@ -1221,59 +1224,12 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("';' expected after 'unset' statement.");
         }
         getNextToken();
       }
       return;
-      //      } else if (token == TokenNameexit || token == TokenNamedie) {
-      //        getNextToken();
-      //        if (token != TokenNameSEMICOLON) {
-      //          exitStatus();
-      //        }
-      //        if (token == TokenNameSEMICOLON) {
-      //          getNextToken();
-      //        } else {
-      //          if (token != TokenNameStopPHP) {
-      //            throwSyntaxError("';' expected after 'exit' or 'die'
-      // statement.");
-      //          }
-      //          getNextToken();
-      //        }
-      //        return;
-      //    } else if (token == TokenNamedefine) {
-      //      getNextToken();
-      //      if (token == TokenNameLPAREN) {
-      //        getNextToken();
-      //      } else {
-      //        throwSyntaxError("'(' expected after 'define' keyword.");
-      //      }
-      //      expr();
-      //      if (token == TokenNameCOMMA) {
-      //        getNextToken();
-      //      } else {
-      //        throwSyntaxError("',' expected after first 'define' constant.");
-      //      }
-      //      expr();
-      //      if (token == TokenNameCOMMA) {
-      //        getNextToken();
-      //        expr();
-      //      }
-      //      if (token == TokenNameRPAREN) {
-      //        getNextToken();
-      //      } else {
-      //        throwSyntaxError("')' expected after 'define' statement.");
-      //      }
-      //      if (token == TokenNameSEMICOLON) {
-      //        getNextToken();
-      //      } else {
-      //        if (token != TokenNameStopPHP) {
-      //          throwSyntaxError("';' expected after 'define' statement.");
-      //        }
-      //        getNextToken();
-      //      }
-      //      return;
     } else if (token == TokenNamefunction) {
       MethodDeclaration methodDecl = new MethodDeclaration(
           this.compilationUnit.compilationResult);
@@ -1282,6 +1238,57 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
       functionDefinition(methodDecl);
       return;
+    } else if (token == TokenNametry) {
+      getNextToken();
+if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'try' statement.");
+      }
+      getNextToken();
+      statementList();
+if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'try' statement.");
+      }
+getNextToken();
+      return;
+    } else if (token == TokenNamecatch) {
+getNextToken();
+if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected in 'catch' statement.");
+      }
+      getNextToken();
+      fully_qualified_class_name();
+      if (token != TokenNameVariable) {
+        throwSyntaxError("Variable expected in 'catch' statement.");
+      }
+      getNextToken();
+
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("')' expected in 'catch' statement.");
+      }
+      getNextToken();
+getNextToken();
+if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'catch' statement.");
+      }
+      getNextToken();
+      statementList();
+if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'catch' statement.");
+      }
+getNextToken();
+      additional_catches();
+      return;
+    } else if (token == TokenNamethrow) {
+      getNextToken();
+      
+      expr();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        throwSyntaxError("';' expected after 'throw' exxpression.");
+      }
+      
+      return;
     } else if (token == TokenNamefinal || token == TokenNameabstract
         || token == TokenNameclass || token == TokenNameinterface) {
       TypeDeclaration typeDecl = new TypeDeclaration(
@@ -1320,7 +1327,7 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
         return;
       } else {
-        if (token != TokenNameStopPHP && token != TokenNameEOF) {
+        if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
           throwSyntaxError("';' expected after expression (Found token: "
               + scanner.toStringAction(token) + ")");
         }
@@ -1328,6 +1335,36 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+  private void additional_catches() {
+    while (token == TokenNamecatch) {
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected in 'catch' statement.");
+      }
+      getNextToken();
+      fully_qualified_class_name();
+      if (token != TokenNameVariable) {
+        throwSyntaxError("Variable expected in 'catch' statement.");
+      }
+      getNextToken();
+
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("')' expected in 'catch' statement.");
+      }
+      getNextToken();
+      getNextToken();
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'catch' statement.");
+      }
+      getNextToken();
+      statementList();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'catch' statement.");
+      }
+      getNextToken();
+    }
+  }
+
   private void global_var_list() {
     //  global_var_list:
     //	global_var_list ',' global_var
@@ -2388,7 +2425,7 @@ public class Parser //extends PHPParserSuperclass
         }
         break;
       default :
-        if (token != TokenNameStopPHP) {
+        if (token != TokenNameINLINE_HTML) {
           throwSyntaxError("Error in expression (found token '"
               + scanner.toStringAction(token) + "').");
         }
@@ -3234,7 +3271,7 @@ public class Parser //extends PHPParserSuperclass
         break;
       }
       getNextToken();
-      if (token != TokenNameRPAREN) {
+      if (token == TokenNameRPAREN) {
         break;
       }
     }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index 041fd95..9b91cf2 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -1081,7 +1081,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
             case '?' :
               if (getNextChar('>')) {
                 phpMode = false;
-                return TokenNameStopPHP;
+                return TokenNameINLINE_HTML;
               }
               return TokenNameQUESTION;
             case ':' :
@@ -1522,7 +1522,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                         if (getNextChar('>')) {
                           startPosition = currentPosition - 2;
                           phpMode = false;
-                          return TokenNameStopPHP;
+                          return TokenNameINLINE_HTML;
                         }
                       }
                       //get the next char
@@ -3471,7 +3471,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case TokenNameERROR :
         return "ScannerError"; // + new String(getCurrentTokenSource()) + ")";
       // //$NON-NLS-1$
-      case TokenNameStopPHP :
+      case TokenNameINLINE_HTML :
         return "StopPHP(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameIdentifier :
         return "Identifier(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
index bdb0401..df61b62 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
@@ -14,9 +14,9 @@ import net.sourceforge.phpdt.core.IClasspathEntry;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.corext.Assert;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -256,7 +256,7 @@ public class ClasspathEntry implements IClasspathEntry {
 		switch (kind) {
 
 			case IClasspathEntry.CPE_PROJECT :
-				return PHPCore.newProjectEntry(path, isExported);
+				return JavaCore.newProjectEntry(path, isExported);
 				
 //			case IClasspathEntry.CPE_LIBRARY :
 //				return JavaCore.newLibraryEntry(
@@ -269,9 +269,9 @@ public class ClasspathEntry implements IClasspathEntry {
 				// must be an entry in this project or specify another project
 				String projSegment = path.segment(0);
 				if (projSegment != null && projSegment.equals(project.getElementName())) { // this project
-					return PHPCore.newSourceEntry(path, exclusionPatterns, outputLocation);
+					return JavaCore.newSourceEntry(path, exclusionPatterns, outputLocation);
 				} else { // another project
-					return PHPCore.newProjectEntry(path, isExported);
+					return JavaCore.newProjectEntry(path, isExported);
 				}
 
 //			case IClasspathEntry.CPE_VARIABLE :
@@ -282,7 +282,7 @@ public class ClasspathEntry implements IClasspathEntry {
 //						isExported);
 				
 			case IClasspathEntry.CPE_CONTAINER :
-				return PHPCore.newContainerEntry(
+				return JavaCore.newContainerEntry(
 						path,
 						isExported);
 
@@ -582,6 +582,6 @@ public class ClasspathEntry implements IClasspathEntry {
 	 */
 	public IClasspathEntry getResolvedEntry() {
 	
-		return PHPCore.getResolvedClasspathEntry(this);
+		return JavaCore.getResolvedClasspathEntry(this);
 	}
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java
index 6cfb4c4..695eb36 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java
@@ -18,6 +18,7 @@ import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
@@ -32,7 +33,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.PackageBinding;
 import net.sourceforge.phpdt.internal.compiler.parser.SourceTypeConverter;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -205,7 +205,7 @@ public class CompilationUnitProblemFinder extends Compiler {
 
 		CompilationUnitDeclaration unit = null;
 		try {
-			String encoding = project.getOption(PHPCore.CORE_ENCODING, true);
+			String encoding = project.getOption(JavaCore.CORE_ENCODING, true);
 			
 			IPackageFragment packageFragment = (IPackageFragment)unitElement.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
 			char[][] expectedPackageName = null;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
index 2e30065..e6d149e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
@@ -29,12 +29,12 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.jdom.DOMException;
 import net.sourceforge.phpdt.core.jdom.DOMFactory;
 import net.sourceforge.phpdt.core.jdom.IDOMCompilationUnit;
 import net.sourceforge.phpdt.core.jdom.IDOMNode;
 import net.sourceforge.phpdt.core.jdom.IDOMPackage;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -276,7 +276,7 @@ public class CopyResourceElementsOperation extends MultiOperation {
 			// update new resource content
 			try {
 				if (newContent != null){
-					String encoding = source.getJavaProject().getOption(PHPCore.CORE_ENCODING, true);
+					String encoding = source.getJavaProject().getOption(JavaCore.CORE_ENCODING, true);
 					destFile.setContents(
 						new ByteArrayInputStream(encoding == null ? newContent.getBytes() : newContent.getBytes(encoding)), 
 						fForce ? IResource.FORCE | IResource.KEEP_HISTORY : IResource.KEEP_HISTORY,
@@ -310,7 +310,7 @@ public class CopyResourceElementsOperation extends MultiOperation {
 			// see http://dev.eclipse.org/bugs/show_bug.cgi?id=9351
 			try {
 				if (newContent != null){
-					String encoding = source.getJavaProject().getOption(PHPCore.CORE_ENCODING, true);
+					String encoding = source.getJavaProject().getOption(JavaCore.CORE_ENCODING, true);
 					destFile.setContents(
 						new ByteArrayInputStream(encoding == null ? newContent.getBytes() : newContent.getBytes(encoding)), 
 						fForce ? IResource.FORCE | IResource.KEEP_HISTORY : IResource.KEEP_HISTORY, 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessor.java
index 45ffede..bbfe240 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessor.java
@@ -22,8 +22,8 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModel;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
@@ -229,7 +229,7 @@ public class DeltaProcessor implements IResourceChangeListener {
 	 * to update.
 	 */
 	void addToProjectsToUpdateWithDependents(IProject project) {
-		this.projectsToUpdate.add(PHPCore.create(project));
+		this.projectsToUpdate.add(JavaCore.create(project));
 //		this.addDependentProjects(project.getFullPath(), this.projectsToUpdate);
 	}
 	
@@ -1114,7 +1114,7 @@ public class DeltaProcessor implements IResourceChangeListener {
 				
 				// source attachment path
 				if (entry.getEntryKind() != IClasspathEntry.CPE_LIBRARY) continue;
-				QualifiedName qName = new QualifiedName(PHPCore.PLUGIN_ID, "sourceattachment: " + path.toOSString()); //$NON-NLS-1$;
+				QualifiedName qName = new QualifiedName(JavaCore.PLUGIN_ID, "sourceattachment: " + path.toOSString()); //$NON-NLS-1$;
 				String propertyString = null;
 				try {
 					propertyString = ResourcesPlugin.getWorkspace().getRoot().getPersistentProperty(qName);
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index 1838edf..4c295b7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -39,8 +39,8 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IWorkingCopy;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 
@@ -248,13 +248,13 @@ public class JavaModelManager implements ISaveParticipant {
 		int type = resource.getType();
 		switch (type) {
 			case IResource.PROJECT :
-				return PHPCore.create((IProject) resource);
+				return JavaCore.create((IProject) resource);
 			case IResource.FILE :
 				return create((IFile) resource, project);
 			case IResource.FOLDER :
 				return create((IFolder) resource, project);
 			case IResource.ROOT :
-				return PHPCore.create((IWorkspaceRoot) resource);
+				return JavaCore.create((IWorkspaceRoot) resource);
 			default :
 				return null;
 		}
@@ -280,7 +280,7 @@ public class JavaModelManager implements ISaveParticipant {
 			return null;
 		}
 		if (project == null) {
-			project = PHPCore.create(file.getProject());
+			project = JavaCore.create(file.getProject());
 		}
 	
 		if (file.getFileExtension() != null) {
@@ -311,7 +311,7 @@ public class JavaModelManager implements ISaveParticipant {
 			return null;
 		}
 		if (project == null) {
-			project = PHPCore.create(folder.getProject());
+			project = JavaCore.create(folder.getProject());
 		}
 		IJavaElement element = determineIfOnClasspath(folder, project);
 		if (conflictsWithOutputLocation(folder.getFullPath(), (JavaProject)project)
@@ -355,7 +355,7 @@ public class JavaModelManager implements ISaveParticipant {
 		if (file == null) return null;
 
 		if (project == null) {
-			project = PHPCore.create(file.getProject());
+			project = JavaCore.create(file.getProject());
 		}
 		IPackageFragment pkg = (IPackageFragment) determineIfOnClasspath(file, project);
 		if (pkg == null) {
@@ -655,7 +655,7 @@ public class JavaModelManager implements ISaveParticipant {
 	 * Configure the plugin with respect to option settings defined in ".options" file
 	 */
 	public void configurePluginDebugOptions(){
-		if(PHPCore.getPlugin().isDebugging()){
+		if(JavaCore.getPlugin().isDebugging()){
 //		TODO khartlage temp-del
 			String option = Platform.getDebugOption(BUILDER_DEBUG);
 //			if(option != null) JavaBuilder.DEBUG = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
@@ -1000,7 +1000,7 @@ public class JavaModelManager implements ISaveParticipant {
 		JavaModelManager.PerProjectInfo info = getPerProjectInfo(project, false /* don't create info */);
 		if (info == null) {
 			if (!JavaProject.hasJavaNature(project)) {
-				throw ((JavaProject)PHPCore.create(project)).newNotPresentException();
+				throw ((JavaProject)JavaCore.create(project)).newNotPresentException();
 			}
 			info = getPerProjectInfo(project, true /* create info */);
 		}
@@ -1012,7 +1012,7 @@ public class JavaModelManager implements ISaveParticipant {
  	 */
 	public static String[] getRegisteredVariableNames(){
 		
-		Plugin jdtCorePlugin = PHPCore.getPlugin();
+		Plugin jdtCorePlugin = JavaCore.getPlugin();
 		if (jdtCorePlugin == null) return null;
 
 		ArrayList variableList = new ArrayList(5);
@@ -1062,7 +1062,7 @@ public class JavaModelManager implements ISaveParticipant {
 	 */
 	private File getSerializationFile(IProject project) {
 		if (!project.exists()) return null;
-		IPluginDescriptor descr= PHPCore.getJavaCore().getDescriptor();
+		IPluginDescriptor descr= JavaCore.getJavaCore().getDescriptor();
 		IPath workingLocation= project.getPluginWorkingLocation(descr);
 		return workingLocation.append("state.dat").toFile(); //$NON-NLS-1$
 	}
@@ -1094,18 +1094,18 @@ public class JavaModelManager implements ISaveParticipant {
 				} else { // internal resource (not an IFile or not existing)
 					IPath location;
 					if (file.getType() != IResource.FILE || (location = file.getLocation()) == null) {
-						throw new CoreException(new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
+						throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
 					}
 					fileSystemPath= location.toOSString();
 				}
 			} else if (!path.isAbsolute()) {
 				file= root.getFile(path);
 				if (file == null || file.getType() != IResource.FILE) {
-					throw new CoreException(new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
+					throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
 				}
 				IPath location = file.getLocation();
 				if (location == null) {
-					throw new CoreException(new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
+					throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("file.notFound", path.toString()), null)); //$NON-NLS-1$
 				}
 				fileSystemPath= location.toOSString();
 			} else {
@@ -1122,7 +1122,7 @@ public class JavaModelManager implements ISaveParticipant {
 				}
 				return zipFile;
 			} catch (IOException e) {
-				throw new CoreException(new Status(Status.ERROR, PHPCore.PLUGIN_ID, -1, Util.bind("status.IOException"), e)); //$NON-NLS-1$
+				throw new CoreException(new Status(Status.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("status.IOException"), e)); //$NON-NLS-1$
 			}
 		}
 	}
@@ -1297,7 +1297,7 @@ public class JavaModelManager implements ISaveParticipant {
 				DataInputStream in= new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
 				try {
 					String pluginID= in.readUTF();
-					if (!pluginID.equals(PHPCore.PLUGIN_ID))
+					if (!pluginID.equals(JavaCore.PLUGIN_ID))
 						throw new IOException(Util.bind("build.wrongFileFormat")); //$NON-NLS-1$
 					String kind= in.readUTF();
 					if (!kind.equals("STATE")) //$NON-NLS-1$
@@ -1311,7 +1311,7 @@ public class JavaModelManager implements ISaveParticipant {
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
-				throw new CoreException(new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, Platform.PLUGIN_ERROR, "Error reading last build state for project "+ project.getName(), e)); //$NON-NLS-1$
+				throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, "Error reading last build state for project "+ project.getName(), e)); //$NON-NLS-1$
 			}
 		}
 		return null;
@@ -1453,7 +1453,7 @@ public class JavaModelManager implements ISaveParticipant {
 		try {
 			DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
 			try {
-				out.writeUTF(PHPCore.PLUGIN_ID);
+				out.writeUTF(JavaCore.PLUGIN_ID);
 				out.writeUTF("STATE"); //$NON-NLS-1$
 				if (info.savedState == null) {
 					out.writeBoolean(false);
@@ -1467,12 +1467,12 @@ public class JavaModelManager implements ISaveParticipant {
 		} catch (RuntimeException e) {
 			try {file.delete();} catch(SecurityException se) {}
 			throw new CoreException(
-				new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, Platform.PLUGIN_ERROR,
+				new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR,
 					Util.bind("build.cannotSaveState", info.project.getName()), e)); //$NON-NLS-1$
 		} catch (IOException e) {
 			try {file.delete();} catch(SecurityException se) {}
 			throw new CoreException(
-				new Status(IStatus.ERROR, PHPCore.PLUGIN_ID, Platform.PLUGIN_ERROR,
+				new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR,
 					Util.bind("build.cannotSaveState", info.project.getName()), e)); //$NON-NLS-1$
 		}
 		if (PHPBuilder.DEBUG) {
@@ -1508,7 +1508,7 @@ public class JavaModelManager implements ISaveParticipant {
 		if (vStats != null) {
 			IStatus[] stats= new IStatus[vStats.size()];
 			vStats.toArray(stats);
-			throw new CoreException(new MultiStatus(PHPCore.PLUGIN_ID, IStatus.ERROR, stats, Util.bind("build.cannotSaveStates"), null)); //$NON-NLS-1$
+			throw new CoreException(new MultiStatus(JavaCore.PLUGIN_ID, IStatus.ERROR, stats, Util.bind("build.cannotSaveStates"), null)); //$NON-NLS-1$
 		}
 	}
 
@@ -1520,7 +1520,7 @@ public class JavaModelManager implements ISaveParticipant {
 
 		// optional behaviour
 		// possible value of index 0 is Compute
-		if (!PHPCore.COMPUTE.equals(PHPCore.getOption(PHPCore.CORE_JAVA_BUILD_ORDER))) return; // cannot be customized at project level
+		if (!JavaCore.COMPUTE.equals(JavaCore.getOption(JavaCore.CORE_JAVA_BUILD_ORDER))) return; // cannot be customized at project level
 		
 		if (javaBuildOrder == null || javaBuildOrder.length <= 1) return;
 		
@@ -1661,11 +1661,11 @@ public class JavaModelManager implements ISaveParticipant {
 		if (variablePath == JavaModelManager.VariableInitializationInProgress){
 			return;
 		} 
-		Preferences preferences = PHPCore.getPlugin().getPluginPreferences();
+		Preferences preferences = JavaCore.getPlugin().getPluginPreferences();
 		String variableKey = CP_VARIABLE_PREFERENCES_PREFIX+variableName;
 		String variableString = variablePath == null ? CP_ENTRY_IGNORE : variablePath.toString();
 		preferences.setDefault(variableKey, CP_ENTRY_IGNORE); // use this default to get rid of removed ones
 		preferences.setValue(variableKey, variableString);
-		PHPCore.getPlugin().savePluginPreferences();
+		JavaCore.getPlugin().savePluginPreferences();
 	}
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
index 37a591d..9f7e031 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
@@ -13,7 +13,7 @@ package net.sourceforge.phpdt.internal.core;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatus;
 import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
 
 import org.eclipse.core.resources.IResourceStatus;
 import org.eclipse.core.runtime.CoreException;
@@ -68,13 +68,13 @@ public class JavaModelStatus
    */
   public JavaModelStatus() {
     // no code for an multi-status
-    super(ERROR, PHPCore.PLUGIN_ID, 0, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, 0, "JavaModelStatus", null); //$NON-NLS-1$
   }
   /**
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }
@@ -83,7 +83,7 @@ public class JavaModelStatus
    * elements.
    */
   public JavaModelStatus(int code, IJavaElement[] elements) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     fElements = elements;
     fPath = null;
   }
@@ -97,7 +97,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int severity, int code, String string) {
-    super(severity, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(severity, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     // fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
     fPath = null;
@@ -107,7 +107,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code, Throwable throwable) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", throwable); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", throwable); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }
@@ -115,7 +115,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code, IPath path) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     //		fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
     fPath = path;
@@ -148,7 +148,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(CoreException coreException) {
-    super(ERROR, PHPCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus", coreException); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus", coreException); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
index a634464..3215459 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
@@ -44,11 +44,11 @@ import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.codeassist.ISearchableNameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.util.ObjectVector;
 import net.sourceforge.phpdt.internal.corext.Assert;
 import net.sourceforge.phpeclipse.LoadPathEntry;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.apache.xerces.dom.DocumentImpl;
@@ -419,7 +419,7 @@ public class JavaProject
 					if (member != null && member.getType() == IResource.PROJECT){ // double check if bound to project (23977)
 						IProject projRsc = (IProject) member;
 						if (JavaProject.hasJavaNature(projRsc)) {				
-							JavaProject project = (JavaProject) PHPCore.create(projRsc);
+							JavaProject project = (JavaProject) JavaCore.create(projRsc);
 							project.computeExpandedClasspath(
 								initialProject, 
 								ignoreUnresolvedVariable, 
@@ -560,7 +560,7 @@ public class JavaProject
 					IProject requiredProjectRsc = (IProject) member;
 					if (JavaProject.hasJavaNature(requiredProjectRsc)){ // special builder binary output
 						rootIDs.add(rootID);
-						JavaProject requiredProject = (JavaProject)PHPCore.create(requiredProjectRsc);
+						JavaProject requiredProject = (JavaProject)JavaCore.create(requiredProjectRsc);
 						requiredProject.computePackageFragmentRoots(
 							requiredProject.getResolvedClasspath(true), 
 							accumulatedRoots, 
@@ -680,7 +680,7 @@ public class JavaProject
 
 			case  IJavaModelStatusConstants.CLASSPATH_CYCLE :
 				isCycleProblem = true;
-				if (PHPCore.ERROR.equals(getOption(PHPCore.CORE_CIRCULAR_CLASSPATH, true))) {
+				if (JavaCore.ERROR.equals(getOption(JavaCore.CORE_CIRCULAR_CLASSPATH, true))) {
 					severity = IMarker.SEVERITY_ERROR;
 				} else {
 					severity = IMarker.SEVERITY_WARNING;
@@ -695,7 +695,7 @@ public class JavaProject
 			default:
 				IPath path = status.getPath();
 				if (path != null) arguments = new String[] { path.toString() };
-				if (PHPCore.ERROR.equals(getOption(PHPCore.CORE_INCOMPLETE_CLASSPATH, true))) {
+				if (JavaCore.ERROR.equals(getOption(JavaCore.CORE_INCOMPLETE_CLASSPATH, true))) {
 					severity = IMarker.SEVERITY_ERROR;
 				} else {
 					severity = IMarker.SEVERITY_WARNING;
@@ -836,7 +836,7 @@ public class JavaProject
 	protected IClasspathEntry[] defaultClasspath() throws JavaModelException {
 
 		return new IClasspathEntry[] {
-			 PHPCore.newSourceEntry(getProject().getFullPath())};
+			 JavaCore.newSourceEntry(getProject().getFullPath())};
 	}
 
 	/**
@@ -1296,7 +1296,7 @@ public class JavaProject
 			
 			Preferences preferences = getPreferences();
 			if (preferences == null || preferences.isDefault(optionName)) {
-				return inheritJavaCoreOptions ? PHPCore.getOption(optionName) : null;
+				return inheritJavaCoreOptions ? JavaCore.getOption(optionName) : null;
 			}
 			return preferences.getString(optionName).trim();
 		}
@@ -1309,7 +1309,7 @@ public class JavaProject
 	public Map getOptions(boolean inheritJavaCoreOptions) {
 		
 		// initialize to the defaults from JavaCore options pool
-		Map options = inheritJavaCoreOptions ? PHPCore.getOptions() : new Hashtable(5);
+		Map options = inheritJavaCoreOptions ? JavaCore.getOptions() : new Hashtable(5);
 
 		Preferences preferences = getPreferences();
 		if (preferences == null) return options; // cannot do better (non-Java project)
@@ -1693,7 +1693,7 @@ public class JavaProject
 				
 				case IClasspathEntry.CPE_VARIABLE :
 				
-					IClasspathEntry resolvedEntry = PHPCore.getResolvedClasspathEntry(rawEntry);
+					IClasspathEntry resolvedEntry = JavaCore.getResolvedClasspathEntry(rawEntry);
 					if (resolvedEntry == null) {
 						if (!ignoreUnresolvedEntry) throw new JavaModelException(status);
 					} else {
@@ -1955,7 +1955,7 @@ public class JavaProject
 	 	Preferences preferences = new Preferences();
 	 	
 //		File prefFile = getProject().getLocation().append(PREF_FILENAME).toFile();
-		IPath projectMetaLocation = getProject().getPluginWorkingLocation(PHPCore.getPlugin().getDescriptor());
+		IPath projectMetaLocation = getProject().getPluginWorkingLocation(JavaCore.getPlugin().getDescriptor());
 		if (projectMetaLocation != null) {
 			File prefFile = projectMetaLocation.append(PREF_FILENAME).toFile();
 			if (prefFile.exists()) { // load preferences from file
@@ -2164,7 +2164,7 @@ public class JavaProject
 		// the preferences file is located in the plug-in's state area
 		// at a well-known name (.jprefs)
 //		File prefFile = getProject().getLocation().append(PREF_FILENAME).toFile();
-		File prefFile = project.getPluginWorkingLocation(PHPCore.getPlugin().getDescriptor()).append(PREF_FILENAME).toFile();
+		File prefFile = project.getPluginWorkingLocation(JavaCore.getPlugin().getDescriptor()).append(PREF_FILENAME).toFile();
 		if (preferences.propertyNames().length == 0) {
 			// there are no preference settings
 			// rather than write an empty file, just delete any existing file
@@ -2438,8 +2438,8 @@ public class JavaProject
 			
 			if (cycleParticipants.contains(project.getPath())){
 				IMarker cycleMarker = project.getCycleMarker();
-				String circularCPOption = project.getOption(PHPCore.CORE_CIRCULAR_CLASSPATH, true);
-				int circularCPSeverity = PHPCore.ERROR.equals(circularCPOption) ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING;
+				String circularCPOption = project.getOption(JavaCore.CORE_CIRCULAR_CLASSPATH, true);
+				int circularCPSeverity = JavaCore.ERROR.equals(circularCPOption) ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING;
 				if (cycleMarker != null) {
 					// update existing cycle marker if needed
 					try {
@@ -2491,7 +2491,7 @@ public class JavaProject
 						if (!traversed.contains(prereqProjectPath)) {
 							IResource member = workspaceRoot.findMember(prereqProjectPath);
 							if (member != null && member.getType() == IResource.PROJECT){
-								JavaProject project = (JavaProject)PHPCore.create((IProject)member);
+								JavaProject project = (JavaProject)JavaCore.create((IProject)member);
 								project.updateCycleParticipants(null, prereqChain, cycleParticipants, workspaceRoot, traversed);
 							}
 						}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java
index d32a9d3..f2d66c4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java
@@ -24,8 +24,8 @@ import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.IWorkingCopy;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.ICompilationUnit;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.core.util.PerThreadObject;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
@@ -260,7 +260,7 @@ public class NameLookup {
 				}
 			}
 		} else {
-			IJavaElement fromFactory = PHPCore.create(possibleFragment);
+			IJavaElement fromFactory = JavaCore.create(possibleFragment);
 			if (fromFactory == null) {
 				return null;
 			}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
index 11aec11..f3e3f82 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
@@ -17,8 +17,8 @@ import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -623,7 +623,7 @@ public IResource getResource() {
  * of this root.
  */
 protected QualifiedName getSourceAttachmentPropertyName() throws JavaModelException {
-	return new QualifiedName(PHPCore.PLUGIN_ID, "sourceattachment: " + this.getPath().toOSString()); //$NON-NLS-1$
+	return new QualifiedName(JavaCore.PLUGIN_ID, "sourceattachment: " + this.getPath().toOSString()); //$NON-NLS-1$
 }
 
 public void setSourceAttachmentProperty(String property) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java
index 825cd1a..93e8ef0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java
@@ -22,12 +22,12 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.core.util.CharArrayBuffer;
 import net.sourceforge.phpdt.internal.corext.Assert;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -619,7 +619,7 @@ public class Util {
 	 * Returns the given file's contents as a character array.
 	 */
 	public static char[] getResourceContentsAsCharArray(IFile file) throws JavaModelException {
-		String encoding = PHPCore.create(file.getProject()).getOption(PHPCore.CORE_ENCODING, true);
+		String encoding = JavaCore.create(file.getProject()).getOption(JavaCore.CORE_ENCODING, true);
 		return getResourceContentsAsCharArray(file, encoding);
 	}
 
@@ -848,11 +848,11 @@ public class Util {
 		}
 		IStatus status= new Status(
 			IStatus.ERROR, 
-			PHPCore.getPlugin().getDescriptor().getUniqueIdentifier(), 
+			JavaCore.getPlugin().getDescriptor().getUniqueIdentifier(), 
 			IStatus.ERROR, 
 			message, 
 			e); 
-		PHPCore.getPlugin().getLog().log(status);
+		JavaCore.getPlugin().getLog().log(status);
 	}	
 	
 	/**
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/WorkingCopy.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/WorkingCopy.java
index 416eb26..f101c98 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/WorkingCopy.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/WorkingCopy.java
@@ -25,7 +25,7 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -89,7 +89,7 @@ public void commit(boolean force, IProgressMonitor monitor) throws JavaModelExce
 		CommitWorkingCopyOperation op= new CommitWorkingCopyOperation(this, force);
 		runOperation(op, monitor);
 	} else {
-		String encoding = this.getJavaProject().getOption(PHPCore.CORE_ENCODING, true);
+		String encoding = this.getJavaProject().getOption(JavaCore.CORE_ENCODING, true);
 		String contents = this.getSource();
 		if (contents == null) return;
 		try {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
index 6b40b16..e79256b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
@@ -15,6 +15,7 @@ import java.util.Locale;
 
 import net.sourceforge.phpdt.core.IJavaModelMarker;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.Compiler;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
@@ -22,7 +23,6 @@ import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
 import net.sourceforge.phpdt.internal.compiler.ICompilerRequestor;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.core.Util;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
@@ -65,7 +65,7 @@ protected AbstractImageBuilder(PHPBuilder javaBuilder) {
 	this.sourceLocations = this.nameEnvironment.sourceLocations;
 	this.notifier = javaBuilder.notifier;
 
-	this.encoding = javaBuilder.javaProject.getOption(PHPCore.CORE_ENCODING, true);
+	this.encoding = javaBuilder.javaProject.getOption(JavaCore.CORE_ENCODING, true);
 	this.compiler = newCompiler();
 	this.workQueue = new WorkQueue();
 	this.problemSourceFiles = new ArrayList(3);
@@ -215,7 +215,7 @@ protected void createErrorFor(IResource resource, String message) {
 		IMarker marker = resource.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
 		int severity = IMarker.SEVERITY_ERROR;
 		if (message.equals(Util.bind("build.duplicateResource"))) //$NON-NLS-1$
-			if (PHPCore.WARNING.equals(javaBuilder.javaProject.getOption(PHPCore.CORE_JAVA_BUILD_DUPLICATE_RESOURCE, true)))
+			if (JavaCore.WARNING.equals(javaBuilder.javaProject.getOption(JavaCore.CORE_JAVA_BUILD_DUPLICATE_RESOURCE, true)))
 				severity = IMarker.SEVERITY_WARNING;
 		marker.setAttributes(
 			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END},
@@ -387,9 +387,9 @@ protected void storeTasksFor(SourceFile sourceFile, IProblem[] tasks) throws Cor
 			IMarker marker = resource.createMarker(IJavaModelMarker.TASK_MARKER);
 			int priority = IMarker.PRIORITY_NORMAL;
 			String compilerPriority = task.getArguments()[2];
-			if (PHPCore.COMPILER_TASK_PRIORITY_HIGH.equals(compilerPriority))
+			if (JavaCore.COMPILER_TASK_PRIORITY_HIGH.equals(compilerPriority))
 				priority = IMarker.PRIORITY_HIGH;
-			else if (PHPCore.COMPILER_TASK_PRIORITY_LOW.equals(compilerPriority))
+			else if (JavaCore.COMPILER_TASK_PRIORITY_LOW.equals(compilerPriority))
 				priority = IMarker.PRIORITY_LOW;
 			marker.setAttributes(
 				new String[] {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
index 2be5495..967d8c3 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
@@ -12,9 +12,9 @@ package net.sourceforge.phpdt.internal.core.builder;
 
 import java.util.ArrayList;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.Util;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 
@@ -102,8 +102,8 @@ protected void addAllSourceFiles(final ArrayList sourceFiles) throws CoreExcepti
 }
 
 protected void cleanOutputFolders() throws CoreException {
-	boolean deleteAll = PHPCore.CLEAN.equals(
-		javaBuilder.javaProject.getOption(PHPCore.CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, true));
+	boolean deleteAll = JavaCore.CLEAN.equals(
+		javaBuilder.javaProject.getOption(JavaCore.CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, true));
 	if (deleteAll) {
 		ArrayList visited = new ArrayList(sourceLocations.length);
 		for (int i = 0, l = sourceLocations.length; i < l; i++) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
index 635ac56..ffbe886 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
@@ -137,7 +137,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
             / allSourceFiles.length);
         increment = increment / 2;
         compile(allSourceFiles);
-        removeSecondaryTypes();
+//        removeSecondaryTypes();
         addAffectedSourceFiles();
       }
       if (this.hasStructuralChanges && javaBuilder.javaProject.hasCycleMarker())
@@ -171,41 +171,41 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
     // if a well known name was found then we can skip over these
     if (simpleNames.length < simpleStrings.size())
       simpleNames = null;
-    Object[] keyTable = newState.references.keyTable;
-    Object[] valueTable = newState.references.valueTable;
-    next : for (int i = 0, l = valueTable.length; i < l; i++) {
-      ReferenceCollection refs = (ReferenceCollection) valueTable[i];
-      if (refs != null && refs.includes(qualifiedNames, simpleNames)) {
-        String typeLocator = (String) keyTable[i];
-        IFile file = javaBuilder.currentProject.getFile(typeLocator);
-        if (file.exists()) {
-          ClasspathMultiDirectory md = sourceLocations[0];
-          if (sourceLocations.length > 1) {
-            IPath sourceFileFullPath = file.getFullPath();
-            for (int j = 0, m = sourceLocations.length; j < m; j++) {
-              if (sourceLocations[j].sourceFolder.getFullPath().isPrefixOf(
-                  sourceFileFullPath)) {
-                md = sourceLocations[j];
-                if (md.exclusionPatterns == null
-                    || !Util.isExcluded(file, md.exclusionPatterns))
-                  break;
-              }
-            }
-          }
-          SourceFile sourceFile = new SourceFile(file, md, encoding);
-          if (sourceFiles.contains(sourceFile))
-            continue next;
-          if (compiledAllAtOnce && previousSourceFiles != null
-              && previousSourceFiles.contains(sourceFile))
-            continue next; // can skip previously compiled files since already
-          // saw hierarchy related problems
-          if (PHPBuilder.DEBUG)
-            System.out.println("  adding affected source file " + typeLocator); //$NON-NLS-1$
-          //				// update indexfile for the project:
-          sourceFiles.add(sourceFile);
-        }
-      }
-    }
+//    Object[] keyTable = newState.references.keyTable;
+//    Object[] valueTable = newState.references.valueTable;
+//    next : for (int i = 0, l = valueTable.length; i < l; i++) {
+//      ReferenceCollection refs = (ReferenceCollection) valueTable[i];
+//      if (refs != null && refs.includes(qualifiedNames, simpleNames)) {
+//        String typeLocator = (String) keyTable[i];
+//        IFile file = javaBuilder.currentProject.getFile(typeLocator);
+//        if (file.exists()) {
+//          ClasspathMultiDirectory md = sourceLocations[0];
+//          if (sourceLocations.length > 1) {
+//            IPath sourceFileFullPath = file.getFullPath();
+//            for (int j = 0, m = sourceLocations.length; j < m; j++) {
+//              if (sourceLocations[j].sourceFolder.getFullPath().isPrefixOf(
+//                  sourceFileFullPath)) {
+//                md = sourceLocations[j];
+//                if (md.exclusionPatterns == null
+//                    || !Util.isExcluded(file, md.exclusionPatterns))
+//                  break;
+//              }
+//            }
+//          }
+//          SourceFile sourceFile = new SourceFile(file, md, encoding);
+//          if (sourceFiles.contains(sourceFile))
+//            continue next;
+//          if (compiledAllAtOnce && previousSourceFiles != null
+//              && previousSourceFiles.contains(sourceFile))
+//            continue next; // can skip previously compiled files since already
+//          // saw hierarchy related problems
+//          if (PHPBuilder.DEBUG)
+//            System.out.println("  adding affected source file " + typeLocator); //$NON-NLS-1$
+//          //				// update indexfile for the project:
+//          sourceFiles.add(sourceFile);
+//        }
+//      }
+//    }
   }
   protected void addDependentsOf(IPath path, boolean hasStructuralChanges) {
     if (hasStructuralChanges) {
@@ -292,12 +292,12 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
             if (binaryDelta.getKind() == IResourceDelta.ADDED) {
               // see if any known source file is from the same package...
               // classpath already includes new package
-              if (!newState.isKnownPackage(packageName)) {
-                if (PHPBuilder.DEBUG)
-                  System.out.println("Found added package " + packageName); //$NON-NLS-1$
-                addDependentsOf(packagePath, false);
-                return;
-              }
+//              if (!newState.isKnownPackage(packageName)) {
+//                if (PHPBuilder.DEBUG)
+//                  System.out.println("Found added package " + packageName); //$NON-NLS-1$
+//                addDependentsOf(packagePath, false);
+//                return;
+//              }
               if (PHPBuilder.DEBUG)
                 System.out.println("Skipped dependents of added package "
                     + packageName); //$NON-NLS-1$
@@ -453,37 +453,37 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
                     + typeLocator); //$NON-NLS-1$
               sourceFiles.add(new SourceFile((IFile) resource, md, encoding));
               String typeName = typePath.toString();
-              if (!newState.isDuplicateLocator(typeName, typeLocator)) { // adding
-                // dependents
-                // results
-                // in
-                // 2
-                // duplicate
-                // errors
-                if (PHPBuilder.DEBUG)
-                  System.out.println("Found added source file " + typeName); //$NON-NLS-1$
-                addDependentsOf(typePath, true);
-              }
+//              if (!newState.isDuplicateLocator(typeName, typeLocator)) { // adding
+//                // dependents
+//                // results
+//                // in
+//                // 2
+//                // duplicate
+//                // errors
+//                if (PHPBuilder.DEBUG)
+//                  System.out.println("Found added source file " + typeName); //$NON-NLS-1$
+//                addDependentsOf(typePath, true);
+//              }
               return;
             case IResourceDelta.REMOVED :
-              char[][] definedTypeNames = newState
-                  .getDefinedTypeNamesFor(typeLocator);
-              if (definedTypeNames == null) { // defined a single type matching
-                // typePath
-                removeClassFile(typePath, md.binaryFolder);
-                if ((sourceDelta.getFlags() & IResourceDelta.MOVED_TO) != 0) {
-                  // remove problems and tasks for a compilation unit that is
-                  // being moved (to another package or renamed)
-                  // if the target file is a compilation unit, the new cu will
-                  // be recompiled
-                  // if the target file is a non-java resource, then markers
-                  // are removed
-                  // see bug 2857
-                  IResource movedFile = javaBuilder.workspaceRoot
-                      .getFile(sourceDelta.getMovedToPath());
-                  PHPBuilder.removeProblemsAndTasksFor(movedFile);
-                }
-              } else {
+//              char[][] definedTypeNames = newState
+//                  .getDefinedTypeNamesFor(typeLocator);
+//              if (definedTypeNames == null) { // defined a single type matching
+//                // typePath
+//                removeClassFile(typePath, md.binaryFolder);
+//                if ((sourceDelta.getFlags() & IResourceDelta.MOVED_TO) != 0) {
+//                  // remove problems and tasks for a compilation unit that is
+//                  // being moved (to another package or renamed)
+//                  // if the target file is a compilation unit, the new cu will
+//                  // be recompiled
+//                  // if the target file is a non-java resource, then markers
+//                  // are removed
+//                  // see bug 2857
+//                  IResource movedFile = javaBuilder.workspaceRoot
+//                      .getFile(sourceDelta.getMovedToPath());
+//                  PHPBuilder.removeProblemsAndTasksFor(movedFile);
+//                }
+//              } else {
                 if (PHPBuilder.DEBUG)
                   System.out.println("Found removed source file "
                       + typePath.toString()); //$NON-NLS-1$
@@ -491,16 +491,16 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
                 // source file since it may be
                 // involved in a name
                 // collision
-                if (definedTypeNames.length > 0) { // skip it if it failed to
-                  // successfully define a
-                  // type
-                  IPath packagePath = typePath.removeLastSegments(1);
-                  for (int i = 0, l = definedTypeNames.length; i < l; i++)
-                    removeClassFile(packagePath.append(new String(
-                        definedTypeNames[i])), md.binaryFolder);
-                }
-              }
-              newState.removeLocator(typeLocator);
+//                if (definedTypeNames.length > 0) { // skip it if it failed to
+//                  // successfully define a
+//                  // type
+//                  IPath packagePath = typePath.removeLastSegments(1);
+//                  for (int i = 0, l = definedTypeNames.length; i < l; i++)
+//                    removeClassFile(packagePath.append(new String(
+//                        definedTypeNames[i])), md.binaryFolder);
+//                }
+//              }
+//              newState.removeLocator(typeLocator);
               return;
             case IResourceDelta.CHANGED :
               if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0)
@@ -573,73 +573,73 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
   protected void finishedWith(String sourceLocator, CompilationResult result,
       char[] mainTypeName, ArrayList definedTypeNames,
       ArrayList duplicateTypeNames) throws CoreException {
-    char[][] previousTypeNames = newState.getDefinedTypeNamesFor(sourceLocator);
-    if (previousTypeNames == null)
-      previousTypeNames = new char[][]{mainTypeName};
-    IPath packagePath = null;
-    next : for (int i = 0, l = previousTypeNames.length; i < l; i++) {
-      char[] previous = previousTypeNames[i];
-      for (int j = 0, m = definedTypeNames.size(); j < m; j++)
-        if (CharOperation.equals(previous, (char[]) definedTypeNames.get(j)))
-          continue next;
-      SourceFile sourceFile = (SourceFile) result.getCompilationUnit();
-      if (packagePath == null) {
-        int count = sourceFile.sourceLocation.sourceFolder.getFullPath()
-            .segmentCount();
-        packagePath = sourceFile.resource.getFullPath().removeFirstSegments(
-            count).removeLastSegments(1);
-      }
-      if (secondaryTypesToRemove == null)
-        this.secondaryTypesToRemove = new SimpleLookupTable();
-      ArrayList types = (ArrayList) secondaryTypesToRemove
-          .get(sourceFile.sourceLocation.binaryFolder);
-      if (types == null)
-        types = new ArrayList(definedTypeNames.size());
-      types.add(packagePath.append(new String(previous)));
-      secondaryTypesToRemove.put(sourceFile.sourceLocation.binaryFolder, types);
-    }
+//    char[][] previousTypeNames = newState.getDefinedTypeNamesFor(sourceLocator);
+//    if (previousTypeNames == null)
+//      previousTypeNames = new char[][]{mainTypeName};
+//    IPath packagePath = null;
+//    next : for (int i = 0, l = previousTypeNames.length; i < l; i++) {
+//      char[] previous = previousTypeNames[i];
+//      for (int j = 0, m = definedTypeNames.size(); j < m; j++)
+//        if (CharOperation.equals(previous, (char[]) definedTypeNames.get(j)))
+//          continue next;
+//      SourceFile sourceFile = (SourceFile) result.getCompilationUnit();
+//      if (packagePath == null) {
+//        int count = sourceFile.sourceLocation.sourceFolder.getFullPath()
+//            .segmentCount();
+//        packagePath = sourceFile.resource.getFullPath().removeFirstSegments(
+//            count).removeLastSegments(1);
+//      }
+//      if (secondaryTypesToRemove == null)
+//        this.secondaryTypesToRemove = new SimpleLookupTable();
+//      ArrayList types = (ArrayList) secondaryTypesToRemove
+//          .get(sourceFile.sourceLocation.binaryFolder);
+//      if (types == null)
+//        types = new ArrayList(definedTypeNames.size());
+//      types.add(packagePath.append(new String(previous)));
+//      secondaryTypesToRemove.put(sourceFile.sourceLocation.binaryFolder, types);
+//    }
     //	super.finishedWith(sourceLocator, result, mainTypeName,
     // definedTypeNames, duplicateTypeNames);
   }
-  protected void removeClassFile(IPath typePath, IContainer outputFolder)
-      throws CoreException {
-    if (typePath.lastSegment().indexOf('$') == -1) { // is not a nested type
-      newState.removeQualifiedTypeName(typePath.toString());
-      // add dependents even when the type thinks it does not exist to be on
-      // the safe side
-      if (PHPBuilder.DEBUG)
-        System.out.println("Found removed type " + typePath); //$NON-NLS-1$
-      addDependentsOf(typePath, true); // when member types are removed, their
-      // enclosing type is structurally
-      // changed
-    }
-    IFile classFile = outputFolder.getFile(typePath
-        .addFileExtension(PHPBuilder.CLASS_EXTENSION));
-    if (classFile.exists()) {
-      if (PHPBuilder.DEBUG)
-        System.out.println("Deleting class file of removed type " + typePath); //$NON-NLS-1$
-      classFile.delete(IResource.FORCE, null);
-    }
-  }
-  protected void removeSecondaryTypes() throws CoreException {
-    if (secondaryTypesToRemove != null) { // delayed deleting secondary types
-      // until the end of the compile loop
-      Object[] keyTable = secondaryTypesToRemove.keyTable;
-      Object[] valueTable = secondaryTypesToRemove.valueTable;
-      for (int i = 0, l = keyTable.length; i < l; i++) {
-        IContainer outputFolder = (IContainer) keyTable[i];
-        if (outputFolder != null) {
-          ArrayList paths = (ArrayList) valueTable[i];
-          for (int j = 0, m = paths.size(); j < m; j++)
-            removeClassFile((IPath) paths.get(j), outputFolder);
-        }
-      }
-      this.secondaryTypesToRemove = null;
-      if (previousSourceFiles != null && previousSourceFiles.size() > 1)
-        this.previousSourceFiles = null; // cannot optimize recompile case when
-      // a secondary type is deleted
-    }
-  }
+//  protected void removeClassFile(IPath typePath, IContainer outputFolder)
+//      throws CoreException {
+//    if (typePath.lastSegment().indexOf('$') == -1) { // is not a nested type
+//      newState.removeQualifiedTypeName(typePath.toString());
+//      // add dependents even when the type thinks it does not exist to be on
+//      // the safe side
+//      if (PHPBuilder.DEBUG)
+//        System.out.println("Found removed type " + typePath); //$NON-NLS-1$
+//      addDependentsOf(typePath, true); // when member types are removed, their
+//      // enclosing type is structurally
+//      // changed
+//    }
+//    IFile classFile = outputFolder.getFile(typePath
+//        .addFileExtension(PHPBuilder.CLASS_EXTENSION));
+//    if (classFile.exists()) {
+//      if (PHPBuilder.DEBUG)
+//        System.out.println("Deleting class file of removed type " + typePath); //$NON-NLS-1$
+//      classFile.delete(IResource.FORCE, null);
+//    }
+//  }
+//  protected void removeSecondaryTypes() throws CoreException {
+//    if (secondaryTypesToRemove != null) { // delayed deleting secondary types
+//      // until the end of the compile loop
+//      Object[] keyTable = secondaryTypesToRemove.keyTable;
+//      Object[] valueTable = secondaryTypesToRemove.valueTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++) {
+//        IContainer outputFolder = (IContainer) keyTable[i];
+//        if (outputFolder != null) {
+//          ArrayList paths = (ArrayList) valueTable[i];
+//          for (int j = 0, m = paths.size(); j < m; j++)
+//            removeClassFile((IPath) paths.get(j), outputFolder);
+//        }
+//      }
+//      this.secondaryTypesToRemove = null;
+//      if (previousSourceFiles != null && previousSourceFiles.size() > 1)
+//        this.previousSourceFiles = null; // cannot optimize recompile case when
+//      // a secondary type is deleted
+//    }
+//  }
   protected void resetCollections() {
     previousSourceFiles = sourceFiles.isEmpty()
         ? null
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
index 9265c4c..50456a0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.IClasspathEntry;
 import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.env.NameEnvironmentAnswer;
@@ -22,7 +23,6 @@ import net.sourceforge.phpdt.internal.core.ClasspathEntry;
 import net.sourceforge.phpdt.internal.core.JavaModel;
 import net.sourceforge.phpdt.internal.core.JavaProject;
 import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
@@ -93,7 +93,7 @@ public class NameEnvironment implements INameEnvironment {
   	/* Update cycle marker */
   	IMarker cycleMarker = javaProject.getCycleMarker();
   	if (cycleMarker != null) {
-  		int severity = PHPCore.ERROR.equals(javaProject.getOption(PHPCore.CORE_CIRCULAR_CLASSPATH, true))
+  		int severity = JavaCore.ERROR.equals(javaProject.getOption(JavaCore.CORE_CIRCULAR_CLASSPATH, true))
   			? IMarker.SEVERITY_ERROR
   			: IMarker.SEVERITY_WARNING;
   		if (severity != ((Integer) cycleMarker.getAttribute(IMarker.SEVERITY)).intValue())
@@ -131,7 +131,7 @@ public class NameEnvironment implements INameEnvironment {
   				IProject prereqProject = (IProject) target;
   				if (!JavaProject.hasJavaNature(prereqProject)) continue nextEntry; // if project doesn't have java nature or is not accessible
   
-  				JavaProject prereqJavaProject = (JavaProject) PHPCore.create(prereqProject);
+  				JavaProject prereqJavaProject = (JavaProject) JavaCore.create(prereqProject);
   				IClasspathEntry[] prereqClasspathEntries = prereqJavaProject.getRawClasspath();
   				ArrayList seen = new ArrayList();
   				nextPrereqEntry: for (int j = 0, m = prereqClasspathEntries.length; j < m; j++) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
index 575bb44..f7a56a6 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
@@ -20,6 +20,7 @@ import java.util.Map;
 import net.sourceforge.phpdt.core.IClasspathEntry;
 import net.sourceforge.phpdt.core.IJavaModelMarker;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.core.JavaModel;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
@@ -27,7 +28,6 @@ import net.sourceforge.phpdt.internal.core.JavaProject;
 import net.sourceforge.phpdt.internal.core.Util;
 import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 import net.sourceforge.phpeclipse.phpeditor.PHPParserAction;
@@ -532,7 +532,7 @@ public class PHPBuilder extends IncrementalProjectBuilder {
     return false;
   }
   private void initializeBuilder() throws CoreException {
-    this.javaProject = (JavaProject) PHPCore.create(currentProject);
+    this.javaProject = (JavaProject) JavaCore.create(currentProject);
     this.workspaceRoot = currentProject.getWorkspace().getRoot();
     // Flush the existing external files cache if this is the beginning of a
     // build cycle
@@ -546,7 +546,7 @@ public class PHPBuilder extends IncrementalProjectBuilder {
     this.nameEnvironment = new NameEnvironment(workspaceRoot, javaProject,
         binaryLocationsPerProject);
     String filterSequence = javaProject.getOption(
-        PHPCore.CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, true);
+        JavaCore.CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, true);
     char[][] filters = filterSequence != null && filterSequence.length() > 0
         ? CharOperation.splitAndTrimOn(',', filterSequence.toCharArray())
         : null;
@@ -591,8 +591,8 @@ public class PHPBuilder extends IncrementalProjectBuilder {
     return false;
   }
   private boolean isWorthBuilding() throws CoreException {
-    boolean abortBuilds = PHPCore.ABORT.equals(javaProject.getOption(
-        PHPCore.CORE_JAVA_BUILD_INVALID_CLASSPATH, true));
+    boolean abortBuilds = JavaCore.ABORT.equals(javaProject.getOption(
+        JavaCore.CORE_JAVA_BUILD_INVALID_CLASSPATH, true));
     if (!abortBuilds)
       return true;
     // Abort build only if there are classpath errors
@@ -622,10 +622,10 @@ public class PHPBuilder extends IncrementalProjectBuilder {
       if (getLastState(p) == null) {
         // The prereq project has no build state: if this prereq project has a
         // 'warning' cycle marker then allow build (see bug id 23357)
-        JavaProject prereq = (JavaProject) PHPCore.create(p);
+        JavaProject prereq = (JavaProject) JavaCore.create(p);
         if (prereq.hasCycleMarker()
-            && PHPCore.WARNING.equals(javaProject.getOption(
-                PHPCore.CORE_CIRCULAR_CLASSPATH, true)))
+            && JavaCore.WARNING.equals(javaProject.getOption(
+                JavaCore.CORE_CIRCULAR_CLASSPATH, true)))
           continue;
         if (DEBUG)
           System.out.println("Aborted build because prereq project "
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java
index 06bf6ca..9b0a223 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java
@@ -36,9 +36,9 @@ public class State {
   //ClasspathLocation[] binaryLocations;
   // keyed by the project relative path of the type (ie. "src1/p1/p2/A.java"), value is a ReferenceCollection or an
   // AdditionalTypeCollection
-  SimpleLookupTable references;
+//  SimpleLookupTable references;
   // keyed by qualified type name "p1/p2/A", value is the project relative path which defines this type "src1/p1/p2/A.java"
-  SimpleLookupTable typeLocators;
+//  SimpleLookupTable typeLocators;
 
   int buildNumber;
   long lastStructuralBuildTime;
@@ -61,8 +61,8 @@ public class State {
     this.javaProjectName = javaBuilder.currentProject.getName();
     this.sourceLocations = javaBuilder.nameEnvironment.sourceLocations;
     //	this.binaryLocations = javaBuilder.nameEnvironment.binaryLocations;
-    this.references = new SimpleLookupTable(7);
-    this.typeLocators = new SimpleLookupTable(7);
+//    this.references = new SimpleLookupTable(7);
+//    this.typeLocators = new SimpleLookupTable(7);
 
     this.buildNumber = 0; // indicates a full build
     this.lastStructuralBuildTime = System.currentTimeMillis();
@@ -70,91 +70,91 @@ public class State {
   }
 
   void copyFrom(State lastState) {
-    try {
+//    try {
       this.knownPackageNames = null;
       this.buildNumber = lastState.buildNumber + 1;
       this.lastStructuralBuildTime = lastState.lastStructuralBuildTime;
-      this.references = (SimpleLookupTable) lastState.references.clone();
-      this.typeLocators = (SimpleLookupTable) lastState.typeLocators.clone();
-    } catch (CloneNotSupportedException e) {
-      this.references = new SimpleLookupTable(lastState.references.elementSize);
-      Object[] keyTable = lastState.references.keyTable;
-      Object[] valueTable = lastState.references.valueTable;
-      for (int i = 0, l = keyTable.length; i < l; i++)
-        if (keyTable[i] != null)
-          this.references.put(keyTable[i], valueTable[i]);
-
-      this.typeLocators = new SimpleLookupTable(lastState.typeLocators.elementSize);
-      keyTable = lastState.typeLocators.keyTable;
-      valueTable = lastState.typeLocators.valueTable;
-      for (int i = 0, l = keyTable.length; i < l; i++)
-        if (keyTable[i] != null)
-          this.typeLocators.put(keyTable[i], valueTable[i]);
-    }
-  }
-
-  char[][] getDefinedTypeNamesFor(String typeLocator) {
-    Object c = references.get(typeLocator);
-    if (c instanceof AdditionalTypeCollection)
-      return ((AdditionalTypeCollection) c).definedTypeNames;
-    return null; // means only one type is defined with the same name as the file... saves space
-  }
-
-  boolean isDuplicateLocator(String qualifiedTypeName, String typeLocator) {
-    String existing = (String) typeLocators.get(qualifiedTypeName);
-    return existing != null && !existing.equals(typeLocator);
-  }
-
-  boolean isKnownPackage(String qualifiedPackageName) {
-    if (knownPackageNames == null) {
-      ArrayList names = new ArrayList(typeLocators.elementSize);
-      Object[] keyTable = typeLocators.keyTable;
-      for (int i = 0, l = keyTable.length; i < l; i++) {
-        if (keyTable[i] != null) {
-          String packageName = (String) keyTable[i]; // is a type name of the form p1/p2/A
-          int last = packageName.lastIndexOf('/');
-          packageName = last == -1 ? null : packageName.substring(0, last);
-          while (packageName != null && !names.contains(packageName)) {
-            names.add(packageName);
-            last = packageName.lastIndexOf('/');
-            packageName = last == -1 ? null : packageName.substring(0, last);
-          }
-        }
-      }
-      knownPackageNames = new String[names.size()];
-      names.toArray(knownPackageNames);
-    }
-    for (int i = 0, l = knownPackageNames.length; i < l; i++)
-      if (knownPackageNames[i].equals(qualifiedPackageName))
-        return true;
-    return false;
+//      this.references = (SimpleLookupTable) lastState.references.clone();
+//      this.typeLocators = (SimpleLookupTable) lastState.typeLocators.clone();
+//    } catch (CloneNotSupportedException e) {
+//      this.references = new SimpleLookupTable(lastState.references.elementSize);
+//      Object[] keyTable = lastState.references.keyTable;
+//      Object[] valueTable = lastState.references.valueTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++)
+//        if (keyTable[i] != null)
+//          this.references.put(keyTable[i], valueTable[i]);
+//
+//      this.typeLocators = new SimpleLookupTable(lastState.typeLocators.elementSize);
+//      keyTable = lastState.typeLocators.keyTable;
+//      valueTable = lastState.typeLocators.valueTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++)
+//        if (keyTable[i] != null)
+//          this.typeLocators.put(keyTable[i], valueTable[i]);
+//    }
   }
 
-  void record(String typeLocator, char[][][] qualifiedRefs, char[][] simpleRefs, char[] mainTypeName, ArrayList typeNames) {
-    if (typeNames.size() == 1 && CharOperation.equals(mainTypeName, (char[]) typeNames.get(0))) {
-      references.put(typeLocator, new ReferenceCollection(qualifiedRefs, simpleRefs));
-    } else {
-      char[][] definedTypeNames = new char[typeNames.size()][]; // can be empty when no types are defined
-      typeNames.toArray(definedTypeNames);
-      references.put(typeLocator, new AdditionalTypeCollection(definedTypeNames, qualifiedRefs, simpleRefs));
-    }
-  }
-
-  void recordLocatorForType(String qualifiedTypeName, String typeLocator) {
-    this.knownPackageNames = null;
-    typeLocators.put(qualifiedTypeName, typeLocator);
-  }
+//  char[][] getDefinedTypeNamesFor(String typeLocator) {
+//    Object c = references.get(typeLocator);
+//    if (c instanceof AdditionalTypeCollection)
+//      return ((AdditionalTypeCollection) c).definedTypeNames;
+//    return null; // means only one type is defined with the same name as the file... saves space
+//  }
+
+//  boolean isDuplicateLocator(String qualifiedTypeName, String typeLocator) {
+//    String existing = (String) typeLocators.get(qualifiedTypeName);
+//    return existing != null && !existing.equals(typeLocator);
+//  }
+
+//  boolean isKnownPackage(String qualifiedPackageName) {
+//    if (knownPackageNames == null) {
+//      ArrayList names = new ArrayList(typeLocators.elementSize);
+//      Object[] keyTable = typeLocators.keyTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++) {
+//        if (keyTable[i] != null) {
+//          String packageName = (String) keyTable[i]; // is a type name of the form p1/p2/A
+//          int last = packageName.lastIndexOf('/');
+//          packageName = last == -1 ? null : packageName.substring(0, last);
+//          while (packageName != null && !names.contains(packageName)) {
+//            names.add(packageName);
+//            last = packageName.lastIndexOf('/');
+//            packageName = last == -1 ? null : packageName.substring(0, last);
+//          }
+//        }
+//      }
+//      knownPackageNames = new String[names.size()];
+//      names.toArray(knownPackageNames);
+//    }
+//    for (int i = 0, l = knownPackageNames.length; i < l; i++)
+//      if (knownPackageNames[i].equals(qualifiedPackageName))
+//        return true;
+//    return false;
+//  }
+
+//  void record(String typeLocator, char[][][] qualifiedRefs, char[][] simpleRefs, char[] mainTypeName, ArrayList typeNames) {
+//    if (typeNames.size() == 1 && CharOperation.equals(mainTypeName, (char[]) typeNames.get(0))) {
+//      references.put(typeLocator, new ReferenceCollection(qualifiedRefs, simpleRefs));
+//    } else {
+//      char[][] definedTypeNames = new char[typeNames.size()][]; // can be empty when no types are defined
+//      typeNames.toArray(definedTypeNames);
+//      references.put(typeLocator, new AdditionalTypeCollection(definedTypeNames, qualifiedRefs, simpleRefs));
+//    }
+//  }
+//
+//  void recordLocatorForType(String qualifiedTypeName, String typeLocator) {
+//    this.knownPackageNames = null;
+//    typeLocators.put(qualifiedTypeName, typeLocator);
+//  }
 
   void recordStructuralDependency(IProject prereqProject, State prereqState) {
     if (prereqState != null)
       structuralBuildTimes.put(prereqProject.getName(), new Long(prereqState.lastStructuralBuildTime));
   }
 
-  void removeLocator(String typeLocatorToRemove) {
-    this.knownPackageNames = null;
-    references.removeKey(typeLocatorToRemove);
-    typeLocators.removeValue(typeLocatorToRemove);
-  }
+//  void removeLocator(String typeLocatorToRemove) {
+//    this.knownPackageNames = null;
+//    references.removeKey(typeLocatorToRemove);
+//    typeLocators.removeValue(typeLocatorToRemove);
+//  }
 
   void removePackage(IResourceDelta sourceDelta) {
     IResource resource = sourceDelta.getResource();
@@ -166,15 +166,15 @@ public class State {
         return;
       case IResource.FILE :
         IPath typeLocatorPath = resource.getProjectRelativePath();
-        if (Util.isJavaFileName(typeLocatorPath.lastSegment()))
-          removeLocator(typeLocatorPath.toString());
+//        if (Util.isJavaFileName(typeLocatorPath.lastSegment()))
+//          removeLocator(typeLocatorPath.toString());
     }
   }
 
-  void removeQualifiedTypeName(String qualifiedTypeNameToRemove) {
-    this.knownPackageNames = null;
-    typeLocators.removeKey(qualifiedTypeNameToRemove);
-  }
+//  void removeQualifiedTypeName(String qualifiedTypeNameToRemove) {
+//    this.knownPackageNames = null;
+//    typeLocators.removeKey(qualifiedTypeNameToRemove);
+//  }
 
   static State read(IProject project, DataInputStream in) throws IOException {
     if (PHPBuilder.DEBUG)
@@ -194,9 +194,10 @@ public class State {
     }
     newState.buildNumber = in.readInt();
     newState.lastStructuralBuildTime = in.readLong();
-
-    int length = in.readInt();
-    newState.sourceLocations = new ClasspathMultiDirectory[0];
+    
+    int length;
+//    int length = in.readInt();
+//    newState.sourceLocations = new ClasspathMultiDirectory[0];
     //	newState.sourceLocations = new ClasspathMultiDirectory[length];
     //	for (int i = 0; i < length; i++) {
     //		IContainer sourceFolder = project, outputFolder = project;
@@ -210,7 +211,7 @@ public class State {
     //		newState.sourceLocations[i] = md;
     //	}
 
-    length = in.readInt();
+//    length = in.readInt();
     //	newState.binaryLocations = new ClasspathLocation[length];
     //	IWorkspaceRoot root = project.getWorkspace().getRoot();
     //	for (int i = 0; i < length; i++) {
@@ -237,51 +238,51 @@ public class State {
     for (int i = 0; i < length; i++)
       newState.structuralBuildTimes.put(in.readUTF(), new Long(in.readLong()));
 
-    String[] internedTypeLocators = new String[length = in.readInt()];
-    for (int i = 0; i < length; i++)
-      internedTypeLocators[i] = in.readUTF();
-
-    newState.typeLocators = new SimpleLookupTable(length = in.readInt());
-    for (int i = 0; i < length; i++)
-      newState.typeLocators.put(in.readUTF(), internedTypeLocators[in.readInt()]);
-
-    char[][] internedSimpleNames = ReferenceCollection.internSimpleNames(readNames(in), false);
-    char[][][] internedQualifiedNames = new char[length = in.readInt()][][];
-    for (int i = 0; i < length; i++) {
-      int qLength = in.readInt();
-      char[][] qName = new char[qLength][];
-      for (int j = 0; j < qLength; j++)
-        qName[j] = internedSimpleNames[in.readInt()];
-      internedQualifiedNames[i] = qName;
-    }
-    internedQualifiedNames = ReferenceCollection.internQualifiedNames(internedQualifiedNames);
-
-    newState.references = new SimpleLookupTable(length = in.readInt());
-    for (int i = 0; i < length; i++) {
-      String typeLocator = internedTypeLocators[in.readInt()];
-      ReferenceCollection collection = null;
-      switch (in.readByte()) {
-        case 1 :
-          char[][] additionalTypeNames = readNames(in);
-          char[][][] qualifiedNames = new char[in.readInt()][][];
-          for (int j = 0, m = qualifiedNames.length; j < m; j++)
-            qualifiedNames[j] = internedQualifiedNames[in.readInt()];
-          char[][] simpleNames = new char[in.readInt()][];
-          for (int j = 0, m = simpleNames.length; j < m; j++)
-            simpleNames[j] = internedSimpleNames[in.readInt()];
-          collection = new AdditionalTypeCollection(additionalTypeNames, qualifiedNames, simpleNames);
-          break;
-        case 2 :
-          char[][][] qNames = new char[in.readInt()][][];
-          for (int j = 0, m = qNames.length; j < m; j++)
-            qNames[j] = internedQualifiedNames[in.readInt()];
-          char[][] sNames = new char[in.readInt()][];
-          for (int j = 0, m = sNames.length; j < m; j++)
-            sNames[j] = internedSimpleNames[in.readInt()];
-          collection = new ReferenceCollection(qNames, sNames);
-      }
-      newState.references.put(typeLocator, collection);
-    }
+//    String[] internedTypeLocators = new String[length = in.readInt()];
+//    for (int i = 0; i < length; i++)
+//      internedTypeLocators[i] = in.readUTF();
+
+//    newState.typeLocators = new SimpleLookupTable(length = in.readInt());
+//    for (int i = 0; i < length; i++)
+//      newState.typeLocators.put(in.readUTF(), internedTypeLocators[in.readInt()]);
+
+//    char[][] internedSimpleNames = ReferenceCollection.internSimpleNames(readNames(in), false);
+//    char[][][] internedQualifiedNames = new char[length = in.readInt()][][];
+//    for (int i = 0; i < length; i++) {
+//      int qLength = in.readInt();
+//      char[][] qName = new char[qLength][];
+//      for (int j = 0; j < qLength; j++)
+//        qName[j] = internedSimpleNames[in.readInt()];
+//      internedQualifiedNames[i] = qName;
+//    }
+//    internedQualifiedNames = ReferenceCollection.internQualifiedNames(internedQualifiedNames);
+//
+//    newState.references = new SimpleLookupTable(length = in.readInt());
+//    for (int i = 0; i < length; i++) {
+//      String typeLocator = internedTypeLocators[in.readInt()];
+//      ReferenceCollection collection = null;
+//      switch (in.readByte()) {
+//        case 1 :
+//          char[][] additionalTypeNames = readNames(in);
+//          char[][][] qualifiedNames = new char[in.readInt()][][];
+//          for (int j = 0, m = qualifiedNames.length; j < m; j++)
+//            qualifiedNames[j] = internedQualifiedNames[in.readInt()];
+//          char[][] simpleNames = new char[in.readInt()][];
+//          for (int j = 0, m = simpleNames.length; j < m; j++)
+//            simpleNames[j] = internedSimpleNames[in.readInt()];
+//          collection = new AdditionalTypeCollection(additionalTypeNames, qualifiedNames, simpleNames);
+//          break;
+//        case 2 :
+//          char[][][] qNames = new char[in.readInt()][][];
+//          for (int j = 0, m = qNames.length; j < m; j++)
+//            qNames[j] = internedQualifiedNames[in.readInt()];
+//          char[][] sNames = new char[in.readInt()][];
+//          for (int j = 0, m = sNames.length; j < m; j++)
+//            sNames[j] = internedSimpleNames[in.readInt()];
+//          collection = new ReferenceCollection(qNames, sNames);
+//      }
+//      newState.references.put(typeLocator, collection);
+//    }
     if (PHPBuilder.DEBUG)
       System.out.println("Successfully read state for " + newState.javaProjectName); //$NON-NLS-1$
     return newState;
@@ -338,14 +339,14 @@ public class State {
     /*
 	 * ClasspathMultiDirectory[] int id String path(s)
 	 */
-    out.writeInt(length = sourceLocations.length);
-    for (int i = 0; i < length; i++) {
-      ClasspathMultiDirectory md = sourceLocations[i];
-      out.writeUTF(md.sourceFolder.getProjectRelativePath().toString());
-      out.writeUTF(md.binaryFolder.getProjectRelativePath().toString());
-      writeNames(md.exclusionPatterns, out);
-      out.writeBoolean(md.hasIndependentOutputFolder);
-    }
+//    out.writeInt(length = sourceLocations.length);
+//    for (int i = 0; i < length; i++) {
+//      ClasspathMultiDirectory md = sourceLocations[i];
+//      out.writeUTF(md.sourceFolder.getProjectRelativePath().toString());
+//      out.writeUTF(md.binaryFolder.getProjectRelativePath().toString());
+//      writeNames(md.exclusionPatterns, out);
+//      out.writeBoolean(md.hasIndependentOutputFolder);
+//    }
 
     /*
 	 * ClasspathLocation[] int id String path(s)
@@ -399,115 +400,115 @@ public class State {
     /*
 	 * String[] Interned type locators
 	 */
-    out.writeInt(length = references.elementSize);
-    ArrayList internedTypeLocators = new ArrayList(length);
-    if (length > 0) {
-      keyTable = references.keyTable;
-      for (int i = 0, l = keyTable.length; i < l; i++) {
-        if (keyTable[i] != null) {
-          length--;
-          String key = (String) keyTable[i];
-          out.writeUTF(key);
-          internedTypeLocators.add(key);
-        }
-      }
-      if (PHPBuilder.DEBUG && length != 0)
-        System.out.println("references table is inconsistent"); //$NON-NLS-1$
-    }
+//    out.writeInt(length = references.elementSize);
+//    ArrayList internedTypeLocators = new ArrayList(length);
+//    if (length > 0) {
+//      keyTable = references.keyTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++) {
+//        if (keyTable[i] != null) {
+//          length--;
+//          String key = (String) keyTable[i];
+//          out.writeUTF(key);
+//          internedTypeLocators.add(key);
+//        }
+//      }
+//      if (PHPBuilder.DEBUG && length != 0)
+//        System.out.println("references table is inconsistent"); //$NON-NLS-1$
+//    }
 
     /*
 	 * Type locators table String type name int interned locator id
 	 */
-    out.writeInt(length = typeLocators.elementSize);
-    if (length > 0) {
-      keyTable = typeLocators.keyTable;
-      valueTable = typeLocators.valueTable;
-      for (int i = 0, l = keyTable.length; i < l; i++) {
-        if (keyTable[i] != null) {
-          length--;
-          out.writeUTF((String) keyTable[i]);
-          out.writeInt(internedTypeLocators.indexOf((String) valueTable[i]));
-        }
-      }
-      if (PHPBuilder.DEBUG && length != 0)
-        System.out.println("typeLocators table is inconsistent"); //$NON-NLS-1$
-    }
+//    out.writeInt(length = typeLocators.elementSize);
+//    if (length > 0) {
+//      keyTable = typeLocators.keyTable;
+//      valueTable = typeLocators.valueTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++) {
+//        if (keyTable[i] != null) {
+//          length--;
+//          out.writeUTF((String) keyTable[i]);
+//          out.writeInt(internedTypeLocators.indexOf((String) valueTable[i]));
+//        }
+//      }
+//      if (PHPBuilder.DEBUG && length != 0)
+//        System.out.println("typeLocators table is inconsistent"); //$NON-NLS-1$
+//    }
 
     /*
 	 * char[][][] Interned qualified names char[][] Interned simple names
 	 */
-    ArrayList internedQualifiedNames = new ArrayList(31);
-    ArrayList internedSimpleNames = new ArrayList(31);
-    valueTable = references.valueTable;
-    for (int i = 0, l = valueTable.length; i < l; i++) {
-      if (valueTable[i] != null) {
-        ReferenceCollection collection = (ReferenceCollection) valueTable[i];
-        char[][][] qNames = collection.qualifiedNameReferences;
-        for (int j = 0, m = qNames.length; j < m; j++) {
-          char[][] qName = qNames[j];
-          if (!internedQualifiedNames.contains(qName)) { // remember the names have been interned
-            internedQualifiedNames.add(qName);
-            for (int k = 0, n = qName.length; k < n; k++) {
-              char[] sName = qName[k];
-              if (!internedSimpleNames.contains(sName)) // remember the names have been interned
-                internedSimpleNames.add(sName);
-            }
-          }
-        }
-        char[][] sNames = collection.simpleNameReferences;
-        for (int j = 0, m = sNames.length; j < m; j++) {
-          char[] sName = sNames[j];
-          if (!internedSimpleNames.contains(sName)) // remember the names have been interned
-            internedSimpleNames.add(sName);
-        }
-      }
-    }
-    char[][] internedArray = new char[internedSimpleNames.size()][];
-    internedSimpleNames.toArray(internedArray);
-    writeNames(internedArray, out);
-    // now write the interned qualified names as arrays of interned simple names
-    out.writeInt(length = internedQualifiedNames.size());
-    for (int i = 0; i < length; i++) {
-      char[][] qName = (char[][]) internedQualifiedNames.get(i);
-      int qLength = qName.length;
-      out.writeInt(qLength);
-      for (int j = 0; j < qLength; j++)
-        out.writeInt(internedSimpleNames.indexOf(qName[j]));
-    }
-
-    /*
-	 * References table int interned locator id ReferenceCollection
-	 */
-    out.writeInt(length = references.elementSize);
-    if (length > 0) {
-      keyTable = references.keyTable;
-      for (int i = 0, l = keyTable.length; i < l; i++) {
-        if (keyTable[i] != null) {
-          length--;
-          out.writeInt(internedTypeLocators.indexOf((String) keyTable[i]));
-          ReferenceCollection collection = (ReferenceCollection) valueTable[i];
-          if (collection instanceof AdditionalTypeCollection) {
-            out.writeByte(1);
-            AdditionalTypeCollection atc = (AdditionalTypeCollection) collection;
-            writeNames(atc.definedTypeNames, out);
-          } else {
-            out.writeByte(2);
-          }
-          char[][][] qNames = collection.qualifiedNameReferences;
-          int qLength = qNames.length;
-          out.writeInt(qLength);
-          for (int j = 0; j < qLength; j++)
-            out.writeInt(internedQualifiedNames.indexOf(qNames[j]));
-          char[][] sNames = collection.simpleNameReferences;
-          int sLength = sNames.length;
-          out.writeInt(sLength);
-          for (int j = 0; j < sLength; j++)
-            out.writeInt(internedSimpleNames.indexOf(sNames[j]));
-        }
-      }
-      if (PHPBuilder.DEBUG && length != 0)
-        System.out.println("references table is inconsistent"); //$NON-NLS-1$
-    }
+//    ArrayList internedQualifiedNames = new ArrayList(31);
+//    ArrayList internedSimpleNames = new ArrayList(31);
+//    valueTable = references.valueTable;
+//    for (int i = 0, l = valueTable.length; i < l; i++) {
+//      if (valueTable[i] != null) {
+//        ReferenceCollection collection = (ReferenceCollection) valueTable[i];
+//        char[][][] qNames = collection.qualifiedNameReferences;
+//        for (int j = 0, m = qNames.length; j < m; j++) {
+//          char[][] qName = qNames[j];
+//          if (!internedQualifiedNames.contains(qName)) { // remember the names have been interned
+//            internedQualifiedNames.add(qName);
+//            for (int k = 0, n = qName.length; k < n; k++) {
+//              char[] sName = qName[k];
+//              if (!internedSimpleNames.contains(sName)) // remember the names have been interned
+//                internedSimpleNames.add(sName);
+//            }
+//          }
+//        }
+//        char[][] sNames = collection.simpleNameReferences;
+//        for (int j = 0, m = sNames.length; j < m; j++) {
+//          char[] sName = sNames[j];
+//          if (!internedSimpleNames.contains(sName)) // remember the names have been interned
+//            internedSimpleNames.add(sName);
+//        }
+//      }
+//    }
+//    char[][] internedArray = new char[internedSimpleNames.size()][];
+//    internedSimpleNames.toArray(internedArray);
+//    writeNames(internedArray, out);
+//    // now write the interned qualified names as arrays of interned simple names
+//    out.writeInt(length = internedQualifiedNames.size());
+//    for (int i = 0; i < length; i++) {
+//      char[][] qName = (char[][]) internedQualifiedNames.get(i);
+//      int qLength = qName.length;
+//      out.writeInt(qLength);
+//      for (int j = 0; j < qLength; j++)
+//        out.writeInt(internedSimpleNames.indexOf(qName[j]));
+//    }
+//
+//    /*
+//	 * References table int interned locator id ReferenceCollection
+//	 */
+//    out.writeInt(length = references.elementSize);
+//    if (length > 0) {
+//      keyTable = references.keyTable;
+//      for (int i = 0, l = keyTable.length; i < l; i++) {
+//        if (keyTable[i] != null) {
+//          length--;
+//          out.writeInt(internedTypeLocators.indexOf((String) keyTable[i]));
+//          ReferenceCollection collection = (ReferenceCollection) valueTable[i];
+//          if (collection instanceof AdditionalTypeCollection) {
+//            out.writeByte(1);
+//            AdditionalTypeCollection atc = (AdditionalTypeCollection) collection;
+//            writeNames(atc.definedTypeNames, out);
+//          } else {
+//            out.writeByte(2);
+//          }
+//          char[][][] qNames = collection.qualifiedNameReferences;
+//          int qLength = qNames.length;
+//          out.writeInt(qLength);
+//          for (int j = 0; j < qLength; j++)
+//            out.writeInt(internedQualifiedNames.indexOf(qNames[j]));
+//          char[][] sNames = collection.simpleNameReferences;
+//          int sLength = sNames.length;
+//          out.writeInt(sLength);
+//          for (int j = 0; j < sLength; j++)
+//            out.writeInt(internedSimpleNames.indexOf(sNames[j]));
+//        }
+//      }
+//      if (PHPBuilder.DEBUG && length != 0)
+//        System.out.println("references table is inconsistent"); //$NON-NLS-1$
+//    }
   }
 
   private void writeNames(char[][] names, DataOutputStream out) throws IOException {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMBuilder.java
index f1faf41..0ee24f0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMBuilder.java
@@ -13,6 +13,7 @@ package net.sourceforge.phpdt.internal.core.jdom;
 import java.util.ArrayList;
 import java.util.Map;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.core.jdom.IDOMCompilationUnit;
 import net.sourceforge.phpdt.core.jdom.IDOMField;
@@ -27,7 +28,6 @@ import net.sourceforge.phpdt.internal.compiler.IDocumentElementRequestor;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.core.util.CharArrayOps;
-import net.sourceforge.phpeclipse.PHPCore;
 
 /**
  * The DOMBuilder constructs each type of JDOM document fragment,
@@ -56,7 +56,7 @@ public class DOMBuilder extends AbstractDOMBuilder implements IDocumentElementRe
 	 */
 	protected ArrayList fFields;
 
-	Map options = PHPCore.getOptions();
+	Map options = JavaCore.getOptions();
 
 /**
  * Creates a new DOMBuilder
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/SimpleDOMBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/SimpleDOMBuilder.java
index c923015..df63d2c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/SimpleDOMBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/SimpleDOMBuilder.java
@@ -12,13 +12,13 @@ package net.sourceforge.phpdt.internal.core.jdom;
 
 import java.util.Map;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.jdom.IDOMCompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.ISourceElementRequestor;
 import net.sourceforge.phpdt.internal.compiler.SourceElementParser;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.core.util.CharArrayOps;
-import net.sourceforge.phpeclipse.PHPCore;
 
 /**
  * A DOM builder that uses the SourceElementParser
@@ -51,7 +51,7 @@ public IDOMCompilationUnit createCompilationUnit(String sourceCode, String name)
  */
 public IDOMCompilationUnit createCompilationUnit(ICompilationUnit compilationUnit) {
 	initializeBuild(compilationUnit.getContents(), true, true);
-	getParser(PHPCore.getOptions()).parseCompilationUnit(compilationUnit, false);
+	getParser(JavaCore.getOptions()).parseCompilationUnit(compilationUnit, false);
 	return super.createCompilationUnit(compilationUnit);
 }
 /**
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/WorkbenchRunnableAdapter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/WorkbenchRunnableAdapter.java
index 7c4ae96..a062bba 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/WorkbenchRunnableAdapter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/WorkbenchRunnableAdapter.java
@@ -12,7 +12,7 @@ package net.sourceforge.phpdt.internal.ui.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.CoreException;
@@ -39,7 +39,7 @@ public class WorkbenchRunnableAdapter implements IRunnableWithProgress {
 	 */
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 		try {
-			PHPCore.run(fWorkspaceRunnable, monitor);
+			JavaCore.run(fWorkspaceRunnable, monitor);
 		} catch (OperationCanceledException e) {
 			throw new InterruptedException(e.getMessage());
 		} catch (CoreException e) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
index 2f7e150..ab22fb0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
@@ -11,12 +11,12 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 
 import net.sourceforge.phpdt.core.ICodeFormatter;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.ToolFactory;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
 import net.sourceforge.phpdt.internal.ui.dialog.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.dialog.StatusUtil;
 import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.runtime.IStatus;
@@ -46,28 +46,28 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
 public class CodeFormatterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
 	// Preference store keys, see PHPCore.getOptions
-	private static final String PREF_NEWLINE_OPENING_BRACES= PHPCore.FORMATTER_NEWLINE_OPENING_BRACE; 
-	private static final String PREF_NEWLINE_CONTROL_STATEMENT= PHPCore.FORMATTER_NEWLINE_CONTROL;
-	private static final String PREF_NEWLINE_CLEAR_ALL= PHPCore.FORMATTER_CLEAR_BLANK_LINES;
+	private static final String PREF_NEWLINE_OPENING_BRACES= JavaCore.FORMATTER_NEWLINE_OPENING_BRACE; 
+	private static final String PREF_NEWLINE_CONTROL_STATEMENT= JavaCore.FORMATTER_NEWLINE_CONTROL;
+	private static final String PREF_NEWLINE_CLEAR_ALL= JavaCore.FORMATTER_CLEAR_BLANK_LINES;
 	// private static final String PREF_NEWLINE_ELSE_IF= PHPCore.FORMATTER_NEWLINE_ELSE_IF;
-	private static final String PREF_NEWLINE_EMPTY_BLOCK= PHPCore.FORMATTER_NEWLINE_EMPTY_BLOCK;
-	private static final String PREF_LINE_SPLIT= PHPCore.FORMATTER_LINE_SPLIT;
-	private static final String PREF_STYLE_COMPACT_ASSIGNEMENT= PHPCore.FORMATTER_COMPACT_ASSIGNMENT;
-	private static final String PREF_TAB_CHAR= PHPCore.FORMATTER_TAB_CHAR;
-	private static final String PREF_TAB_SIZE= PHPCore.FORMATTER_TAB_SIZE;
+	private static final String PREF_NEWLINE_EMPTY_BLOCK= JavaCore.FORMATTER_NEWLINE_EMPTY_BLOCK;
+	private static final String PREF_LINE_SPLIT= JavaCore.FORMATTER_LINE_SPLIT;
+	private static final String PREF_STYLE_COMPACT_ASSIGNEMENT= JavaCore.FORMATTER_COMPACT_ASSIGNMENT;
+	private static final String PREF_TAB_CHAR= JavaCore.FORMATTER_TAB_CHAR;
+	private static final String PREF_TAB_SIZE= JavaCore.FORMATTER_TAB_SIZE;
 
 	// values
-	private static final String INSERT=  PHPCore.INSERT;
-	private static final String DO_NOT_INSERT= PHPCore.DO_NOT_INSERT;
+	private static final String INSERT=  JavaCore.INSERT;
+	private static final String DO_NOT_INSERT= JavaCore.DO_NOT_INSERT;
 	
-	private static final String COMPACT= PHPCore.COMPACT;
-	private static final String NORMAL= PHPCore.NORMAL;
+	private static final String COMPACT= JavaCore.COMPACT;
+	private static final String NORMAL= JavaCore.NORMAL;
 	
-	private static final String TAB= PHPCore.TAB;
-	private static final String SPACE= PHPCore.SPACE;
+	private static final String TAB= JavaCore.TAB;
+	private static final String SPACE= JavaCore.SPACE;
 	
-	private static final String CLEAR_ALL= PHPCore.CLEAR_ALL;
-	private static final String PRESERVE_ONE= PHPCore.PRESERVE_ONE;
+	private static final String CLEAR_ALL= JavaCore.CLEAR_ALL;
+	private static final String PRESERVE_ONE= JavaCore.PRESERVE_ONE;
 	
 
 	private static String[] getAllKeys() {
@@ -84,7 +84,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 	 * @deprecated Inline to avoid reference to preference page
 	 */
 	public static int getTabSize() {
-		String string= (String) PHPCore.getOptions().get(PREF_TAB_SIZE);
+		String string= (String) JavaCore.getOptions().get(PREF_TAB_SIZE);
 		return getPositiveIntValue(string, 4);
 	}
 	
@@ -93,7 +93,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 	 * @deprecated Inline to avoid reference to preference page
 	 */	
 	public static boolean isCompactingAssignment() {
-		return COMPACT.equals(PHPCore.getOptions().get(PREF_STYLE_COMPACT_ASSIGNEMENT));
+		return COMPACT.equals(JavaCore.getOptions().get(PREF_STYLE_COMPACT_ASSIGNEMENT));
 	}
 	
 	/**
@@ -101,7 +101,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 	 * @deprecated Inline to avoid reference to preference page
 	 */	
 	public static boolean useSpaces() {
-		return SPACE.equals(PHPCore.getOptions().get(PREF_TAB_CHAR));
+		return SPACE.equals(JavaCore.getOptions().get(PREF_TAB_CHAR));
 	}	
 	
 	
@@ -167,7 +167,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 		setPreferenceStore(PHPeclipsePlugin.getDefault().getPreferenceStore());		
 		setDescription(PHPUIMessages.getString("CodeFormatterPreferencePage.description")); //$NON-NLS-1$
 	
-		fWorkingValues= PHPCore.getOptions();
+		fWorkingValues= JavaCore.getOptions();
 		fCheckBoxes= new ArrayList();
 		fTextBoxes= new ArrayList();
 		
@@ -385,13 +385,13 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 		String[] allKeys= getAllKeys();
 		// preserve other options
 		// store in JCore
-		Hashtable actualOptions= PHPCore.getOptions();
+		Hashtable actualOptions= JavaCore.getOptions();
 		for (int i= 0; i < allKeys.length; i++) {
 			String key= allKeys[i];
 			String val=  (String) fWorkingValues.get(key);
 			actualOptions.put(key, val);
 		}
-		PHPCore.setOptions(actualOptions);
+		JavaCore.setOptions(actualOptions);
 		PHPeclipsePlugin.getDefault().savePluginPreferences();
 		return super.performOk();
 	}	
@@ -400,7 +400,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
 	 * @see PreferencePage#performDefaults()
 	 */
 	protected void performDefaults() {
-		fWorkingValues= PHPCore.getDefaultOptions();
+		fWorkingValues= JavaCore.getDefaultOptions();
 		updateControls();
 		super.performDefaults();
 	}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java
index 641374d..c273cfe 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
 import net.sourceforge.phpdt.internal.ui.dialog.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.dialog.StatusUtil;
@@ -26,7 +27,6 @@ import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
 import net.sourceforge.phpeclipse.preferences.ColorEditor;
@@ -76,7 +76,7 @@ import org.eclipse.ui.texteditor.WorkbenchChainedTextFontFieldEditor;
 public class PHPEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
   private static final String BOLD = PreferenceConstants.EDITOR_BOLD_SUFFIX;
-  private static final String COMPILER_TASK_TAGS = PHPCore.COMPILER_TASK_TAGS;
+  private static final String COMPILER_TASK_TAGS = JavaCore.COMPILER_TASK_TAGS;
 
   public final OverlayPreferenceStore.OverlayKey[] fKeys =
     new OverlayPreferenceStore.OverlayKey[] {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPProjectSelector.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPProjectSelector.java
index 6199901..c52aeb5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPProjectSelector.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPProjectSelector.java
@@ -1,7 +1,7 @@
 package net.sourceforge.phpdt.internal.ui.util;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.dialog.ElementListSelectionDialog;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
@@ -28,7 +28,7 @@ public class PHPProjectSelector extends ResourceSelector {
 		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new WorkbenchLabelProvider());
 		dialog.setTitle(browseDialogTitle);
 		dialog.setMessage(browseDialogMessage);
-		dialog.setElements(PHPCore.getPHPProjects());
+		dialog.setElements(JavaCore.getPHPProjects());
 
 		if (dialog.open() == ElementListSelectionDialog.OK) {
 			textField.setText(((IProject) dialog.getFirstResult()).getName());
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaUI.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaUI.java
index 23ff50e..3120edf 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaUI.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaUI.java
@@ -14,7 +14,7 @@ import net.sourceforge.phpdt.core.IBufferFactory;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IWorkingCopy;
 import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.EditorUtility;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
@@ -556,7 +556,7 @@ public final class JavaUI {
 	 * @since 2.0
 	 */
 	public static IWorkingCopy[] getSharedWorkingCopies() {
-		return PHPCore.getSharedWorkingCopies(getBufferFactory());
+		return JavaCore.getSharedWorkingCopies(getBufferFactory());
 	}
 	
 	/**
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
index 21b7dc1..7f1d21b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
@@ -23,8 +23,8 @@ import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IParent;
 import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -318,7 +318,7 @@ public class StandardJavaElementContentProvider implements ITreeContentProvider,
 				// Included is a member of excluded, but since it is rendered as a source
 				// folder we have to exclude it as a normal child.
 				if (o instanceof IFolder) {
-					IJavaElement element= PHPCore.create((IFolder)o);
+					IJavaElement element= JavaCore.create((IFolder)o);
 					if (element instanceof IPackageFragmentRoot && element.exists()) {
 						continue;
 					}
@@ -408,7 +408,7 @@ public class StandardJavaElementContentProvider implements ITreeContentProvider,
 		// try to map resources to the containing package fragment
 		if (element instanceof IResource) {
 			IResource parent= ((IResource)element).getParent();
-			IJavaElement jParent= PHPCore.create(parent);
+			IJavaElement jParent= JavaCore.create(parent);
 			// http://bugs.eclipse.org/bugs/show_bug.cgi?id=31374
 			if (jParent != null && jParent.exists()) 
 				return jParent;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
index 7dddc0f..735c2a7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
@@ -14,6 +14,7 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.viewsupport.IViewPartInputProvider;
 import net.sourceforge.phpdt.internal.ui.wizards.NewWizardMessages;
@@ -22,7 +23,6 @@ import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListen
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
@@ -141,7 +141,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
 							jelem= (IJavaElement) resource.getAdapter(IJavaElement.class);
 						}
 						if (jelem == null) {
-							jelem= PHPCore.create(resource); // java project
+							jelem= JavaCore.create(resource); // java project
 						}
 					}
 				}
@@ -163,7 +163,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
 
 		if (jelem == null || jelem.getElementType() == IJavaElement.JAVA_MODEL) {
 			try {
-				IJavaProject[] projects= PHPCore.create(getWorkspaceRoot()).getJavaProjects();
+				IJavaProject[] projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
 				if (projects.length == 1) {
 					jelem= projects[0];
 				}
@@ -270,7 +270,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
 					status.setError(NewWizardMessages.getFormattedString("NewContainerWizardPage.error.ProjectClosed", proj.getFullPath().toString())); //$NON-NLS-1$
 					return status;
 				}				
-				IJavaProject jproject= PHPCore.create(proj);
+				IJavaProject jproject= JavaCore.create(proj);
 //				fCurrRoot= jproject.getPackageFragmentRoot(res);
 //				if (res.exists()) {
 //					try {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPCore.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPCore.java
deleted file mode 100644
index aff160f..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPCore.java
+++ /dev/null
@@ -1,3780 +0,0 @@
-package net.sourceforge.phpeclipse;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import net.sourceforge.phpdt.core.ClasspathVariableInitializer;
-import net.sourceforge.phpdt.core.ElementChangedEvent;
-import net.sourceforge.phpdt.core.IBufferFactory;
-import net.sourceforge.phpdt.core.IClasspathEntry;
-import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.IElementChangedListener;
-import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaModel;
-import net.sourceforge.phpdt.core.IJavaProject;
-import net.sourceforge.phpdt.core.IMember;
-import net.sourceforge.phpdt.core.IPackageFragmentRoot;
-import net.sourceforge.phpdt.core.IRegion;
-import net.sourceforge.phpdt.core.IWorkingCopy;
-import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.internal.core.BatchOperation;
-import net.sourceforge.phpdt.internal.core.BufferManager;
-import net.sourceforge.phpdt.internal.core.ClasspathEntry;
-import net.sourceforge.phpdt.internal.core.JavaModel;
-import net.sourceforge.phpdt.internal.core.JavaModelManager;
-import net.sourceforge.phpdt.internal.core.Region;
-import net.sourceforge.phpdt.internal.corext.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class PHPCore {
-
-//  public static HashSet OptionNames = new HashSet(20);
-  /**
-   * The plug-in identifier of the Java core support
-   * (value <code>"org.phpeclipse.phpdt.core"</code>).
-   */
-//  public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.core"; //$NON-NLS-1$
-	public static final String PLUGIN_ID = PHPeclipsePlugin.PLUGIN_ID;
-  /**
-     * Possible  configurable option ID.
-     * @see #getDefaultOptions
-     * @since 2.0
-     */
-  public static final String CORE_ENCODING = PLUGIN_ID + ".encoding"; //$NON-NLS-1$
-
-  /**
-     * Possible  configurable option ID.
-     * @see #getDefaultOptions
-     * @since 2.0
-     */
-  public static final String FORMATTER_NEWLINE_OPENING_BRACE = PLUGIN_ID + ".formatter.newline.openingBrace"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_NEWLINE_CONTROL = PLUGIN_ID + ".formatter.newline.controlStatement"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_NEWLINE_ELSE_IF = PLUGIN_ID + ".formatter.newline.elseIf"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_NEWLINE_EMPTY_BLOCK = PLUGIN_ID + ".formatter.newline.emptyBlock"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_CLEAR_BLANK_LINES = PLUGIN_ID + ".formatter.newline.clearAll"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_LINE_SPLIT = PLUGIN_ID + ".formatter.lineSplit"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_COMPACT_ASSIGNMENT = PLUGIN_ID + ".formatter.style.assignment"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_TAB_CHAR = PLUGIN_ID + ".formatter.tabulation.char"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option ID.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String FORMATTER_TAB_SIZE = PLUGIN_ID + ".formatter.tabulation.size"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String INSERT = "insert"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String DO_NOT_INSERT = "do not insert"; //$NON-NLS-1$
-
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String PRESERVE_ONE = "preserve one"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String CLEAR_ALL = "clear all"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String NORMAL = "normal"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String COMPACT = "compact"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String TAB = "tab"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String SPACE = "space"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String ENABLED = "enabled"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.0
-   */
-  public static final String DISABLED = "disabled"; //$NON-NLS-1$
-  /**
-   * Possible  configurable option value.
-   * @see #getDefaultOptions
-   * @since 2.1
-   */
-  public static final String CLEAN = "clean"; //$NON-NLS-1$
-
-  /**
-  	 * Possible  configurable option ID.
-  	 * @see #getDefaultOptions
-  	 * @since 2.1
-  	 */
-  public static final String COMPILER_TASK_TAGS = PLUGIN_ID + ".compiler.taskTags"; //$NON-NLS-1$
-
-	/**
-		 * Name of the handle id attribute in a Java marker.
-		 */
-		protected static final String ATT_HANDLE_ID =
-			"net.sourceforge.phpdt.internal.core.JavaModelManager.handleId" ; //$NON-NLS-1$
-
-		// *************** Possible IDs for configurable options. ********************
-
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions()
-		 */
-		public static final String COMPILER_LOCAL_VARIABLE_ATTR = PLUGIN_ID + ".compiler.debug.localVariable"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions()
-		 */
-		public static final String COMPILER_LINE_NUMBER_ATTR = PLUGIN_ID + ".compiler.debug.lineNumber"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_SOURCE_FILE_ATTR = PLUGIN_ID + ".compiler.debug.sourceFile"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_CODEGEN_UNUSED_LOCAL = PLUGIN_ID + ".compiler.codegen.unusedLocal"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_CODEGEN_TARGET_PLATFORM = PLUGIN_ID + ".compiler.codegen.targetPlatform"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_UNREACHABLE_CODE = PLUGIN_ID + ".compiler.problem.unreachableCode"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_INVALID_IMPORT = PLUGIN_ID + ".compiler.problem.invalidImport"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD = PLUGIN_ID + ".compiler.problem.overridingPackageDefaultMethod"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME = PLUGIN_ID + ".compiler.problem.methodWithConstructorName"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_DEPRECATION = PLUGIN_ID + ".compiler.problem.deprecation"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE = PLUGIN_ID + ".compiler.problem.deprecationInDeprecatedCode"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_HIDDEN_CATCH_BLOCK = PLUGIN_ID + ".compiler.problem.hiddenCatchBlock"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_UNUSED_LOCAL = PLUGIN_ID + ".compiler.problem.unusedLocal"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_UNUSED_PARAMETER = PLUGIN_ID + ".compiler.problem.unusedParameter"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT = PLUGIN_ID + ".compiler.problem.unusedParameterWhenImplementingAbstract"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE = PLUGIN_ID + ".compiler.problem.unusedParameterWhenOverridingConcrete"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_PB_UNUSED_IMPORT = PLUGIN_ID + ".compiler.problem.unusedImport"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPILER_PB_SYNTHETIC_ACCESS_EMULATION = PLUGIN_ID + ".compiler.problem.syntheticAccessEmulation"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_PB_NON_NLS_STRING_LITERAL = PLUGIN_ID + ".compiler.problem.nonExternalizedStringLiteral"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_PB_ASSERT_IDENTIFIER = PLUGIN_ID + ".compiler.problem.assertIdentifier"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_STATIC_ACCESS_RECEIVER = PLUGIN_ID + ".compiler.problem.staticAccessReceiver"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_NO_EFFECT_ASSIGNMENT = PLUGIN_ID + ".compiler.problem.noEffectAssignment"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD = PLUGIN_ID + ".compiler.problem.incompatibleNonInheritedInterfaceMethod"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION = PLUGIN_ID + ".compiler.problem.noImplicitStringConversion"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_PB_MAX_PER_UNIT = PLUGIN_ID + ".compiler.maxProblemPerUnit"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_SOURCE = PLUGIN_ID + ".compiler.source"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String COMPILER_COMPLIANCE = PLUGIN_ID + ".compiler.compliance"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_TASK_PRIORITIES = PLUGIN_ID + ".compiler.taskPriorities"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_TASK_PRIORITY_HIGH = "HIGH"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_TASK_PRIORITY_LOW = "LOW"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value for COMPILER_TASK_PRIORITIES.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String COMPILER_TASK_PRIORITY_NORMAL = "NORMAL"; //$NON-NLS-1$
-				/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 */
-		public static final String CORE_JAVA_BUILD_ORDER = PLUGIN_ID + ".computeJavaBuildOrder"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String CORE_JAVA_BUILD_RESOURCE_COPY_FILTER = PLUGIN_ID + ".builder.resourceCopyExclusionFilter"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CORE_JAVA_BUILD_DUPLICATE_RESOURCE = PLUGIN_ID + ".builder.duplicateResourceTask"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER = PLUGIN_ID + ".builder.cleanOutputFolder"; //$NON-NLS-1$	 	
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CORE_INCOMPLETE_CLASSPATH = PLUGIN_ID + ".incompleteClasspath"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CORE_CIRCULAR_CLASSPATH = PLUGIN_ID + ".circularClasspath"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String CORE_JAVA_BUILD_INVALID_CLASSPATH = PLUGIN_ID + ".builder.invalidClasspath"; //$NON-NLS-1$
-			/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1 
-		 */
-		public static final String CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS = PLUGIN_ID + ".classpath.exclusionPatterns"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS = PLUGIN_ID + ".classpath.multipleOutputLocations"; //$NON-NLS-1$
-		/**
-		 * Default task tag
-		 * @since 2.1
-		 */
-		public static final String DEFAULT_TASK_TAG = "TODO"; //$NON-NLS-1$
-		/**
-		 * Default task priority
-		 * @since 2.1
-		 */
-		public static final String DEFAULT_TASK_PRIORITY = "NORMAL"; //$NON-NLS-1$
-		/**
-		 * Possible configurable option ID
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String FORMATTER_SPACE_CASTEXPRESSION = PLUGIN_ID + ".formatter.space.castexpression"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String CODEASSIST_VISIBILITY_CHECK = PLUGIN_ID + ".codeComplete.visibilityCheck"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String CODEASSIST_IMPLICIT_QUALIFICATION = PLUGIN_ID + ".codeComplete.forceImplicitQualification"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.fieldPrefixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_STATIC_FIELD_PREFIXES = PLUGIN_ID + ".codeComplete.staticFieldPrefixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_LOCAL_PREFIXES = PLUGIN_ID + ".codeComplete.localPrefixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_ARGUMENT_PREFIXES = PLUGIN_ID + ".codeComplete.argumentPrefixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.fieldSuffixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_STATIC_FIELD_SUFFIXES = PLUGIN_ID + ".codeComplete.staticFieldSuffixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_LOCAL_SUFFIXES = PLUGIN_ID + ".codeComplete.localSuffixes"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option ID.
-		 * @see #getDefaultOptions
-		 * @since 2.1
-		 */
-		public static final String CODEASSIST_ARGUMENT_SUFFIXES = PLUGIN_ID + ".codeComplete.argumentSuffixes"; //$NON-NLS-1$
-
-		// *************** Possible values for configurable options. ********************
-	
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String GENERATE = "generate"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String DO_NOT_GENERATE = "do not generate"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String PRESERVE = "preserve"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String OPTIMIZE_OUT = "optimize out"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String VERSION_1_1 = "1.1"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String VERSION_1_2 = "1.2"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String VERSION_1_3 = "1.3"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String VERSION_1_4 = "1.4"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-		public static final String ABORT = "abort"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String ERROR = "error"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String WARNING = "warning"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String IGNORE = "ignore"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 */
-		public static final String COMPUTE = "compute"; //$NON-NLS-1$
-		/**
-		 * Possible  configurable option value.
-		 * @see #getDefaultOptions
-		 * @since 2.0
-		 */
-
-	
-  /**
-   * Returns a table of all known configurable options with their default values.
-   * These options allow to configure the behaviour of the underlying components.
-   * The client may safely use the result as a template that they can modify and
-   * then pass to <code>setOptions</code>.
-   * 
-   * Helper constants have been defined on JavaCore for each of the option ID and 
-   * their possible constant values.
-   * 
-   * Note: more options might be added in further releases.
-   * <pre>
-   * RECOGNIZED OPTIONS:
-   * COMPILER / Generating Local Variable Debug Attribute
-   *    When generated, this attribute will enable local variable names 
-   *    to be displayed in debugger, only in place where variables are 
-   *    definitely assigned (.class file is then bigger)
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.localVariable"
-   *     - possible values:   { "generate", "do not generate" }
-   *     - default:           "generate"
-   *
-   * COMPILER / Generating Line Number Debug Attribute 
-   *    When generated, this attribute will enable source code highlighting in debugger 
-   *    (.class file is then bigger).
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.lineNumber"
-   *     - possible values:   { "generate", "do not generate" }
-   *     - default:           "generate"
-   *    
-   * COMPILER / Generating Source Debug Attribute 
-   *    When generated, this attribute will enable the debugger to present the 
-   *    corresponding source code.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.debug.sourceFile"
-   *     - possible values:   { "generate", "do not generate" }
-   *     - default:           "generate"
-   *    
-   * COMPILER / Preserving Unused Local Variables
-   *    Unless requested to preserve unused local variables (i.e. never read), the 
-   *    compiler will optimize them out, potentially altering debugging
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.codegen.unusedLocal"
-   *     - possible values:   { "preserve", "optimize out" }
-   *     - default:           "preserve"
-   * 
-   * COMPILER / Defining Target Java Platform
-   *    For binary compatibility reason, .class files can be tagged to with certain VM versions and later.
-   *    Note that "1.4" target require to toggle compliance mode to "1.4" too.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.codegen.targetPlatform"
-   *     - possible values:   { "1.1", "1.2", "1.3", "1.4" }
-   *     - default:           "1.1"
-   *
-   * COMPILER / Reporting Unreachable Code
-   *    Unreachable code can optionally be reported as an error, warning or simply 
-   *    ignored. The bytecode generation will always optimized it out.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unreachableCode"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "error"
-   *
-   * COMPILER / Reporting Invalid Import
-   *    An import statement that cannot be resolved might optionally be reported 
-   *    as an error, as a warning or ignored.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.invalidImport"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "error"
-   *
-   * COMPILER / Reporting Attempt to Override Package-Default Method
-   *    A package default method is not visible in a different package, and thus 
-   *    cannot be overridden. When enabling this option, the compiler will signal 
-   *    such scenarii either as an error or a warning.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.overridingPackageDefaultMethod"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   *
-   * COMPILER / Reporting Method With Constructor Name
-   *    Naming a method with a constructor name is generally considered poor 
-   *    style programming. When enabling this option, the compiler will signal such 
-   *    scenarii either as an error or a warning.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.methodWithConstructorName"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   *
-   * COMPILER / Reporting Deprecation
-   *    When enabled, the compiler will signal use of deprecated API either as an 
-   *    error or a warning.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.deprecation"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   *
-   * COMPILER / Reporting Deprecation Inside Deprecated Code
-   *    When enabled, the compiler will signal use of deprecated API inside deprecated code.
-   *    The severity of the problem is controlled with option "org.phpeclipse.phpdt.core.compiler.problem.deprecation".
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.deprecationInDeprecatedCode"
-   *     - possible values:   { "enabled", "disabled" }
-   *     - default:           "disabled"
-   *
-   * COMPILER / Reporting Hidden Catch Block
-   *    Locally to a try statement, some catch blocks may hide others , e.g.
-   *      try {  throw new java.io.CharConversionException();
-   *      } catch (java.io.CharConversionException e) {
-   *      } catch (java.io.IOException e) {}. 
-   *    When enabling this option, the compiler will issue an error or a warning for hidden 
-   *    catch blocks corresponding to checked exceptions
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.hiddenCatchBlock"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   *
-   * COMPILER / Reporting Unused Local
-   *    When enabled, the compiler will issue an error or a warning for unused local 
-   *    variables (i.e. variables never read from)
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedLocal"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "ignore"
-   *
-   * COMPILER / Reporting Unused Parameter
-   *    When enabled, the compiler will issue an error or a warning for unused method 
-   *    parameters (i.e. parameters never read from)
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedParameter"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "ignore"
-   *
-   * COMPILER / Reporting Unused Import
-   *    When enabled, the compiler will issue an error or a warning for unused import 
-   *    reference 
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.unusedImport"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   *
-   * COMPILER / Reporting Synthetic Access Emulation
-   *    When enabled, the compiler will issue an error or a warning whenever it emulates 
-   *    access to a non-accessible member of an enclosing type. Such access can have
-   *    performance implications.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.syntheticAccessEmulation"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "ignore"
-   *
-   * COMPILER / Reporting Non-Externalized String Literal
-   *    When enabled, the compiler will issue an error or a warning for non externalized 
-   *    String literal (i.e. non tagged with //$NON-NLS-<n>$). 
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.nonExternalizedStringLiteral"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "ignore"
-   * 
-   * COMPILER / Reporting Usage of 'assert' Identifier
-   *    When enabled, the compiler will issue an error or a warning whenever 'assert' is 
-   *    used as an identifier (reserved keyword in 1.4)
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.assertIdentifier"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "ignore"
-   * 
-   * COMPILER / Reporting Usage of expression receiver on static invocation/field access
-   *    When enabled, the compiler will issue an error or a warning whenever a static field
-   *    or method is accessed with an expression receiver.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.staticAccessReceiver"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   * 
-   * COMPILER / Reporting Assignment with no effect
-   *    When enabled, the compiler will issue an error or a warning whenever an assignment
-   *    has no effect (e.g 'x = x').
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.problem.noEffectAssignment"
-   *     - possible values:   { "error", "warning", "ignore" }
-   *     - default:           "warning"
-   * 
-   * COMPILER / Setting Source Compatibility Mode
-   *    Specify whether source is 1.3 or 1.4 compatible. From 1.4 on, 'assert' is a keyword
-   *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
-   *   level should be set to "1.4" and the compliance mode should be "1.4".
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.source"
-   *     - possible values:   { "1.3", "1.4" }
-   *     - default:           "1.3"
-   * 
-   * COMPILER / Setting Compliance Level
-   *    Select the compliance level for the compiler. In "1.3" mode, source and target settings
-   *    should not go beyond "1.3" level.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.compliance"
-   *     - possible values:   { "1.3", "1.4" }
-   *     - default:           "1.3"
-   * 
-   * COMPILER / Maximum number of problems reported per compilation unit
-   *    Specify the maximum number of problems reported on each compilation unit.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.maxProblemPerUnit"
-   *     - possible values:	"<n>" where <n> is zero or a positive integer (if zero then all problems are reported).
-   *     - default:           "100"
-   * 
-   * COMPILER / Define the Automatic Task Tags
-   *    When the tag is non empty, the compiler will issue a task marker whenever it encounters
-   *    one of the corresponding tag inside any comment in Java source code.
-   *    Generated task messages will include the tag, and range until the next line separator or comment ending, and will be trimmed.
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.taskTags"
-   *     - possible values:   { "<tag>[,<tag>]*" } where <tag> is a String without any wild-card 
-   *     - default:           ""
-   * COMPILER / Define the Automatic Task Priorities
-   *    In parallel with the Automatic Task Tags, this list defines the priorities (high, normal or low)
-   *    of the task markers issued by the compiler.
-   *    If the default is specified, the priority of each task marker is "NORMAL".
-   *     - option id:         "org.phpeclipse.phpdt.core.compiler.taskPriorities"
-   *     - possible values:   { "<priority>[,<priority>]*" } where <priority> is one of "HIGH", "NORMAL" or "LOW"
-   *     - default:           ""
-   * 
-   * BUILDER / Specifying Filters for Resource Copying Control
-   *    Allow to specify some filters to control the resource copy process.
-   *     - option id:         "org.phpeclipse.phpdt.core.builder.resourceCopyExclusionFilter"
-   *     - possible values:   { "<name>[,<name>]* } where <name> is a file name pattern (* and ? wild-cards allowed)
-   *       or the name of a folder which ends with '/'
-   *     - default:           ""
-   * 
-   * BUILDER / Abort if Invalid Classpath
-   *    Allow to toggle the builder to abort if the classpath is invalid
-   *     - option id:         "org.phpeclipse.phpdt.core.builder.invalidClasspath"
-   *     - possible values:   { "abort", "ignore" }
-   *     - default:           "ignore"
-   * 
-   * BUILDER / Cleaning Output Folder(s)
-   *    Indicate whether the JavaBuilder is allowed to clean the output folders
-   *    when performing full build operations.
-   *     - option id:         "org.phpeclipse.phpdt.core.builder.cleanOutputFolder"
-   *     - possible values:   { "clean", "ignore" }
-   *     - default:           "clean"
-   * 
-   * JAVACORE / Computing Project Build Order
-   *    Indicate whether JavaCore should enforce the project build order to be based on
-   *    the classpath prerequisite chain. When requesting to compute, this takes over
-   *    the platform default order (based on project references).
-   *     - option id:         "org.phpeclipse.phpdt.core.computeJavaBuildOrder"
-   *     - possible values:   { "compute", "ignore" }
-   *     - default:           "ignore"	 
-   * 
-   * JAVACORE / Specify Default Source Encoding Format
-   *    Get the encoding format for compiled sources. This setting is read-only, it is equivalent
-   *    to 'ResourcesPlugin.getEncoding()'.
-   *     - option id:         "org.phpeclipse.phpdt.core.encoding"
-   *     - possible values:   { any of the supported encoding name}.
-   *     - default:           <platform default>
-   * 
-   * JAVACORE / Reporting Incomplete Classpath
-   *    An entry on the classpath doesn't exist or is not visible (e.g. a referenced project is closed).
-   *     - option id:         "org.phpeclipse.phpdt.core.incompleteClasspath"
-   *     - possible values:   { "error", "warning"}
-   *     - default:           "error"
-   * 
-   * JAVACORE / Reporting Classpath Cycle
-   *    A project is involved in a cycle.
-   *     - option id:         "org.phpeclipse.phpdt.core.circularClasspath"
-   *     - possible values:   { "error", "warning" }
-   *     - default:           "error"
-   * 
-   *	FORMATTER / Inserting New Line Before Opening Brace
-   *    When Insert, a new line is inserted before an opening brace, otherwise nothing
-   *    is inserted
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.openingBrace"
-   *     - possible values:   { "insert", "do not insert" }
-   *     - default:           "do not insert"
-   * 
-   *	FORMATTER / Inserting New Line Inside Control Statement
-   *    When Insert, a new line is inserted between } and following else, catch, finally
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.controlStatement"
-   *     - possible values:   { "insert", "do not insert" }
-   *     - default:           "do not insert"
-   * 
-   *	FORMATTER / Clearing Blank Lines
-   *    When Clear all, all blank lines are removed. When Preserve one, only one is kept
-   *    and all others removed.
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.clearAll"
-   *     - possible values:   { "clear all", "preserve one" }
-   *     - default:           "preserve one"
-   * 
-   *	FORMATTER / Inserting New Line Between Else/If 
-   *    When Insert, a blank line is inserted between an else and an if when they are 
-   *    contiguous. When choosing to not insert, else-if will be kept on the same
-   *    line when possible.
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.elseIf"
-   *     - possible values:   { "insert", "do not insert" }
-   *     - default:           "do not insert"
-   * 
-   *	FORMATTER / Inserting New Line In Empty Block
-   *    When insert, a line break is inserted between contiguous { and }, if } is not followed
-   *    by a keyword.
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.newline.emptyBlock"
-   *     - possible values:   { "insert", "do not insert" }
-   *     - default:           "insert"
-   * 
-   *	FORMATTER / Splitting Lines Exceeding Length
-   *    Enable splitting of long lines (exceeding the configurable length). Length of 0 will
-   *    disable line splitting
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.lineSplit"
-   *     - possible values:	"<n>", where n is zero or a positive integer
-   *     - default:           "80"
-   * 
-   *	FORMATTER / Compacting Assignment
-   *    Assignments can be formatted asymmetrically, e.g. 'int x= 2;', when Normal, a space
-   *    is inserted before the assignment operator
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.style.assignment"
-   *     - possible values:   { "compact", "normal" }
-   *     - default:           "normal"
-   * 
-   *	FORMATTER / Defining Indentation Character
-   *    Either choose to indent with tab characters or spaces
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.tabulation.char"
-   *     - possible values:   { "tab", "space" }
-   *     - default:           "tab"
-   * 
-   *	FORMATTER / Defining Space Indentation Length
-   *    When using spaces, set the amount of space characters to use for each 
-   *    indentation mark.
-   *     - option id:         "org.phpeclipse.phpdt.core.formatter.tabulation.size"
-   *     - possible values:	"<n>", where n is a positive integer
-   *     - default:           "4"
-   * 
-   *	CODEASSIST / Activate Visibility Sensitive Completion
-   *    When active, completion doesn't show that you can not see
-   *    (e.g. you can not see private methods of a super class).
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.visibilityCheck"
-   *     - possible values:   { "enabled", "disabled" }
-   *     - default:           "disabled"
-   * 
-   *	CODEASSIST / Automatic Qualification of Implicit Members
-   *    When active, completion automatically qualifies completion on implicit
-   *    field references and message expressions.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.forceImplicitQualification"
-   *     - possible values:   { "enabled", "disabled" }
-   *     - default:           "disabled"
-   * 
-   *  CODEASSIST / Define the Prefixes for Field Name
-   *    When the prefixes is non empty, completion for field name will begin with
-   *    one of the proposed prefixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.fieldPrefixes"
-   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Prefixes for Static Field Name
-   *    When the prefixes is non empty, completion for static field name will begin with
-   *    one of the proposed prefixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.staticFieldPrefixes"
-   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Prefixes for Local Variable Name
-   *    When the prefixes is non empty, completion for local variable name will begin with
-   *    one of the proposed prefixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.localPrefixes"
-   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Prefixes for Argument Name
-   *    When the prefixes is non empty, completion for argument name will begin with
-   *    one of the proposed prefixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.argumentPrefixes"
-   *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Suffixes for Field Name
-   *    When the suffixes is non empty, completion for field name will end with
-   *    one of the proposed suffixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.fieldSuffixes"
-   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Suffixes for Static Field Name
-   *    When the suffixes is non empty, completion for static field name will end with
-   *    one of the proposed suffixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.staticFieldSuffixes"
-   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Suffixes for Local Variable Name
-   *    When the suffixes is non empty, completion for local variable name will end with
-   *    one of the proposed suffixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.localSuffixes"
-   *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
-   *     - default:           ""
-   * 
-   *  CODEASSIST / Define the Suffixes for Argument Name
-   *    When the suffixes is non empty, completion for argument name will end with
-   *    one of the proposed suffixes.
-   *     - option id:         "org.phpeclipse.phpdt.core.codeComplete.argumentSuffixes"
-   *     - possible values:   { "<suffix>[,<suffix>]*" } where <prefix> is a String without any wild-card 
-   *     - default:           ""
-   * </pre>
-   * 
-   * @return a mutable table containing the default settings of all known options
-   *   (key type: <code>String</code>; value type: <code>String</code>)
-   * @see #setOptions
-   */
-//  public static Hashtable getDefaultOptions() {
-//
-//    Hashtable defaultOptions = new Hashtable(10);
-//
-//    // see #initializeDefaultPluginPreferences() for changing default settings
-//    Preferences preferences = getPlugin().getPluginPreferences();
-//    HashSet optionNames = OptionNames;
-//
-//    // get preferences set to their default
-//    String[] defaultPropertyNames = preferences.defaultPropertyNames();
-//    for (int i = 0; i < defaultPropertyNames.length; i++) {
-//      String propertyName = defaultPropertyNames[i];
-//      if (optionNames.contains(propertyName)) {
-//        defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
-//      }
-//    }
-//    // get preferences not set to their default
-//    String[] propertyNames = preferences.propertyNames();
-//    for (int i = 0; i < propertyNames.length; i++) {
-//      String propertyName = propertyNames[i];
-//      if (optionNames.contains(propertyName)) {
-//        defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
-//      }
-//    }
-//    // get encoding through resource plugin
-//    defaultOptions.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
-//
-//    return defaultOptions;
-//  }
-  /**
-   * Helper method for returning one option value only. Equivalent to <code>(String)JavaCore.getOptions().get(optionName)</code>
-   * Note that it may answer <code>null</code> if this option does not exist.
-   * <p>
-   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-   * </p>
-   * 
-   * @param optionName the name of an option
-   * @return the String value of a given option
-   * @see JavaCore#getDefaultOptions
-   * @since 2.0
-   */
-//  public static String getOption(String optionName) {
-//
-//    if (CORE_ENCODING.equals(optionName)) {
-//      return ResourcesPlugin.getEncoding();
-//    }
-//    if (OptionNames.contains(optionName)) {
-//      Preferences preferences = getPlugin().getPluginPreferences();
-//      return preferences.getString(optionName).trim();
-//    }
-//    return null;
-//  }
-
-  /**
-   * Returns the table of the current options. Initially, all options have their default values,
-   * and this method returns a table that includes all known options.
-   * <p>
-   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-   * </p>
-   * 
-   * @return table of current settings of all options 
-   *   (key type: <code>String</code>; value type: <code>String</code>)
-   * @see JavaCore#getDefaultOptions
-   */
-//  public static Hashtable getOptions() {
-//
-//    Hashtable options = new Hashtable(10);
-//
-//    // see #initializeDefaultPluginPreferences() for changing default settings
-//    Plugin plugin = getPlugin();
-//    if (plugin != null) {
-//      Preferences preferences = getPlugin().getPluginPreferences();
-//      HashSet optionNames = OptionNames;
-//
-//      // get preferences set to their default
-//      String[] defaultPropertyNames = preferences.defaultPropertyNames();
-//      for (int i = 0; i < defaultPropertyNames.length; i++) {
-//        String propertyName = defaultPropertyNames[i];
-//        if (optionNames.contains(propertyName)) {
-//          options.put(propertyName, preferences.getDefaultString(propertyName));
-//        }
-//      }
-//      // get preferences not set to their default
-//      String[] propertyNames = preferences.propertyNames();
-//      for (int i = 0; i < propertyNames.length; i++) {
-//        String propertyName = propertyNames[i];
-//        if (optionNames.contains(propertyName)) {
-//          options.put(propertyName, preferences.getString(propertyName).trim());
-//        }
-//      }
-//      // get encoding through resource plugin
-//      options.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
-//    }
-//    return options;
-//  }
-  /**
-   * Sets the current table of options. All and only the options explicitly included in the given table 
-   * are remembered; all previous option settings are forgotten, including ones not explicitly
-   * mentioned.
-   * <p>
-   * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
-   * </p>
-   * 
-   * @param newOptions the new options (key type: <code>String</code>; value type: <code>String</code>),
-   *   or <code>null</code> to reset all options to their default values
-   * @see JavaCore#getDefaultOptions
-   */
-//  public static void setOptions(Hashtable newOptions) {
-//
-//    // see #initializeDefaultPluginPreferences() for changing default settings
-//    Preferences preferences = getPlugin().getPluginPreferences();
-//
-//    if (newOptions == null) {
-//      newOptions = getDefaultOptions();
-//    }
-//    Enumeration keys = newOptions.keys();
-//    while (keys.hasMoreElements()) {
-//      String key = (String) keys.nextElement();
-//      if (!OptionNames.contains(key))
-//        continue; // unrecognized option
-//      if (key.equals(CORE_ENCODING))
-//        continue; // skipped, contributed by resource prefs
-//      String value = (String) newOptions.get(key);
-//      preferences.setValue(key, value);
-//    }
-//
-//    // persist options
-//    getPlugin().savePluginPreferences();
-//  }
-  public static IProject[] getPHPProjects() {
-    List phpProjectsList = new ArrayList();
-    IProject[] workspaceProjects = PHPeclipsePlugin.getWorkspace().getRoot().getProjects();
-
-    for (int i = 0; i < workspaceProjects.length; i++) {
-      IProject iProject = workspaceProjects[i];
-      if (isPHPProject(iProject))
-        phpProjectsList.add(iProject);
-    }
-
-    IProject[] phpProjects = new IProject[phpProjectsList.size()];
-    return (IProject[]) phpProjectsList.toArray(phpProjects);
-  }
-
-//  public static PHPProject getPHPProject(String name) {
-//    IProject aProject = PHPeclipsePlugin.getWorkspace().getRoot().getProject(name);
-//    if (isPHPProject(aProject)) {
-//      PHPProject thePHPProject = new PHPProject();
-//      thePHPProject.setProject(aProject);
-//      return thePHPProject;
-//    }
-//    return null;
-//  }
-
-  public static boolean isPHPProject(IProject aProject) {
-    try {
-      return aProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID);
-    } catch (CoreException e) {
-    }
-
-    return false;
-  }
-
-//  public static PHPFile create(IFile aFile) {
-//    if (PHPFile.EXTENSION.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//    if (PHPFile.EXTENSION1.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//    if (PHPFile.EXTENSION2.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//    if (PHPFile.EXTENSION3.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//    if (PHPFile.EXTENSION4.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//    if (PHPFile.EXTENSION5.equalsIgnoreCase(aFile.getFileExtension()))
-//      return new PHPFile(aFile);
-//
-//    return null;
-//  }
-
-//  public static PHPProject create(IProject aProject) {
-//	
-//    try {
-//      if (aProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
-//        PHPProject project = new PHPProject();
-//        project.setProject(aProject);
-//        return project;
-//      }
-//    } catch (CoreException e) {
-//      System.err.println("Exception occurred in PHPCore#create(IProject): " + e.toString());
-//    }
-//
-//    return null;
-//  }
-
-  public static void addPHPNature(IProject project, IProgressMonitor monitor) throws CoreException {
-    if (!project.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
-      IProjectDescription description = project.getDescription();
-      String[] prevNatures = description.getNatureIds();
-      String[] newNatures = new String[prevNatures.length + 1];
-      System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-      newNatures[prevNatures.length] = PHPeclipsePlugin.PHP_NATURE_ID;
-      description.setNatureIds(newNatures);
-      project.setDescription(description, monitor);
-    }
-  }
-
-  /**
-   * Returns the single instance of the PHP core plug-in runtime class.
-   * 
-   * @return the single instance of the PHP core plug-in runtime class
-   */
-  public static Plugin getPlugin() {
-    return PHPeclipsePlugin.getDefault();
-  }
-
-  /**
-     * Initializes the default preferences settings for this plug-in.
-     */
- 
-  /**
-  	 * Runs the given action as an atomic Java model operation.
-  	 * <p>
-  	 * After running a method that modifies Java elements,
-  	 * registered listeners receive after-the-fact notification of
-  	 * what just transpired, in the form of a element changed event.
-  	 * This method allows clients to call a number of
-  	 * methods that modify java elements and only have element
-  	 * changed event notifications reported at the end of the entire
-  	 * batch.
-  	 * </p>
-  	 * <p>
-  	 * If this method is called outside the dynamic scope of another such
-  	 * call, this method runs the action and then reports a single
-  	 * element changed event describing the net effect of all changes
-  	 * done to java elements by the action.
-  	 * </p>
-  	 * <p>
-  	 * If this method is called in the dynamic scope of another such
-  	 * call, this method simply runs the action.
-  	 * </p>
-  	 *
-  	 * @param action the action to perform
-  	 * @param monitor a progress monitor, or <code>null</code> if progress
-  	 *    reporting and cancellation are not desired
-  	 * @exception CoreException if the operation failed.
-  	 * @since 2.1
-  	 */
-  public static void run(IWorkspaceRunnable action, IProgressMonitor monitor) throws CoreException {
-    IWorkspace workspace = ResourcesPlugin.getWorkspace();
-    if (workspace.isTreeLocked()) {
-      new BatchOperation(action).run(monitor);
-    } else {
-      // use IWorkspace.run(...) to ensure that a build will be done in autobuild mode
-      workspace.run(new BatchOperation(action), monitor);
-    }
-  }
-  
-/**
- * Adds the given listener for changes to Java elements.
- * Has no effect if an identical listener is already registered.
- *
- * This listener will only be notified during the POST_CHANGE resource change notification
- * and any reconcile operation (POST_RECONCILE).
- * For finer control of the notification, use <code>addElementChangedListener(IElementChangedListener,int)</code>,
- * which allows to specify a different eventMask.
- * 
- * @see ElementChangedEvent
- * @param listener the listener
- */
-public static void addElementChangedListener(IElementChangedListener listener) {
-	addElementChangedListener(listener, ElementChangedEvent.POST_CHANGE | ElementChangedEvent.POST_RECONCILE);
-}
-
-/**
- * Adds the given listener for changes to Java elements.
- * Has no effect if an identical listener is already registered.
- * After completion of this method, the given listener will be registered for exactly
- * the specified events.  If they were previously registered for other events, they
- * will be deregistered.  
- * <p>
- * Once registered, a listener starts receiving notification of changes to
- * java elements in the model. The listener continues to receive 
- * notifications until it is replaced or removed. 
- * </p>
- * <p>
- * Listeners can listen for several types of event as defined in <code>ElementChangeEvent</code>.
- * Clients are free to register for any number of event types however if they register
- * for more than one, it is their responsibility to ensure they correctly handle the
- * case where the same java element change shows up in multiple notifications.  
- * Clients are guaranteed to receive only the events for which they are registered.
- * </p>
- * 
- * @param listener the listener
- * @param eventMask the bit-wise OR of all event types of interest to the listener
- * @see IElementChangedListener
- * @see ElementChangedEvent
- * @see #removeElementChangedListener(IElementChangedListener)
- * @since 2.0
- */
-public static void addElementChangedListener(IElementChangedListener listener, int eventMask) {
-	JavaModelManager.getJavaModelManager().addElementChangedListener(listener, eventMask);
-}
-
-/**
- * Configures the given marker attribute map for the given Java element.
- * Used for markers, which denote a Java element rather than a resource.
- *
- * @param attributes the mutable marker attribute map (key type: <code>String</code>,
- *   value type: <code>String</code>)
- * @param element the Java element for which the marker needs to be configured
- */
-public static void addJavaElementMarkerAttributes(
-	Map attributes,
-	IJavaElement element) {
-//	if (element instanceof IMember)
-//		element = ((IMember) element).getClassFile();
-	if (attributes != null && element != null)
-		attributes.put(ATT_HANDLE_ID, element.getHandleIdentifier());
-}
-	
-/**
- * Configures the given marker for the given Java element.
- * Used for markers, which denote a Java element rather than a resource.
- *
- * @param marker the marker to be configured
- * @param element the Java element for which the marker needs to be configured
- * @exception CoreException if the <code>IMarker.setAttribute</code> on the marker fails
- */
-public void configureJavaElementMarker(IMarker marker, IJavaElement element)
-	throws CoreException {
-//	if (element instanceof IMember)
-//		element = ((IMember) element).getClassFile();
-	if (marker != null && element != null)
-		marker.setAttribute(ATT_HANDLE_ID, element.getHandleIdentifier());
-}
-	
-/**
- * Returns the Java model element corresponding to the given handle identifier
- * generated by <code>IJavaElement.getHandleIdentifier()</code>, or
- * <code>null</code> if unable to create the associated element.
- */
-public static IJavaElement create(String handleIdentifier) {
-	if (handleIdentifier == null) {
-		return null;
-	}
-	try {
-		return JavaModelManager.getJavaModelManager().getHandleFromMemento(handleIdentifier);
-	} catch (JavaModelException e) {
-		return null;
-	}
-}
-/**
- * Returns the Java element corresponding to the given file, or
- * <code>null</code> if unable to associate the given file
- * with a Java element.
- *
- * <p>The file must be one of:<ul>
- *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
- *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
- *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
- *	</ul>
- * <p>
- * Creating a Java element has the side effect of creating and opening all of the
- * element's parents if they are not yet open.
- * 
- * @param the given file
- * @return the Java element corresponding to the given file, or
- * <code>null</code> if unable to associate the given file
- * with a Java element
- */
-public static IJavaElement create(IFile file) {
-	return JavaModelManager.create(file, null);
-}
-/**
- * Returns the package fragment or package fragment root corresponding to the given folder, or
- * <code>null</code> if unable to associate the given folder with a Java element.
- * <p>
- * Note that a package fragment root is returned rather than a default package.
- * <p>
- * Creating a Java element has the side effect of creating and opening all of the
- * element's parents if they are not yet open.
- * 
- * @param the given folder
- * @return the package fragment or package fragment root corresponding to the given folder, or
- * <code>null</code> if unable to associate the given folder with a Java element
- */
-public static IJavaElement create(IFolder folder) {
-	return JavaModelManager.create(folder, null);
-}
-/**
- * Returns the Java project corresponding to the given project.
- * <p>
- * Creating a Java Project has the side effect of creating and opening all of the
- * project's parents if they are not yet open.
- * <p>
- * Note that no check is done at this time on the existence or the java nature of this project.
- * 
- * @param project the given project
- * @return the Java project corresponding to the given project, null if the given project is null
- */
-public static IJavaProject create(IProject project) {
-	if (project == null) {
-		return null;
-	}
-	JavaModel javaModel = JavaModelManager.getJavaModelManager().getJavaModel();
-	return javaModel.getJavaProject(project);
-}
-/**
- * Returns the Java element corresponding to the given resource, or
- * <code>null</code> if unable to associate the given resource
- * with a Java element.
- * <p>
- * The resource must be one of:<ul>
- *	<li>a project - the element returned is the corresponding <code>IJavaProject</code></li>
- *	<li>a <code>.java</code> file - the element returned is the corresponding <code>ICompilationUnit</code></li>
- *	<li>a <code>.class</code> file - the element returned is the corresponding <code>IClassFile</code></li>
- *	<li>a <code>.jar</code> file - the element returned is the corresponding <code>IPackageFragmentRoot</code></li>
- *  <li>a folder - the element returned is the corresponding <code>IPackageFragmentRoot</code>
- *    	or <code>IPackageFragment</code></li>
- *  <li>the workspace root resource - the element returned is the <code>IJavaModel</code></li>
- *	</ul>
- * <p>
- * Creating a Java element has the side effect of creating and opening all of the
- * element's parents if they are not yet open.
- * 
- * @param resource the given resource
- * @return the Java element corresponding to the given resource, or
- * <code>null</code> if unable to associate the given resource
- * with a Java element
- */
-public static IJavaElement create(IResource resource) {
-	return JavaModelManager.create(resource, null);
-}
-/**
- * Returns the Java model.
- * 
- * @param root the given root
- * @return the Java model, or <code>null</code> if the root is null
- */
-public static IJavaModel create(IWorkspaceRoot root) {
-	if (root == null) {
-		return null;
-	}
-	return JavaModelManager.getJavaModelManager().getJavaModel();
-}
-/**
- * Creates and returns a class file element for
- * the given <code>.class</code> file. Returns <code>null</code> if unable
- * to recognize the class file.
- * 
- * @param file the given <code>.class</code> file
- * @return a class file element for the given <code>.class</code> file, or <code>null</code> if unable
- * to recognize the class file
- */
-//public static IClassFile createClassFileFrom(IFile file) {
-//	return JavaModelManager.createClassFileFrom(file, null);
-//}
-/**
- * Creates and returns a compilation unit element for
- * the given <code>.java</code> file. Returns <code>null</code> if unable
- * to recognize the compilation unit.
- * 
- * @param file the given <code>.java</code> file
- * @return a compilation unit element for the given <code>.java</code> file, or <code>null</code> if unable
- * to recognize the compilation unit
- */
-public static ICompilationUnit createCompilationUnitFrom(IFile file) {
-	return JavaModelManager.createCompilationUnitFrom(file, null);
-}
-/**
- * Creates and returns a handle for the given JAR file.
- * The Java model associated with the JAR's project may be
- * created as a side effect. 
- * 
- * @param file the given JAR file
- * @return a handle for the given JAR file, or <code>null</code> if unable to create a JAR package fragment root.
- * (for example, if the JAR file represents a non-Java resource)
- */
-//public static IPackageFragmentRoot createJarPackageFragmentRootFrom(IFile file) {
-//	return JavaModelManager.createJarPackageFragmentRootFrom(file, null);
-//}
-
-/** 
- * Answers the project specific value for a given classpath container.
- * In case this container path could not be resolved, then will answer <code>null</code>.
- * Both the container path and the project context are supposed to be non-null.
- * <p>
- * The containerPath is a formed by a first ID segment followed with extra segments, which can be 
- * used as additional hints for resolution. If no container was ever recorded for this container path 
- * onto this project (using <code>setClasspathContainer</code>, then a 
- * <code>ClasspathContainerInitializer</code> will be activated if any was registered for this container 
- * ID onto the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
- * <p>
- * There is no assumption that the returned container must answer the exact same containerPath
- * when requested <code>IClasspathContainer#getPath</code>. 
- * Indeed, the containerPath is just an indication for resolving it to an actual container object.
- * <p>
- * Classpath container values are persisted locally to the workspace, but 
- * are not preserved from a session to another. It is thus highly recommended to register a 
- * <code>ClasspathContainerInitializer</code> for each referenced container 
- * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
- * <p>
- * @param containerPath the name of the container, which needs to be resolved
- * @param project a specific project in which the container is being resolved
- * @return the corresponding classpath container or <code>null</code> if unable to find one.
- * 
- * @exception JavaModelException if an exception occurred while resolving the container, or if the resolved container
- *   contains illegal entries (contains CPE_CONTAINER entries or null entries).	 
- * 
- * @see ClasspathContainerInitializer
- * @see IClasspathContainer
- * @see #setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
- * @since 2.0
- */
-//public static IClasspathContainer getClasspathContainer(final IPath containerPath, final IJavaProject project) throws JavaModelException {
-//
-//	IClasspathContainer container = JavaModelManager.containerGet(project, containerPath);
-//	if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
-//
-//	if (container == null){
-//		final ClasspathContainerInitializer initializer = JavaCore.getClasspathContainerInitializer(containerPath.segment(0));
-//		if (initializer != null){
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPContainer INIT - triggering initialization of: ["+project.getElementName()+"] " + containerPath + " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-//				new Exception("FAKE exception for dumping current CPContainer (["+project.getElementName()+"] "+ containerPath+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-//			}
-//			JavaModelManager.containerPut(project, containerPath, JavaModelManager.ContainerInitializationInProgress); // avoid initialization cycles
-//			boolean ok = false;
-//			try {
-//				// wrap initializer call with Safe runnable in case initializer would be causing some grief
-//				Platform.run(new ISafeRunnable() {
-//					public void handleException(Throwable exception) {
-//						Util.log(exception, "Exception occurred in classpath container initializer: "+initializer); //$NON-NLS-1$
-//					}
-//					public void run() throws Exception {
-//						initializer.initialize(containerPath, project);
-//					}
-//				});
-//					
-//				// retrieve value (if initialization was successful)
-//				container = JavaModelManager.containerGet(project, containerPath);
-//				if (container == JavaModelManager.ContainerInitializationInProgress) return null; // break cycle
-//				ok = true;
-//			} finally {
-//				if (!ok) JavaModelManager.containerPut(project, containerPath, null); // flush cache
-//			}
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.print("CPContainer INIT - after resolution: ["+project.getElementName()+"] " + containerPath + " --> "); //$NON-NLS-2$//$NON-NLS-1$//$NON-NLS-3$
-//				if (container != null){
-//					System.out.print("container: "+container.getDescription()+" {"); //$NON-NLS-2$//$NON-NLS-1$
-//					IClasspathEntry[] entries = container.getClasspathEntries();
-//					if (entries != null){
-//						for (int i = 0; i < entries.length; i++){
-//							if (i > 0) System.out.println(", ");//$NON-NLS-1$
-//							System.out.println(entries[i]);
-//						}
-//					}
-//					System.out.println("}");//$NON-NLS-1$
-//				} else {
-//					System.out.println("{unbound}");//$NON-NLS-1$
-//				}
-//			}
-//		} else {
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPContainer INIT - no initializer found for: "+project.getElementName()+"] " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
-//			}
-//		}
-//	}
-//	return container;			
-//}
-
-/**
- * Helper method finding the classpath container initializer registered for a given classpath container ID 
- * or <code>null</code> if none was found while iterating over the contributions to extension point to
- * the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
- * <p>
- * A containerID is the first segment of any container path, used to identify the registered container initializer.
- * <p>
- * @param String - a containerID identifying a registered initializer
- * @return ClasspathContainerInitializer - the registered classpath container initializer or <code>null</code> if 
- * none was found.
- * @since 2.1
- */
-//public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID){
-//		
-//	Plugin jdtCorePlugin = JavaCore.getPlugin();
-//	if (jdtCorePlugin == null) return null;
-//
-//	IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
-//	if (extension != null) {
-//		IExtension[] extensions =  extension.getExtensions();
-//		for(int i = 0; i < extensions.length; i++){
-//			IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
-//			for(int j = 0; j < configElements.length; j++){
-//				String initializerID = configElements[j].getAttribute("id"); //$NON-NLS-1$
-//				if (initializerID != null && initializerID.equals(containerID)){
-//					if (JavaModelManager.CP_RESOLVE_VERBOSE) {
-//						System.out.println("CPContainer INIT - found initializer: "+containerID +" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-//					}						
-//					try {
-//						Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
-//						if (execExt instanceof ClasspathContainerInitializer){
-//							return (ClasspathContainerInitializer)execExt;
-//						}
-//					} catch(CoreException e) {
-//					}
-//				}
-//			}
-//		}	
-//	}
-//	return null;
-//}
-
-/**
- * Returns the path held in the given classpath variable.
- * Returns <node>null</code> if unable to bind.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- * Note that classpath variables can be contributed registered initializers for,
- * using the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
- * If an initializer is registered for a variable, its persisted value will be ignored:
- * its initializer will thus get the opportunity to rebind the variable differently on
- * each session.
- *
- * @param variableName the name of the classpath variable
- * @return the path, or <code>null</code> if none 
- * @see #setClasspathVariable
- */
-public static IPath getClasspathVariable(final String variableName) {
-	
-	IPath variablePath = JavaModelManager.variableGet(variableName);
-	if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle
-		
-	if (variablePath != null) {
-		return variablePath;
-	}
-
-	// even if persisted value exists, initializer is given priority, only if no initializer is found the persisted value is reused
-//	final ClasspathVariableInitializer initializer = PHPCore.getClasspathVariableInitializer(variableName);
-//	if (initializer != null){ 
-//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//			System.out.println("CPVariable INIT - triggering initialization of: " + variableName+ " using initializer: "+ initializer); //$NON-NLS-1$ //$NON-NLS-2$
-//			new Exception("FAKE exception for dumping current CPVariable ("+variableName+ ")INIT invocation stack trace").printStackTrace(); //$NON-NLS-1$//$NON-NLS-2$
-//		}
-//		JavaModelManager.variablePut(variableName, JavaModelManager.VariableInitializationInProgress); // avoid initialization cycles
-//		boolean ok = false;
-//		try {
-//			// wrap initializer call with Safe runnable in case initializer would be causing some grief
-//			Platform.run(new ISafeRunnable() {
-//				public void handleException(Throwable exception) {
-//					Util.log(exception, "Exception occurred in classpath variable initializer: "+initializer+" while initializing variable: "+variableName); //$NON-NLS-1$ //$NON-NLS-2$
-//				}
-//				public void run() throws Exception {
-//					initializer.initialize(variableName);
-//				}
-//			});
-//			variablePath = (IPath) JavaModelManager.variableGet(variableName); // initializer should have performed side-effect
-//			if (variablePath == JavaModelManager.VariableInitializationInProgress) return null; // break cycle (initializer did not init or reentering call)
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPVariable INIT - after initialization: " + variableName + " --> " + variablePath); //$NON-NLS-2$//$NON-NLS-1$
-//			}
-//			ok = true;
-//		} finally {
-//			if (!ok) JavaModelManager.variablePut(variableName, null); // flush cache
-//		}
-//	} else {
-//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//			System.out.println("CPVariable INIT - no initializer found for: " + variableName); //$NON-NLS-1$
-//		}
-//	}
-	return variablePath;
-}
-
-/**
- * Helper method finding the classpath variable initializer registered for a given classpath variable name 
- * or <code>null</code> if none was found while iterating over the contributions to extension point to
- * the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
- * <p>
- * @param the given variable
- * @return ClasspathVariableInitializer - the registered classpath variable initializer or <code>null</code> if 
- * none was found.
- * @since 2.1
- */
-public static ClasspathVariableInitializer getClasspathVariableInitializer(String variable){
-		
-	Plugin jdtCorePlugin = PHPCore.getPlugin();
-	if (jdtCorePlugin == null) return null;
-
-//	IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
-//	if (extension != null) {
-//		IExtension[] extensions =  extension.getExtensions();
-//		for(int i = 0; i < extensions.length; i++){
-//			IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
-//			for(int j = 0; j < configElements.length; j++){
-//				try {
-//					String varAttribute = configElements[j].getAttribute("variable"); //$NON-NLS-1$
-//					if (variable.equals(varAttribute)) {
-//						if (JavaModelManager.CP_RESOLVE_VERBOSE) {
-//							System.out.println("CPVariable INIT - found initializer: "+variable+" --> " + configElements[j].getAttribute("class"));//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-//						}						
-//						Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
-//						if (execExt instanceof ClasspathVariableInitializer){
-//							return (ClasspathVariableInitializer)execExt;
-//						}
-//					}
-//				} catch(CoreException e){
-//				}
-//				}
-//		}	
-//	}
-	return null;
-}	
-	
-/**
- * Returns the names of all known classpath variables.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- *
- * @return the list of classpath variable names
- * @see #setClasspathVariable
- */
-//public static String[] getClasspathVariableNames() {
-//	return JavaModelManager.variableNames();
-//}
-
-/**
- * Returns a table of all known configurable options with their default values.
- * These options allow to configure the behaviour of the underlying components.
- * The client may safely use the result as a template that they can modify and
- * then pass to <code>setOptions</code>.
- * 
- * Helper constants have been defined on JavaCore for each of the option ID and 
- * their possible constant values.
- * 
- * Note: more options might be added in further releases.
- * <pre>
- * RECOGNIZED OPTIONS:
- * COMPILER / Generating Local Variable Debug Attribute
- *    When generated, this attribute will enable local variable names 
- *    to be displayed in debugger, only in place where variables are 
- *    definitely assigned (.class file is then bigger)
- *     - option id:         "org.eclipse.jdt.core.compiler.debug.localVariable"
- *     - possible values:   { "generate", "do not generate" }
- *     - default:           "generate"
- *
- * COMPILER / Generating Line Number Debug Attribute 
- *    When generated, this attribute will enable source code highlighting in debugger 
- *    (.class file is then bigger).
- *     - option id:         "org.eclipse.jdt.core.compiler.debug.lineNumber"
- *     - possible values:   { "generate", "do not generate" }
- *     - default:           "generate"
- *    
- * COMPILER / Generating Source Debug Attribute 
- *    When generated, this attribute will enable the debugger to present the 
- *    corresponding source code.
- *     - option id:         "org.eclipse.jdt.core.compiler.debug.sourceFile"
- *     - possible values:   { "generate", "do not generate" }
- *     - default:           "generate"
- *    
- * COMPILER / Preserving Unused Local Variables
- *    Unless requested to preserve unused local variables (that is, never read), the 
- *    compiler will optimize them out, potentially altering debugging
- *     - option id:         "org.eclipse.jdt.core.compiler.codegen.unusedLocal"
- *     - possible values:   { "preserve", "optimize out" }
- *     - default:           "preserve"
- * 
- * COMPILER / Defining Target Java Platform
- *    For binary compatibility reason, .class files can be tagged to with certain VM versions and later.
- *    Note that "1.4" target require to toggle compliance mode to "1.4" too.
- *     - option id:         "org.eclipse.jdt.core.compiler.codegen.targetPlatform"
- *     - possible values:   { "1.1", "1.2", "1.3", "1.4" }
- *     - default:           "1.1"
- *
- * COMPILER / Reporting Unreachable Code
- *    Unreachable code can optionally be reported as an error, warning or simply 
- *    ignored. The bytecode generation will always optimized it out.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unreachableCode"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "error"
- *
- * COMPILER / Reporting Invalid Import
- *    An import statement that cannot be resolved might optionally be reported 
- *    as an error, as a warning or ignored.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.invalidImport"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "error"
- *
- * COMPILER / Reporting Attempt to Override Package-Default Method
- *    A package default method is not visible in a different package, and thus 
- *    cannot be overridden. When enabling this option, the compiler will signal 
- *    such scenarii either as an error or a warning.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Reporting Method With Constructor Name
- *    Naming a method with a constructor name is generally considered poor 
- *    style programming. When enabling this option, the compiler will signal such 
- *    scenarii either as an error or a warning.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.methodWithConstructorName"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Reporting Deprecation
- *    When enabled, the compiler will signal use of deprecated API either as an 
- *    error or a warning.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecation"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Reporting Deprecation Inside Deprecated Code
- *    When enabled, the compiler will signal use of deprecated API inside deprecated code.
- *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.deprecation".
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "disabled"
- *
- * COMPILER / Reporting Hidden Catch Block
- *    Locally to a try statement, some catch blocks may hide others . For example,
- *      try {  throw new java.io.CharConversionException();
- *      } catch (java.io.CharConversionException e) {
- *      } catch (java.io.IOException e) {}. 
- *    When enabling this option, the compiler will issue an error or a warning for hidden 
- *    catch blocks corresponding to checked exceptions
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Reporting Unused Local
- *    When enabled, the compiler will issue an error or a warning for unused local 
- *    variables (that is, variables never read from)
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedLocal"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- *
- * COMPILER / Reporting Unused Parameter
- *    When enabled, the compiler will issue an error or a warning for unused method 
- *    parameters (that is, parameters never read from)
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameter"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- *
- * COMPILER / Reporting Unused Parameter if Implementing Abstract Method
- *    When enabled, the compiler will signal unused parameters in abstract method implementations.
- *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "disabled"
- *
- * COMPILER / Reporting Unused Parameter if Overriding Concrete Method
- *    When enabled, the compiler will signal unused parameters in methods overriding concrete ones.
- *    The severity of the problem is controlled with option "org.eclipse.jdt.core.compiler.problem.unusedParameter".
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "disabled"
- *
- * COMPILER / Reporting Unused Import
- *    When enabled, the compiler will issue an error or a warning for unused import 
- *    reference 
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedImport"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Reporting Unused Private Members
- *    When enabled, the compiler will issue an error or a warning whenever a private 
- *    method or field is declared but never used within the same unit.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.unusedPrivateMember"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- *
- * COMPILER / Reporting Synthetic Access Emulation
- *    When enabled, the compiler will issue an error or a warning whenever it emulates 
- *    access to a non-accessible member of an enclosing type. Such access can have
- *    performance implications.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- *
- * COMPILER / Reporting Non-Externalized String Literal
- *    When enabled, the compiler will issue an error or a warning for non externalized 
- *    String literal (that is, not tagged with //$NON-NLS-<n>$). 
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- * 
- * COMPILER / Reporting Usage of 'assert' Identifier
- *    When enabled, the compiler will issue an error or a warning whenever 'assert' is 
- *    used as an identifier (reserved keyword in 1.4)
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.assertIdentifier"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "ignore"
- * 
- * COMPILER / Reporting Non-Static Reference to a Static Member
- *    When enabled, the compiler will issue an error or a warning whenever a static field
- *    or method is accessed with an expression receiver. A reference to a static member should
- *    be qualified with a type name.
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.staticAccessReceiver"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- * 
- * COMPILER / Reporting Assignment with no Effect
- *    When enabled, the compiler will issue an error or a warning whenever an assignment
- *    has no effect (e.g 'x = x').
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.noEffectAssignment"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- * 
- * COMPILER / Reporting Interface Method not Compatible with non-Inherited Methods
- *    When enabled, the compiler will issue an error or a warning whenever an interface
- *    defines a method incompatible with a non-inherited Object method. Until this conflict
- *    is resolved, such an interface cannot be implemented, For example, 
- *      interface I { 
- *         int clone();
- *      } 
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- * 
- * COMPILER / Reporting Usage of char[] Expressions in String Concatenations
- *    When enabled, the compiler will issue an error or a warning whenever a char[] expression
- *    is used in String concatenations (for example, "hello" + new char[]{'w','o','r','l','d'}).
- *     - option id:         "org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion"
- *     - possible values:   { "error", "warning", "ignore" }
- *     - default:           "warning"
- *
- * COMPILER / Setting Source Compatibility Mode
- *    Specify whether source is 1.3 or 1.4 compatible. From 1.4 on, 'assert' is a keyword
- *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
- *   level should be set to "1.4" and the compliance mode should be "1.4".
- *     - option id:         "org.eclipse.jdt.core.compiler.source"
- *     - possible values:   { "1.3", "1.4" }
- *     - default:           "1.3"
- * 
- * COMPILER / Setting Compliance Level
- *    Select the compliance level for the compiler. In "1.3" mode, source and target settings
- *    should not go beyond "1.3" level.
- *     - option id:         "org.eclipse.jdt.core.compiler.compliance"
- *     - possible values:   { "1.3", "1.4" }
- *     - default:           "1.3"
- * 
- * COMPILER / Maximum number of problems reported per compilation unit
- *    Specify the maximum number of problems reported on each compilation unit.
- *     - option id:         "org.eclipse.jdt.core.compiler.maxProblemPerUnit"
- *     - possible values:	"<n>" where <n> is zero or a positive integer (if zero then all problems are reported).
- *     - default:           "100"
- * 
- * COMPILER / Define the Automatic Task Tags
- *    When the tag list is not empty, the compiler will issue a task marker whenever it encounters
- *    one of the corresponding tag inside any comment in Java source code.
- *    Generated task messages will include the tag, and range until the next line separator or comment ending.
- *    Note that tasks messages are trimmed.
- *     - option id:         "org.eclipse.jdt.core.compiler.taskTags"
- *     - possible values:   { "<tag>[,<tag>]*" } where <tag> is a String without any wild-card or leading/trailing spaces 
- *     - default:           ""
- * 
- * COMPILER / Define the Automatic Task Priorities
- *    In parallel with the Automatic Task Tags, this list defines the priorities (high, normal or low)
- *    of the task markers issued by the compiler.
- *    If the default is specified, the priority of each task marker is "NORMAL".
- *     - option id:         "org.eclipse.jdt.core.compiler.taskPriorities"
- *     - possible values:   { "<priority>[,<priority>]*" } where <priority> is one of "HIGH", "NORMAL" or "LOW"
- *     - default:           ""
- *
- * BUILDER / Specifying Filters for Resource Copying Control
- *    Allow to specify some filters to control the resource copy process.
- *     - option id:         "org.eclipse.jdt.core.builder.resourceCopyExclusionFilter"
- *     - possible values:   { "<name>[,<name>]* } where <name> is a file name pattern (* and ? wild-cards allowed)
- *       or the name of a folder which ends with '/'
- *     - default:           ""
- * 
- * BUILDER / Abort if Invalid Classpath
- *    Allow to toggle the builder to abort if the classpath is invalid
- *     - option id:         "org.eclipse.jdt.core.builder.invalidClasspath"
- *     - possible values:   { "abort", "ignore" }
- *     - default:           "abort"
- * 
- * BUILDER / Cleaning Output Folder(s)
- *    Indicate whether the JavaBuilder is allowed to clean the output folders
- *    when performing full build operations.
- *     - option id:         "org.eclipse.jdt.core.builder.cleanOutputFolder"
- *     - possible values:   { "clean", "ignore" }
- *     - default:           "clean"
- * 
- * BUILDER / Reporting Duplicate Resources
- *    Indicate the severity of the problem reported when more than one occurrence
- *    of a resource is to be copied into the output location.
- *     - option id:         "org.eclipse.jdt.core.builder.duplicateResourceTask"
- *     - possible values:   { "error", "warning" }
- *     - default:           "warning"
- * 
- * JAVACORE / Computing Project Build Order
- *    Indicate whether JavaCore should enforce the project build order to be based on
- *    the classpath prerequisite chain. When requesting to compute, this takes over
- *    the platform default order (based on project references).
- *     - option id:         "org.eclipse.jdt.core.computeJavaBuildOrder"
- *     - possible values:   { "compute", "ignore" }
- *     - default:           "ignore"	 
- * 
- * JAVACORE / Specify Default Source Encoding Format
- *    Get the encoding format for compiled sources. This setting is read-only, it is equivalent
- *    to 'ResourcesPlugin.getEncoding()'.
- *     - option id:         "org.eclipse.jdt.core.encoding"
- *     - possible values:   { any of the supported encoding name}.
- *     - default:           <platform default>
- * 
- * JAVACORE / Reporting Incomplete Classpath
- *    Indicate the severity of the problem reported when an entry on the classpath does not exist, 
- *    is not legite or is not visible (for example, a referenced project is closed).
- *     - option id:         "org.eclipse.jdt.core.incompleteClasspath"
- *     - possible values:   { "error", "warning"}
- *     - default:           "error"
- * 
- * JAVACORE / Reporting Classpath Cycle
- *    Indicate the severity of the problem reported when a project is involved in a cycle.
- *     - option id:         "org.eclipse.jdt.core.circularClasspath"
- *     - possible values:   { "error", "warning" }
- *     - default:           "error"
- * 
- * JAVACORE / Enabling Usage of Classpath Exclusion Patterns
- *    When disabled, no entry on a project classpath can be associated with
- *    an exclusion pattern.
- *     - option id:         "org.eclipse.jdt.core.classpath.exclusionPatterns"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "enabled"
- * 
- * JAVACORE / Enabling Usage of Classpath Multiple Output Locations
- *    When disabled, no entry on a project classpath can be associated with
- *    a specific output location, preventing thus usage of multiple output locations.
- *     - option id:         "org.eclipse.jdt.core.classpath.multipleOutputLocations"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "enabled"
- * 
- *	FORMATTER / Inserting New Line Before Opening Brace
- *    When Insert, a new line is inserted before an opening brace, otherwise nothing
- *    is inserted
- *     - option id:         "org.eclipse.jdt.core.formatter.newline.openingBrace"
- *     - possible values:   { "insert", "do not insert" }
- *     - default:           "do not insert"
- * 
- *	FORMATTER / Inserting New Line Inside Control Statement
- *    When Insert, a new line is inserted between } and following else, catch, finally
- *     - option id:         "org.eclipse.jdt.core.formatter.newline.controlStatement"
- *     - possible values:   { "insert", "do not insert" }
- *     - default:           "do not insert"
- * 
- *	FORMATTER / Clearing Blank Lines
- *    When Clear all, all blank lines are removed. When Preserve one, only one is kept
- *    and all others removed.
- *     - option id:         "org.eclipse.jdt.core.formatter.newline.clearAll"
- *     - possible values:   { "clear all", "preserve one" }
- *     - default:           "preserve one"
- * 
- *	FORMATTER / Inserting New Line Between Else/If 
- *    When Insert, a blank line is inserted between an else and an if when they are 
- *    contiguous. When choosing to not insert, else-if will be kept on the same
- *    line when possible.
- *     - option id:         "org.eclipse.jdt.core.formatter.newline.elseIf"
- *     - possible values:   { "insert", "do not insert" }
- *     - default:           "do not insert"
- * 
- *	FORMATTER / Inserting New Line In Empty Block
- *    When insert, a line break is inserted between contiguous { and }, if } is not followed
- *    by a keyword.
- *     - option id:         "org.eclipse.jdt.core.formatter.newline.emptyBlock"
- *     - possible values:   { "insert", "do not insert" }
- *     - default:           "insert"
- * 
- *	FORMATTER / Splitting Lines Exceeding Length
- *    Enable splitting of long lines (exceeding the configurable length). Length of 0 will
- *    disable line splitting
- *     - option id:         "org.eclipse.jdt.core.formatter.lineSplit"
- *     - possible values:	"<n>", where n is zero or a positive integer
- *     - default:           "80"
- * 
- *	FORMATTER / Compacting Assignment
- *    Assignments can be formatted asymmetrically, for example 'int x= 2;', when Normal, a space
- *    is inserted before the assignment operator
- *     - option id:         "org.eclipse.jdt.core.formatter.style.assignment"
- *     - possible values:   { "compact", "normal" }
- *     - default:           "normal"
- * 
- *	FORMATTER / Defining Indentation Character
- *    Either choose to indent with tab characters or spaces
- *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.char"
- *     - possible values:   { "tab", "space" }
- *     - default:           "tab"
- * 
- *	FORMATTER / Defining Space Indentation Length
- *    When using spaces, set the amount of space characters to use for each 
- *    indentation mark.
- *     - option id:         "org.eclipse.jdt.core.formatter.tabulation.size"
- *     - possible values:	"<n>", where n is a positive integer
- *     - default:           "4"
- * 
- *	FORMATTER / Inserting space in cast expression
- *    When Insert, a space is added between the type and the expression in a cast expression.
- *     - option id:         "org.eclipse.jdt.core.formatter.space.castexpression"
- *     - possible values:   { "insert", "do not insert" }
- *     - default:           "insert"
- * 
- *	CODEASSIST / Activate Visibility Sensitive Completion
- *    When active, completion doesn't show that you can not see
- *    (for example, you can not see private methods of a super class).
- *     - option id:         "org.eclipse.jdt.core.codeComplete.visibilityCheck"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "disabled"
- * 
- *	CODEASSIST / Automatic Qualification of Implicit Members
- *    When active, completion automatically qualifies completion on implicit
- *    field references and message expressions.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.forceImplicitQualification"
- *     - possible values:   { "enabled", "disabled" }
- *     - default:           "disabled"
- * 
- *  CODEASSIST / Define the Prefixes for Field Name
- *    When the prefixes is non empty, completion for field name will begin with
- *    one of the proposed prefixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldPrefixes"
- *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Prefixes for Static Field Name
- *    When the prefixes is non empty, completion for static field name will begin with
- *    one of the proposed prefixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldPrefixes"
- *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Prefixes for Local Variable Name
- *    When the prefixes is non empty, completion for local variable name will begin with
- *    one of the proposed prefixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.localPrefixes"
- *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Prefixes for Argument Name
- *    When the prefixes is non empty, completion for argument name will begin with
- *    one of the proposed prefixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentPrefixes"
- *     - possible values:   { "<prefix>[,<prefix>]*" } where <prefix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Suffixes for Field Name
- *    When the suffixes is non empty, completion for field name will end with
- *    one of the proposed suffixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.fieldSuffixes"
- *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Suffixes for Static Field Name
- *    When the suffixes is non empty, completion for static field name will end with
- *    one of the proposed suffixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.staticFieldSuffixes"
- *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Suffixes for Local Variable Name
- *    When the suffixes is non empty, completion for local variable name will end with
- *    one of the proposed suffixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.localSuffixes"
- *     - possible values:   { "<suffix>[,<suffix>]*" } where <suffix> is a String without any wild-card 
- *     - default:           ""
- * 
- *  CODEASSIST / Define the Suffixes for Argument Name
- *    When the suffixes is non empty, completion for argument name will end with
- *    one of the proposed suffixes.
- *     - option id:         "org.eclipse.jdt.core.codeComplete.argumentSuffixes"
- *     - possible values:   { "<suffix>[,<suffix>]*" } where <prefix> is a String without any wild-card 
- *     - default:           ""
- * </pre>
- * 
- * @return a mutable table containing the default settings of all known options
- *   (key type: <code>String</code>; value type: <code>String</code>)
- * @see #setOptions
- */
-public static Hashtable getDefaultOptions(){
-	
-	Hashtable defaultOptions = new Hashtable(10);
-
-	// see #initializeDefaultPluginPreferences() for changing default settings
-	Preferences preferences = getPlugin().getPluginPreferences();
-	HashSet optionNames = JavaModelManager.OptionNames;
-		
-	// get preferences set to their default
-	String[] defaultPropertyNames = preferences.defaultPropertyNames();
-	for (int i = 0; i < defaultPropertyNames.length; i++){
-		String propertyName = defaultPropertyNames[i];
-		if (optionNames.contains(propertyName)) {
-			defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
-		}
-	}		
-	// get preferences not set to their default
-	String[] propertyNames = preferences.propertyNames();
-	for (int i = 0; i < propertyNames.length; i++){
-		String propertyName = propertyNames[i];
-		if (optionNames.contains(propertyName)) {
-			defaultOptions.put(propertyName, preferences.getDefaultString(propertyName));
-		}
-	}		
-	// get encoding through resource plugin
-	defaultOptions.put(CORE_ENCODING, ResourcesPlugin.getEncoding()); 
-		
-	return defaultOptions;
-}
-
-/**
- * Returns the single instance of the Java core plug-in runtime class.
- * Equivalent to <code>(JavaCore) getPlugin()</code>.
- * 
- * @return the single instance of the Java core plug-in runtime class
- */
-public static PHPeclipsePlugin getJavaCore() {
-	return (PHPeclipsePlugin) getPlugin();
-}
-	
-/**
- * Helper method for returning one option value only. Equivalent to <code>(String)JavaCore.getOptions().get(optionName)</code>
- * Note that it may answer <code>null</code> if this option does not exist.
- * <p>
- * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
- * </p>
- * 
- * @param optionName the name of an option
- * @return the String value of a given option
- * @see JavaCore#getDefaultOptions
- * @since 2.0
- */
-public static String getOption(String optionName) {
-		
-	if (CORE_ENCODING.equals(optionName)){
-		return ResourcesPlugin.getEncoding();
-	}
-	if (JavaModelManager.OptionNames.contains(optionName)){
-		Preferences preferences = getPlugin().getPluginPreferences();
-		return preferences.getString(optionName).trim();
-	}
-	return null;
-}
-	
-/**
- * Returns the table of the current options. Initially, all options have their default values,
- * and this method returns a table that includes all known options.
- * <p>
- * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
- * </p>
- * 
- * @return table of current settings of all options 
- *   (key type: <code>String</code>; value type: <code>String</code>)
- * @see JavaCore#getDefaultOptions
- */
-public static Hashtable getOptions() {
-		
-	Hashtable options = new Hashtable(10);
-
-	// see #initializeDefaultPluginPreferences() for changing default settings
-	Plugin plugin = getPlugin();
-	if (plugin != null) {
-		Preferences preferences = getPlugin().getPluginPreferences();
-		HashSet optionNames = JavaModelManager.OptionNames;
-			
-		// get preferences set to their default
-		String[] defaultPropertyNames = preferences.defaultPropertyNames();
-		for (int i = 0; i < defaultPropertyNames.length; i++){
-			String propertyName = defaultPropertyNames[i];
-			if (optionNames.contains(propertyName)){
-				options.put(propertyName, preferences.getDefaultString(propertyName));
-			}
-		}		
-		// get preferences not set to their default
-		String[] propertyNames = preferences.propertyNames();
-		for (int i = 0; i < propertyNames.length; i++){
-			String propertyName = propertyNames[i];
-			if (optionNames.contains(propertyName)){
-				options.put(propertyName, preferences.getString(propertyName).trim());
-			}
-		}		
-		// get encoding through resource plugin
-		options.put(CORE_ENCODING, ResourcesPlugin.getEncoding());
-	}
-	return options;
-}
-		
-/**
- * This is a helper method, which returns the resolved classpath entry denoted 
- * by a given entry (if it is a variable entry). It is obtained by resolving the variable 
- * reference in the first segment. Returns <node>null</code> if unable to resolve using 
- * the following algorithm:
- * <ul>
- * <li> if variable segment cannot be resolved, returns <code>null</code></li>
- * <li> finds a project, JAR or binary folder in the workspace at the resolved path location</li>
- * <li> if none finds an external JAR file or folder outside the workspace at the resolved path location </li>
- * <li> if none returns <code>null</code></li>
- * </ul>
- * <p>
- * Variable source attachment path and root path are also resolved and recorded in the resulting classpath entry.
- * <p>
- * NOTE: This helper method does not handle classpath containers, for which should rather be used
- * <code>JavaCore#getClasspathContainer(IPath, IJavaProject)</code>.
- * <p>
- * 
- * @param entry the given variable entry
- * @return the resolved library or project classpath entry, or <code>null</code>
- *   if the given variable entry could not be resolved to a valid classpath entry
- */
-public static IClasspathEntry getResolvedClasspathEntry(IClasspathEntry entry) {
-	
-	if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE)
-		return entry;
-	
-	IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-	IPath resolvedPath = PHPCore.getResolvedVariablePath(entry.getPath());
-	if (resolvedPath == null)
-		return null;
-	
-	Object target = JavaModel.getTarget(workspaceRoot, resolvedPath, false);
-	if (target == null)
-		return null;
-	
-	// inside the workspace
-	if (target instanceof IResource) {
-		IResource resolvedResource = (IResource) target;
-		if (resolvedResource != null) {
-			switch (resolvedResource.getType()) {
-					
-				case IResource.PROJECT :  
-					// internal project
-					return PHPCore.newProjectEntry(resolvedPath, entry.isExported());
-						
-				case IResource.FILE : 
-//					if (Util.isArchiveFileName(resolvedResource.getName())) {
-//						// internal binary archive
-//						return JavaCore.newLibraryEntry(
-//								resolvedPath,
-//								getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//								getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//								entry.isExported());
-//					}
-					break;
-						
-				case IResource.FOLDER : 
-					// internal binary folder
-//					return JavaCore.newLibraryEntry(
-//							resolvedPath,
-//							getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//							getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//							entry.isExported());
-          break;
-			}
-		}
-	}
-	// outside the workspace
-	if (target instanceof File) {
-		File externalFile = (File) target;
-		if (externalFile.isFile()) {
-			String fileName = externalFile.getName().toLowerCase();
-//			if (fileName.endsWith(".jar"  //$NON-NLS-1$
-//				) || fileName.endsWith(".zip"  //$NON-NLS-1$
-//				)) { // external binary archive
-//				return JavaCore.newLibraryEntry(
-//						resolvedPath,
-//						getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//						getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//						entry.isExported());
-//			}
-		} else { // external binary folder
-			if (resolvedPath.isAbsolute()){
-//				return JavaCore.newLibraryEntry(
-//						resolvedPath,
-//						getResolvedVariablePath(entry.getSourceAttachmentPath()),
-//						getResolvedVariablePath(entry.getSourceAttachmentRootPath()),
-//						entry.isExported());
-			}
-		}
-	}
-	return null;
-}
-
-
-/**
- * Resolve a variable path (helper method).
- * 
- * @param variablePath the given variable path
- * @return the resolved variable path or <code>null</code> if none
- */
-public static IPath getResolvedVariablePath(IPath variablePath) {
-	
-	if (variablePath == null)
-		return null;
-	int count = variablePath.segmentCount();
-	if (count == 0)
-		return null;
-	
-	// lookup variable	
-	String variableName = variablePath.segment(0);
-	IPath resolvedPath = PHPCore.getClasspathVariable(variableName);
-	if (resolvedPath == null)
-		return null;
-	
-	// append path suffix
-	if (count > 1) {
-		resolvedPath = resolvedPath.append(variablePath.removeFirstSegments(1));
-	}
-	return resolvedPath; 
-}
-
-/**
- * Answers the shared working copies currently registered for this buffer factory. 
- * Working copies can be shared by several clients using the same buffer factory,see 
- * <code>IWorkingCopy.getSharedWorkingCopy</code>.
- * 
- * @param factory the given buffer factory
- * @return the list of shared working copies for a given buffer factory
- * @see IWorkingCopy
- * @since 2.0
- */
-public static IWorkingCopy[] getSharedWorkingCopies(IBufferFactory factory){
-		
-	// if factory is null, default factory must be used
-	if (factory == null) factory = BufferManager.getDefaultBufferManager().getDefaultBufferFactory();
-	Map sharedWorkingCopies = JavaModelManager.getJavaModelManager().sharedWorkingCopies;
-		
-	Map perFactoryWorkingCopies = (Map) sharedWorkingCopies.get(factory);
-	if (perFactoryWorkingCopies == null) return JavaModelManager.NoWorkingCopy;
-	Collection copies = perFactoryWorkingCopies.values();
-	IWorkingCopy[] result = new IWorkingCopy[copies.size()];
-	copies.toArray(result);
-	return result;
-}
-	
-/**
- * Initializes the default preferences settings for this plug-in.
- */
-protected static void initializeDefaultPluginPreferences() {
-		
-	Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences();
-	HashSet optionNames = JavaModelManager.OptionNames;
-		
-	// Compiler settings
-	preferences.setDefault(COMPILER_LOCAL_VARIABLE_ATTR, GENERATE);
-	optionNames.add(COMPILER_LOCAL_VARIABLE_ATTR);
-
-	preferences.setDefault(COMPILER_LINE_NUMBER_ATTR, GENERATE); 
-	optionNames.add(COMPILER_LINE_NUMBER_ATTR);
-
-	preferences.setDefault(COMPILER_SOURCE_FILE_ATTR, GENERATE); 
-	optionNames.add(COMPILER_SOURCE_FILE_ATTR);
-
-	preferences.setDefault(COMPILER_CODEGEN_UNUSED_LOCAL, PRESERVE); 
-	optionNames.add(COMPILER_CODEGEN_UNUSED_LOCAL);
-
-	preferences.setDefault(COMPILER_CODEGEN_TARGET_PLATFORM, VERSION_1_1); 
-	optionNames.add(COMPILER_CODEGEN_TARGET_PLATFORM);
-
-	preferences.setDefault(COMPILER_PB_UNREACHABLE_CODE, ERROR); 
-	optionNames.add(COMPILER_PB_UNREACHABLE_CODE);
-
-	preferences.setDefault(COMPILER_PB_INVALID_IMPORT, ERROR); 
-	optionNames.add(COMPILER_PB_INVALID_IMPORT);
-
-	preferences.setDefault(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD, WARNING); 
-	optionNames.add(COMPILER_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD);
-
-	preferences.setDefault(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME, WARNING); 
-	optionNames.add(COMPILER_PB_METHOD_WITH_CONSTRUCTOR_NAME);
-
-	preferences.setDefault(COMPILER_PB_DEPRECATION, WARNING);
-	optionNames.add(COMPILER_PB_DEPRECATION);
-
-	preferences.setDefault(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, DISABLED);
-	optionNames.add(COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE);
-
-	preferences.setDefault(COMPILER_PB_HIDDEN_CATCH_BLOCK, WARNING); 
-	optionNames.add(COMPILER_PB_HIDDEN_CATCH_BLOCK);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_LOCAL, IGNORE); 
-	optionNames.add(COMPILER_PB_UNUSED_LOCAL);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER, IGNORE); 
-	optionNames.add(COMPILER_PB_UNUSED_PARAMETER);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT, DISABLED); 
-	optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_IMPLEMENTING_ABSTRACT);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE, DISABLED); 
-	optionNames.add(COMPILER_PB_UNUSED_PARAMETER_WHEN_OVERRIDING_CONCRETE);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_IMPORT, WARNING); 
-	optionNames.add(COMPILER_PB_UNUSED_IMPORT);
-
-	preferences.setDefault(COMPILER_PB_UNUSED_PRIVATE_MEMBER, IGNORE); 
-	optionNames.add(COMPILER_PB_UNUSED_PRIVATE_MEMBER);
-
-	preferences.setDefault(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, IGNORE); 
-	optionNames.add(COMPILER_PB_SYNTHETIC_ACCESS_EMULATION);
-
-	preferences.setDefault(COMPILER_PB_NON_NLS_STRING_LITERAL, IGNORE); 
-	optionNames.add(COMPILER_PB_NON_NLS_STRING_LITERAL);
-
-	preferences.setDefault(COMPILER_PB_ASSERT_IDENTIFIER, IGNORE); 
-	optionNames.add(COMPILER_PB_ASSERT_IDENTIFIER);
-
-	preferences.setDefault(COMPILER_PB_STATIC_ACCESS_RECEIVER, WARNING); 
-	optionNames.add(COMPILER_PB_STATIC_ACCESS_RECEIVER);
-
-	preferences.setDefault(COMPILER_PB_NO_EFFECT_ASSIGNMENT, WARNING); 
-	optionNames.add(COMPILER_PB_NO_EFFECT_ASSIGNMENT);
-
-	preferences.setDefault(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD, WARNING); 
-	optionNames.add(COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD);
-
-	preferences.setDefault(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION, WARNING); 
-	optionNames.add(COMPILER_PB_CHAR_ARRAY_IN_STRING_CONCATENATION);
-
-	preferences.setDefault(COMPILER_TASK_TAGS, DEFAULT_TASK_TAG); //$NON-NLS-1$
-	optionNames.add(COMPILER_TASK_TAGS);
-
-	preferences.setDefault(COMPILER_TASK_PRIORITIES, DEFAULT_TASK_PRIORITY); //$NON-NLS-1$
-	optionNames.add(COMPILER_TASK_PRIORITIES);
-
-	preferences.setDefault(COMPILER_SOURCE, VERSION_1_3);
-	optionNames.add(COMPILER_SOURCE);
-
-	preferences.setDefault(COMPILER_COMPLIANCE, VERSION_1_3); 
-	optionNames.add(COMPILER_COMPLIANCE);
-
-	preferences.setDefault(COMPILER_PB_MAX_PER_UNIT, "100"); //$NON-NLS-1$
-	optionNames.add(COMPILER_PB_MAX_PER_UNIT);
-		
-	// Builder settings
-	preferences.setDefault(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, ""); //$NON-NLS-1$
-	optionNames.add(CORE_JAVA_BUILD_RESOURCE_COPY_FILTER);
-
-	preferences.setDefault(CORE_JAVA_BUILD_INVALID_CLASSPATH, ABORT); 
-	optionNames.add(CORE_JAVA_BUILD_INVALID_CLASSPATH);
-	
-	preferences.setDefault(CORE_JAVA_BUILD_DUPLICATE_RESOURCE, WARNING); 
-	optionNames.add(CORE_JAVA_BUILD_DUPLICATE_RESOURCE);
-		
-	preferences.setDefault(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, CLEAN); 
-	optionNames.add(CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER);
-
-	// JavaCore settings
-	preferences.setDefault(CORE_JAVA_BUILD_ORDER, IGNORE); 
-	optionNames.add(CORE_JAVA_BUILD_ORDER);
-	
-	preferences.setDefault(CORE_CIRCULAR_CLASSPATH, ERROR); 
-	optionNames.add(CORE_CIRCULAR_CLASSPATH);
-		
-	preferences.setDefault(CORE_INCOMPLETE_CLASSPATH, ERROR); 
-	optionNames.add(CORE_INCOMPLETE_CLASSPATH);
-		
-	preferences.setDefault(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, ENABLED); 
-	optionNames.add(CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS);
-
-	preferences.setDefault(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS, ENABLED); 
-	optionNames.add(CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS);
-
-	// encoding setting comes from resource plug-in
-	optionNames.add(CORE_ENCODING);
-		
-	// Formatter settings
-	preferences.setDefault(FORMATTER_NEWLINE_OPENING_BRACE, DO_NOT_INSERT); 
-	optionNames.add(FORMATTER_NEWLINE_OPENING_BRACE);
-
-	preferences.setDefault(FORMATTER_NEWLINE_CONTROL, DO_NOT_INSERT);
-	optionNames.add(FORMATTER_NEWLINE_CONTROL);
-
-	preferences.setDefault(FORMATTER_CLEAR_BLANK_LINES, PRESERVE_ONE); 
-	optionNames.add(FORMATTER_CLEAR_BLANK_LINES);
-
-	preferences.setDefault(FORMATTER_NEWLINE_ELSE_IF, DO_NOT_INSERT);
-	optionNames.add(FORMATTER_NEWLINE_ELSE_IF);
-
-	preferences.setDefault(FORMATTER_NEWLINE_EMPTY_BLOCK, INSERT); 
-	optionNames.add(FORMATTER_NEWLINE_EMPTY_BLOCK);
-
-	preferences.setDefault(FORMATTER_LINE_SPLIT, "80"); //$NON-NLS-1$
-	optionNames.add(FORMATTER_LINE_SPLIT);
-
-	preferences.setDefault(FORMATTER_COMPACT_ASSIGNMENT, NORMAL); 
-	optionNames.add(FORMATTER_COMPACT_ASSIGNMENT);
-
-	preferences.setDefault(FORMATTER_TAB_CHAR, TAB); 
-	optionNames.add(FORMATTER_TAB_CHAR);
-
-	preferences.setDefault(FORMATTER_TAB_SIZE, "4"); //$NON-NLS-1$ 
-	optionNames.add(FORMATTER_TAB_SIZE);
-		
-	preferences.setDefault(FORMATTER_SPACE_CASTEXPRESSION, INSERT); //$NON-NLS-1$ 
-	optionNames.add(FORMATTER_SPACE_CASTEXPRESSION);
-
-	// CodeAssist settings
-	preferences.setDefault(CODEASSIST_VISIBILITY_CHECK, DISABLED); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_VISIBILITY_CHECK);
-
-	preferences.setDefault(CODEASSIST_IMPLICIT_QUALIFICATION, DISABLED); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_IMPLICIT_QUALIFICATION);
-		
-	preferences.setDefault(CODEASSIST_FIELD_PREFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_FIELD_PREFIXES);
-		
-	preferences.setDefault(CODEASSIST_STATIC_FIELD_PREFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_STATIC_FIELD_PREFIXES);
-		
-	preferences.setDefault(CODEASSIST_LOCAL_PREFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_LOCAL_PREFIXES);
-		
-	preferences.setDefault(CODEASSIST_ARGUMENT_PREFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_ARGUMENT_PREFIXES);
-		
-	preferences.setDefault(CODEASSIST_FIELD_SUFFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_FIELD_SUFFIXES);
-		
-	preferences.setDefault(CODEASSIST_STATIC_FIELD_SUFFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_STATIC_FIELD_SUFFIXES);
-		
-	preferences.setDefault(CODEASSIST_LOCAL_SUFFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_LOCAL_SUFFIXES);
-		
-	preferences.setDefault(CODEASSIST_ARGUMENT_SUFFIXES, ""); //$NON-NLS-1$
-	optionNames.add(CODEASSIST_ARGUMENT_SUFFIXES);
-}
-	
-/**
- * Returns whether the given marker references the given Java element.
- * Used for markers, which denote a Java element rather than a resource.
- *
- * @param element the element
- * @param marker the marker
- * @return <code>true</code> if the marker references the element, false otherwise
- * @exception CoreException if the <code>IMarker.getAttribute</code> on the marker fails 	 
- */
-public static boolean isReferencedBy(IJavaElement element, IMarker marker) throws CoreException {
-		
-	// only match units or classfiles
-	if (element instanceof IMember){
-		IMember member = (IMember) element;
-		if (member.isBinary()){
-			element = null; //member.getClassFile();
-		} else {
-			element = member.getCompilationUnit();
-		}
-	}
-	if (element == null) return false;			
-	if (marker == null) return false;
-
-	String markerHandleId = (String)marker.getAttribute(ATT_HANDLE_ID);
-	if (markerHandleId == null) return false;
-		
-	IJavaElement markerElement = PHPCore.create(markerHandleId);
-//	while (true){
-		if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
-			
-		// cycle through enclosing types in case marker is associated with a classfile (15568)
-//		if (markerElement instanceof IClassFile){
-//			IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
-//			if (enclosingType != null){
-//				markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
-//				continue;
-//			}
-//		}
-//		break;
-//	}
-	return false;
-}
-
-/**
- * Returns whether the given marker delta references the given Java element.
- * Used for markers deltas, which denote a Java element rather than a resource.
- *
- * @param element the element
- * @param markerDelta the marker delta
- * @return <code>true</code> if the marker delta references the element
- * @exception CoreException if the  <code>IMarkerDelta.getAttribute</code> on the marker delta fails 	 
- */
-public static boolean isReferencedBy(IJavaElement element, IMarkerDelta markerDelta) throws CoreException {
-		
-	// only match units or classfiles
-	if (element instanceof IMember){
-		IMember member = (IMember) element;
-		if (member.isBinary()){
-			element = null; //member.getClassFile();
-		} else {
-			element = member.getCompilationUnit();
-		}
-	}
-	if (element == null) return false;			
-	if (markerDelta == null) return false;
-
-	String markerDeltarHandleId = (String)markerDelta.getAttribute(ATT_HANDLE_ID);
-	if (markerDeltarHandleId == null) return false;
-		
-	IJavaElement markerElement = PHPCore.create(markerDeltarHandleId);
-//	while (true){
-		if (element.equals(markerElement)) return true; // external elements may still be equal with different handleIDs.
-			
-		// cycle through enclosing types in case marker is associated with a classfile (15568)
-//		if (markerElement instanceof IClassFile){
-//			IType enclosingType = ((IClassFile)markerElement).getType().getDeclaringType();
-//			if (enclosingType != null){
-//				markerElement = enclosingType.getClassFile(); // retry with immediate enclosing classfile
-//				continue;
-//			}
-//		}
-//		break;
-//	}
-	return false;
-}
-
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
- * for the given path. The path of the container will be used during resolution so as to map this
- * container entry to a set of other classpath entries the container is acting for.
- * <p>
- * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
- * which can be interpreted differently for each Java project where it is used.
- * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
- * and updated with <code>JavaCore.classpathContainerChanged</code>
- * <p>
- * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
- * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
- * <p>
- * A container path must be formed of at least one segment, where: <ul>
- * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
- * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
- * <li> the remaining segments will be passed onto the initializer, and can be used as additional
- * 	hints during the initialization phase. </li>
- * </ul>
- * <p>
- * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
- * 
- * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
- * 
- * <extension
- *    point="org.eclipse.jdt.core.classpathContainerInitializer">
- *    <containerInitializer
- *       id="MyProvidedJDK"
- *       class="com.example.MyInitializer"/> 
- * <p>
- * Note that this operation does not attempt to validate classpath containers
- * or access the resources at the given paths.
- * <p>
- * The resulting entry is not exported to dependent projects. This method is equivalent to
- * <code>newContainerEntry(-,false)</code>.
- * <p>
- * @param containerPath the path identifying the container, it must be formed of two
- * 	segments
- * @return a new container classpath entry
- * 
- * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
- * @see JavaCore#newContainerEntry(IPath, boolean)
- * @since 2.0
- */
-public static IClasspathEntry newContainerEntry(IPath containerPath) {
-			
-	return newContainerEntry(containerPath, false);
-}
-
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_CONTAINER</code>
- * for the given path. The path of the container will be used during resolution so as to map this
- * container entry to a set of other classpath entries the container is acting for.
- * <p>
- * A container entry allows to express indirect references to a set of libraries, projects and variable entries,
- * which can be interpreted differently for each Java project where it is used.
- * A classpath container entry can be resolved using <code>JavaCore.getResolvedClasspathContainer</code>,
- * and updated with <code>JavaCore.classpathContainerChanged</code>
- * <p>
- * A container is exclusively resolved by a <code>ClasspathContainerInitializer</code> registered onto the
- * extension point "org.eclipse.jdt.core.classpathContainerInitializer".
- * <p>
- * A container path must be formed of at least one segment, where: <ul>
- * <li> the first segment is a unique ID identifying the target container, there must be a container initializer registered
- * 	onto this ID through the extension point  "org.eclipse.jdt.core.classpathContainerInitializer". </li>
- * <li> the remaining segments will be passed onto the initializer, and can be used as additional
- * 	hints during the initialization phase. </li>
- * </ul>
- * <p>
- * Example of an ClasspathContainerInitializer for a classpath container denoting a default JDK container:
- * 
- * containerEntry = JavaCore.newContainerEntry(new Path("MyProvidedJDK/default"));
- * 
- * <extension
- *    point="org.eclipse.jdt.core.classpathContainerInitializer">
- *    <containerInitializer
- *       id="MyProvidedJDK"
- *       class="com.example.MyInitializer"/> 
- * <p>
- * Note that this operation does not attempt to validate classpath containers
- * or access the resources at the given paths.
- * <p>
- * @param containerPath the path identifying the container, it must be formed of at least
- * 	one segment (ID+hints)
- * @param isExported a boolean indicating whether this entry is contributed to dependent
- *    projects in addition to the output location
- * @return a new container classpath entry
- * 
- * @see JavaCore#getClasspathContainer(IPath, IJavaProject)
- * @see JavaCore#setClasspathContainer(IPath, IJavaProject[], IClasspathContainer[], IProgressMonitor)
- * @see JavaCore#newContainerEntry(IPath, boolean)
- * @since 2.0
- */
-public static IClasspathEntry newContainerEntry(IPath containerPath, boolean isExported) {
-			
-	if (containerPath == null || containerPath.segmentCount() < 1) {
-		Assert.isTrue(
-			false,
-			"Illegal classpath container path: \'" + containerPath.makeRelative().toString() + "\', must have at least one segment (containerID+hints)"); //$NON-NLS-1$//$NON-NLS-2$
-	}
-	return new ClasspathEntry(
-		IPackageFragmentRoot.K_SOURCE,
-		IClasspathEntry.CPE_CONTAINER,
-		containerPath,
-		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-		null, // source attachment
-		null, // source attachment root
-		null, // specific output folder
-		isExported);
-}
-
-/**
- * Creates and returns a new non-exported classpath entry of kind <code>CPE_LIBRARY</code> for the 
- * JAR or folder identified by the given absolute path. This specifies that all package fragments 
- * within the root will have children of type <code>IClassFile</code>.
- * <p>
- * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
- * The target JAR or folder can either be defined internally to the workspace (absolute path relative
- * to the workspace root) or externally to the workspace (absolute path in the file system).
- * <p>
- * e.g. Here are some examples of binary path usage<ul>
- *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
- *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
- *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
- * </ul>
- * Note that this operation does not attempt to validate or access the 
- * resources at the given paths.
- * <p>
- * The resulting entry is not exported to dependent projects. This method is equivalent to
- * <code>newLibraryEntry(-,-,-,false)</code>.
- * <p>
- * 
- * @param path the absolute path of the binary archive
- * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
- *    or <code>null</code> if none
- * @param sourceAttachmentRootPath the location of the root within the source archive or folder
- *    or <code>null</code> if this location should be automatically detected.
- * @return a new library classpath entry
- * 
- * @see #newLibraryEntry(IPath, IPath, IPath, boolean)
- */
-//public static IClasspathEntry newLibraryEntry(
-//	IPath path,
-//	IPath sourceAttachmentPath,
-//	IPath sourceAttachmentRootPath) {
-//			
-//	return newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath, false);
-//}
-
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_LIBRARY</code> for the JAR or folder
- * identified by the given absolute path. This specifies that all package fragments within the root 
- * will have children of type <code>IClassFile</code>.
- * <p>
- * A library entry is used to denote a prerequisite JAR or root folder containing binaries.
- * The target JAR or folder can either be defined internally to the workspace (absolute path relative
- * to the workspace root) or externally to the workspace (absolute path in the file system).
- *	<p>
- * e.g. Here are some examples of binary path usage<ul>
- *	<li><code> "c:/jdk1.2.2/jre/lib/rt.jar" </code> - reference to an external JAR</li>
- *	<li><code> "/Project/someLib.jar" </code> - reference to an internal JAR </li>
- *	<li><code> "c:/classes/" </code> - reference to an external binary folder</li>
- * </ul>
- * Note that this operation does not attempt to validate or access the 
- * resources at the given paths.
- * <p>
- * 
- * @param path the absolute path of the binary archive
- * @param sourceAttachmentPath the absolute path of the corresponding source archive or folder, 
- *    or <code>null</code> if none
- * @param sourceAttachmentRootPath the location of the root within the source archive or folder
- *    or <code>null</code> if this location should be automatically detected.
- * @param isExported indicates whether this entry is contributed to dependent
- * 	  projects in addition to the output location
- * @return a new library classpath entry
- * @since 2.0
- */
-//public static IClasspathEntry newLibraryEntry(
-//	IPath path,
-//	IPath sourceAttachmentPath,
-//	IPath sourceAttachmentRootPath,
-//	boolean isExported) {
-//			
-//	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
-//
-//	return new ClasspathEntry(
-//		IPackageFragmentRoot.K_BINARY,
-//		IClasspathEntry.CPE_LIBRARY,
-//		JavaProject.canonicalizedPath(path),
-//		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//		sourceAttachmentPath,
-//		sourceAttachmentRootPath,
-//		null, // specific output folder
-//		isExported);
-//}
-
-/**
- * Creates and returns a new non-exported classpath entry of kind <code>CPE_PROJECT</code>
- * for the project identified by the given absolute path.
- * <p>
- * A project entry is used to denote a prerequisite project on a classpath.
- * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
- * contributes all its package fragment roots) or as binaries (when building, it contributes its 
- * whole output location).
- * <p>
- * A project reference allows to indirect through another project, independently from its internal layout. 
- * <p>
- * The prerequisite project is referred to using an absolute path relative to the workspace root.
- * <p>
- * The resulting entry is not exported to dependent projects. This method is equivalent to
- * <code>newProjectEntry(_,false)</code>.
- * <p>
- * 
- * @param path the absolute path of the binary archive
- * @return a new project classpath entry
- * 
- * @see JavaCore#newProjectEntry(IPath, boolean)
- */
-public static IClasspathEntry newProjectEntry(IPath path) {
-	return newProjectEntry(path, false);
-}
-	
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_PROJECT</code>
- * for the project identified by the given absolute path.
- * <p>
- * A project entry is used to denote a prerequisite project on a classpath.
- * The referenced project will be contributed as a whole, either as sources (in the Java Model, it
- * contributes all its package fragment roots) or as binaries (when building, it contributes its 
- * whole output location).
- * <p>
- * A project reference allows to indirect through another project, independently from its internal layout. 
- * <p>
- * The prerequisite project is referred to using an absolute path relative to the workspace root.
- * <p>
- * 
- * @param path the absolute path of the prerequisite project
- * @param isExported indicates whether this entry is contributed to dependent
- * 	  projects in addition to the output location
- * @return a new project classpath entry
- * @since 2.0
- */
-public static IClasspathEntry newProjectEntry(IPath path, boolean isExported) {
-		
-	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
-		
-	return new ClasspathEntry(
-		IPackageFragmentRoot.K_SOURCE,
-		IClasspathEntry.CPE_PROJECT,
-		path,
-		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-		null, // source attachment
-		null, // source attachment root
-		null, // specific output folder
-		isExported);
-}
-
-/**
- * Returns a new empty region.
- * 
- * @return a new empty region
- */
-public static IRegion newRegion() {
-	return new Region();
-}
-
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
- * for the project's source folder identified by the given absolute 
- * workspace-relative path. This specifies that all package fragments
- * within the root will have children of type <code>ICompilationUnit</code>.
- * <p>
- * The source folder is referred to using an absolute path relative to the
- * workspace root, e.g. <code>/Project/src</code>. A project's source 
- * folders are located with that project. That is, a source classpath
- * entry specifying the path <code>/P1/src</code> is only usable for
- * project <code>P1</code>.
- * </p>
- * <p>
- * The source classpath entry created by this method includes all source
- * files below the given workspace-relative path. To selectively exclude
- * some of these source files, use the factory method 
- * <code>JavaCore.newSourceEntry(IPath,IPath[])</code> instead.
- * </p>
- * <p>
- * Note that all sources/binaries inside a project are contributed as a whole through
- * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
- * source entries cannot be selectively exported.
- * </p>
- * 
- * @param path the absolute workspace-relative path of a source folder
- * @return a new source classpath entry with not exclusion patterns
- * 
- * @see #newSourceEntry(org.eclipse.core.runtime.IPath,org.eclipse.core.runtime.IPath[])
- */
-public static IClasspathEntry newSourceEntry(IPath path) {
-
-	return newSourceEntry(path, ClasspathEntry.NO_EXCLUSION_PATTERNS, null /*output location*/);
-}
-	
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
- * for the project's source folder identified by the given absolute 
- * workspace-relative path but excluding all source files with paths
- * matching any of the given patterns. This specifies that all package
- * fragments within the root will have children of type 
- * <code>ICompilationUnit</code>.
- * <p>
- * The source folder is referred to using an absolute path relative to the
- * workspace root, e.g. <code>/Project/src</code>. A project's source 
- * folders are located with that project. That is, a source classpath
- * entry specifying the path <code>/P1/src</code> is only usable for
- * project <code>P1</code>.
- * </p>
- * <p>
- * The source classpath entry created by this method includes all source
- * files below the given workspace-relative path except for those matched
- * by one (or more) of the given exclusion patterns. Each exclusion pattern
- * is represented by a relative path, which is interpreted as relative to
- * the source folder. For example, if the source folder path is 
- * <code>/Project/src</code> and the exclusion pattern is 
- * <code>com/xyz/tests/&#42;&#42;</code>, then source files
- * like <code>/Project/src/com/xyz/Foo.java</code>
- * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
- * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
- * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
- * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
- * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
- * for the full description of the syntax and semantics of exclusion
- * patterns.
- * </p>
- * If the empty list of exclusion patterns is specified, the source folder
- * will automatically include all resources located inside the source
- * folder. In that case, the result is entirely equivalent to using the
- * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
- * </p>
- * <p>
- * Note that all sources/binaries inside a project are contributed as a whole through
- * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
- * source entries cannot be selectively exported.
- * </p>
- *
- * @param path the absolute workspace-relative path of a source folder
- * @param exclusionPatterns the possibly empty list of exclusion patterns
- *    represented as relative paths
- * @return a new source classpath entry with the given exclusion patterns
- * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
- * @see IClasspathEntry#getExclusionPatterns
- * 
- * @since 2.1
- */
-public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns) {
-
-	return newSourceEntry(path, exclusionPatterns, null /*output location*/); 
-}
-
-/**
- * Creates and returns a new classpath entry of kind <code>CPE_SOURCE</code>
- * for the project's source folder identified by the given absolute 
- * workspace-relative path but excluding all source files with paths
- * matching any of the given patterns, and associated with a specific output location
- * (that is, ".class" files are not going to the project default output location). 
- * All package fragments within the root will have children of type 
- * <code>ICompilationUnit</code>.
- * <p>
- * The source folder is referred to using an absolute path relative to the
- * workspace root, e.g. <code>/Project/src</code>. A project's source 
- * folders are located with that project. That is, a source classpath
- * entry specifying the path <code>/P1/src</code> is only usable for
- * project <code>P1</code>.
- * </p>
- * <p>
- * The source classpath entry created by this method includes all source
- * files below the given workspace-relative path except for those matched
- * by one (or more) of the given exclusion patterns. Each exclusion pattern
- * is represented by a relative path, which is interpreted as relative to
- * the source folder. For example, if the source folder path is 
- * <code>/Project/src</code> and the exclusion pattern is 
- * <code>com/xyz/tests/&#42;&#42;</code>, then source files
- * like <code>/Project/src/com/xyz/Foo.java</code>
- * and <code>/Project/src/com/xyz/utils/Bar.java</code> would be included,
- * whereas <code>/Project/src/com/xyz/tests/T1.java</code>
- * and <code>/Project/src/com/xyz/tests/quick/T2.java</code> would be
- * excluded. Exclusion patterns can contain can contain '**', '*' or '?'
- * wildcards; see <code>IClasspathEntry.getExclusionPatterns</code>
- * for the full description of the syntax and semantics of exclusion
- * patterns.
- * </p>
- * If the empty list of exclusion patterns is specified, the source folder
- * will automatically include all resources located inside the source
- * folder. In that case, the result is entirely equivalent to using the
- * factory method <code>JavaCore.newSourceEntry(IPath)</code>. 
- * </p>
- * <p>
- * Additionally, a source entry can be associated with a specific output location. 
- * By doing so, the Java builder will ensure that the generated ".class" files will 
- * be issued inside this output location, as opposed to be generated into the 
- * project default output location (when output location is <code>null</code>). 
- * Note that multiple source entries may target the same output location.
- * The output location is referred to using an absolute path relative to the 
- * workspace root, e.g. <code>"/Project/bin"</code>, it must be located inside 
- * the same project as the source folder.
- * </p>
- * <p>
- * Also note that all sources/binaries inside a project are contributed as a whole through
- * a project entry (see <code>JavaCore.newProjectEntry</code>). Particular
- * source entries cannot be selectively exported.
- * </p>
- *
- * @param path the absolute workspace-relative path of a source folder
- * @param exclusionPatterns the possibly empty list of exclusion patterns
- *    represented as relative paths
- * @param outputLocation the specific output location for this source entry (<code>null</code> if using project default ouput location)
- * @return a new source classpath entry with the given exclusion patterns
- * @see #newSourceEntry(org.eclipse.core.runtime.IPath)
- * @see IClasspathEntry#getExclusionPatterns
- * @see IClasspathEntry#getOutputLocation()
- * 
- * @since 2.1
- */
-public static IClasspathEntry newSourceEntry(IPath path, IPath[] exclusionPatterns, IPath specificOutputLocation) {
-
-	if (!path.isAbsolute()) Assert.isTrue(false, "Path for IClasspathEntry must be absolute"); //$NON-NLS-1$
-	if (exclusionPatterns == null) Assert.isTrue(false, "Exclusion pattern set cannot be null"); //$NON-NLS-1$
-
-	return new ClasspathEntry(
-		IPackageFragmentRoot.K_SOURCE,
-		IClasspathEntry.CPE_SOURCE,
-		path,
-		exclusionPatterns,
-		null, // source attachment
-		null, // source attachment root
-		specificOutputLocation, // custom output location
-		false);
-}
-		
-/**
- * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
- * for the given path. The first segment of the path is the name of a classpath variable.
- * The trailing segments of the path will be appended to resolved variable path.
- * <p>
- * A variable entry allows to express indirect references on a classpath to other projects or libraries,
- * depending on what the classpath variable is referring.
- * <p>
- *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
- * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
- * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
- * <p>
- * e.g. Here are some examples of variable path usage<ul>
- * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
- *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
- * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
- *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
- * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
- *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
- * </ul>
- * Note that this operation does not attempt to validate classpath variables
- * or access the resources at the given paths.
- * <p>
- * The resulting entry is not exported to dependent projects. This method is equivalent to
- * <code>newVariableEntry(-,-,-,false)</code>.
- * <p>
- * 
- * @param variablePath the path of the binary archive; first segment is the
- *   name of a classpath variable
- * @param variableSourceAttachmentPath the path of the corresponding source archive, 
- *    or <code>null</code> if none; if present, the first segment is the
- *    name of a classpath variable (not necessarily the same variable
- *    as the one that begins <code>variablePath</code>)
- * @param sourceAttachmentRootPath the location of the root within the source archive
- *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
- * @return a new library classpath entry
- * 
- * @see JavaCore#newVariableEntry(IPath, IPath, IPath, boolean)
- */
-//public static IClasspathEntry newVariableEntry(
-//	IPath variablePath,
-//	IPath variableSourceAttachmentPath,
-//	IPath sourceAttachmentRootPath) {
-//
-//	return newVariableEntry(variablePath, variableSourceAttachmentPath, sourceAttachmentRootPath, false);
-//}
-
-/**
- * Creates and returns a new non-exported classpath entry of kind <code>CPE_VARIABLE</code>
- * for the given path. The first segment of the path is the name of a classpath variable.
- * The trailing segments of the path will be appended to resolved variable path.
- * <p>
- * A variable entry allows to express indirect references on a classpath to other projects or libraries,
- * depending on what the classpath variable is referring.
- * <p>
- *	It is possible to register an automatic initializer (<code>ClasspathVariableInitializer</code>),
- * which will be invoked through the extension point "org.eclipse.jdt.core.classpathVariableInitializer".
- * After resolution, a classpath variable entry may either correspond to a project or a library entry. </li>	 
- * <p>
- * e.g. Here are some examples of variable path usage<ul>
- * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
- *		bound to "c:/jars/jdtcore.jar". The resolved classpath entry is denoting the library "c:\jars\jdtcore.jar"</li>
- * <li> "JDTCORE" where variable <code>JDTCORE</code> is 
- *		bound to "/Project_JDTCORE". The resolved classpath entry is denoting the project "/Project_JDTCORE"</li>
- * <li> "PLUGINS/com.example/example.jar" where variable <code>PLUGINS</code>
- *      is bound to "c:/eclipse/plugins". The resolved classpath entry is denoting the library "c:/eclipse/plugins/com.example/example.jar"</li>
- * </ul>
- * Note that this operation does not attempt to validate classpath variables
- * or access the resources at the given paths.
- * <p>
- *
- * @param variablePath the path of the binary archive; first segment is the
- *   name of a classpath variable
- * @param variableSourceAttachmentPath the path of the corresponding source archive, 
- *    or <code>null</code> if none; if present, the first segment is the
- *    name of a classpath variable (not necessarily the same variable
- *    as the one that begins <code>variablePath</code>)
- * @param sourceAttachmentRootPath the location of the root within the source archive
- *    or <code>null</code> if <code>archivePath</code> is also <code>null</code>
- * @param isExported indicates whether this entry is contributed to dependent
- * 	  projects in addition to the output location
- * @return a new variable classpath entry
- * @since 2.0
- */
-//public static IClasspathEntry newVariableEntry(
-//	IPath variablePath,
-//	IPath variableSourceAttachmentPath,
-//	IPath variableSourceAttachmentRootPath,
-//	boolean isExported) {
-//			
-//	if (variablePath == null || variablePath.segmentCount() < 1) {
-//		Assert.isTrue(
-//			false,
-//			"Illegal classpath variable path: \'" + variablePath.makeRelative().toString() + "\', must have at least one segment"); //$NON-NLS-1$//$NON-NLS-2$
-//	}
-//	
-//	return new ClasspathEntry(
-//		IPackageFragmentRoot.K_SOURCE,
-//		IClasspathEntry.CPE_VARIABLE,
-//		variablePath,
-//		ClasspathEntry.NO_EXCLUSION_PATTERNS, 
-//		variableSourceAttachmentPath, // source attachment
-//		variableSourceAttachmentRootPath, // source attachment root			
-//		null, // specific output folder
-//		isExported);
-//}
-
-/**
- * Removed the given classpath variable. Does nothing if no value was
- * set for this classpath variable.
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- *
- * @param variableName the name of the classpath variable
- * @see #setClasspathVariable
- *
- * @deprecated - use version with extra IProgressMonitor
- */
-//public static void removeClasspathVariable(String variableName) {
-//	removeClasspathVariable(variableName, null);
-//}
-
-/**
- * Removed the given classpath variable. Does nothing if no value was
- * set for this classpath variable.
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- *
- * @param variableName the name of the classpath variable
- * @param monitor the progress monitor to report progress
- * @see #setClasspathVariable
- */
-//public static void removeClasspathVariable(
-//	String variableName,
-//	IProgressMonitor monitor) {
-//
-//	try {
-//		updateVariableValues(new String[]{ variableName}, new IPath[]{ null }, monitor);
-//	} catch (JavaModelException e) {
-//	}
-//}
-
-/**
- * Removes the given element changed listener.
- * Has no affect if an identical listener is not registered.
- *
- * @param listener the listener
- */
-public static void removeElementChangedListener(IElementChangedListener listener) {
-	JavaModelManager.getJavaModelManager().removeElementChangedListener(listener);
-}
-
-/** 
- * Bind a container reference path to some actual containers (<code>IClasspathContainer</code>).
- * This API must be invoked whenever changes in container need to be reflected onto the JavaModel.
- * Containers can have distinct values in different projects, therefore this API considers a
- * set of projects with their respective containers.
- * <p>
- * <code>containerPath</code> is the path under which these values can be referenced through
- * container classpath entries (<code>IClasspathEntry#CPE_CONTAINER</code>). A container path 
- * is formed by a first ID segment followed with extra segments, which can be used as additional hints
- * for the resolution. The container ID is used to identify a <code>ClasspathContainerInitializer</code> 
- * registered on the extension point "org.eclipse.jdt.core.classpathContainerInitializer".
- * <p>
- * There is no assumption that each individual container value passed in argument 
- * (<code>respectiveContainers</code>) must answer the exact same path when requested 
- * <code>IClasspathContainer#getPath</code>. 
- * Indeed, the containerPath is just an indication for resolving it to an actual container object. It can be 
- * delegated to a <code>ClasspathContainerInitializer</code>, which can be activated through the extension
- * point "org.eclipse.jdt.core.ClasspathContainerInitializer"). 
- * <p>
- * In reaction to changing container values, the JavaModel will be updated to reflect the new
- * state of the updated container. 
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath container values are persisted locally to the workspace, but 
- * are not preserved from a session to another. It is thus highly recommended to register a 
- * <code>ClasspathContainerInitializer</code> for each referenced container 
- * (through the extension point "org.eclipse.jdt.core.ClasspathContainerInitializer").
- * <p>
- * Note: setting a container to <code>null</code> will cause it to be lazily resolved again whenever
- * its value is required. In particular, this will cause a registered initializer to be invoked
- * again.
- * <p>
- * @param containerPath - the name of the container reference, which is being updated
- * @param affectedProjects - the set of projects for which this container is being bound
- * @param respectiveContainers - the set of respective containers for the affected projects
- * @param monitor a monitor to report progress
- * 
- * @see ClasspathContainerInitializer
- * @see #getClasspathContainer(IPath, IJavaProject)
- * @see IClasspathContainer
- * @since 2.0
- */
-//public static void setClasspathContainer(final IPath containerPath, IJavaProject[] affectedProjects, IClasspathContainer[] respectiveContainers, IProgressMonitor monitor) throws JavaModelException {
-//
-//	if (affectedProjects.length != respectiveContainers.length) Assert.isTrue(false, "Projects and containers collections should have the same size"); //$NON-NLS-1$
-//	
-//	if (monitor != null && monitor.isCanceled()) return;
-//	
-//	if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//		System.out.println("CPContainer SET  - setting container: ["+containerPath+"] for projects: {" //$NON-NLS-1$ //$NON-NLS-2$
-//			+ (Util.toString(affectedProjects, 
-//					new Util.Displayable(){ 
-//						public String displayString(Object o) { return ((IJavaProject) o).getElementName(); }
-//					}))
-//			+ "} with values: " //$NON-NLS-1$
-//			+ (Util.toString(respectiveContainers, 
-//					new Util.Displayable(){ 
-//						public String displayString(Object o) { return ((IClasspathContainer) o).getDescription(); }
-//					}))
-//				);
-//	}
-//
-//	final int projectLength = affectedProjects.length;
-//	final IJavaProject[] modifiedProjects;
-//	System.arraycopy(affectedProjects, 0, modifiedProjects = new IJavaProject[projectLength], 0, projectLength);
-//	final IClasspathEntry[][] oldResolvedPaths = new IClasspathEntry[projectLength][];
-//			
-//	// filter out unmodified project containers
-//	int remaining = 0;
-//	for (int i = 0; i < projectLength; i++){
-//	
-//		if (monitor != null && monitor.isCanceled()) return;
-//	
-//		IJavaProject affectedProject = affectedProjects[i];
-//		IClasspathContainer newContainer = respectiveContainers[i];
-//		if (newContainer == null) newContainer = JavaModelManager.ContainerInitializationInProgress; // 30920 - prevent infinite loop
-//		boolean found = false;
-//		if (JavaProject.hasJavaNature(affectedProject.getProject())){
-//			IClasspathEntry[] rawClasspath = affectedProject.getRawClasspath();
-//			for (int j = 0, cpLength = rawClasspath.length; j <cpLength; j++) {
-//				IClasspathEntry entry = rawClasspath[j];
-//				if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER && entry.getPath().equals(containerPath)){
-//					found = true;
-//					break;
-//				}
-//			}
-//		}
-//		if (!found){
-//			modifiedProjects[i] = null; // filter out this project - does not reference the container path, or isnt't yet Java project
-//			JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
-//			continue;
-//		}
-//		IClasspathContainer oldContainer = JavaModelManager.containerGet(affectedProject, containerPath);
-//		if (oldContainer == JavaModelManager.ContainerInitializationInProgress) {
-//			Map previousContainerValues = (Map)JavaModelManager.PreviousSessionContainers.get(affectedProject);
-//			if (previousContainerValues != null){
-//				IClasspathContainer previousContainer = (IClasspathContainer)previousContainerValues.get(containerPath);
-//				if (previousContainer != null) {
-//					if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//						System.out.println("CPContainer INIT - reentering access to project container: ["+affectedProject.getElementName()+"] " + containerPath + " during its initialization, will see previous value: "+ previousContainer.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-//					}
-//					JavaModelManager.containerPut(affectedProject, containerPath, previousContainer); 
-//				}
-//				oldContainer = null; //33695 - cannot filter out restored container, must update affected project to reset cached CP
-//			} else {
-//				oldContainer = null;
-//			}
-//		}
-//		if (oldContainer != null && oldContainer.equals(respectiveContainers[i])){// TODO: could improve to only compare entries
-//			modifiedProjects[i] = null; // filter out this project - container did not change
-//			continue;
-//		}
-//		remaining++; 
-//		oldResolvedPaths[i] = affectedProject.getResolvedClasspath(true);
-//		JavaModelManager.containerPut(affectedProject, containerPath, newContainer);
-//	}
-//		
-//	if (remaining == 0) return;
-//		
-//	// trigger model refresh
-//	try {
-//		JavaCore.run(new IWorkspaceRunnable() {
-//			public void run(IProgressMonitor monitor) throws CoreException {
-//				for(int i = 0; i < projectLength; i++){
-//		
-//					if (monitor != null && monitor.isCanceled()) return;
-//		
-//					JavaProject affectedProject = (JavaProject)modifiedProjects[i];
-//					if (affectedProject == null) continue; // was filtered out
-//						
-//					if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//						System.out.println("CPContainer SET  - updating affected project: ["+affectedProject.getElementName()+"] due to setting container: " + containerPath); //$NON-NLS-1$ //$NON-NLS-2$
-//					}
-//
-//					// force a refresh of the affected project (will compute deltas)
-//					affectedProject.setRawClasspath(
-//							affectedProject.getRawClasspath(),
-//							SetClasspathOperation.ReuseOutputLocation,
-//							monitor,
-//							!ResourcesPlugin.getWorkspace().isTreeLocked(), // can save resources
-//							oldResolvedPaths[i],
-//							false, // updating - no validation
-//							false); // updating - no need to save
-//				}
-//			}
-//		},
-//		monitor);
-//	} catch(CoreException e) {
-//		if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//			System.out.println("CPContainer SET  - FAILED DUE TO EXCEPTION: "+containerPath); //$NON-NLS-1$
-//			e.printStackTrace();
-//		}
-//		if (e instanceof JavaModelException) {
-//			throw (JavaModelException)e;
-//		} else {
-//			throw new JavaModelException(e);
-//		}
-//	} finally {
-//		for (int i = 0; i < projectLength; i++) {
-//			if (respectiveContainers[i] == null) {
-//				JavaModelManager.containerPut(affectedProjects[i], containerPath, null); // reset init in progress marker
-//			}
-//		}
-//	}
-//					
-//}
-
-/**
- * Sets the value of the given classpath variable.
- * The path must have at least one segment.
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- *
- * @param variableName the name of the classpath variable
- * @param path the path
- * @see #getClasspathVariable
- *
- * @deprecated - use API with IProgressMonitor
- */
-//public static void setClasspathVariable(String variableName, IPath path)
-//	throws JavaModelException {
-//
-//	setClasspathVariable(variableName, path, null);
-//}
-
-/**
- * Sets the value of the given classpath variable.
- * The path must not be null.
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- * Updating a variable with the same value has no effect.
- *
- * @param variableName the name of the classpath variable
- * @param path the path
- * @param monitor a monitor to report progress
- * @see #getClasspathVariable
- */
-//public static void setClasspathVariable(
-//	String variableName,
-//	IPath path,
-//	IProgressMonitor monitor)
-//	throws JavaModelException {
-//
-//	if (path == null) Assert.isTrue(false, "Variable path cannot be null"); //$NON-NLS-1$
-//	setClasspathVariables(new String[]{variableName}, new IPath[]{ path }, monitor);
-//}
-
-/**
- * Sets the values of all the given classpath variables at once.
- * Null paths can be used to request corresponding variable removal.
- * <p>
- * This functionality cannot be used while the resource tree is locked.
- * <p>
- * Classpath variable values are persisted locally to the workspace, and 
- * are preserved from session to session.
- * <p>
- * Updating a variable with the same value has no effect.
- * 
- * @param variableNames an array of names for the updated classpath variables
- * @param paths an array of path updates for the modified classpath variables (null
- *       meaning that the corresponding value will be removed
- * @param monitor a monitor to report progress
- * @see #getClasspathVariable
- * @since 2.0
- */
-//public static void setClasspathVariables(
-//	String[] variableNames,
-//	IPath[] paths,
-//	IProgressMonitor monitor)
-//	throws JavaModelException {
-//
-//	if (variableNames.length != paths.length)	Assert.isTrue(false, "Variable names and paths collections should have the same size"); //$NON-NLS-1$
-//	//TODO: should check that null cannot be used as variable paths
-//	updateVariableValues(variableNames, paths, monitor);
-//}
-
-/* (non-Javadoc)
- * Method declared on IExecutableExtension.
- * Record any necessary initialization data from the plugin.
- */
-public void setInitializationData(
-	IConfigurationElement cfig,
-	String propertyName,
-	Object data)
-	throws CoreException {
-}
-
-/**
- * Sets the current table of options. All and only the options explicitly included in the given table 
- * are remembered; all previous option settings are forgotten, including ones not explicitly
- * mentioned.
- * <p>
- * For a complete description of the configurable options, see <code>getDefaultOptions</code>.
- * </p>
- * 
- * @param newOptions the new options (key type: <code>String</code>; value type: <code>String</code>),
- *   or <code>null</code> to reset all options to their default values
- * @see JavaCore#getDefaultOptions
- */
-public static void setOptions(Hashtable newOptions) {
-		
-	// see #initializeDefaultPluginPreferences() for changing default settings
-	Preferences preferences = getPlugin().getPluginPreferences();
-
-	if (newOptions == null){
-		newOptions = PHPCore.getDefaultOptions();
-	}
-	Enumeration keys = newOptions.keys();
-	while (keys.hasMoreElements()){
-		String key = (String)keys.nextElement();
-		if (!JavaModelManager.OptionNames.contains(key)) continue; // unrecognized option
-		if (key.equals(CORE_ENCODING)) continue; // skipped, contributed by resource prefs
-		String value = (String)newOptions.get(key);
-		preferences.setValue(key, value);
-	}
-		
-	// persist options
-	getPlugin().savePluginPreferences();
-}
-	
-/**
- * Shutdown the JavaCore plug-in.
- * <p>
- * De-registers the JavaModelManager as a resource changed listener and save participant.
- * <p>
- * @see org.eclipse.core.runtime.Plugin#shutdown()
- */
-public void shutdown() {
-
-	//savePluginPreferences();
-	getPlugin().savePluginPreferences();
-	IWorkspace workspace = ResourcesPlugin.getWorkspace();
-	workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaProcessor);
-	workspace.removeSaveParticipant(PHPeclipsePlugin.getDefault());
-
-	((JavaModelManager) JavaModelManager.getJavaModelManager()).shutdown();
-}
-
-/**
- * Initiate the background indexing process.
- * This should be deferred after the plugin activation.
- */
-//private void startIndexing() {
-//
-//	JavaModelManager.getJavaModelManager().getIndexManager().reset();
-//}
-
-/**
- * Startup of the JavaCore plug-in.
- * <p>
- * Registers the JavaModelManager as a resource changed listener and save participant.
- * Starts the background indexing, and restore saved classpath variable values.
- * <p>
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
-public void startup() {
-		
-	JavaModelManager manager = JavaModelManager.getJavaModelManager();
-	try {
-		manager.configurePluginDebugOptions();
-
-		// request state folder creation (workaround 19885)
-		PHPCore.getPlugin().getStateLocation();
-
-		// retrieve variable values
-		PHPCore.getPlugin().getPluginPreferences().addPropertyChangeListener(new JavaModelManager.PluginPreferencesListener());
-//	TODO khartlage temp-del
-//		manager.loadVariablesAndContainers();
-
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		workspace.addResourceChangeListener(
-			manager.deltaProcessor,
-			IResourceChangeEvent.PRE_AUTO_BUILD
-				| IResourceChangeEvent.POST_AUTO_BUILD
-				| IResourceChangeEvent.POST_CHANGE
-				| IResourceChangeEvent.PRE_DELETE
-				| IResourceChangeEvent.PRE_CLOSE);
-
-//		startIndexing();
-		workspace.addSaveParticipant(PHPeclipsePlugin.getDefault(), manager);
-			
-	} catch (CoreException e) {
-	} catch (RuntimeException e) {
-		manager.shutdown();
-		throw e;
-	}
-}
-
-
-/**
- * Internal updating of a variable values (null path meaning removal), allowing to change multiple variable values at once.
- */
-//private static void updateVariableValues(
-//	String[] variableNames,
-//	IPath[] variablePaths,
-//	IProgressMonitor monitor) throws JavaModelException {
-//	
-//	if (monitor != null && monitor.isCanceled()) return;
-//		
-//	if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//		System.out.println("CPVariable SET  - setting variables: {" + Util.toString(variableNames)  //$NON-NLS-1$
-//			+ "} with values: " + Util.toString(variablePaths)); //$NON-NLS-1$
-//	}
-//
-//	int varLength = variableNames.length;
-//		
-//	// gather classpath information for updating
-//	final HashMap affectedProjects = new HashMap(5);
-//	JavaModelManager manager = JavaModelManager.getJavaModelManager();
-//	IJavaModel model = manager.getJavaModel();
-//	
-//	// filter out unmodified variables
-//	int discardCount = 0;
-//	for (int i = 0; i < varLength; i++){
-//		String variableName = variableNames[i];
-//		IPath oldPath = (IPath)JavaModelManager.variableGet(variableName); // if reentering will provide previous session value 
-//		if (oldPath == JavaModelManager.VariableInitializationInProgress){
-//			IPath previousPath = (IPath)JavaModelManager.PreviousSessionVariables.get(variableName);
-//			if (previousPath != null){
-//				if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//					System.out.println("CPVariable INIT - reentering access to variable: " + variableName+ " during its initialization, will see previous value: "+ previousPath); //$NON-NLS-1$ //$NON-NLS-2$
-//				}
-//				JavaModelManager.variablePut(variableName, previousPath); // replace value so reentering calls are seeing old value
-//			}
-//			oldPath = null;  //33695 - cannot filter out restored variable, must update affected project to reset cached CP
-//		}
-//		if (oldPath != null && oldPath.equals(variablePaths[i])){
-//			variableNames[i] = null;
-//			discardCount++;
-//		}
-//	}
-//	if (discardCount > 0){
-//		if (discardCount == varLength) return;
-//		int changedLength = varLength - discardCount;
-//		String[] changedVariableNames = new String[changedLength];
-//		IPath[] changedVariablePaths = new IPath[changedLength];
-//		for (int i = 0, index = 0; i < varLength; i++){
-//			if (variableNames[i] != null){
-//				changedVariableNames[index] = variableNames[i];
-//				changedVariablePaths[index] = variablePaths[i];
-//				index++;
-//			}
-//		}
-//		variableNames = changedVariableNames;
-//		variablePaths = changedVariablePaths;
-//		varLength = changedLength;
-//	}
-//		
-//	if (monitor != null && monitor.isCanceled()) return;
-//
-//	if (model != null) {
-//		IJavaProject[] projects = model.getJavaProjects();
-//		nextProject : for (int i = 0, projectLength = projects.length; i < projectLength; i++){
-//			IJavaProject project = projects[i];
-//						
-//			// check to see if any of the modified variables is present on the classpath
-//			IClasspathEntry[] classpath = project.getRawClasspath();
-//			for (int j = 0, cpLength = classpath.length; j < cpLength; j++){
-//					
-//				IClasspathEntry entry = classpath[j];
-//				for (int k = 0; k < varLength; k++){
-//	
-//					String variableName = variableNames[k];						
-//					if (entry.getEntryKind() ==  IClasspathEntry.CPE_VARIABLE){
-//	
-//						if (variableName.equals(entry.getPath().segment(0))){
-//							affectedProjects.put(project, project.getResolvedClasspath(true));
-//							continue nextProject;
-//						}
-//						IPath sourcePath, sourceRootPath;
-//						if (((sourcePath = entry.getSourceAttachmentPath()) != null	&& variableName.equals(sourcePath.segment(0)))
-//							|| ((sourceRootPath = entry.getSourceAttachmentRootPath()) != null	&& variableName.equals(sourceRootPath.segment(0)))) {
-//	
-//							affectedProjects.put(project, project.getResolvedClasspath(true));
-//							continue nextProject;
-//						}
-//					}												
-//				}
-//			}
-//		}
-//	}
-//	// update variables
-//	for (int i = 0; i < varLength; i++){
-//		JavaModelManager.variablePut(variableNames[i], variablePaths[i]);
-//	}
-//	final String[] dbgVariableNames = variableNames;
-//				
-//	// update affected project classpaths
-//	if (!affectedProjects.isEmpty()) {
-//		try {
-//			JavaCore_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt_DeleteIt.run(
-//				new IWorkspaceRunnable() {
-//					public void run(IProgressMonitor monitor) throws CoreException {
-//						// propagate classpath change
-//						Iterator projectsToUpdate = affectedProjects.keySet().iterator();
-//						while (projectsToUpdate.hasNext()) {
-//			
-//							if (monitor != null && monitor.isCanceled()) return;
-//			
-//							JavaProject project = (JavaProject) projectsToUpdate.next();
-//
-//							if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//								System.out.println("CPVariable SET  - updating affected project: ["+project.getElementName()+"] due to setting variables: "+ Util.toString(dbgVariableNames)); //$NON-NLS-1$ //$NON-NLS-2$
-//							}
-//								
-//							project
-//								.setRawClasspath(
-//									project.getRawClasspath(),
-//									SetClasspathOperation.ReuseOutputLocation,
-//									null, // don't call beginTask on the monitor (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=3717)
-//									!ResourcesPlugin.getWorkspace().isTreeLocked(), // can change resources
-//									(IClasspathEntry[]) affectedProjects.get(project),
-//									false, // updating - no validation
-//									false); // updating - no need to save
-//						}
-//					}
-//				},
-//				monitor);
-//		} catch (CoreException e) {
-//			if (JavaModelManager.CP_RESOLVE_VERBOSE){
-//				System.out.println("CPVariable SET  - FAILED DUE TO EXCEPTION: "+Util.toString(dbgVariableNames)); //$NON-NLS-1$
-//				e.printStackTrace();
-//			}
-//			if (e instanceof JavaModelException) {
-//				throw (JavaModelException)e;
-//			} else {
-//				throw new JavaModelException(e);
-//			}
-//		}
-//	}
-//}
-}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 735cda1..4511487 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -1,16 +1,15 @@
 /**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
-**********************************************************************/
+ Copyright (c) 2000, 2002 IBM Corp. and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Common Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/cpl-v10.html
+
+ Contributors:
+ IBM Corporation - Initial implementation
+ Klaus Hartlage - www.eclipseproject.de
+ **********************************************************************/
 package net.sourceforge.phpeclipse;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,10 +18,11 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.externaltools.internal.model.ColorManager;
 import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager;
+import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferenceCache;
 import net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage;
 import net.sourceforge.phpdt.internal.ui.text.java.hover.JavaEditorTextHoverDescriptor;
@@ -43,11 +43,11 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 import net.sourceforge.phpeclipse.resourcesview.PHPElement;
 import net.sourceforge.phpeclipse.resourcesview.PHPElementAdapterFactory;
 import net.sourceforge.phpeclipse.resourcesview.ResourceAdapterFactory;
-
 import org.eclipse.core.boot.BootLoader;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -79,85 +79,66 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
-
 /**
  * The main plugin class to be used in the desktop.
  */
-public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceConstants {
+public class PHPeclipsePlugin extends AbstractUIPlugin
+    implements
+      IPreferenceConstants {
   /**
    * The id of the PHP plugin (value <code>"net.sourceforge.phpeclipse"</code>).
    */
   public static final String PLUGIN_ID = "net.sourceforge.phpeclipse"; //$NON-NLS-1$
-
-  /** 
-   * id of builder - matches plugin.xml (concatenate pluginid.builderid) 
+  /**
+   * id of builder - matches plugin.xml (concatenate pluginid.builderid)
    */
   public static final String BUILDER_PARSER_ID = PLUGIN_ID + ".parserbuilder";
   //public static final String BUILDER_INDEX_ID = PLUGIN_ID + ".indexbuilder";
-
-  /** General debug flag*/
+  /** General debug flag */
   public static final boolean DEBUG = false;
-
   /**
    * The maximum number of allowed proposals by category
    */
   public final static int MAX_PROPOSALS = 200;
-
   private static ExternalToolsPlugin externalTools;
-
   /**
-  * The Java virtual machine that we are running on.
-  */
+   * The Java virtual machine that we are running on.
+   */
   private static int jvm;
-
   /** MRJ 2.0 */
   private static final int MRJ_2_0 = 0;
-
   /** MRJ 2.1 or later */
   private static final int MRJ_2_1 = 1;
-
   /** Java on Mac OS X 10.0 (MRJ 3.0) */
   private static final int MRJ_3_0 = 3;
-
   /** MRJ 3.1 */
   private static final int MRJ_3_1 = 4;
-
   /** JVM constant for any other platform */
   private static final int OTHER = -1;
-
-  // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
-  public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$
+  // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID +
+  // ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
+  public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID
+      + ".ui.CodingActionSet"; //$NON-NLS-1$
   public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature";
-
   public static final String PHPPARSER_ORIGINAL = "net.sourceforge.phpdt.internal.compiler.parser.Parser";
-
   public static final String PHPPARSER_NEW = "test.PHPParser";
-
   /** Change this if you want to switch PHP Parser. */
   public static final String PHPPARSER = PHPPARSER_ORIGINAL;
-
   //The shared instance.
   private static PHPeclipsePlugin plugin;
-
-  /** Windows 9x  */
+  /** Windows 9x */
   private static final int WINDOWS_9x = 6;
-
-  /** Windows NT  */
+  /** Windows NT */
   private static final int WINDOWS_NT = 5;
-
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private HashMap fIndexManagerMap = new HashMap();
-
   private IWorkingCopyManager fWorkingCopyManager;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
   private JavaTextTools fJavaTextTools;
   private ProblemMarkerManager fProblemMarkerManager;
-	private MembersOrderPreferenceCache fMembersOrderPreferenceCache;
-
+  private MembersOrderPreferenceCache fMembersOrderPreferenceCache;
   private IFile fLastEditorFile = null;
-
-	private JavaEditorTextHoverDescriptor[] fJavaEditorTextHoverDescriptors;
-	
+  private JavaEditorTextHoverDescriptor[] fJavaEditorTextHoverDescriptors;
   /**
    * The constructor.
    */
@@ -167,69 +148,68 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     setJVM();
     externalTools = new ExternalToolsPlugin();
     //    try {
-    //      resourceBundle = ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources");
+    //      resourceBundle =
+    // ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources");
     //    } catch (MissingResourceException x) {
     //      resourceBundle = null;
     //    }
   }
-	/**
-	 * Returns all Java editor text hovers contributed to the workbench.
-	 * 
-	 * @return an array of JavaEditorTextHoverDescriptor
-	 * @since 2.1
-	 */
-	public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
-		if (fJavaEditorTextHoverDescriptors == null)
-			fJavaEditorTextHoverDescriptors= JavaEditorTextHoverDescriptor.getContributedHovers();
-		return fJavaEditorTextHoverDescriptors;
-	} 
-
-	/**
-	 * Resets the Java editor text hovers contributed to the workbench.
-	 * <p>
-	 * This will force a rebuild of the descriptors the next time
-	 * a client asks for them.
-	 * </p>
-	 * 
-	 * @return an array of JavaEditorTextHoverDescriptor
-	 * @since 2.1
-	 */
-	public void resetJavaEditorTextHoverDescriptors() {
-		fJavaEditorTextHoverDescriptors= null;
-	}
-	/**
-	 * Creates the PHP plugin standard groups in a context menu.
-	 */
-	public static void createStandardGroups(IMenuManager menu) {
-		if (!menu.isEmpty())
-			return;
-			
-		menu.add(new Separator(IContextMenuConstants.GROUP_NEW));
-		menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
-		menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
-		menu.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-		menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
-		menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
-		menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-		menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
-		menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
-		menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
-		menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
-	}
+  /**
+   * Returns all Java editor text hovers contributed to the workbench.
+   * 
+   * @return an array of JavaEditorTextHoverDescriptor
+   * @since 2.1
+   */
+  public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
+    if (fJavaEditorTextHoverDescriptors == null)
+      fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor
+          .getContributedHovers();
+    return fJavaEditorTextHoverDescriptors;
+  }
+  /**
+   * Resets the Java editor text hovers contributed to the workbench.
+   * <p>
+   * This will force a rebuild of the descriptors the next time a client asks
+   * for them.
+   * </p>
+   * 
+   * @return an array of JavaEditorTextHoverDescriptor
+   * @since 2.1
+   */
+  public void resetJavaEditorTextHoverDescriptors() {
+    fJavaEditorTextHoverDescriptors = null;
+  }
+  /**
+   * Creates the PHP plugin standard groups in a context menu.
+   */
+  public static void createStandardGroups(IMenuManager menu) {
+    if (!menu.isEmpty())
+      return;
+    menu.add(new Separator(IContextMenuConstants.GROUP_NEW));
+    menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
+    menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
+    menu.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
+    menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
+    menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
+    menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
+    menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
+    menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
+    menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
+    menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
+  }
   public static IWorkbenchPage getActivePage() {
     return getDefault().internalGetActivePage();
   }
-
   public static Shell getActiveWorkbenchShell() {
     return getActiveWorkbenchWindow().getShell();
   }
-
   /**
-  	 * Returns an array of all editors that have an unsaved content. If the identical content is 
-  	 * presented in more than one editor, only one of those editor parts is part of the result.
-  	 * 
-  	 * @return an array of all dirty editor parts.
-  	 */
+   * Returns an array of all editors that have an unsaved content. If the
+   * identical content is presented in more than one editor, only one of those
+   * editor parts is part of the result.
+   * 
+   * @return an array of all dirty editor parts.
+   */
   public static IEditorPart[] getDirtyEditors() {
     Set inputs = new HashSet();
     List result = new ArrayList(0);
@@ -251,7 +231,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     }
     return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
   }
-
   public static IWorkbenchWindow getActiveWorkbenchWindow() {
     return getDefault().getWorkbench().getActiveWorkbenchWindow();
   }
@@ -261,26 +240,22 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   public static PHPeclipsePlugin getDefault() {
     return plugin;
   }
-
   public static ImageDescriptorRegistry getImageDescriptorRegistry() {
     return getDefault().internalGetImageDescriptorRegistry();
   }
-
   static IPath getInstallLocation() {
     return new Path(getDefault().getDescriptor().getInstallURL().getFile());
   }
   public static int getJVM() {
     return jvm;
   }
-
   public static String getPluginId() {
     return getDefault().getDescriptor().getUniqueIdentifier();
   }
-
   /**
-   * Returns the standard display to be used. The method first checks, if
-   * the thread calling this method has an associated display. If so, this
-   * display is returned. Otherwise the method returns the default display.
+   * Returns the standard display to be used. The method first checks, if the
+   * thread calling this method has an associated display. If so, this display
+   * is returned. Otherwise the method returns the default display.
    */
   public static Display getStandardDisplay() {
     Display display = Display.getCurrent();
@@ -289,7 +264,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     }
     return display;
   }
-
   //  public static ExternalToolsPlugin getExternalTools() {
   //    return externalTools;
   //  }
@@ -299,13 +273,12 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   public static IWorkspace getWorkspace() {
     return ResourcesPlugin.getWorkspace();
   }
-
   public static boolean isDebug() {
     return getDefault().isDebugging();
   }
-
   //  public static void logErrorMessage(String message) {
-  //    log(new Status(IStatus.ERROR, getPluginId(), JavaStatusConstants.INTERNAL_ERROR, message, null));
+  //    log(new Status(IStatus.ERROR, getPluginId(),
+  // JavaStatusConstants.INTERNAL_ERROR, message, null));
   //  }
   //
   //  public static void logErrorStatus(String message, IStatus status) {
@@ -313,38 +286,36 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //      logErrorMessage(message);
   //      return;
   //    }
-  //    MultiStatus multi= new MultiStatus(getPluginId(), JavaStatusConstants.INTERNAL_ERROR, message, null);
+  //    MultiStatus multi= new MultiStatus(getPluginId(),
+  // JavaStatusConstants.INTERNAL_ERROR, message, null);
   //    multi.add(status);
   //    log(multi);
   //  }
   //
   //  public static void log(Throwable e) {
-  //    log(new Status(IStatus.ERROR, getPluginId(), JavaStatusConstants.INTERNAL_ERROR, JavaUIMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
+  //    log(new Status(IStatus.ERROR, getPluginId(),
+  // JavaStatusConstants.INTERNAL_ERROR,
+  // JavaUIMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
   //  }
-
   public static void log(int severity, String message) {
     Status status = new Status(severity, PLUGIN_ID, IStatus.OK, message, null);
     log(status);
   }
-
   public static void log(IStatus status) {
     getDefault().getLog().log(status);
   }
   public static void log(Throwable e) {
-    log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$
+    log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR,
+        "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$
   }
-
   private static void setJVM() {
     String osName = System.getProperty("os.name");
-
     if (osName.startsWith("Mac OS")) {
       String mrjVersion = System.getProperty("mrj.version");
       String majorMRJVersion = mrjVersion.substring(0, 3);
       jvm = OTHER;
       try {
-
         double version = Double.valueOf(majorMRJVersion).doubleValue();
-
         if (version == 2) {
           jvm = MRJ_2_0;
         } else if (version >= 2.1 && version < 3) {
@@ -354,11 +325,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
         } else if (version >= 3.1) {
           jvm = MRJ_3_1;
         }
-
       } catch (NumberFormatException nfe) {
-
       }
-
     } else if (osName.startsWith("Windows")) {
       if (osName.indexOf("9") != -1) {
         jvm = WINDOWS_9x;
@@ -367,30 +335,30 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       }
     }
   }
-
   // TODO: refactor this into a better method name !
   public synchronized PHPDocumentProvider getCompilationUnitDocumentProvider() {
     if (fCompilationUnitDocumentProvider == null)
       fCompilationUnitDocumentProvider = new PHPDocumentProvider();
     return fCompilationUnitDocumentProvider;
   }
-
   /**
    * Get the identifier index manager for the given project
    * 
-   * @param iProject the current project
+   * @param iProject
+   *            the current project
    * @return
    */
   public IdentifierIndexManager getIndexManager(IProject iProject) {
-    String indexFilename = iProject.getLocation() + File.separator + "project.index";
-    IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap.get(indexFilename);
+    String indexFilename = iProject.getLocation() + File.separator
+        + "project.index";
+    IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap
+        .get(indexFilename);
     if (indexManager == null) {
       indexManager = new IdentifierIndexManager(indexFilename);
       fIndexManagerMap.put(indexFilename, indexManager);
     }
     return indexManager;
   }
-
   public synchronized IWorkingCopyManager getWorkingCopyManager() {
     if (fWorkingCopyManager == null) {
       PHPDocumentProvider provider = getCompilationUnitDocumentProvider();
@@ -398,32 +366,27 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     }
     return fWorkingCopyManager;
   }
-  
-	public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() {
-		if (fMembersOrderPreferenceCache == null)
-			fMembersOrderPreferenceCache= new MembersOrderPreferenceCache();
-		return fMembersOrderPreferenceCache;
-	}	
-	
+  public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() {
+    if (fMembersOrderPreferenceCache == null)
+      fMembersOrderPreferenceCache = new MembersOrderPreferenceCache();
+    return fMembersOrderPreferenceCache;
+  }
   public synchronized ProblemMarkerManager getProblemMarkerManager() {
     if (fProblemMarkerManager == null)
       fProblemMarkerManager = new ProblemMarkerManager();
     return fProblemMarkerManager;
   }
-
   public synchronized JavaTextTools getJavaTextTools() {
     if (fJavaTextTools == null)
       fJavaTextTools = new JavaTextTools(getPreferenceStore());
     return fJavaTextTools;
   }
-
   public IFile getLastEditorFile() {
     return fLastEditorFile;
   }
-
   /**
-   * Returns the string from the plugin's resource bundle,
-   * or 'key' if not found.
+   * Returns the string from the plugin's resource bundle, or 'key' if not
+   * found.
    */
   //  public static String getResourceString(String key) {
   //    ResourceBundle bundle = PHPeclipsePlugin.getDefault().getResourceBundle();
@@ -433,36 +396,33 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //      return key;
   //    }
   //  }
-
   /**
    * Returns the plugin's resource bundle,
    */
   //  public ResourceBundle getResourceBundle() {
   //    return resourceBundle;
   //  }
-
   protected void initializeDefaultPreferences(IPreferenceStore store) {
     // windows preferences:
     store.setDefault(LOCALHOST_PREF, "http://localhost");
-
     store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true");
     store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false");
     store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
-
     String windowsSystem = BootLoader.getWS();
-
     if (jvm == WINDOWS_9x) {
-      store.setDefault(EXTERNAL_BROWSER_PREF, "command.com /c start iexplore {0}");
+      store.setDefault(EXTERNAL_BROWSER_PREF,
+          "command.com /c start iexplore {0}");
     } else if (windowsSystem.equals(BootLoader.WS_WIN32)) {
-      store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}");
+      store.setDefault(EXTERNAL_BROWSER_PREF,
+          "rundll32 url.dll,FileProtocolHandler {0}");
     } else if (windowsSystem.equals(BootLoader.WS_CARBON)) {
       // TODO How do we start Safari on Mac OS X ?
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     } else {
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     }
-    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
-
+    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation()
+        .toString());
     //  if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
     //	
     if (windowsSystem.equals(BootLoader.WS_WIN32)) {
@@ -471,53 +431,54 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       store.setDefault(MYSQL_RUN_PREF, "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
       store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
     } else {
-
       store.setDefault(PHP_RUN_PREF, "/apache/php/php");
       store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
       store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
       store.setDefault(APACHE_RUN_PREF, "/apache/apache");
-
     }
     store.setDefault(MYSQL_PREF, "--standalone");
     store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
     store.setDefault(APACHE_STOP_PREF, "-k shutdown");
     store.setDefault(APACHE_RESTART_PREF, "-k restart");
-
     store.setDefault(MYSQL_START_BACKGROUND, "true");
     store.setDefault(APACHE_START_BACKGROUND, "true");
     store.setDefault(APACHE_STOP_BACKGROUND, "true");
     store.setDefault(APACHE_RESTART_BACKGROUND, "true");
-
     store.setDefault(PHP_PARSER_DEFAULT, PHP_EXTERNAL_PARSER);
     store.setDefault(PHP_INTERNAL_PARSER, "false");
     store.setDefault(PHP_EXTERNAL_PARSER, "true");
-
     //    store.setDefault(PHP_PARSE_ON_SAVE, "true");
-
     // show line numbers:
     //   store.setDefault(LINE_NUMBER_RULER, "false");
     //    store.setDefault(FORMATTER_TAB_SIZE, "4");
-
     // php syntax highlighting
     store.setDefault(PHP_USERDEF_XMLFILE, "");
-    //assume there is none  chooA
-
-    PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT);
-    PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, PHPColorProvider.SINGLE_LINE_COMMENT);
+    //assume there is none chooA
+    PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT,
+        PHPColorProvider.MULTI_LINE_COMMENT);
+    PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT,
+        PHPColorProvider.SINGLE_LINE_COMMENT);
     PreferenceConverter.setDefault(store, PHP_TAG, PHPColorProvider.TAG);
-    PreferenceConverter.setDefault(store, PHP_KEYWORD, PHPColorProvider.KEYWORD);
-    PreferenceConverter.setDefault(store, PHP_VARIABLE, PHPColorProvider.VARIABLE);
-    PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME, PHPColorProvider.FUNCTION_NAME);
-    PreferenceConverter.setDefault(store, PHP_CONSTANT, PHPColorProvider.CONSTANT);
+    PreferenceConverter
+        .setDefault(store, PHP_KEYWORD, PHPColorProvider.KEYWORD);
+    PreferenceConverter.setDefault(store, PHP_VARIABLE,
+        PHPColorProvider.VARIABLE);
+    PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME,
+        PHPColorProvider.FUNCTION_NAME);
+    PreferenceConverter.setDefault(store, PHP_CONSTANT,
+        PHPColorProvider.CONSTANT);
     PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
     PreferenceConverter.setDefault(store, PHP_STRING, PHPColorProvider.STRING);
-    PreferenceConverter.setDefault(store, PHP_DEFAULT, PHPColorProvider.DEFAULT);
-
-    PreferenceConverter.setDefault(store, PHPDOC_KEYWORD, PHPColorProvider.PHPDOC_KEYWORD);
-    PreferenceConverter.setDefault(store, PHPDOC_TAG, PHPColorProvider.PHPDOC_TAG);
-    PreferenceConverter.setDefault(store, PHPDOC_LINK, PHPColorProvider.PHPDOC_LINK);
-    PreferenceConverter.setDefault(store, PHPDOC_DEFAULT, PHPColorProvider.PHPDOC_DEFAULT);
-
+    PreferenceConverter
+        .setDefault(store, PHP_DEFAULT, PHPColorProvider.DEFAULT);
+    PreferenceConverter.setDefault(store, PHPDOC_KEYWORD,
+        PHPColorProvider.PHPDOC_KEYWORD);
+    PreferenceConverter.setDefault(store, PHPDOC_TAG,
+        PHPColorProvider.PHPDOC_TAG);
+    PreferenceConverter.setDefault(store, PHPDOC_LINK,
+        PHPColorProvider.PHPDOC_LINK);
+    PreferenceConverter.setDefault(store, PHPDOC_DEFAULT,
+        PHPColorProvider.PHPDOC_DEFAULT);
     //    PreferenceConverter.setDefault(
     //      store,
     //      PHP_EDITOR_BACKGROUND,
@@ -530,81 +491,70 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     //      store,
     //      LINE_NUMBER_COLOR,
     //      PHPColorProvider.LINE_NUMBER_COLOR);
-
     //    // set default PHPDoc colors:
     //    PreferenceConverter.setDefault(
     //      store,
-    //      PHPDOC_KEYWORD, 
+    //      PHPDOC_KEYWORD,
     //      PHPColorProvider.PHPDOC_KEYWORD);
     //    PreferenceConverter.setDefault(
     //      store,
-    //      PHPDOC_LINK, 
-    //      PHPColorProvider.PHPDOC_LINK);      
+    //      PHPDOC_LINK,
+    //      PHPColorProvider.PHPDOC_LINK);
     //    PreferenceConverter.setDefault(
     //      store,
-    //      PHPDOC_DEFAULT, 
+    //      PHPDOC_DEFAULT,
     //      PHPColorProvider.PHPDOC_DEFAULT);
     //    PreferenceConverter.setDefault(
     //      store,
-    //      PHPDOC_TAG, 
+    //      PHPDOC_TAG,
     //      PHPColorProvider.PHPDOC_TAG);
-
     //    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
     //    PreferenceConverter.setDefault(
     //      store,
     //      PREFERENCE_COLOR_BACKGROUND,
     //      PHPColorProvider.BACKGROUND_COLOR);
-
     //language stuff
     //    store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT);
     //    store.setDefault(RESOURCE_BUNDLE_EN_GB, "true");
     //    store.setDefault(RESOURCE_BUNDLE_DE, "false");
     //    store.setDefault(RESOURCE_BUNDLE_FR, "false");
     //    store.setDefault(RESOURCE_BUNDLE_ES, "false");
-
     store.setDefault(PHP_OUTLINE_CLASS, "true"); //$NON-NLS-1$
     store.setDefault(PHP_OUTLINE_FUNC, "true"); //$NON-NLS-1$
     store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$
-
     TemplatePreferencePage.initDefaults(store);
     //this will initialize the static fields in the syntaxrdr class
     new PHPSyntaxRdr();
-
-    PHPCore.initializeDefaultPluginPreferences();
+    JavaCore.initializeDefaultPluginPreferences();
     PreferenceConstants.initializeDefaultValues(store);
-
     externalTools.initializeDefaultPreferences(store);
   }
-
   private IWorkbenchPage internalGetActivePage() {
     IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
     if (window != null)
       return window.getActivePage();
     return null;
   }
-
   private ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
     if (fImageDescriptorRegistry == null)
       fImageDescriptorRegistry = new ImageDescriptorRegistry();
     return fImageDescriptorRegistry;
   }
   /**
-  	* Open a file in the Workbench that may or may not exist in the workspace.
-  	* Must be run on the UI thread.
-  	* @param filename
-  	* @throws CoreException
-  	*/
+   * Open a file in the Workbench that may or may not exist in the workspace.
+   * Must be run on the UI thread.
+   * 
+   * @param filename
+   * @throws CoreException
+   */
   public ITextEditor openFileInTextEditor(String filename) throws CoreException {
-
     //	reject directories
     if (new File(filename).isDirectory())
       return null;
-
     IWorkbench workbench = PlatformUI.getWorkbench();
     IWorkbenchWindow window = workbench.getWorkbenchWindows()[0];
     IWorkbenchPage page = window.getActivePage();
     IPath path = new Path(filename);
-
     // If the file exists in the workspace, open it
     IFile file = getWorkspace().getRoot().getFileForLocation(path);
     IEditorPart editor;
@@ -625,7 +575,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       IEditorInput input = new ExternalEditorInput(storage);
       editor = page.openEditor(input, desc.getId());
       textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-
       // If the storage provider is not ours, we can't guarantee read/write.
       if (textEditor != null) {
         IDocumentProvider documentProvider = textEditor.getDocumentProvider();
@@ -637,81 +586,79 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     return textEditor;
   }
   /**
-  	* Open a file in the Workbench that may or may not exist in the workspace.
-  	* Must be run on the UI thread.
-  	* @param filename
-  	* @param line
-  	* @throws CoreException
-  	*/
-  public void openFileAndGotoLine(String filename, int line) throws CoreException {
-
+   * Open a file in the Workbench that may or may not exist in the workspace.
+   * Must be run on the UI thread.
+   * 
+   * @param filename
+   * @param line
+   * @throws CoreException
+   */
+  public void openFileAndGotoLine(String filename, int line)
+      throws CoreException {
     ITextEditor textEditor = openFileInTextEditor(filename);
     if (textEditor != null) {
       // If a line number was given, go to it
       if (line > 0) {
         try {
           line--; // document is 0 based
-          IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-          textEditor.selectAndReveal(document.getLineOffset(line), document.getLineLength(line));
-
+          IDocument document = textEditor.getDocumentProvider().getDocument(
+              textEditor.getEditorInput());
+          textEditor.selectAndReveal(document.getLineOffset(line), document
+              .getLineLength(line));
         } catch (BadLocationException e) {
           // invalid text position -> do nothing
         }
       }
     }
   }
-
   /**
-  	* Open a file in the Workbench that may or may not exist in the workspace.
-  	* Must be run on the UI thread.
-  	* @param filename
-  	* @param offset
-  	* @throws CoreException
-  	*/
-  public void openFileAndGotoOffset(String filename, int offset, int length) throws CoreException {
-
+   * Open a file in the Workbench that may or may not exist in the workspace.
+   * Must be run on the UI thread.
+   * 
+   * @param filename
+   * @param offset
+   * @throws CoreException
+   */
+  public void openFileAndGotoOffset(String filename, int offset, int length)
+      throws CoreException {
     ITextEditor textEditor = openFileInTextEditor(filename);
     if (textEditor != null) {
       // If a line number was given, go to it
       if (offset >= 0) {
-        IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
+        IDocument document = textEditor.getDocumentProvider().getDocument(
+            textEditor.getEditorInput());
         textEditor.selectAndReveal(offset, length);
       }
     }
   }
-
-  public void openFileAndFindString(String filename, String findString) throws CoreException {
-
+  public void openFileAndFindString(String filename, String findString)
+      throws CoreException {
     ITextEditor textEditor = openFileInTextEditor(filename);
     if (textEditor != null) {
       //		If a string was given, go to it
       if (findString != null) {
         try {
-          IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
+          IDocument document = textEditor.getDocumentProvider().getDocument(
+              textEditor.getEditorInput());
           int offset = document.search(0, findString, true, false, true);
           textEditor.selectAndReveal(offset, findString.length());
-
         } catch (BadLocationException e) {
           // invalid text position -> do nothing
         }
-
       }
     }
   }
   public void setLastEditorFile(IFile textEditor) {
     this.fLastEditorFile = textEditor;
   }
-
   /**
    * @see org.eclipse.ui.plugin.AbstractUIPlugin#shutdown()
    */
   public void shutdown() throws CoreException {
-  	// moved down:
+    // moved down (see below):
     //    super.shutdown();
-
     //  externalTools.shutDown();
     ColorManager.getDefault().dispose();
-
     // save the information from the php index files if necessary
     Collection collection = fIndexManagerMap.values();
     Iterator iterator = collection.iterator();
@@ -720,41 +667,72 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       indexManager = (IdentifierIndexManager) iterator.next();
       indexManager.writeFile();
     }
-
     if (fImageDescriptorRegistry != null)
       fImageDescriptorRegistry.dispose();
-
     //				unregisterAdapters();
-
     super.shutdown();
-
     if (fWorkingCopyManager != null) {
       fWorkingCopyManager.shutdown();
       fWorkingCopyManager = null;
     }
-
     if (fCompilationUnitDocumentProvider != null) {
       fCompilationUnitDocumentProvider.shutdown();
       fCompilationUnitDocumentProvider = null;
     }
-
     if (fJavaTextTools != null) {
       fJavaTextTools.dispose();
       fJavaTextTools = null;
     }
-
     //				JavaDocLocations.shutdownJavadocLocations();
     //		
     //				JFaceResources.getFontRegistry().removeListener(fFontPropertyChangeListener);
-
+    // begin JavaCore#shutdown()
+    //savePluginPreferences();
+    savePluginPreferences();
+    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+    workspace.removeResourceChangeListener(JavaModelManager
+        .getJavaModelManager().deltaProcessor);
+    workspace.removeSaveParticipant(PHPeclipsePlugin.getDefault());
+    ((JavaModelManager) JavaModelManager.getJavaModelManager()).shutdown();
+    //	 end JavaCore#shutdown()
   }
-
   public void startup() throws CoreException {
     super.startup();
-    IAdapterManager manager = Platform.getAdapterManager();
-    manager.registerAdapters(new PHPElementAdapterFactory(), PHPElement.class);
-    manager.registerAdapters(new ResourceAdapterFactory(), IResource.class);
-    //  externalTools.startUp(); 
+    // begin JavaCore.startup();
+    JavaModelManager manager = JavaModelManager.getJavaModelManager();
+    try {
+      manager.configurePluginDebugOptions();
+      // request state folder creation (workaround 19885)
+      //		JavaCore.getPlugin().getStateLocation();
+      getStateLocation();
+      // retrieve variable values
+      //		JavaCore.getPlugin().getPluginPreferences().addPropertyChangeListener(new
+      // JavaModelManager.PluginPreferencesListener());
+      getPluginPreferences().addPropertyChangeListener(
+          new JavaModelManager.PluginPreferencesListener());
+      //	TODO khartlage temp-del
+      //		manager.loadVariablesAndContainers();
+      IWorkspace workspace = ResourcesPlugin.getWorkspace();
+      workspace.addResourceChangeListener(manager.deltaProcessor,
+          IResourceChangeEvent.PRE_AUTO_BUILD
+              | IResourceChangeEvent.POST_AUTO_BUILD
+              | IResourceChangeEvent.POST_CHANGE
+              | IResourceChangeEvent.PRE_DELETE
+              | IResourceChangeEvent.PRE_CLOSE);
+      //		startIndexing();
+      workspace.addSaveParticipant(PHPeclipsePlugin.getDefault(), manager);
+    } catch (CoreException e) {
+    } catch (RuntimeException e) {
+      manager.shutdown();
+      throw e;
+    }
+    //	 end JavaCore.startup();
+    IAdapterManager platformManager = Platform.getAdapterManager();
+    platformManager.registerAdapters(new PHPElementAdapterFactory(),
+        PHPElement.class);
+    platformManager.registerAdapters(new ResourceAdapterFactory(),
+        IResource.class);
+    //  externalTools.startUp();
     getStandardDisplay().asyncExec(new Runnable() {
       public void run() {
         //initialize the variable context manager
@@ -762,5 +740,4 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       }
     });
   }
-
 }
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaMarkerAnnotation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaMarkerAnnotation.java
index 65b7e5d..c5e2f9d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaMarkerAnnotation.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaMarkerAnnotation.java
@@ -14,20 +14,17 @@ package net.sourceforge.phpeclipse.phpeditor;
 
 import java.util.Iterator;
 
-import org.eclipse.core.resources.IMarker;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelMarker;
 import net.sourceforge.phpdt.core.JavaCore;
-
 import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
 
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+
 
 
 public class JavaMarkerAnnotation extends MarkerAnnotation implements IJavaAnnotation {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
index b6d1eb1..d72d62c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
@@ -28,6 +28,7 @@ import net.sourceforge.phpdt.core.ISourceRange;
 import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.actions.CompositeActionGroup;
 import net.sourceforge.phpdt.internal.ui.dnd.JdtViewerDragAdapter;
@@ -43,7 +44,6 @@ import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.ProblemsLabelDecorator.ProblemsLabelChangedEvent;
 import net.sourceforge.phpdt.ui.actions.GenerateActionGroup;
 import net.sourceforge.phpdt.ui.actions.MemberFilterActionGroup;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IResource;
@@ -298,7 +298,7 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, IAdapt
 				
 				public void dispose() {
 					if (fListener != null) {
-						PHPCore.removeElementChangedListener(fListener);
+						JavaCore.removeElementChangedListener(fListener);
 						fListener= null;
 					}		
 				}
@@ -311,9 +311,9 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, IAdapt
 									
 					if (isCU && fListener == null) {
 						fListener= new ElementChangedListener();
-						PHPCore.addElementChangedListener(fListener);
+						JavaCore.addElementChangedListener(fListener);
 					} else if (!isCU && fListener != null) {
-						PHPCore.removeElementChangedListener(fListener);
+						JavaCore.removeElementChangedListener(fListener);
 						fListener= null;
 					}
 				}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java
index 6e01d7b..c01b0de 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java
@@ -17,8 +17,6 @@ import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.IDocument;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
index a79460d..ec23358 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
@@ -26,13 +26,13 @@ import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
 import net.sourceforge.phpdt.core.IOpenable;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.ui.PHPStatusConstants;
 import net.sourceforge.phpdt.internal.ui.PHPUIStatus;
 import net.sourceforge.phpdt.internal.ui.text.java.IProblemRequestorExtension;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
@@ -937,7 +937,7 @@ public class PHPDocumentProvider extends FileDocumentProvider {
    * @param file the file from which to create the compilation unit
    */
   protected ICompilationUnit createCompilationUnit(IFile file) {
-    Object element = PHPCore.create(file);
+    Object element = JavaCore.create(file);
     if (element instanceof ICompilationUnit)
       return (ICompilationUnit) element;
     return null;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
index 47c1963..e6a298c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
@@ -25,6 +25,7 @@ import net.sourceforge.phpdt.core.IMember;
 import net.sourceforge.phpdt.core.ISourceRange;
 import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.actions.CompositeActionGroup;
 import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
 import net.sourceforge.phpdt.internal.ui.text.PHPPairMatcher;
@@ -35,7 +36,6 @@ import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.actions.GenerateActionGroup;
 import net.sourceforge.phpdt.ui.actions.GotoMatchingBracketAction;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.php.IPHPPartitionScannerConstants;
 
@@ -1123,7 +1123,7 @@ public abstract class PHPEditor  extends ExtendedTextEditor implements IViewPart
   /** Preference key for the link color */
   private final static String LINK_COLOR = PreferenceConstants.EDITOR_LINK_COLOR;
   /** Preference key for compiler task tags */
-  private final static String COMPILER_TASK_TAGS = PHPCore.COMPILER_TASK_TAGS;
+  private final static String COMPILER_TASK_TAGS = JavaCore.COMPILER_TASK_TAGS;
 
   // protected PHPActionGroup fActionGroups;
   //  /** The outline page */
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
index 627a046..b8ab839 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -11,6 +11,8 @@
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
 import java.util.Vector;
+
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
 import net.sourceforge.phpdt.internal.ui.text.JavaAnnotationHover;
@@ -24,7 +26,6 @@ import net.sourceforge.phpdt.internal.ui.text.java.hover.JavaEditorTextHoverProx
 import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCompletionProcessor;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.html.HTMLFormattingStrategy;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLCompletionProcessor;
@@ -423,7 +424,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 		// prefix[0] is either '\t' or ' ' x tabWidth, depending on useSpaces
 		final IPreferenceStore preferences = PHPeclipsePlugin.getDefault()
 				.getPreferenceStore();
-		int tabWidth = preferences.getInt(PHPCore.FORMATTER_TAB_SIZE);
+		int tabWidth = preferences.getInt(JavaCore.FORMATTER_TAB_SIZE);
 		boolean useSpaces = getPreferenceStore().getBoolean(SPACES_FOR_TABS);
 		for (int i = 0; i <= tabWidth; i++) {
 			StringBuffer prefix = new StringBuffer();
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
index 419fd01..d8c935d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
@@ -11,6 +11,7 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.ISourceRange;
 import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.PHPPairMatcher;
@@ -20,7 +21,6 @@ import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI.ExitFlags;
 import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.php.IPHPPartitionScannerConstants;
 
@@ -867,7 +867,7 @@ public class PHPUnitEditor extends PHPEditor {
   //    }
   //  }
   /* Preference key for code formatter tab size */
-  private final static String CODE_FORMATTER_TAB_SIZE = PHPCore.FORMATTER_TAB_SIZE;
+  private final static String CODE_FORMATTER_TAB_SIZE = JavaCore.FORMATTER_TAB_SIZE;
   /** Preference key for matching brackets */
   private final static String MATCHING_BRACKETS = PreferenceConstants.EDITOR_MATCHING_BRACKETS;
   /** Preference key for matching brackets color */
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/resourcesview/ResourceAdapterFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/resourcesview/ResourceAdapterFactory.java
index e288032..4a5799c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/resourcesview/ResourceAdapterFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/resourcesview/ResourceAdapterFactory.java
@@ -1,7 +1,7 @@
 package net.sourceforge.phpeclipse.resourcesview;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.core.JavaProject;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -17,17 +17,17 @@ public class ResourceAdapterFactory implements IAdapterFactory {
 
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (PHPFile.class.equals(adapterType))
-			return PHPCore.create((IFile) adaptableObject);
+			return JavaCore.create((IFile) adaptableObject);
 
 		if (JavaProject.class.equals(adapterType))
-			return PHPCore.create((IProject) adaptableObject);
+			return JavaCore.create((IProject) adaptableObject);
 
 		if (PHPElement.class.equals(adapterType)) {
 			if (adaptableObject instanceof IFile)
-				return PHPCore.create((IFile) adaptableObject);
+				return JavaCore.create((IFile) adaptableObject);
 
 			if (adaptableObject instanceof IProject)
-				return PHPCore.create((IProject) adaptableObject);
+				return JavaCore.create((IProject) adaptableObject);
 		}
 
 		return null;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
index 4378e2f..cbeca0a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
@@ -2,7 +2,7 @@ package net.sourceforge.phpeclipse.wizards;
 
 import java.lang.reflect.InvocationTargetException;
 
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
@@ -73,7 +73,7 @@ public class NewProjectCreationWizard extends BasicNewResourceWizard implements
 						newProject.open(new SubProgressMonitor(monitor, 1));
 						remainingWorkUnits--;
 					}
-					PHPCore.addPHPNature(newProject, new SubProgressMonitor(monitor, remainingWorkUnits));
+					JavaCore.addPHPNature(newProject, new SubProgressMonitor(monitor, remainingWorkUnits));
 				} catch (CoreException e) {
 					throw new InvocationTargetException(e);
 				} finally {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/TempnewPHPProject.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/TempnewPHPProject.java
index ec03535..caff19b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/TempnewPHPProject.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/TempnewPHPProject.java
@@ -2,8 +2,8 @@ package net.sourceforge.phpeclipse.wizards;
 
 import java.lang.reflect.InvocationTargetException;
 
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -83,7 +83,7 @@ public class TempnewPHPProject extends BasicNewResourceWizard implements INewWiz
 				project.open(monitor);
 				monitor= null;
 			}
-			PHPCore.addPHPNature(project, new NullProgressMonitor());
+			JavaCore.addPHPNature(project, new NullProgressMonitor());
 		} finally {
 			if (monitor != null) {
 				monitor.done();
-- 
1.7.1


From a1622122cab1d39005dd183565abd649bd3ce1ed Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 26 Mar 2004 21:41:41 +0000
Subject: [PATCH 06/16] misc parser changes

---
 .../phpeditor/php/test/PHPFormatterTest.java       |    6 +-
 .../phpeclipse/tests/parser/PHPParserTestCase.java |   15 ++-
 .../phpdt/core/compiler/ITerminalSymbols.java      |    4 +-
 .../phpdt/internal/compiler/parser/Parser.java     |    6 +-
 .../phpdt/internal/compiler/parser/Scanner.java    |  132 ++++++++++----------
 5 files changed, 91 insertions(+), 72 deletions(-)

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
index 11e7ed1..b9e7618 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
@@ -7,18 +7,18 @@ package net.sourceforge.phpeclipse.phpeditor.php.test;
 import java.util.Map;
 
 import junit.framework.TestCase;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
 import net.sourceforge.phpdt.internal.corext.util.Strings;
 import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
 import net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.jface.text.IDocument;
 
 /**
  * Testcase for the PHP CodeFormatter
  * @author Stefan Langer
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class PHPFormatterTest extends TestCase {
   private CodeFormatter fFormatter;
@@ -29,7 +29,7 @@ public class PHPFormatterTest extends TestCase {
    * @see junit.framework.TestCase#setUp()
    */
   protected void setUp() throws Exception {
-    Map options = PHPCore.getOptions();
+    Map options = JavaCore.getOptions();
     fFormatter = new CodeFormatter(options);
     fDocument = new DummyDocument();
   }
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
index d7759ea..c8b0443 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
@@ -6,7 +6,6 @@ package net.sourceforge.phpeclipse.tests.parser;
  * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
  ******************************************************************************/
 import net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
-import net.sourceforge.phpdt.internal.compiler.parser.Parser;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 /**
  * Tests the php parser
@@ -20,7 +19,19 @@ public class PHPParserTestCase extends AbstractCompilerTest {
    * Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
-    checkHTML("<?php echo $bgcolor2?>");
+    checkHTML("<?php if ($a==$b) {\n" +
+		"}\n" +
+		""+
+		"?> ");
+    checkHTML("<?php if ($a==$b) {?>\n" +
+    		"<b>test <?php echo \"test\";?> me</b>\n" +
+    		"<?php } \n" +
+    		"echo $bgcolor2 ?>");
+   
+    checkHTML("<?php echo $bgcolor2 ?>");
+    checkPHP("function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)\r\n" + 
+    		"{ static $drop_char_match = array(\'^\', \'$\'); }");
+    
     checkPHP("if ($topic<1) { $topic = 1;}");
     checkPHP("$this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);");
     checkPHP("$db->sql_query($sql);");
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index 7d6e6b7..4a841f4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -38,8 +38,8 @@ public interface ITerminalSymbols {
   public final static int TokenNameWHITESPACE = 900,
     TokenNameCOMMENT_LINE = 901,
     TokenNameCOMMENT_BLOCK = 902,
-    TokenNameCOMMENT_PHPDOC = 903,
-    TokenNameHTML = 904;
+    TokenNameCOMMENT_PHPDOC = 903;
+//    TokenNameHTML = 904;
 
   final static int TokenNameEOF = 0;
   final static int TokenNameERROR = 1;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 820b0c7..c9b73cf 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -2938,9 +2938,13 @@ getNextToken();
     if (Scanner.TRACE) {
       System.out.println("TRACE: variable_name()");
     }
-    if (token == TokenNameIdentifier) {
+    if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+      if (token > TokenNameKEYWORD) {
+        // TODO show a warning "Keyword used as variable" ?
+      }
       getNextToken();
     } else {
+      
       if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in variable name.");
       }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index 9b91cf2..ff11fa1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -804,65 +804,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
     return TokenNameLPAREN;
   }
   public int getNextToken() throws InvalidInputException {
-    int htmlPosition = currentPosition;
-    try {
-      while (!phpMode) {
-        currentCharacter = source[currentPosition++];
-        if (currentCharacter == '<') {
-          if (getNextChar('?')) {
-            currentCharacter = source[currentPosition++];
-            if ((currentCharacter == ' ')
-                || Character.isWhitespace(currentCharacter)) {
-              // <?
-              startPosition = currentPosition;
-              phpMode = true;
-              if (tokenizeWhiteSpace) {
-                // && (whiteStart != currentPosition - 1)) {
-                // reposition scanner in case we are interested by spaces as
-                // tokens
-                startPosition = htmlPosition;
-                return TokenNameHTML;
-              }
-            } else {
-              boolean phpStart = (currentCharacter == 'P')
-                  || (currentCharacter == 'p');
-              if (phpStart) {
-                int test = getNextChar('H', 'h');
-                if (test >= 0) {
-                  test = getNextChar('P', 'p');
-                  if (test >= 0) {
-                    // <?PHP <?php
-                    startPosition = currentPosition;
-                    phpMode = true;
-                    if (tokenizeWhiteSpace) {
-                      // && (whiteStart != currentPosition - 1)) {
-                      // reposition scanner in case we are interested by spaces
-                      // as tokens
-                      startPosition = htmlPosition;
-                      return TokenNameHTML;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
-          if (recordLineSeparator) {
-            pushLineSeparator();
-          } else {
-            currentLine = null;
-          }
-        }
-      }
-    } //-----------------end switch while try--------------------
-    catch (IndexOutOfBoundsException e) {
-      if (tokenizeWhiteSpace) {
-        // && (whiteStart != currentPosition - 1)) {
-        // reposition scanner in case we are interested by spaces as tokens
-        startPosition = htmlPosition;
-      }
-      return TokenNameEOF;
+    if (!phpMode) {
+      return getInlinedHTML(currentPosition);
     }
     if (phpMode) {
       this.wasAcr = false;
@@ -1081,7 +1024,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
             case '?' :
               if (getNextChar('>')) {
                 phpMode = false;
-                return TokenNameINLINE_HTML;
+                if (currentPosition==source.length) {
+                  phpMode = true;
+                  return TokenNameINLINE_HTML;
+                }
+                return getInlinedHTML(currentPosition - 2);
               }
               return TokenNameQUESTION;
             case ':' :
@@ -1702,7 +1649,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 int oldPosition = currentPosition;
                 try {
                   currentCharacter = source[currentPosition++];
-                  
                   if (isPHPIdentifierStart(currentCharacter)) {
                     return scanIdentifierOrKeyword(true);
                   } else {
@@ -1727,6 +1673,63 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return TokenNameEOF;
   }
+  /**
+   * @return @throws
+   *         InvalidInputException
+   */
+  private int getInlinedHTML(int start) throws InvalidInputException {
+    //    int htmlPosition = start;
+    if (currentPosition>source.length) {
+        currentPosition = source.length;
+        return TokenNameEOF;
+    }
+    startPosition = start;
+    try {
+      while (!phpMode) {
+        currentCharacter = source[currentPosition++];
+        if (currentCharacter == '<') {
+          if (getNextChar('?')) {
+            currentCharacter = source[currentPosition++];
+            if ((currentCharacter == ' ')
+                || Character.isWhitespace(currentCharacter)) {
+              // <?
+              phpMode = true;
+              return TokenNameINLINE_HTML;
+            } else {
+              boolean phpStart = (currentCharacter == 'P')
+                  || (currentCharacter == 'p');
+              if (phpStart) {
+                int test = getNextChar('H', 'h');
+                if (test >= 0) {
+                  test = getNextChar('P', 'p');
+                  if (test >= 0) {
+                    // <?PHP <?php
+                    phpMode = true;
+                    return TokenNameINLINE_HTML;
+                  }
+                }
+              }
+            }
+          }
+        }
+        if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+          if (recordLineSeparator) {
+            pushLineSeparator();
+          } else {
+            currentLine = null;
+          }
+        }
+      } //-----------------while--------------------
+      phpMode = true;
+      return TokenNameINLINE_HTML;
+    } //-----------------try--------------------
+    catch (IndexOutOfBoundsException e) {
+      startPosition = start;
+      currentPosition--;
+    }
+    phpMode = true;
+    return TokenNameINLINE_HTML;
+  }
   //  public final void getNextUnicodeChar()
   //    throws IndexOutOfBoundsException, InvalidInputException {
   //    //VOID
@@ -3472,7 +3475,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "ScannerError"; // + new String(getCurrentTokenSource()) + ")";
       // //$NON-NLS-1$
       case TokenNameINLINE_HTML :
-        return "StopPHP(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        return "Inline-HTML(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameIdentifier :
         return "Identifier(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameVariable :
@@ -3714,8 +3717,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "COMMENT_BLOCK(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
       case TokenNameCOMMENT_PHPDOC :
         return "COMMENT_PHPDOC(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
-      case TokenNameHTML :
-        return "HTML(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+        //      case TokenNameHTML :
+        //        return "HTML(" + new String(getCurrentTokenSource()) + ")";
+        // //$NON-NLS-1$
       case TokenNameFILE :
         return "__FILE__"; //$NON-NLS-1$
       case TokenNameLINE :
-- 
1.7.1


From 5d0919faf7157ae7b386174a503892a029e49b61 Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sat, 27 Mar 2004 18:39:42 +0000
Subject: [PATCH 07/16] Eclipse 3.x compatible;

---
 net.sourceforge.phpeclipse.debug.core/plugin.xml   |    7 ++++
 .../plugin.properties                              |    7 +++-
 net.sourceforge.phpeclipse.debug.ui/plugin.xml     |   34 +++++++++++++++++++-
 net.sourceforge.phpeclipse.launching/plugin.xml    |    7 ++++
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml
index f2a5952..46e6b66 100644
--- a/net.sourceforge.phpeclipse.debug.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.debug.core"
    name="%Plugin.name"
@@ -12,6 +13,12 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.properties b/net.sourceforge.phpeclipse.debug.ui/plugin.properties
index d74728d..6b3b861 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.properties
@@ -9,4 +9,9 @@ LaunchShortcut.PHP.label=PHP Application
 DebugActionSet.label=PHP Debug
 RunMenu.label=&Run
 
-GlobalManageBreakpointAction.label=Add/Remove Brea&kpoint (PHP)
\ No newline at end of file
+GlobalManageBreakpointAction.label=Add/Remove Brea&kpoint (PHP)
+
+Context.Debugging.name=Debugging PHP
+Context.Debugging.description=Debugging PHP-Scripts
+DebugHover.description=Shows the value of the selected variable.
+DebugHover.label=debug variable hover
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index c32d3b7..deb23ed 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.debug.ui"
    name="%Plugin.name"
@@ -12,6 +13,12 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
@@ -91,7 +98,7 @@
    </extension>
 <!-- Breakpoint Image -->
    <extension
-         point="org.eclipse.ui.markerImageProviders">
+         point="org.eclipse.ui.ide.markerImageProviders">
       <imageprovider
             markertype="net.sourceforge.phpeclipse.debug.core.phpLineBreakpointMarker"
             icon="icons/obj16/brkp_obj.gif"
@@ -119,5 +126,30 @@
          </action>
       </actionSet>
    </extension>
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            name="%Context.Debugging.name"
+            description="%Context.Debugging.description"
+            id="net.sourceforge.phpeclipse.debug.ui.debugging"
+            parentId="org.eclipse.debug.ui.debugging">
+      </context>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.debugModelContextBindings">
+      <modelContextBinding
+            debugModelId="net.sourceforge.phpeclipse.debug.core"
+            contextId="net.sourceforge.phpeclipse.debug.ui.debugging">
+      </modelContextBinding>
+   </extension>
+   <extension
+         point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+      <hover
+            label="%DebugHover.label"
+            description="%DebugHover.description"
+            class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugHover"
+            id="net.sourceforge.phpdt.ui.DebugHover">
+      </hover>
+   </extension>
 
 </plugin>
diff --git a/net.sourceforge.phpeclipse.launching/plugin.xml b/net.sourceforge.phpeclipse.launching/plugin.xml
index f4a8503..da280ef 100644
--- a/net.sourceforge.phpeclipse.launching/plugin.xml
+++ b/net.sourceforge.phpeclipse.launching/plugin.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.launching"
    name="%Plugin.name"
@@ -12,6 +13,12 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
-- 
1.7.1


From e8debfab0c32a381eb107081eb09e7300ca844c3 Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:30:30 +0000
Subject: [PATCH 08/16] make sure that the VariableHover for the debugPlugin is the first to show

---
 .../java/hover/JavaEditorTextHoverDescriptor.java  |   10 ++++++++++
 .../sourceforge/phpeclipse/PHPeclipsePlugin.java   |   11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaEditorTextHoverDescriptor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaEditorTextHoverDescriptor.java
index 7f8148f..410463d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaEditorTextHoverDescriptor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaEditorTextHoverDescriptor.java
@@ -309,4 +309,14 @@ public class JavaEditorTextHoverDescriptor implements Comparable {
 	public boolean isEnabled() {
 		return fIsEnabled;
 	}
+	
+	/**
+	 * Returns this hover descriptors configuration element.
+	 * 
+	 * @return the configuration element
+	 * @since 3.0 
+	 */
+	public IConfigurationElement getConfigurationElement() {
+		return fElement;
+	}
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 4511487..e748758 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -54,6 +54,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -79,6 +80,7 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.ConfigurationElementSorter;
 /**
  * The main plugin class to be used in the desktop.
  */
@@ -162,8 +164,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin
    */
   public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() {
     if (fJavaEditorTextHoverDescriptors == null)
-      fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor
-          .getContributedHovers();
+      fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor.getContributedHovers();
+			ConfigurationElementSorter sorter= new ConfigurationElementSorter() {
+			  public IConfigurationElement getConfigurationElement(Object object) {
+			    return ((JavaEditorTextHoverDescriptor)object).getConfigurationElement();
+			  }
+			};
+			sorter.sort(fJavaEditorTextHoverDescriptors);    
     return fJavaEditorTextHoverDescriptors;
   }
   /**
-- 
1.7.1


From fb4d28cebc7efe36f683c5eeb223255a6903f757 Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:34:24 +0000
Subject: [PATCH 09/16] changes for VariableHover

---
 .../internal/debug/core/model/PHPStackFrame.java   |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
index cf68846..2e1d71f 100644
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
@@ -64,6 +64,18 @@ public class PHPStackFrame implements IStackFrame {
 		return variables;
 	}
 	
+	public IVariable findVariable(String s) throws DebugException {
+		if (this.hasVariables()) {
+			String name="$"+s;
+			for(int i= 0; i < variables.length; i++) {
+				String n= variables[i].getName();
+				if((variables[i].getName()).equals(name))
+					return variables[i];
+			}
+		}	
+		return null;
+	}
+	
 	public boolean hasVariables() throws DebugException {
 		if (variables == null) {
 			return false;
@@ -194,7 +206,10 @@ public class PHPStackFrame implements IStackFrame {
 	} 
 	
 	public Object getAdapter(Class arg0) {
-		return null;
+		if (arg0==PHPStackFrame.class)
+			return this;
+		else
+			return null;
 	}
 
 	public int getIndex() {
-- 
1.7.1


From 424138b8ec9e3a53086d6bdf702d95502e85f39a Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:36:35 +0000
Subject: [PATCH 10/16] Changes for 3.x

---
 .../debug/ui/launcher/PHPEnvironmentTab.java       |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
index 92162b0..754118d 100644
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
@@ -14,9 +14,10 @@ import net.sourceforge.phpdt.internal.launching.PHPInterpreter;
 import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute;
 import net.sourceforge.phpdt.internal.launching.PHPRuntime;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpeclipse.LoadPathEntry;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.resourcesview.PHPProject;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -26,6 +27,7 @@ import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.swt.SWT;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -495,9 +497,11 @@ public class PHPEnvironmentTab extends AbstractLaunchConfigurationTab {
 			if (useDefaultLoadPath) {
 				String projectName = configuration.getAttribute(PHPLaunchConfigurationAttribute.PROJECT_NAME, "");
 				if (projectName != "") {
-					PHPProject project = PHPCore.getPHPProject(projectName);
-					if (project != null) {
-						List loadPathEntries = project.getLoadPathEntries();
+				    IProject aProject = PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName);
+					if ((aProject != null) && JavaCore.isPHPProject(aProject)) {
+					      PHPProject thePHPProject = new PHPProject();
+					      thePHPProject.setProject(aProject);						
+						List loadPathEntries = thePHPProject.getLoadPathEntries();
 						loadPathListViewer.setInput(loadPathEntries);
 					}
 				}
-- 
1.7.1


From 096a632c2b0d765d16410bbe46c54a1c67e4075b Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:38:15 +0000
Subject: [PATCH 11/16] initial implementation of VariableHover

---
 .../phpdt/internal/debug/ui/PHPDebugHover.java     |  240 ++++++++++++++++++++
 1 files changed, 240 insertions(+), 0 deletions(-)
 create mode 100644 net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java
new file mode 100644
index 0000000..9b41956
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java
@@ -0,0 +1,240 @@
+
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package net.sourceforge.phpdt.internal.debug.ui;
+
+
+import org.eclipse.core.runtime.IAdaptable;
+//import org.eclipse.core.runtime.Platform;
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IValue;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.debug.ui.IDebugUIConstants;
+//import org.eclipse.jdt.debug.core.IJavaStackFrame;
+//import org.eclipse.jdt.debug.core.IJavaThread;
+//import org.eclipse.jdt.debug.core.IJavaType;
+//import org.eclipse.jdt.debug.core.IJavaValue;
+import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
+//import org.eclipse.jdt.ui.PreferenceConstants;
+//import org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover;
+import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+
+import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
+import net.sourceforge.phpdt.internal.debug.core.model.PHPValue;
+import net.sourceforge.phpdt.internal.ui.text.JavaWordFinder;
+
+
+public class PHPDebugHover implements IJavaEditorTextHover, ITextHoverExtension, ISelectionListener, IPartListener {
+		
+	protected IEditorPart fEditor;
+	protected ISelection fSelection = null;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
+	 */
+	public void partActivated(IWorkbenchPart part) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
+	 */
+	public void partBroughtToTop(IWorkbenchPart part) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
+	 */
+	public void partClosed(IWorkbenchPart part) {
+		if (part.equals(fEditor)) {
+			IWorkbenchPage page = fEditor.getSite().getPage();
+			page.removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
+			page.removePartListener(this);
+			fSelection = null;
+			fEditor = null;
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
+	 */
+	public void partDeactivated(IWorkbenchPart part) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
+	 */
+	public void partOpened(IWorkbenchPart part) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+	 */
+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+		fSelection = selection;
+	}
+
+	public PHPDebugHover() {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover#setEditor(org.eclipse.ui.IEditorPart)
+	 */
+	public void setEditor(IEditorPart editor) {
+		if (editor != null) {
+			fEditor= editor;
+			final IWorkbenchPage page = editor.getSite().getPage();
+			page.addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
+			page.addPartListener(this);
+			// initialize selection
+			Runnable r = new Runnable() {
+				public void run() {
+					fSelection = page.getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
+				}
+			};
+			PHPDebugUiPlugin.getStandardDisplay().asyncExec(r);
+		}
+	}
+		
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		return JavaWordFinder.findWord(textViewer.getDocument(), offset);
+	}
+	
+	/**
+	 * Returns the stack frame in which to search for variables, or <code>null</code>
+	 * if none.
+	 * 
+	 * @return the stack frame in which to search for variables, or <code>null</code>
+	 * if none
+	 */
+	protected PHPStackFrame getFrame() {
+		if (fSelection instanceof IStructuredSelection) {
+			IStructuredSelection selection = (IStructuredSelection)fSelection;
+			if (selection.size() == 1) {
+				Object el = selection.getFirstElement();
+				if (el instanceof IAdaptable) {
+					return (PHPStackFrame)((IAdaptable)el).getAdapter(PHPStackFrame.class); 
+				}
+			}
+		}
+		return null;
+	}
+		
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+	 */
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		PHPStackFrame frame = getFrame();				
+		if (frame != null) {
+			try {
+				
+				IDocument document= textViewer.getDocument();
+				if (document == null)
+					return null;
+					
+				String variableName= document.get(hoverRegion.getOffset(), hoverRegion.getLength());
+																
+				StringBuffer buffer= new StringBuffer();	
+				try {
+					IVariable variable= frame.findVariable(variableName);
+					if (variable != null) {
+						appendVariable(buffer, variable);
+					}
+				} catch (DebugException x) {
+//					if (x.getStatus().getCode() != IJavaThread.ERR_THREAD_NOT_SUSPENDED) {
+						PHPDebugUiPlugin.log(x);
+//					}
+				}
+				
+				if (buffer.length() > 0) {
+					return buffer.toString();
+				}
+			
+			} catch (BadLocationException x) {
+				PHPDebugUiPlugin.log(x);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Append HTML for the given variable to the given buffer
+	 */
+	private static void appendVariable(StringBuffer buffer, IVariable variable) throws DebugException {
+
+		buffer.append("<p>"); //$NON-NLS-1$
+		buffer.append("<pre>").append(variable.getName()).append("</pre>"); //$NON-NLS-1$ //$NON-NLS-2$
+		buffer.append(" ="); //$NON-NLS-1$
+		
+		String type= getTypeName(variable);
+		String value= "<b><pre>" + variable.getValue().getValueString() + "</pre></b>"; //$NON-NLS-1$ //$NON-NLS-2$
+		
+		if (type == null) {
+			buffer.append(" null"); //$NON-NLS-1$
+		} else if (type.equals("java.lang.String")) { //$NON-NLS-1$
+			buffer.append(" \""); //$NON-NLS-1$
+			buffer.append(value);
+			buffer.append('"');
+		} else if (type.equals("boolean")) { //$NON-NLS-1$
+			buffer.append(' ');
+			buffer.append(value);
+		} else {
+			buffer.append(" ("); //$NON-NLS-1$
+			buffer.append("<pre>").append(type).append("</pre>"); //$NON-NLS-1$ //$NON-NLS-2$
+			buffer.append(") "); //$NON-NLS-1$
+			buffer.append(value);			
+		}		
+		buffer.append("</p>"); //$NON-NLS-1$
+	}
+
+	private static String getTypeName(IVariable variable) throws DebugException {
+		IValue value= variable.getValue();
+		if (value instanceof PHPValue) 
+			return((PHPValue) value).getReferenceTypeName();
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.ITextHoverExtension#getInformationControlCreator()
+	 */
+	public IInformationControlCreator getInformationControlCreator() {
+//		if (Platform.getPlugin("org.eclipse.jdt.ui").getPluginPreferences().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)) { //$NON-NLS-1$
+			return new IInformationControlCreator() {
+				public IInformationControl createInformationControl(Shell parent) {
+	  				return new DefaultInformationControl(parent, SWT.NONE, 
+	  					new HTMLTextPresenter(true),
+				   		PHPDebugUiMessages.getString("JavaDebugHover.16")); //$NON-NLS-1$
+			 	}
+  			};
+//		}
+//		return null;
+	}
+}
-- 
1.7.1


From 160d7bf3a470cd18b60f407c6e760b1e519e76a4 Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:39:47 +0000
Subject: [PATCH 12/16] changes for VariableHover

---
 .../phpdt/internal/debug/ui/PHPDebugUiPlugin.java  |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
index 340563e..16f59ce 100644
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
@@ -11,6 +11,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.swt.widgets.Display;
 
 public class PHPDebugUiPlugin extends AbstractUIPlugin {
 	public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.ui"; //$NON-NLS-1$
@@ -50,7 +51,20 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin {
 			return PLUGIN_ID;
 		}
 		return getDefault().getDescriptor().getUniqueIdentifier();
-	}	
+	}
+	
+	/**
+	 * Returns the standard display to be used. The method first checks, if
+	 * the thread calling this method has an associated display. If so, this
+	 * display is returned. Otherwise the method returns the default display.
+	 */
+	public static Display getStandardDisplay() {
+		Display display;
+		display= Display.getCurrent();
+		if (display == null)
+			display= Display.getDefault();
+		return display;		
+	}
 	
 	/**
 	 * Returns the active workbench shell or <code>null</code> if none
-- 
1.7.1


From cb216353f1cb352b9f0588034acd391d187f6997 Mon Sep 17 00:00:00 2001
From: cperkonig <cperkonig>
Date: Sun, 28 Mar 2004 08:46:41 +0000
Subject: [PATCH 13/16] Changes for 3.x

---
 net.sourceforge.phpeclipse.debug.core/.classpath |   40 ++-------------------
 net.sourceforge.phpeclipse.debug.core/.project   |    2 +-
 net.sourceforge.phpeclipse.debug.ui/.classpath   |   40 ++-------------------
 net.sourceforge.phpeclipse.debug.ui/.project     |    2 +-
 net.sourceforge.phpeclipse.launching/.classpath  |   41 ++-------------------
 net.sourceforge.phpeclipse.launching/.project    |    2 +-
 6 files changed, 15 insertions(+), 112 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.core/.classpath b/net.sourceforge.phpeclipse.debug.core/.classpath
index 3b89370..275b34c 100644
--- a/net.sourceforge.phpeclipse.debug.core/.classpath
+++ b/net.sourceforge.phpeclipse.debug.core/.classpath
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.1/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.1/uisrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.2/ws/win32/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.1/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.1/jfacesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.1/workbenchsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.ui.win32_2.1.0/workbenchwin32src.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_2.1.0/texteditorsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_2.1.0/editors.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_2.1.0/editorssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.1/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.1/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.1/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.1/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_2.1.2/dtcore.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_2.1.2/dtcoresrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_2.1.2.1/dtui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_2.1.2.1/dtuisrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar" sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse213"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.3/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.3/bootsrc.zip"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/net.sourceforge.phpeclipse.debug.core/.project b/net.sourceforge.phpeclipse.debug.core/.project
index 01597ae..375b066 100644
--- a/net.sourceforge.phpeclipse.debug.core/.project
+++ b/net.sourceforge.phpeclipse.debug.core/.project
@@ -3,7 +3,7 @@
 	<name>net.sourceforge.phpeclipse.debug.core</name>
 	<comment></comment>
 	<projects>
-		<project>net.sourceforge.phpeclipse213</project>
+		<project>net.sourceforge.phpeclipse</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/net.sourceforge.phpeclipse.debug.ui/.classpath b/net.sourceforge.phpeclipse.debug.ui/.classpath
index 19bc6e5..275b34c 100644
--- a/net.sourceforge.phpeclipse.debug.ui/.classpath
+++ b/net.sourceforge.phpeclipse.debug.ui/.classpath
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.1/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.1/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.1/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.1/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.1/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.1/uisrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.2/ws/win32/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.1/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.1/jfacesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.1/workbenchsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.ui.win32_2.1.0/workbenchwin32src.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_2.1.0/texteditorsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_2.1.0/editors.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_2.1.0/editorssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_2.1.2/dtcore.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_2.1.2/dtcoresrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_2.1.2.1/dtui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_2.1.2.1/dtuisrc.zip"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse.debug.core"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse.launching"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse213"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.3/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.3/bootsrc.zip"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/net.sourceforge.phpeclipse.debug.ui/.project b/net.sourceforge.phpeclipse.debug.ui/.project
index a1c5e4a..ad08fc7 100644
--- a/net.sourceforge.phpeclipse.debug.ui/.project
+++ b/net.sourceforge.phpeclipse.debug.ui/.project
@@ -3,9 +3,9 @@
 	<name>net.sourceforge.phpeclipse.debug.ui</name>
 	<comment></comment>
 	<projects>
+		<project>net.sourceforge.phpeclipse</project>
 		<project>net.sourceforge.phpeclipse.debug.core</project>
 		<project>net.sourceforge.phpeclipse.launching</project>
-		<project>net.sourceforge.phpeclipse213</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/net.sourceforge.phpeclipse.launching/.classpath b/net.sourceforge.phpeclipse.launching/.classpath
index 76db8ee..275b34c 100644
--- a/net.sourceforge.phpeclipse.launching/.classpath
+++ b/net.sourceforge.phpeclipse.launching/.classpath
@@ -1,40 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.1/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.1/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.1/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.1/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.1/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.1/uisrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.2/ws/win32/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.1/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.1/jfacesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.1/workbenchsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.ui.win32_2.1.0/workbenchwin32src.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_2.1.0/texteditorsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_2.1.0/editors.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_2.1.0/editorssrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_2.1.2/dtcore.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_2.1.2/dtcoresrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar" sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip"/>
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse213"/>
-    <classpathentry kind="src" path="/net.sourceforge.phpeclipse.debug.core"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.3/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.3/bootsrc.zip"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/net.sourceforge.phpeclipse.launching/.project b/net.sourceforge.phpeclipse.launching/.project
index 515d5a4..f147bcf 100644
--- a/net.sourceforge.phpeclipse.launching/.project
+++ b/net.sourceforge.phpeclipse.launching/.project
@@ -3,8 +3,8 @@
 	<name>net.sourceforge.phpeclipse.launching</name>
 	<comment></comment>
 	<projects>
+		<project>net.sourceforge.phpeclipse</project>
 		<project>net.sourceforge.phpeclipse.debug.core</project>
-		<project>net.sourceforge.phpeclipse213</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-- 
1.7.1


From 2886b1c517878abedb1271b6c5544cfb9592e51d Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 2 Apr 2004 18:37:51 +0000
Subject: [PATCH 14/16] misc parser changes

---
 .../phpdt/internal/compiler/parser/Parser.java     |  341 +++++++++++++-------
 .../phpdt/internal/compiler/parser/Scanner.java    |    4 +
 .../phpeclipse/phpeditor/EditorUtility.java        |    2 +-
 3 files changed, 222 insertions(+), 125 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index c9b73cf..12b9245 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -23,7 +23,6 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclarati
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-
 import org.eclipse.core.resources.IFile;
 public class Parser //extends PHPParserSuperclass
     implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
@@ -554,78 +553,78 @@ public class Parser //extends PHPParserSuperclass
   //		} catch (CoreException e) {
   //		}
   //	}
-//  public void phpParserTester(String s, int rowCount) {
-//    this.str = s;
-//    if (s == null) {
-//      if (phpList.size() != 0) {
-//        this.str = ((PHPString) phpList.get(currentPHPString++)).getPHPString();
-//      }
-//    }
-//    this.token = TokenNameEOF;
-//    //    this.chIndx = 0;
-//    //    this.rowCount = rowCount;
-//    //    this.columnCount = 0;
-//    this.phpEnd = false;
-//    this.phpMode = true;
-//    scanner.setSource(s.toCharArray());
-//    scanner.setPHPMode(true);
-//    getNextToken();
-//    do {
-//      try {
-//        if (token != TokenNameEOF && token != TokenNameERROR) {
-//          statementList();
-//        }
-//        if (token != TokenNameEOF) {
-//          if (token == TokenNameERROR) {
-//            throwSyntaxError("Scanner error (Found unknown token: "
-//                + scanner.toStringAction(token) + ")");
-//          }
-//          if (token == TokenNameRPAREN) {
-//            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameRBRACE) {
-//            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameRBRACKET) {
-//            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameLPAREN) {
-//            throwSyntaxError("Read character '('; end-of-file not reached.");
-//          }
-//          if (token == TokenNameLBRACE) {
-//            throwSyntaxError("Read character '{';  end-of-file not reached.");
-//          }
-//          if (token == TokenNameLBRACKET) {
-//            throwSyntaxError("Read character '[';  end-of-file not reached.");
-//          }
-//          throwSyntaxError("End-of-file not reached.");
-//        }
-//        return;
-//      } catch (SyntaxError err) {
-//        if (s != null) {
-//          throw err;
-//        } else {
-//          //   setMarker(err.getMessage(), err.getLine(), ERROR);
-//          //          setMarker(err.getMessage(),
-//          // scanner.getCurrentTokenStartPosition(),
-//          // scanner.getCurrentTokenEndPosition(), ERROR);
-//        }
-//        // if an error occured,
-//        // try to find keywords 'class' or 'function'
-//        // to parse the rest of the string
-//        while (token != TokenNameEOF && token != TokenNameERROR) {
-//          if (token == TokenNameabstract || token == TokenNamefinal
-//              || token == TokenNameclass || token == TokenNamefunction) {
-//            break;
-//          }
-//          getNextToken();
-//        }
-//        if (token == TokenNameEOF || token == TokenNameERROR) {
-//          return;
-//        }
-//      }
-//    } while (true);
-//  }
+  //  public void phpParserTester(String s, int rowCount) {
+  //    this.str = s;
+  //    if (s == null) {
+  //      if (phpList.size() != 0) {
+  //        this.str = ((PHPString) phpList.get(currentPHPString++)).getPHPString();
+  //      }
+  //    }
+  //    this.token = TokenNameEOF;
+  //    // this.chIndx = 0;
+  //    // this.rowCount = rowCount;
+  //    // this.columnCount = 0;
+  //    this.phpEnd = false;
+  //    this.phpMode = true;
+  //    scanner.setSource(s.toCharArray());
+  //    scanner.setPHPMode(true);
+  //    getNextToken();
+  //    do {
+  //      try {
+  //        if (token != TokenNameEOF && token != TokenNameERROR) {
+  //          statementList();
+  //        }
+  //        if (token != TokenNameEOF) {
+  //          if (token == TokenNameERROR) {
+  //            throwSyntaxError("Scanner error (Found unknown token: "
+  //                + scanner.toStringAction(token) + ")");
+  //          }
+  //          if (token == TokenNameRPAREN) {
+  //            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
+  //          }
+  //          if (token == TokenNameRBRACE) {
+  //            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
+  //          }
+  //          if (token == TokenNameRBRACKET) {
+  //            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
+  //          }
+  //          if (token == TokenNameLPAREN) {
+  //            throwSyntaxError("Read character '('; end-of-file not reached.");
+  //          }
+  //          if (token == TokenNameLBRACE) {
+  //            throwSyntaxError("Read character '{'; end-of-file not reached.");
+  //          }
+  //          if (token == TokenNameLBRACKET) {
+  //            throwSyntaxError("Read character '['; end-of-file not reached.");
+  //          }
+  //          throwSyntaxError("End-of-file not reached.");
+  //        }
+  //        return;
+  //      } catch (SyntaxError err) {
+  //        if (s != null) {
+  //          throw err;
+  //        } else {
+  //          // setMarker(err.getMessage(), err.getLine(), ERROR);
+  //          // setMarker(err.getMessage(),
+  //          // scanner.getCurrentTokenStartPosition(),
+  //          // scanner.getCurrentTokenEndPosition(), ERROR);
+  //        }
+  //        // if an error occured,
+  //        // try to find keywords 'class' or 'function'
+  //        // to parse the rest of the string
+  //        while (token != TokenNameEOF && token != TokenNameERROR) {
+  //          if (token == TokenNameabstract || token == TokenNamefinal
+  //              || token == TokenNameclass || token == TokenNamefunction) {
+  //            break;
+  //          }
+  //          getNextToken();
+  //        }
+  //        if (token == TokenNameEOF || token == TokenNameERROR) {
+  //          return;
+  //        }
+  //      }
+  //    } while (true);
+  //  }
   public void init(String s) {
     this.str = s;
     this.token = TokenNameEOF;
@@ -633,7 +632,7 @@ public class Parser //extends PHPParserSuperclass
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-//    this.phpMode = false;
+    //    this.phpMode = false;
     /* scanner initialization */
     scanner.setSource(s.toCharArray());
     scanner.setPHPMode(false);
@@ -647,7 +646,7 @@ public class Parser //extends PHPParserSuperclass
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-//    this.phpMode = phpMode;
+    //    this.phpMode = phpMode;
     scanner.setPHPMode(phpMode);
   }
   /**
@@ -1130,7 +1129,9 @@ public class Parser //extends PHPParserSuperclass
       } else {
         throwSyntaxError("'as' expected after 'foreach' exxpression.");
       }
-      variable();
+//      variable();
+      foreach_variable();
+      foreach_optional_arg();
       if (token == TokenNameEQUAL_GREATER) {
         getNextToken();
         variable();
@@ -1208,7 +1209,7 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
       }
       return;
-    }else if (token == TokenNameunset) {
+    } else if (token == TokenNameunset) {
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -1240,19 +1241,19 @@ public class Parser //extends PHPParserSuperclass
       return;
     } else if (token == TokenNametry) {
       getNextToken();
-if (token != TokenNameLBRACE) {
+      if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'try' statement.");
       }
       getNextToken();
       statementList();
-if (token != TokenNameRBRACE) {
+      if (token != TokenNameRBRACE) {
         throwSyntaxError("'}' expected in 'try' statement.");
       }
-getNextToken();
+      getNextToken();
       return;
     } else if (token == TokenNamecatch) {
-getNextToken();
-if (token != TokenNameLPAREN) {
+      getNextToken();
+      if (token != TokenNameLPAREN) {
         throwSyntaxError("'(' expected in 'catch' statement.");
       }
       getNextToken();
@@ -1261,33 +1262,29 @@ if (token != TokenNameLPAREN) {
         throwSyntaxError("Variable expected in 'catch' statement.");
       }
       getNextToken();
-
-      if (token != TokenNameRBRACE) {
+      if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in 'catch' statement.");
       }
       getNextToken();
-getNextToken();
-if (token != TokenNameLBRACE) {
+      if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'catch' statement.");
       }
       getNextToken();
       statementList();
-if (token != TokenNameRBRACE) {
+      if (token != TokenNameRBRACE) {
         throwSyntaxError("'}' expected in 'catch' statement.");
       }
-getNextToken();
+      getNextToken();
       additional_catches();
       return;
     } else if (token == TokenNamethrow) {
       getNextToken();
-      
       expr();
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
         throwSyntaxError("';' expected after 'throw' exxpression.");
       }
-      
       return;
     } else if (token == TokenNamefinal || token == TokenNameabstract
         || token == TokenNameclass || token == TokenNameinterface) {
@@ -1347,12 +1344,10 @@ getNextToken();
         throwSyntaxError("Variable expected in 'catch' statement.");
       }
       getNextToken();
-
-      if (token != TokenNameRBRACE) {
+      if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in 'catch' statement.");
       }
       getNextToken();
-      getNextToken();
       if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'catch' statement.");
       }
@@ -1364,7 +1359,24 @@ getNextToken();
       getNextToken();
     }
   }
-
+  
+  private void foreach_variable() {
+    //	w_variable  
+    //| '&' w_variable  
+    if (token == TokenNameAND) {
+      getNextToken();
+    }
+    w_variable();
+  }
+  private void foreach_optional_arg() {
+    //	/* empty */ 
+    //| T_DOUBLE_ARROW foreach_variable  
+    if (token == TokenNameEQUAL_GREATER) {
+      getNextToken();
+      foreach_variable();
+    }
+  }
+  
   private void global_var_list() {
     //  global_var_list:
     //	global_var_list ',' global_var
@@ -1607,7 +1619,8 @@ getNextToken();
     } while (token == TokenNamepublic || token == TokenNameprotected
         || token == TokenNameprivate || token == TokenNamestatic
         || token == TokenNameabstract || token == TokenNamefinal
-        || token == TokenNamefunction || token == TokenNamevar);
+        || token == TokenNamefunction || token == TokenNamevar
+        || token == TokenNameconst);
   }
   private void class_statement() {
     //    class_statement:
@@ -1624,6 +1637,12 @@ getNextToken();
           compilationUnit.compilationResult);
       getNextToken();
       class_variable_declaration();
+    } else if (token == TokenNameconst) {
+      class_constant_declaration();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after class const declaration.");
+      }
+      getNextToken();
     } else {
       boolean hasModifiers = member_modifiers();
       if (token == TokenNamefunction) {
@@ -1658,6 +1677,30 @@ getNextToken();
     //      throwSyntaxError("'function' or 'var' expected.");
     //    }
   }
+  private void class_constant_declaration() {
+    //	class_constant_declaration ',' T_STRING '=' static_scalar
+    //	| T_CONST T_STRING '=' static_scalar
+    if (token != TokenNameconst) {
+      throwSyntaxError("'const' keyword expected in class declaration.");
+    } else {
+      getNextToken();
+    }
+    while (true) {
+      if (token != TokenNameIdentifier) {
+        throwSyntaxError("Identifier expected in class const declaration.");
+      }
+      getNextToken();
+      if (token != TokenNameEQUAL) {
+        throwSyntaxError("'=' expected in class const declaration.");
+      }
+      getNextToken();
+      static_scalar();
+      if (token != TokenNameCOMMA) {
+        break; // while(true)-loop
+      }
+      getNextToken();
+    }
+  }
   //  private void variable_modifiers() {
   //    // variable_modifiers:
   //    // non_empty_member_modifiers
@@ -1757,6 +1800,7 @@ getNextToken();
     getNextToken();
   }
   private void functionDefinition(MethodDeclaration methodDecl) {
+    boolean isAbstract = false;
     if (astPtr == 0) {
       compilationUnit.types.add(methodDecl);
     } else {
@@ -1776,9 +1820,22 @@ getNextToken();
           newMethods[0] = methodDecl;
           typeDecl.methods = newMethods;
         }
+        if ((typeDecl.modifiers & AccAbstract) == AccAbstract) {
+          isAbstract = true;
+        } else if ((typeDecl.modifiers & AccInterface) == AccInterface) {
+          isAbstract = true;
+        }
       }
     }
     functionDeclarator(methodDecl);
+    if (token == TokenNameSEMICOLON) {
+      if (!isAbstract) {
+        throwSyntaxError("Body declaration expected for method: "
+            + new String(methodDecl.selector));
+      }
+      getNextToken();
+      return;
+    }
     functionBody(methodDecl);
   }
   private void functionDeclarator(MethodDeclaration methodDecl) {
@@ -1797,7 +1854,7 @@ getNextToken();
         throwSyntaxError("'(' expected in function declaration.");
       }
       if (token != TokenNameRPAREN) {
-        parameterList();
+        parameter_list();
       }
       if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in function declaration.");
@@ -1814,16 +1871,54 @@ getNextToken();
     }
   }
   //
-  private void parameterList() {
-    //parameter-declaration
-    //parameter-list ',' parameter-declaration
-    do {
-      parameterDeclaration();
-      if (token != TokenNameCOMMA) {
-        break;
+  private void parameter_list() {
+    //	non_empty_parameter_list
+    //	| /* empty */
+    non_empty_parameter_list(true);
+  }
+  private void non_empty_parameter_list(boolean empty_allowed) {
+    //	optional_class_type T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE '=' static_scalar
+    //	| optional_class_type T_VARIABLE '=' static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE '='
+    // static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE '='
+    // static_scalar
+    if (token == TokenNameIdentifier || token == TokenNameVariable
+        || token == TokenNameAND) {
+      while (true) {
+        if (token == TokenNameIdentifier) {
+          getNextToken();
+        }
+        if (token == TokenNameAND) {
+          getNextToken();
+        }
+        if (token == TokenNameVariable) {
+          getNextToken();
+          if (token == TokenNameEQUAL) {
+            getNextToken();
+            static_scalar();
+          }
+        } else {
+          throwSyntaxError("Variable expected in parameter list.");
+        }
+        if (token != TokenNameCOMMA) {
+          break;
+        }
+        getNextToken();
       }
-      getNextToken();
-    } while (true);
+      return;
+    }
+    if (!empty_allowed) {
+      throwSyntaxError("Identifier expected in parameter list.");
+    }
+  }
+  private void optional_class_type() {
+    //	/* empty */
+    //| T_STRING
   }
   private void parameterDeclaration() {
     //variable
@@ -2491,8 +2586,7 @@ getNextToken();
         //	| expr '?' expr ':' expr
         case TokenNameinstanceof :
           getNextToken();
-          throwSyntaxError("not yet implemented (class_name_reference)");
-          //            class_name_reference();
+          class_name_reference();
           break;
         case TokenNameQUESTION :
           getNextToken();
@@ -2653,16 +2747,16 @@ getNextToken();
       }
     }
   }
-//  private void variableList() {
-//    do {
-//      variable();
-//      if (token == TokenNameCOMMA) {
-//        getNextToken();
-//      } else {
-//        break;
-//      }
-//    } while (true);
-//  }
+  //  private void variableList() {
+  //    do {
+  //      variable();
+  //      if (token == TokenNameCOMMA) {
+  //        getNextToken();
+  //      } else {
+  //        break;
+  //      }
+  //    } while (true);
+  //  }
   private void variable_without_objects() {
     //  variable_without_objects:
     //  		reference_variable
@@ -2739,12 +2833,12 @@ getNextToken();
         getNextToken();
         w_variable();
       } else {
-//        if (token == TokenNameIdentifier || token == TokenNameVariable
-//            || token == TokenNameDOLLAR) {
-//          variable();
-//        } else {
-          expr_without_variable(true);
-//        }
+        //        if (token == TokenNameIdentifier || token == TokenNameVariable
+        //            || token == TokenNameDOLLAR) {
+        //          variable();
+        //        } else {
+        expr_without_variable(true);
+        //        }
       }
       if (token != TokenNameCOMMA) {
         break;
@@ -2944,7 +3038,6 @@ getNextToken();
       }
       getNextToken();
     } else {
-      
       if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in variable name.");
       }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index ff11fa1..1ae5d16 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -3494,6 +3494,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "case"; //$NON-NLS-1$
       case TokenNameclass :
         return "class"; //$NON-NLS-1$
+      case TokenNamecatch :
+        return "catch"; //$NON-NLS-1$
       case TokenNameclone :
         //$NON-NLS-1$
         return "clone";
@@ -3546,6 +3548,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "include"; //$NON-NLS-1$
       case TokenNameinclude_once :
         return "include_once"; //$NON-NLS-1$
+      case TokenNameinstanceof :
+        return "instanceof"; //$NON-NLS-1$
       case TokenNameinterface :
         return "interface"; //$NON-NLS-1$
       case TokenNameisset :
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/EditorUtility.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/EditorUtility.java
index b874f4f..097261a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/EditorUtility.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/EditorUtility.java
@@ -67,7 +67,7 @@ public class EditorUtility {
 		IEditorInput input= null;
 		
 		try {
-			input= getEditorInput(inputElement);
+			input = getEditorInput(inputElement);
 		} catch (JavaModelException x) {
 			PHPeclipsePlugin.log(x.getStatus());
 		}
-- 
1.7.1


From 316002b7eecbabe70db2f63228c964db2bb113c2 Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 16 Apr 2004 17:30:27 +0000
Subject: [PATCH 15/16] misc changes

---
 .../internal/corext/template/default-templates.xml |   34 +++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
index 8f2f29c..2ab2143 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
@@ -464,6 +464,38 @@ ${cursor}
   <template name="{cycle" description="{cycle values= }(Smarty)" context="html" enabled="true">{cycle values="${values}"}${cursor}</template>
   <template name="{counter" description="{counter start= skip= print= }(Smarty)" context="html" enabled="true">{counter start=${startValue} skip=${skipValue} print=false}${cursor}</template>
   <template name="{counter" description="{counter}(Smarty)" context="html" enabled="true">{counter}${cursor}</template>
-  
+  <template name="&lt;br&gt;" description="&lt;br&gt;" context="html" enabled="true">&lt;br/&gt;${cursor}</template>
+  <template name="&lt;div&gt;" description="div block with id" context="html" enabled="true">&lt;div id=&quot;${id}&quot;&gt;${cursor}&lt;/div&gt;</template>
+  <template name="&lt;strong&gt;" description="&lt;strong&gt;" context="html" enabled="true">&lt;strong&gt;${cursor}&lt;/strong&gt;</template>
+  <template name="@author" description="author name email" context="phpdoc" enabled="true">@author ${user} &lt;${email}&gt;</template>
+  <template name="@access" description="access private" context="phpdoc" enabled="true">@access private</template>
+  <template name="@access" description="access protected" context="phpdoc" enabled="true">@access protected</template>
+  <template name="@access" description="access public" context="phpdoc" enabled="true">@access public</template>
+  <template name="@category" description="category" context="phpdoc" enabled="true">@category ${categoryname}</template>
+  <template name="@copyright" description="copyright" context="phpdoc" enabled="true">@copyright Copyright &amp;copy; ${year}, ${user}</template>
+  <template name="@deprecated" description="deprecated version date" context="phpdoc" enabled="true">@deprecated ${version} - ${date}</template>
+  <template name="@example" description="example path description" context="phpdoc" enabled="true">@example ${path} ${description}</template>
+  <template name="@abstract" description="abstract" context="phpdoc" enabled="true">@abstract</template>
+  <template name="@final" description="final" context="phpdoc" enabled="true">@final</template>
+  <template name="@filesource" description="filesource" context="phpdoc" enabled="true">@filesource</template>
+  <template name="@global" description="global datatype globalvariable" context="phpdoc" enabled="true">@global ${datatype} ${globalvariable}</template>
+  <template name="@global" description="global datatype description" context="phpdoc" enabled="true">@global ${datatype} ${description}</template>
+  <template name="@ignore" description="ignore" context="phpdoc" enabled="true">@ignore</template>
+  <template name="@internal " description="internal comment" context="phpdoc" enabled="true">@internal ${comment}</template>
+  <template name="@license" description="license url name" context="phpdoc" enabled="true">@license ${url} ${nameoflicense}</template>
+  <template name="@link" description="link url description" context="phpdoc" enabled="true">@link ${url} ${description}</template>
+  <template name="@name" description="name globalvariable" context="phpdoc" enabled="true">@name ${globalvariable}</template>
+  <template name="@package" description="package packagename" context="phpdoc" enabled="true">@package ${packagename}</template>
+  <template name="@param" description="param datatype paramname description" context="phpdoc" enabled="true">@param ${datatype} ${paramname} ${description}</template>
+  <template name="@param" description="param datatype paramname" context="phpdoc" enabled="true">@param ${datatype} ${paramname}</template>
+  <template name="@return" description="return datatype description" context="phpdoc" enabled="true">@return ${datatype} ${description}</template>
+  <template name="@see" description="see element" context="phpdoc" enabled="true">@see ${element}</template><template name="@since" description="since version date" context="phpdoc" enabled="true">@since ${version} - ${date}</template>
+  <template name="@staticvar" description="staticvar datatype description" context="phpdoc" enabled="true">@staticvar ${datatype} ${description}</template>
+  <template name="@subpackage" description="subpackage subpackagename" context="phpdoc" enabled="true">@subpackage ${subpackagename}</template>
+  <template name="@todo" description="@todo information_string" context="phpdoc" enabled="true">@todo ${information_string}</template>
+  <template name="@tutorial" description="tutorial string description" context="phpdoc" enabled="true">@tutorial ${string} ${description}</template>
+  <template name="@uses" description="uses element description" context="phpdoc" enabled="true">@uses ${element} ${description}</template>
+  <template name="@var" description="var datatype description" context="phpdoc" enabled="true">@var ${datatype} ${description}</template>
+  <template name="@version" description="version versionstring" context="phpdoc" enabled="true">@version ${versionstring}</template>
    
 </templates>
\ No newline at end of file
-- 
1.7.1


From 1efc03c75342d181eba38eaf9c6722b5f19758f7 Mon Sep 17 00:00:00 2001
From: khartlage <khartlage>
Date: Fri, 16 Apr 2004 19:15:53 +0000
Subject: [PATCH 16/16] initial quantum version

---
 .../.classpath                                     |    9 +
 .../.cvsignore                                     |    2 +
 .../.project                                       |   17 +
 .../net.sourceforge.phpeclipse.quantum.sql/README  |   78 +++
 .../build.properties                               |   10 +
 .../doc/Custom Copy.html                           |   99 ++++
 .../doc/Structure.html                             |   98 ++++
 .../doc/book.css                                   |    1 +
 .../doc/connect.html                               |   71 +++
 .../doc/developers.html                            |  301 +++++++++++
 .../doc/getting_started_connections.html           |   77 +++
 .../doc/getting_started_perspective.html           |   28 +
 .../doc/images/logo.gif                            |  Bin 0 -> 9740 bytes
 .../doc/images/newbookmark_menu.gif                |  Bin 0 -> 4120 bytes
 .../doc/images/newbookmark_wizard.gif              |  Bin 0 -> 8861 bytes
 .../doc/images/open_perspective.gif                |  Bin 0 -> 32416 bytes
 .../doc/images/quantum_perspective.gif             |  Bin 0 -> 27548 bytes
 .../doc/images/select_perspective_dialog.gif       |  Bin 0 -> 8360 bytes
 .../doc/index.html                                 |   17 +
 .../doc/structure.gif                              |  Bin 0 -> 3882 bytes
 .../doc/toc.xml                                    |    9 +
 .../icons/.xvpics/fulldata-disabled.gif            |    5 +
 .../icons/add.gif                                  |  Bin 0 -> 238 bytes
 .../icons/add_schema.gif                           |  Bin 0 -> 154 bytes
 .../icons/append.gif                               |  Bin 0 -> 164 bytes
 .../icons/autocommit.gif                           |  Bin 0 -> 207 bytes
 .../icons/bigtable.gif                             |  Bin 0 -> 242 bytes
 .../icons/bookmarkfile.gif                         |  Bin 0 -> 933 bytes
 .../icons/bookmarks.gif                            |  Bin 0 -> 238 bytes
 .../icons/clear.gif                                |  Bin 0 -> 162 bytes
 .../icons/close.gif                                |  Bin 0 -> 155 bytes
 .../icons/column.gif                               |  Bin 0 -> 219 bytes
 .../icons/commit.gif                               |  Bin 0 -> 252 bytes
 .../icons/connect.gif                              |  Bin 0 -> 902 bytes
 .../icons/connected.gif                            |  Bin 0 -> 152 bytes
 .../icons/copy.gif                                 |  Bin 0 -> 288 bytes
 .../icons/cut.gif                                  |  Bin 0 -> 652 bytes
 .../icons/delete.gif                               |  Bin 0 -> 143 bytes
 .../icons/disconnect.gif                           |  Bin 0 -> 919 bytes
 .../icons/edit.gif                                 |  Bin 0 -> 441 bytes
 .../icons/entitygroup.gif                          |  Bin 0 -> 169 bytes
 .../icons/export.gif                               |  Bin 0 -> 143 bytes
 .../icons/filter.gif                               |  Bin 0 -> 159 bytes
 .../icons/fulldata.gif                             |  Bin 0 -> 111 bytes
 .../icons/greentable.gif                           |  Bin 0 -> 120 bytes
 .../icons/grid.gif                                 |  Bin 0 -> 152 bytes
 .../icons/group.gif                                |  Bin 0 -> 217 bytes
 .../icons/import.gif                               |  Bin 0 -> 141 bytes
 .../icons/key.gif                                  |  Bin 0 -> 156 bytes
 .../icons/keycolumn.gif                            |  Bin 0 -> 251 bytes
 .../icons/log.gif                                  |  Bin 0 -> 164 bytes
 .../icons/missingtable.gif                         |  Bin 0 -> 256 bytes
 .../icons/next.gif                                 |  Bin 0 -> 183 bytes
 .../icons/paste.gif                                |  Bin 0 -> 298 bytes
 .../icons/play.gif                                 |  Bin 0 -> 186 bytes
 .../icons/previous.gif                             |  Bin 0 -> 183 bytes
 .../icons/qmodel.gif                               |  Bin 0 -> 941 bytes
 .../icons/quantum-ng.gif                           |  Bin 0 -> 591 bytes
 .../icons/refresh.gif                              |  Bin 0 -> 937 bytes
 .../icons/rollback.gif                             |  Bin 0 -> 201 bytes
 .../icons/sample.gif                               |  Bin 0 -> 983 bytes
 .../icons/schema.gif                               |  Bin 0 -> 152 bytes
 .../icons/script.gif                               |  Bin 0 -> 677 bytes
 .../icons/sequence.gif                             |  Bin 0 -> 118 bytes
 .../icons/statement.gif                            |  Bin 0 -> 152 bytes
 .../icons/stop.gif                                 |  Bin 0 -> 254 bytes
 .../icons/subset.gif                               |  Bin 0 -> 156 bytes
 .../icons/success.gif                              |  Bin 0 -> 661 bytes
 .../icons/table.gif                                |  Bin 0 -> 237 bytes
 .../icons/torque.gif                               |  Bin 0 -> 1044 bytes
 .../icons/unused/Thumbs.db                         |  Bin 0 -> 9216 bytes
 .../icons/unused/bluegroup.gif                     |  Bin 0 -> 157 bytes
 .../icons/unused/green_group.gif                   |  Bin 0 -> 159 bytes
 .../icons/unused/green_schema.gif                  |  Bin 0 -> 152 bytes
 .../icons/unused/green_view_group.gif              |  Bin 0 -> 254 bytes
 .../icons/unused/key.gif                           |  Bin 0 -> 155 bytes
 .../icons/unused/key2.gif                          |  Bin 0 -> 153 bytes
 .../icons/unused/margarita.gif                     |  Bin 0 -> 152 bytes
 .../icons/unused/quantum.gif                       |  Bin 0 -> 93 bytes
 .../icons/unused/sequence_group.gif                |  Bin 0 -> 248 bytes
 .../icons/unused/subset.gif                        |  Bin 0 -> 621 bytes
 .../icons/unused/table_group.gif                   |  Bin 0 -> 252 bytes
 .../icons/unused/view.gif                          |  Bin 0 -> 149 bytes
 .../icons/unused/view_group.gif                    |  Bin 0 -> 254 bytes
 .../icons/user.gif                                 |  Bin 0 -> 134 bytes
 .../icons/view.gif                                 |  Bin 0 -> 148 bytes
 .../icons/xml.gif                                  |  Bin 0 -> 159 bytes
 .../install.txt                                    |   24 +
 .../lib/junit.jar                                  |  Bin 0 -> 121070 bytes
 .../plugin-3.0.xml                                 |  300 +++++++++++
 .../plugin.properties                              |   15 +
 .../plugin.xml                                     |  303 +++++++++++
 .../schema/data.exsd                               |  107 ++++
 .../schema/metadata.exsd                           |  107 ++++
 .../src-test/com/quantum/util/StringUtilTest.java  |   71 +++
 .../src/com/quantum/IQuantumConstants.java         |   26 +
 .../src/com/quantum/Messages.java                  |   41 ++
 .../src/com/quantum/QuantumPlugin.java             |  310 ++++++++++++
 .../src/com/quantum/QuantumResources.properties    |  286 +++++++++++
 .../com/quantum/actions/AddToQuickListAction.java  |   56 ++
 .../src/com/quantum/actions/BaseSQLAction.java     |   25 +
 .../com/quantum/actions/BaseSequenceAction.java    |   53 ++
 .../src/com/quantum/actions/CloseTableAction.java  |   40 ++
 .../src/com/quantum/actions/ConnectAction.java     |  115 +++++
 .../src/com/quantum/actions/CustomCopyAction.java  |   73 +++
 .../com/quantum/actions/DeleteAllRowsAction.java   |   77 +++
 .../com/quantum/actions/DeleteBookmarkAction.java  |   59 +++
 .../com/quantum/actions/DeleteColumnAction.java    |   63 +++
 .../com/quantum/actions/DeleteObjectAction.java    |   77 +++
 .../com/quantum/actions/DeleteSubsetAction.java    |   55 ++
 .../src/com/quantum/actions/DisconnectAction.java  |   81 +++
 .../src/com/quantum/actions/ExecuteAction.java     |  142 ++++++
 .../com/quantum/actions/ExecuteAgainstAction.java  |  184 +++++++
 .../com/quantum/actions/ExportBookmarksAction.java |   42 ++
 .../src/com/quantum/actions/ExportQueryAction.java |   83 +++
 .../src/com/quantum/actions/ExportXMLAction.java   |  130 +++++
 .../com/quantum/actions/ImportBookmarksAction.java |   88 ++++
 .../src/com/quantum/actions/ImportQueryAction.java |   80 +++
 .../src/com/quantum/actions/NewBookmarkAction.java |   32 ++
 .../src/com/quantum/actions/NewSubsetAction.java   |   53 ++
 .../com/quantum/actions/NextSequenceAction.java    |   42 ++
 .../src/com/quantum/actions/OpenQueryAction.java   |   43 ++
 .../com/quantum/actions/PrevSequenceAction.java    |   44 ++
 .../com/quantum/actions/RefreshBookmarkAction.java |   37 ++
 .../com/quantum/actions/RefreshTableAction.java    |   40 ++
 .../quantum/actions/RemoveFromQuickListAction.java |   56 ++
 .../src/com/quantum/actions/ViewTableAction.java   |   59 +++
 .../quantum/actions/ViewTableDetailsAction.java    |   66 +++
 .../src/com/quantum/adapters/AdabasDAdapter.java   |   11 +
 .../src/com/quantum/adapters/AdapterFactory.java   |   93 ++++
 .../src/com/quantum/adapters/DB2AS400Adapter.java  |   15 +
 .../src/com/quantum/adapters/DB2Adapter.java       |   21 +
 .../src/com/quantum/adapters/DatabaseAdapter.java  |  198 ++++++++
 .../src/com/quantum/adapters/DriverInfo.java       |   57 +++
 .../com/quantum/adapters/FeatureNotSupported.java  |    7 +
 .../src/com/quantum/adapters/GenericAdapter.java   |   20 +
 .../src/com/quantum/adapters/MySQLAdapter.java     |    9 +
 .../quantum/adapters/NoSuchAdapterException.java   |    9 +
 .../src/com/quantum/adapters/OracleAdapter.java    |   67 +++
 .../src/com/quantum/adapters/PostgresAdapter.java  |   70 +++
 .../src/com/quantum/adapters/RedBrickAdapter.java  |   23 +
 .../src/com/quantum/editors/ColorManager.java      |   28 +
 .../editors/NonRuleBasedDamagerRepairer.java       |  135 +++++
 .../src/com/quantum/editors/SQLColorConstants.java |   13 +
 .../src/com/quantum/editors/SQLConfiguration.java  |   89 ++++
 .../com/quantum/editors/SQLDocumentProvider.java   |   35 ++
 .../src/com/quantum/editors/SQLEditor.java         |   59 +++
 .../com/quantum/editors/SQLPartitionScanner.java   |  225 +++++++++
 .../com/quantum/extensions/ExtensionAction.java    |  132 +++++
 .../src/com/quantum/extensions/IDataExtension.java |   21 +
 .../com/quantum/extensions/IMetadataExtension.java |   21 +
 .../com/quantum/extensions/IQuantumExtension.java  |   13 +
 .../quantum/extensions/ProcessServiceMembers.java  |  281 +++++++++++
 .../src/com/quantum/model/Bookmark.java            |  525 ++++++++++++++++++++
 .../src/com/quantum/model/BookmarkCollection.java  |  312 ++++++++++++
 .../src/com/quantum/model/BookmarkHolder.java      |   17 +
 .../src/com/quantum/model/Column.java              |   21 +
 .../src/com/quantum/model/ColumnImpl.java          |  148 ++++++
 .../src/com/quantum/model/ConnectionException.java |   56 ++
 .../src/com/quantum/model/Constraint.java          |    8 +
 .../src/com/quantum/model/Database.java            |  214 ++++++++
 .../src/com/quantum/model/Entity.java              |   40 ++
 .../src/com/quantum/model/EntityFactory.java       |   36 ++
 .../src/com/quantum/model/EntityHolder.java        |    8 +
 .../src/com/quantum/model/EntityImpl.java          |  182 +++++++
 .../src/com/quantum/model/ForeignKey.java          |   15 +
 .../src/com/quantum/model/HasMetaData.java         |   24 +
 .../src/com/quantum/model/Index.java               |   13 +
 .../src/com/quantum/model/IndexImpl.java           |   69 +++
 .../com/quantum/model/NotConnectedException.java   |    8 +
 .../src/com/quantum/model/PasswordFinder.java      |   15 +
 .../src/com/quantum/model/Schema.java              |  109 ++++
 .../src/com/quantum/model/SchemaHolder.java        |    8 +
 .../src/com/quantum/model/Sequence.java            |    8 +
 .../src/com/quantum/model/SequenceImpl.java        |   13 +
 .../src/com/quantum/model/Table.java               |   11 +
 .../src/com/quantum/model/TableImpl.java           |   31 ++
 .../src/com/quantum/model/View.java                |   11 +
 .../src/com/quantum/model/ViewImpl.java            |   25 +
 .../com/quantum/model/xml/ModelToXMLConverter.java |  150 ++++++
 .../src/com/quantum/model/xml/TorqueConverter.java |   90 ++++
 .../src/com/quantum/perspective/DBPerspective.java |   30 ++
 .../com/quantum/preferences/CopyPreferences.java   |   37 ++
 .../quantum/preferences/CustomCopyPreferences.java |   46 ++
 .../preferences/CustomCopyPreferences2.java        |   46 ++
 .../preferences/CustomCopyPreferences3.java        |   46 ++
 .../com/quantum/preferences/GlobalPreferences.java |   49 ++
 .../quantum/preferences/SQLEditorPreferences.java  |  339 +++++++++++++
 .../quantum/properties/BookmarkPropertyPage.java   |  284 +++++++++++
 .../DatabaseInformationPropertyPage.java           |   60 +++
 .../com/quantum/properties/EntityPropertyPage.java |  187 +++++++
 .../com/quantum/properties/SchemaPropertyPage.java |  256 ++++++++++
 .../src/com/quantum/sql/ConnectionEstablisher.java |   19 +
 .../src/com/quantum/sql/FilterSort.java            |   83 +++
 .../src/com/quantum/sql/MultiSQLServer.java        |  426 ++++++++++++++++
 .../src/com/quantum/sql/SQLHelper.java             |   73 +++
 .../src/com/quantum/sql/SQLParser.java             |   62 +++
 .../src/com/quantum/sql/SQLResults.java            |  139 ++++++
 .../src/com/quantum/sql/TableRow.java              |   60 +++
 .../sql/metadata/MetaDataJDBCInterface.java        |  195 ++++++++
 .../quantum/sql/metadata/MetaDataXMLInterface.java |  191 +++++++
 .../com/quantum/sql/metadata/ObjectMetaData.java   |  204 ++++++++
 .../src/com/quantum/sql/parser/SQLLexx.java        |  166 ++++++
 .../src/com/quantum/sql/parser/StringPointer.java  |   62 +++
 .../src/com/quantum/sql/parser/Token.java          |   57 +++
 .../quantum/ui/dialog/BookmarkSelectionDialog.java |  110 ++++
 .../quantum/ui/dialog/ExceptionDisplayDialog.java  |  281 +++++++++++
 .../src/com/quantum/ui/dialog/PasswordDialog.java  |  122 +++++
 .../src/com/quantum/util/NthLevelConverter.java    |  145 ++++++
 .../src/com/quantum/util/OneLevelConverter.java    |   77 +++
 .../src/com/quantum/util/QuantumUtil.java          |   47 ++
 .../src/com/quantum/util/StringMatrix.java         |  352 +++++++++++++
 .../src/com/quantum/util/StringUtil.java           |   33 ++
 .../quantum/util/connection/ConnectionUtil.java    |   46 ++
 .../src/com/quantum/util/io/InputStreamHelper.java |   18 +
 .../src/com/quantum/util/sql/TypesHelper.java      |   59 +++
 .../quantum/util/versioning/VersioningHelper.java  |   49 ++
 .../src/com/quantum/util/xml/XMLHelper.java        |   73 +++
 .../src/com/quantum/view/CopyAction.java           |   40 ++
 .../src/com/quantum/view/LogConstants.java         |    9 +
 .../src/com/quantum/view/LogProxy.java             |   34 ++
 .../src/com/quantum/view/SQLLogView.java           |  109 ++++
 .../src/com/quantum/view/SQLQueryView.java         |  517 +++++++++++++++++++
 .../src/com/quantum/view/ViewHelper.java           |  101 ++++
 .../com/quantum/view/bookmark/AddSchemaAction.java |   58 +++
 .../com/quantum/view/bookmark/AddSchemaDialog.java |   86 ++++
 .../quantum/view/bookmark/BookmarkClipboard.java   |   13 +
 .../view/bookmark/BookmarkContentProvider.java     |   40 ++
 .../view/bookmark/BookmarkLabelProvider.java       |   74 +++
 .../quantum/view/bookmark/BookmarkListNode.java    |  120 +++++
 .../com/quantum/view/bookmark/BookmarkNode.java    |  167 +++++++
 .../com/quantum/view/bookmark/BookmarkView.java    |  269 ++++++++++
 .../view/bookmark/BookmarkViewActionGroup.java     |  266 ++++++++++
 .../src/com/quantum/view/bookmark/ColumnNode.java  |   64 +++
 .../src/com/quantum/view/bookmark/CopyAction.java  |  109 ++++
 .../src/com/quantum/view/bookmark/EntityNode.java  |  128 +++++
 .../src/com/quantum/view/bookmark/GroupNode.java   |   92 ++++
 .../view/bookmark/LabelDecorationInstructions.java |   39 ++
 .../src/com/quantum/view/bookmark/PasteAction.java |   46 ++
 .../com/quantum/view/bookmark/QueryListNode.java   |   76 +++
 .../src/com/quantum/view/bookmark/QueryNode.java   |   64 +++
 .../com/quantum/view/bookmark/QuickListNode.java   |   98 ++++
 .../com/quantum/view/bookmark/RenameAction.java    |   52 ++
 .../src/com/quantum/view/bookmark/SchemaNode.java  |   81 +++
 .../src/com/quantum/view/bookmark/TreeNode.java    |  124 +++++
 .../src/com/quantum/view/subset/EntitySubset.java  |   86 ++++
 .../src/com/quantum/view/subset/ObjectNode.java    |  167 +++++++
 .../quantum/view/subset/SubsetContentProvider.java |  158 ++++++
 .../quantum/view/subset/SubsetLabelProvider.java   |   61 +++
 .../src/com/quantum/view/subset/SubsetNode.java    |  162 ++++++
 .../src/com/quantum/view/subset/SubsetRoot.java    |   41 ++
 .../src/com/quantum/view/subset/SubsetView.java    |  354 +++++++++++++
 .../com/quantum/view/tableview/DefaultSizes.java   |    6 +
 .../com/quantum/view/tableview/TableAdapter.java   |  269 ++++++++++
 .../src/com/quantum/view/tableview/TableView.java  |  283 +++++++++++
 .../view/tableview/TableViewMenuListener.java      |  138 +++++
 .../quantum/view/tableview/TableViewToolBar.java   |  246 +++++++++
 .../src/com/quantum/wizards/BaseSQLPage.java       |   49 ++
 .../src/com/quantum/wizards/BookmarkWizard.java    |  297 +++++++++++
 .../src/com/quantum/wizards/DeleteRowPage.java     |  139 ++++++
 .../com/quantum/wizards/ExportBookmarkWizard.java  |   34 ++
 .../quantum/wizards/ExportBookmarkWizardPage.java  |  283 +++++++++++
 .../com/quantum/wizards/ExportTorqueWizard.java    |   20 +
 .../src/com/quantum/wizards/InsertRowPage.java     |  120 +++++
 .../src/com/quantum/wizards/SQLPage.java           |   11 +
 .../src/com/quantum/wizards/SQLRowWizard.java      |   28 +
 .../src/com/quantum/wizards/SortFilterPage.java    |  180 +++++++
 .../src/com/quantum/wizards/UpdateRowPage.java     |  166 ++++++
 268 files changed, 18929 insertions(+), 0 deletions(-)
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/.classpath
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/.cvsignore
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/.project
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/README
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/build.properties
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/Custom Copy.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/Structure.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/book.css
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/connect.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/developers.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_connections.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_perspective.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/logo.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_menu.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_wizard.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/open_perspective.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/quantum_perspective.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/select_perspective_dialog.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/index.html
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/structure.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/doc/toc.xml
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/.xvpics/fulldata-disabled.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/add.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/add_schema.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/append.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/autocommit.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/bigtable.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarkfile.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarks.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/clear.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/close.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/column.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/commit.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/connect.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/connected.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/copy.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/cut.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/delete.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/disconnect.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/edit.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/entitygroup.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/export.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/filter.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/fulldata.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/greentable.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/grid.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/import.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/key.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/keycolumn.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/log.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/missingtable.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/next.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/paste.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/play.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/previous.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/qmodel.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/quantum-ng.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/refresh.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/rollback.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/sample.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/schema.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/script.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/sequence.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/statement.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/stop.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/subset.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/success.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/table.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/torque.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/Thumbs.db
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/bluegroup.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_schema.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_view_group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key2.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/margarita.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/quantum.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/sequence_group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/subset.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/table_group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view_group.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/user.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/view.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/icons/xml.gif
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/install.txt
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/lib/junit.jar
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/plugin-3.0.xml
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/plugin.properties
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/plugin.xml
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/schema/data.exsd
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/schema/metadata.exsd
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src-test/com/quantum/util/StringUtilTest.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/IQuantumConstants.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/Messages.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumPlugin.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumResources.properties
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/AddToQuickListAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSQLAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSequenceAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CloseTableAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ConnectAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CustomCopyAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteAllRowsAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteBookmarkAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteColumnAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteObjectAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteSubsetAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DisconnectAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAgainstAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportBookmarksAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportQueryAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportXMLAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportBookmarksAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportQueryAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewBookmarkAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewSubsetAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NextSequenceAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/OpenQueryAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/PrevSequenceAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshBookmarkAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshTableAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RemoveFromQuickListAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableDetailsAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdabasDAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdapterFactory.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2AS400Adapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2Adapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DatabaseAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DriverInfo.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/FeatureNotSupported.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/GenericAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/MySQLAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/NoSuchAdapterException.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/OracleAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/PostgresAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/RedBrickAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/ColorManager.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/NonRuleBasedDamagerRepairer.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLColorConstants.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLConfiguration.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLDocumentProvider.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLEditor.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLPartitionScanner.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ExtensionAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IDataExtension.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IMetadataExtension.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IQuantumExtension.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ProcessServiceMembers.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Bookmark.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkCollection.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkHolder.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Column.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ColumnImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ConnectionException.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Constraint.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Database.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Entity.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityFactory.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityHolder.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ForeignKey.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/HasMetaData.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Index.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/IndexImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/NotConnectedException.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/PasswordFinder.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Schema.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SchemaHolder.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Sequence.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SequenceImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Table.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/TableImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/View.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ViewImpl.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/ModelToXMLConverter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/TorqueConverter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/perspective/DBPerspective.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CopyPreferences.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences2.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences3.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/GlobalPreferences.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/SQLEditorPreferences.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/BookmarkPropertyPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/DatabaseInformationPropertyPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/EntityPropertyPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/SchemaPropertyPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/ConnectionEstablisher.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/FilterSort.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/MultiSQLServer.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLParser.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLResults.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/TableRow.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataJDBCInterface.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataXMLInterface.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/ObjectMetaData.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/SQLLexx.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/StringPointer.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/Token.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/BookmarkSelectionDialog.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/ExceptionDisplayDialog.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/PasswordDialog.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/NthLevelConverter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/OneLevelConverter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/QuantumUtil.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringMatrix.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringUtil.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/connection/ConnectionUtil.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/io/InputStreamHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/sql/TypesHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/versioning/VersioningHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/xml/XMLHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/CopyAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogConstants.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogProxy.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLLogView.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLQueryView.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/ViewHelper.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaDialog.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkClipboard.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkContentProvider.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkLabelProvider.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkListNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkViewActionGroup.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/ColumnNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/CopyAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/EntityNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/GroupNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/LabelDecorationInstructions.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/PasteAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryListNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QuickListNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/RenameAction.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/SchemaNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/EntitySubset.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetContentProvider.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetLabelProvider.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetNode.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetRoot.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetView.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/DefaultSizes.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableAdapter.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableView.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewMenuListener.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewToolBar.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BaseSQLPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BookmarkWizard.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/DeleteRowPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizard.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizardPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportTorqueWizard.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/InsertRowPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLRowWizard.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SortFilterPage.java
 create mode 100644 archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/UpdateRowPage.java

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/.classpath b/archive/net.sourceforge.phpeclipse.quantum.sql/.classpath
new file mode 100644
index 0000000..5074f04
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-test"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/.cvsignore b/archive/net.sourceforge.phpeclipse.quantum.sql/.cvsignore
new file mode 100644
index 0000000..ce087de
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/.cvsignore
@@ -0,0 +1,2 @@
+bin
+com.quantum
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/.project b/archive/net.sourceforge.phpeclipse.quantum.sql/.project
new file mode 100644
index 0000000..68fc1de
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.sourceforge.phpeclipse.quantum.sql</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/README b/archive/net.sourceforge.phpeclipse.quantum.sql/README
new file mode 100644
index 0000000..7212fda
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/README
@@ -0,0 +1,78 @@
+Changes: Changes from 2.2.3
+
+Most changes to this version are trivial, and fall 
+into two main categories:
+
+- JDK 1.3 should now be supported.  
+
+- Eclipse 3.0 M5/M6 should be supported (although 
+  there's a different jar to install
+
+In addition:
+
+- Schema handling has been revised.
+
+
+
+
+
+Changes: Changes from 2.2.2
+
+Most of the changes to the code are structural and
+won't have an effect on the use of the plug-in.  Some
+of the changes that you will see include:
+
+- Better refresh support (Issuing a refresh on the 
+  bookmark list does not collapse any previously-open
+  selections.
+  
+- Properties available for items in the bookmark list
+
+- Key mapping (Ctl-Shift-Q) to execute queries in the 
+  Query view
+  
+- Bug fix for mixed-case tables in PostGres
+
+- Bug fix for SQL Queries on Oracle with column type
+  of CHAR
+  
+- Added an explicit checkbox to indicate that you want
+  to be prompted for a password at connection time.
+  
+- When you've selected multiple nodes at the same time,
+  you can perform the same action on each of them.
+  
+- The status line from the Bookmark View now appears in
+  the standard status line window area.
+  
+- Queries are persisted so that you can keep a list of 
+  queries.
+  
+Changes: Changes from 2.2.1
+
+- Now you can leave blank the password field in the bookmark, 
+  as suggested by Erik Dick in the Forum. You will be asked for 
+  its value when trying to connect. There is a property 
+  (Window->Properties->QuantumDB) to modify in case you use 
+  blank passwords and don't want to be pestered with dialogs. 
+  In this case, change the default (nothing) to a string 
+  (e.g. "") and only when you use that string as bookmark 
+  password you'll be asked for a new password.
+  
+- The Query History View now registers all the queries, even 
+  before being activated, fixing bug #773726.
+  
+- The case sensitivity when using Postgres in Windows should 
+  go now (bug #804353).
+  
+- Fixed bug #811591, the Copy/Paste of bookmarks wasn't properly 
+  initialized.
+  
+- Now if the connection is implicit (created when using the SQL 
+  Editor before opening the bookmark), the bookmark is connected 
+  but the tables and views are not loaded till you try to expand 
+  the node.
+  
+- Fixed (really avoided) the problem with the Oracle jdbc driver 
+  and its bug with getIndexInfo(). Bug reference #819846. 
+  
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/build.properties b/archive/net.sourceforge.phpeclipse.quantum.sql/build.properties
new file mode 100644
index 0000000..c1c75db
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/build.properties
@@ -0,0 +1,10 @@
+bin.includes = icons/,\
+               doc/,\
+               *.jar,\
+               plugin.xml,\
+               plugin.properties,\
+               install.txt,\
+               .classpath,\
+               .project,\
+               
+source.quantum.jar = src/
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Custom Copy.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Custom Copy.html
new file mode 100644
index 0000000..e9b8ee4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Custom Copy.html	
@@ -0,0 +1,99 @@
+ 
+<p>Author: jparrai<br>
+  Date: 26-08-2003<br>
+  Subject: Using the Custom Copy facility<br>
+</p>
+<p> The "Custom Copy" feature is meant to allow the user to customize the copy 
+  format of tables and columns.</p>
+<p><b>How to use </b>: You are in the Bookmarks View, or the Subset View. You 
+  select the tables, views and columns that you want to copy. Be sure that only 
+  tables, views and columns are selected. Then you select "Custom Copy" in the 
+  context menu. By default, a blank sub-menu will appear. You have to customize 
+  it to do something. </p>
+<p><b>How to customize</b> : You go to the <b>Window->Preferences</b> , then <b>QuantumDB->Copy-&gt;Custom 
+  Copy 1</b>. You can have up to three different templates, that will appear in 
+  the sub-menu with the names you give to them. So you start the Custom Copy 1 
+  preferences page. </p>
+<p>There you have some boxes to fill up. The idea is that you will have a list 
+  of tables (from now on, tables will mean "tables and views"). This list of tables 
+  is composed of the directly selected tables plus the implicitely selected (because 
+  a column of it is selected). You choose a general template format, and the formats 
+  of the lists and items. The possible variables you have to play are: </p>
+<blockquote> 
+  <p><b>${schema}</b> The schema of the table or column. Valid in all format specifiers 
+    except Template. </p>
+  <p><b>${table}</b> The table name, without schema. Valid in all format specifiers 
+    except Template. </p>
+  <p><b>${qualified}</b> Same as ${schema}.${table} Valid in all format specifiers 
+    except Template. </p>
+  <p><b>${column}</b> The column name. Only valid for Column specifiers. </p>
+  <p><b>${column_list}</b> The list of all columns. Only valid for Table specifiers. 
+  </p>
+  <p><b>${table_list}</b> The list of all tables. Only valid in Template. This 
+    is the only variable that can be used in Template. </p>
+  <p><b>\n</b> Inserts a new line </p>
+  <p><b>\t</b> Inserts a tab character</p>
+</blockquote>
+<p>It's faster to explain by example. Suppose I select the columns ENAME and JOB 
+  from the table BONUS in schema SCOTT, and also the entire table DEPT from same 
+  schema. </p>
+<blockquote> 
+  <p>&nbsp;</p>
+  <table width="75%" border="1">
+    <tr> 
+      <td>BONUS<i> (implicit)</i></td>
+      <td>ENAME<i> (selected)</i></td>
+    </tr>
+    <tr> 
+      <td>&nbsp;</td>
+      <td>JOB<i> (selected)</i></td>
+    </tr>
+    <tr> 
+      <td>DEPT <i>(selected)</i></td>
+      <td>DEPTO <i>(implicit)</i></td>
+    </tr>
+    <tr> 
+      <td>&nbsp;</td>
+      <td>DNAME <i>(implicit)</i></td>
+    </tr>
+    <tr> 
+      <td>&nbsp;</td>
+      <td>LOC<i> (implicit)</i></td>
+    </tr>
+  </table>
+</blockquote>
+<p>Now I have the specifiers : </p>
+<ul>
+  <li><b>Name</b>: AnyName </li>
+  <li><b>Table Item</b>: Call_Func(${column_list}) </li>
+  <li><b>Table Separator</b>: \n </li>
+  <li><b>Column Item</b>:${column} </li>
+  <li><b>Column Separator</b>: , </li>
+  <li><b>Template</b>: //Generated code\n${table_list}\n//End of generated code 
+  </li>
+</ul>
+<p>The result will be: </p>
+<blockquote> 
+  <blockquote> 
+    <p><i>// Generated code</i></p>
+    <p><i> Call_Func(ENAME, JOB)</i></p>
+    <p><i> Call_Func(DEPTNO, DNAME, LOC)</i></p>
+    <p><i> //End of generated code</i></p>
+  </blockquote>
+</blockquote>
+<p> If I want only a list of columns, I can set: </p>
+<ul>
+  <li><b>Name</b>: AnyName </li>
+  <li><b>Table Item:</b> ${column_list} </li>
+  <li><b>Table Separator</b>:, </li>
+  <li><b>Column Item</b>:${qualified}.${column} </li>
+  <li><b>Column Separator</b>: , </li>
+  <li><b>Template</b>: (${table_list}) </li>
+</ul>
+<p>The result will be: </p>
+<blockquote>
+  <blockquote> 
+    <p><i>(SCOTT.BONUS.ENAME, SCOTT.BONUS.JOB, SCOTT.DEPT.DEPTNO, SCOTT.DEPT.DNAME, 
+      SCOTT.DEPT.LOC) </i></p>
+  </blockquote>
+</blockquote>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Structure.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Structure.html
new file mode 100644
index 0000000..b2f04d1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/Structure.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
+	<TITLE></TITLE>
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1Beta  (Win32)">
+	<META NAME="CREATED" CONTENT="20030628;15450300">
+	<META NAME="CHANGED" CONTENT="20030703;16152310">
+	<STYLE>
+	<!--
+		@page { size: 21.59cm 27.94cm; margin: 2cm }
+		P { margin-bottom: 0.21cm }
+		H3 { margin-bottom: 0.21cm }
+		H3.western { font-family: "Arial", sans-serif }
+		H3.cjk { font-family: "MS Mincho" }
+	-->
+	</STYLE>
+</HEAD>
+<BODY LANG="" DIR="LTR">
+Author: jparrai<br>
+Date: 28-06-2003<br>
+Subject: Highlights of the structure of data in Quantum.<br>
+<H3 CLASS="western">Quantum program data structure</H3>
+<P>After loading the Quantum plug-in, the saved-state file (an xml file) is loaded 
+  up. Bookmarks are loaded into the <font face="Courier New, Courier, mono">BookmarkContentProvider 
+  </font>and the <font face="Courier New, Courier, mono">SubsetContentProvider</font> 
+  classes, where they are stored in the form of a vector of <font face="Courier New, Courier, mono">BookmarkNode</font> 
+  and SubsetNode respectively.</P>
+<P>A <font face="Courier New, Courier, mono">SubsetNode</font> has a number of 
+  children, objects of class <font face="Courier New, Courier, mono">ObjectNode</font>. 
+  Each <font face="Courier New, Courier, mono">ObjectNode</font> has an <font face="Courier New, Courier, mono">ObjectMetaData</font> 
+  instance that will hold the metadata (columns names, sizes and that stuff) of 
+  the table or view that it (the <font face="Courier New, Courier, mono">ObjectNode</font>) 
+  references. That metadata is loaded from the saved-state file also on load-up 
+  of the plug-in (three hypen-words in a single-sentence, wow! :)</P>
+<P>A <font face="Courier New, Courier, mono">BookmarkNode</font> represents a 
+  connection with a database. It will be displayed by the <font face="Courier New, Courier, mono">BookmarView</font> 
+  view. When you double-click on one of the bookmarks, the function <font face="Courier New, Courier, mono">MultiSQLServer.connect(current)</font> 
+  willl be called. <font face="Courier New, Courier, mono">MultiSQLServer</font> 
+  is a Singleton (a class that will have a single instance), so we can get the 
+  instance of it with <font face="Courier New, Courier, mono">MultiSQLServer.getInstance()</font>.</P>
+<P>The <font face="Courier New, Courier, mono">connect()</font> function will 
+  use the JDBC driver and connect to the database. After that, the BookmarkNode 
+  will have its <font face="Courier New, Courier, mono">con</font> member assigned 
+  (not null). After the connection, the function that is answering your double-clicking 
+  (<font face="Courier New, Courier, mono">ConnectAction.run()</font>), will try 
+  to get the tables, views, etc from that connection. To do that, it will call 
+  <font face="Courier New, Courier, mono">BookmarkView.refreshBookmarkData()</font>, 
+  that will query the database. As the procedure to get the tables may be different 
+  for each database, the actual querying is delegated to another class <font face="Courier New, Courier, mono">SQLHelper</font>, 
+  that will centralize that kind of procedures (the ones that depend on the type 
+  of the database). The called function in this case is <font face="Courier New, Courier, mono">getTableList()</font>. 
+  <font face="Courier New, Courier, mono">SQLHelper</font> is not a Singleton, 
+  although it could be, but we don't really need an instance because the functions 
+  are all static.</P>
+<P>The <font face="Courier New, Courier, mono">getTableList()</font> will try 
+  to get the tables from the function <font face="Courier New, Courier, mono">MultiSQLServer.listTables()</font>, 
+  if the jdbc adapter of the bookmark is generic. listTables will ask the jdbc 
+  driver directly for the list of tables, using the <font face="Courier New, Courier, mono">DatabaseMetadata.getTables() 
+  </font>call. If the adapter is not generic, it will use a SQL statement to get 
+  the list of table names. This SQL statement will be of course different in every 
+  database, so it will come from the <font face="Courier New, Courier, mono">DatabaseAdapter</font> 
+  class. </P>
+<P>The <font face="Courier New, Courier, mono">DatabaseAdapter</font> class is 
+  the one where you should put all the functions that will be different for each 
+  database. Then for each database, you create an &quot;adapter&quot; class derived 
+  from <font face="Courier New, Courier, mono">DatabaseAdapter</font>, and implement 
+  all the necessary abstract functions. So you get a proper adapter using <font face="Courier New, Courier, mono">DatabaseAdapter 
+  adapter = AdapterFactory.getInstance().getAdapter(current.getType())</font>, 
+  and the returned adapter will have the proper type (always a derived type from 
+  <font face="Courier New, Courier, mono">DatabaseAdapter</font>). Then calls 
+  to the adapter object will be redirected to the proper function.</P>
+<P>The <font face="Courier New, Courier, mono">TableNode</font> objects generated 
+  will have metadata, i.e. columns. That information is saved in an object of 
+  class <font face="Courier New, Courier, mono">ObjectMetaData</font> in the TableNode 
+  object. This ObjectMetaData class is part of the metadata package, that has 
+  basically four classes:</P>
+<P><font face="Courier New, Courier, mono">MetaDataJDBCInterface</font> : Basically 
+  takes care (through static functions) of passing the metadata from the jdbc 
+  driver to the ObjectMetadata class.</P>
+<P><font face="Courier New, Courier, mono">MetaDataXMLInterface</font> : Handles 
+  interface between an ObjectMetaData and XML storage. It can write an existing 
+  metadata object to XML and generate a new ObjectMetaData from existing XML.</P>
+<P><font face="Courier New, Courier, mono">ObjectMetaData</font> : The class that 
+  has all the metadata. Rather underdeveloped, one must add functions as needed. 
+  The metadata is saved in the form of StringMatrix objects.</P>
+<P><font face="Courier New, Courier, mono">StringMatrix</font> : A matrix of strings. 
+  Saves the results from the jdbc driver, usually given as ResultSet objects, 
+  that are very similar in structure but sequential in nature (you access the 
+  records one at a time). The first line of the matrix are the names of the columns, 
+  and the rest hold the values.</P>
+<P>&nbsp;</P>
+<P><img src="structure.gif" width="749" height="313"></P>
+<P><br>
+</P>
+<P>&nbsp;</P>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/book.css b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/book.css
new file mode 100644
index 0000000..b6da4c8
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/book.css
@@ -0,0 +1 @@
+P.Code {
	display: block;
	text-align: left;
	text-indent: 0.00pt;
	margin-top: 0.000000pt;
	margin-bottom: 0.000000pt;
	margin-right: 0.000000pt;
	margin-left: 15pt;
	font-size: 10.000000pt;
	font-weight: medium;
	font-style: Regular;
	color: #4444CC;
	text-decoration: none;
	vertical-align: baseline;
	text-transform: none;
	font-family: "Courier New";
}
H6.CaptionFigColumn {
	display: block;
	text-align: left;
	text-indent: 0.000000pt;
	margin-top: 3.000000pt;
	margin-bottom: 11.000000pt;
	margin-right: 0.000000pt;
	margin-left: 0.000000pt;
	font-size: 9.000000pt;
	font-weight: medium;
	font-style: Italic;
	color: #000000;
	text-decoration: none;
	vertical-align: baseline;
	text-transform: none;
	font-family: "Arial";
}
P.Note {
	display: block;
	text-align: left;
	text-indent: 0pt;
	margin-top: 19.500000pt;
	margin-bottom: 19.500000pt;
	margin-right: 0.000000pt;
	margin-left: 30pt;
	font-size: 11.000000pt;
	font-weight: medium;
	font-style: Italic;
	color: #000000;
	text-decoration: none;
	vertical-align: baseline;
	text-transform: none;
	font-family: "Arial";
}
EM.UILabel {
	font-weight: Bold;
	font-style: Regular;
	text-decoration: none;
	vertical-align: baseline;
	text-transform: none;
}
EM.CodeName {
	font-weight: Bold;
	font-style: Regular;
	text-decoration: none;
	vertical-align: baseline;
	text-transform: none;
	font-family:"Courier New";
}




/* following font face declarations need to be removed for DBCS */

body, h1, h2, h3, h4, ,h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
pre				{ font-family: Courier, monospace}

/* end font face declarations */

/* following font size declarations should be OK for DBCS */
body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
pre				{ font-size: 10pt}

/* end font size declarations */

body	     { background: #FFFFFF}
h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
p            { margin-top: 10px; margin-bottom: 10px }
pre	     { margin-left: 6; font-size: 9pt }
a:link	     { color: #0000FF }
a:hover	     { color: #000080 }
a:visited    { text-decoration: underline }
ul	     { margin-top: 0; margin-bottom: 10 }
li	     { margin-top: 0; margin-bottom: 0 } 
li p	     { margin-top: 0; margin-bottom: 0 } 
ol	     { margin-top: 0; margin-bottom: 10 }
dl	     { margin-top: 0; margin-bottom: 10 }
dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
dd	     { margin-top: 0; margin-bottom: 0 }
strong	     { font-weight: bold}
em	     { font-style: italic}
var	     { font-style: italic}
div.revision { border-left-style: solid; border-left-width: thin; 
				   border-left-color: #7B68EE; padding-left:5 }
th	     { font-weight: bold }
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/connect.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/connect.html
new file mode 100644
index 0000000..b6b8e63
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/connect.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type"
+ content="text/html; charset=ISO-8859-1">
+  <title>Making a Quantumdb connexion (bookmark)</title>
+</head>
+<body>
+Author: jparrai<br>
+Date: 28-03-2003<br>
+Subject: Making a Quantumdb connexion<br>
+<br>
+To connect to a database (create a bookmark in quantum) you use the <span
+ style="font-weight: bold;">New Bookmark</span> menu item that appears
+when right-clicking on the blank space in the <span
+ style="font-weight: bold;">Database Bookmarks</span> view.<br>
+<br>
+The data that the form asks of you is:<br>
+<br>
+<ul>
+  <li><big><b>Bookmark name:</b></big> Is your private name of the bookmark you 
+    are creating. It will appear in the view after is created. For example <span
+ style="font-weight: bold;">Test</span>.</li>
+  <li><big><b>Username:</b></big> The username for accessing the database. For 
+    example <span style="font-weight: bold;">SCOTT</span> for the classical Oracle 
+    examples.</li>
+  <li><big><b>Password:</b></big> The password for that username. For example 
+    <span
+ style="font-weight: bold;">TIGER</span> for the SCOTT user. If you leave the 
+    password blank, it'll ask you for it when connection is attempted.This behaviour 
+    can be customized.</li>
+  <li><big><b>Schema</b>: (optional):</big> The schema of the user. We can leave 
+    it blank.</li>
+  <li><big><b>Connect</b>:</big> Connect string, the format is (for Oracle) <font
+ face="Geneva, Arial, Helvetica, sans-serif" size="2"><span
+ style="font-weight: bold;">jdbc:[database]:[type]:@[host]:[port]:[database]</span>, 
+    for example, for an Oracle database called DEV based on the same computer 
+    you could put <span style="font-weight: bold;">jdbc:oracle:thin:@localhost:1521:DEV</span>.</font></li>
+  <li><big><b>Driver</b>:</big> The driver name, it should be in the documentation 
+    of the JDBC driver. For Oracle, is usually <span
+ style="font-weight: bold;">oracle.jdbc.OracleDriver</span> or <span
+ style="font-weight: bold;">oracle.jdbc.driver.OracleDriver </span> (Oracle before 
+    version 9)</li>
+  <li><big><b>Type</b>:</big> The type of the database. It will be used by Quantum 
+    to adapt the SQL queries to the particular incompatibilites of each. The generic 
+    should work for most of the features, so if you don't find your database on 
+    the drop-down, use the <span
+ style="font-weight: bold;">Generic SQL</span>.<br>
+  </li>
+  <li><big><b>Driver Filename</b>:</big> You can select the <span
+ style="font-weight: bold;">.jar</span> or <span
+ style="font-weight: bold;">.zip</span> file where the driver is located. For 
+    example in Oracle is usually at <span
+ style="font-weight: bold;">C:\Oracle\jdbc\lib\classes12.jar</span>, being C:\Oracle 
+    the installation directory of oracle.</li>
+</ul>
+<br>
+Other examples (only as orientation, your particular data may be
+different)<br>
+<br>
+For <span style="font-weight: bold;">MySql</span> (in Windows):<br>
+<pre>Connect: <span style="font-weight: bold;">jdbc:mysql://localhost/test</span><br>Driver: <span
+ style="font-weight: bold;">com.mysql.jdbc.Driver</span><br>Driver Filename: <span
+ style="font-weight: bold;">C:\mysql\jdbc\mysql-connector-java-2.0.4-bin.jar</span><br><br>For <span
+ style="font-weight: bold;">PostgreSql</span> (in Linux):<br><br>Connect: <span
+ style="font-weight: bold;">jdbc:postgresql://localhost/emsdevel</span><br>Driver: <span
+ style="font-weight: bold;">org.postgresql.Driver</span><br>driver filename: <span
+ style="font-weight: bold;">/opt/postgresql/share/java/postgresql.jar</span><br><br><br></pre>
+<br>
+</body>
+</html>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/developers.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/developers.html
new file mode 100644
index 0000000..34724ed
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/developers.html
@@ -0,0 +1,301 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type"
+ content="text/html; charset=ISO-8859-1">
+  <title>Tutorial of developing and changing QuantumDb</title>
+</head>
+<body>
+Author: jparrai<br>
+Date: 28-03-2003<br>
+Subject: Tutorial of developing and changing QuantumDb<br>
+<br>
+To modify the quantumdb plug-in, first you get it to a development
+system, usually Eclipse itself.<br>
+<h3> 1. Getting the project from CVS.<br>
+</h3>
+First you go to <span style="font-weight: bold;">Open a Perspective</span>
+and open the <span style="font-weight: bold;">CVS repository exploring
+perspective</span>. It can be in the <span style="font-weight: bold;">Others...</span>.
+You get a perspective. You right-click on the <span
+ style="font-weight: bold;">CVS Repositories</span> view and create a <span
+ style="font-weight: bold;">New -&gt; Repository Location...</span><br>
+The data to access quantum is:<br>
+<br>
+Host: <span style="font-weight: bold;">cvs.sourceforge.net</span><br>
+Repository Path: <span style="font-weight: bold;">/cvsroot/quantum</span><br>
+User: <span style="font-weight: bold;">anonymous</span><br>
+Password:<br>
+<br>
+There is no password for <span style="font-style: italic;">anonymous</span>.
+You can substitute the User and Password for you own, if you are
+registered in <a href="http://sourceforge.net">sourcefoge.net</a>. If
+you want developer access, remember to use <span
+ style="font-style: italic;">extssh</span> as the connexion type, so as
+to be able to update the cvs repository with your changes (that need a
+ssh connection in <a href="http://sourceforge.net">sourceforge</a>)<br>
+<br>
+After that, if you are connected to the Net, you will be able to get
+the project files. You will see a <span style="font-weight: bold;">HEAD</span>
+sub-item, a <span style="font-weight: bold;">Branches</span>, and a <span
+ style="font-weight: bold;">Versions</span>. You select the <span
+ style="font-weight: bold;">HEAD</span>, and then right-click onto <span
+ style="font-weight: bold;">quantum-plugin</span>. Then select <span
+ style="font-weight: bold;">Check Out As...</span>. You cannot check it
+out as a Project, because some files are not present, mainly the <span
+ style="font-style: italic;">.project</span> and <span
+ style="font-style: italic;">.classpath</span>.<br>
+<br>
+<h3> 2. Configuring the project.<br>
+</h3>
+So you "Check Out As..." and select an Plug-In project, call it as you
+wish, (I will use "com.quantum") and then select an Empty Plug In. If
+everything goes ok, you should end with a new project and about 1600
+errors. The errors are caused because you have now a default classpath,
+and the quantumdb project uses some plug-ins, so these plug-ins
+directories must be referenced.<br>
+<br>
+My classpath for Eclipse 2.0 is as follows:<br>
+<br>
+<span style="font-family: monospace;"><nobr> &lt;?xml version="1.0"
+encoding="UTF-8"?&gt;</nobr></span><br style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &lt;classpath&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="src" path="src"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT"
+sourcepath="JRE_SRC"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.core.boot_2.0.2/boot.jar"
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.source_2.0.2/src/org.eclipse.core.boot_2.0.2/bootsrc.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.core.runtime_2.0.2/runtime.jar"
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.source_2.0.2/src/org.eclipse.core.runtime_2.0.2/runtimesrc.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.core.resources_2.0.1/resources.jar"
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.source_2.0.2/src/org.eclipse.core.resources_2.0.1/resourcessrc.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.swt.win32_2.0.2/ws/win32/swt.jar"
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.win32.source_2.0.2/src/org.eclipse.swt.win32_2.0.2/ws/win32/swtsrc.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.ui_2.0.2/workbench.jar"
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.source_2.0.2/src/org.eclipse.ui_2.0.2/workbenchsrc.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="lib"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+path="C:/Parsec/eclipse/plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar"</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; rootpath=""
+sourcepath="C:/Parsec/eclipse/plugins/org.eclipse.platform.win32.source_2.0.2/src/org.eclipse.ui.win32_2.0.0/workbenchwin32src.zip"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &nbsp;&nbsp;&nbsp;
+&lt;classpathentry kind="output" path="bin"/&gt;</nobr></span><br
+ style="font-family: monospace;">
+<span style="font-family: monospace;"><nobr> &lt;/classpath&gt;</nobr></span><br
+ style="font-family: monospace;">
+<br>
+Where, as you can see, my Eclipse home is <span
+ style="font-family: monospace;">C:\Parsec\eclipse</span>. In any case,
+you need to reference those plug-ins you see below, from org.eclipse:<br>
+<ul>
+  <li> core.boot</li>
+  <li> core.runtime</li>
+  <li> core.resources</li>
+  <li> ui</li>
+  <li> swt.win32 (substitute by your platform)</li>
+  <li> ui.win32 (substitute by your platform)</li>
+</ul>
+<p><br>
+  Remember after changing manually the <span style="font-style: italic;">.classpath</span> 
+  file that you have to <span style="font-weight: bold;">Refresh</span> the project 
+  to take the changes in.<br>
+  <br>
+  If you want to reference those plug-ins using the workspace, select <span
+ style="font-weight: bold;">Properties </span>from the newly created <span
+ style="font-weight: bold;">com.quantum</span> project and go to <span
+ style="font-weight: bold;">Java Build Path</span>, then <span
+ style="font-weight: bold;">Libraries </span>tab, and select the <span
+ style="font-weight: bold;">.jar</span> files the project needs.<br>
+  <br>
+  It should now build without errors.<br>
+  <br>
+  In Eclipse 2.1 that won't work. Dependencies amongs plug-ins have changed and 
+  instead of redoing all of them again I chose to use the new "classpath container" 
+  facility. When I say that won't work I mean if linking against the 2.1 libraries. 
+  If you link against the 2.0 libraries will work all right.<br>
+</p>
+<p>The libraries for 2.1 are as follows (I copy my classpath) :</p>
+<p><font face="Courier New, Courier, mono">&lt;classpath&gt;<br>
+  &lt;classpathentry kind=&quot;src&quot; path=&quot;src&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.0/boot.jar&quot; sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.0/bootsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.0/runtime.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.0/runtimesrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.0/resources.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.0/resourcessrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.0/ws/win32/swtsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.0/ui.jar&quot; sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.0/uisrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar&quot; sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.0/jface.jar&quot; sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.0/jfacesrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar&quot; sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.0/workbenchsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.ui.win32_2.1.0/workbenchwin32src.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_2.1.0/texteditorsrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;var&quot;<br>
+  path=&quot;ECLIPSE_HOME/plugins/org.eclipse.ui.editors_2.1.0/editors.jar&quot; 
+  sourcepath=&quot;ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_2.1.0/editorssrc.zip&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;con&quot; path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;<br>
+  &lt;classpathentry kind=&quot;output&quot; path=&quot;bin&quot;/&gt;<br>
+  &lt;/classpath&gt;<br>
+  <br>
+  </font></p>
+<h3>3. Running the project.<br>
+</h3>
+First go to <span style="font-weight: bold;">Window -&gt; Preferences
+-&gt; Plug-in Development -&gt; Target Platform</span> and to select all
+the plug-ins that should be used when running a platform from the
+plug-in development. I select all of them not in the workspace because I
+don't want to resolve all the cross-references.<br>
+<br>
+Then go to <span style="font-weight: bold;">Run -&gt; Run As -&gt;
+Run-time Workbench</span>. If all is well, a new workbench should
+appear, that has you just-compiled quantum plug-in installed. To check
+it, open the quantumdb perspective (<span style="font-weight: bold;">Perspective
+Button -&gt; Others... -&gt;QuantumDb Perspective</span>), and see if
+it appears. This is not<br>
+the usual QuantumDb perspective, but the one you are developing. Of
+course, if you have made no change to the standard source, there is no
+difference. <br>
+<br>
+<h3>4. Making a small change.<br>
+</h3>
+To check that we are really using our modified QuantumDb, and not the
+standard, let's make a change. Open the <span
+ style="font-style: italic;">QuantumResources.properties</span> file,
+(in the <span style="font-weight: bold;">com.quantum</span> package),
+and modify the line<br>
+<br>
+<span style="font-family: monospace;"><nobr> bookmarkview.newBookmark =
+New Bookmark...</nobr></span><br>
+<br>
+to <br>
+<br>
+<span style="font-family: monospace;"><nobr> bookmarkview.newBookmark =
+Add New Bookmark...</nobr></span><br>
+<br>
+(for example)<br>
+<br>
+Then Run the testing workbench again, you can now use simply <span
+ style="font-weight: bold;">Ctrl+F11</span> to run the last launched
+environment. Now, in the bookmark view, when you right-click on it, it
+should show your modified string. So you are now ready to change the
+plug-in.<br>
+<h3> 5. Creating a .jar file.<br>
+</h3>
+<p>You may simply want to make a <span style="font-style: italic;">.jar</span> 
+  file from some configuration taken from the CVS, so as to have the latest version 
+  available to you. You have to follow the same instructions as before for installation. 
+  When it's installed and built, select the <span style="font-weight: bold;">com.quantum</span> 
+  project, right-click on it and select <span style="font-weight: bold;">Export</span>.<br>
+  <br>
+  In Eclipse 2.0: Select <span style="font-weight: bold;">jar File</span> and 
+  then choose a directory. The name of the jar file should be <span
+ style="font-weight: bold;">Quantum.jar</span> as that's the name stated in the 
+  <span style="font-style: italic;">plugin.xml</span> file.<br>
+  <br>
+  To install this jar file as a plug-in, create a directory called <span
+ style="font-style: italic;">com.quantum</span> in the directory <span
+ style="font-style: italic;">plugins</span> under your local Eclipse installation 
+  directory. Copy the jar file to that directory, and uncompress it (without deleting 
+  it) into that same directory. In fact, I think you only need the <span style="font-style: italic;">icons</span> 
+  directory and the <span style="font-style: italic;">plugin.xlm</span>, but you 
+  can leave the rest of the files so they feel not so alone.<br>
+  <br>
+  You close your Eclipse IDE and open it up again, and the QuantumDB perspective 
+  should be available.<br>
+</p>
+<h3>6. Uploading the change to CVS.</h3>
+<p>(I copy directly from the Eclipse Help, so as to have all the info in the same 
+  place) </p>
+<h4>Synchronizing with a CVS repository</h4>
+<p><br>
+  In the CVS team programming environment, there are two distinct processes involved 
+  in synchronizing resources: updating with the latest changes from a branch and 
+  committing to the branch. </p>
+<p>When you make changes in the Workbench, the resources are saved locally. Eventually 
+  you will want to commit your changes to the branch so others can have access 
+  to them. Meanwhile, others may have committed changes to the branch. You will 
+  want to update your Workbench resources with their changes.</p>
+<p>Important!: It is preferable to update before committing, in case there are 
+  conflicts with the resources in your Workbench and the resources currently in 
+  the branch. </p>
+<p>The synchronize view contains filters to control whether you want to view only 
+  incoming changes or outgoing changes. Incoming changes come from the branch. 
+  If accepted, they will update the Workbench resource to the latest version currently 
+  committed into the branch. Outgoing changes come from the Workbench. If committed, 
+  they will change the branch resources to match those currently present in the 
+  Workbench. </p>
+<p>Regardless of which mode (filter) you select, the Synchronize view always shows 
+  you conflicts that arise when you have locally modified a resource for which 
+  a more recent version is available in the branch. In this situation you can 
+  choose to do one of three things: update the resource from the branch, commit 
+  your version of the resource to the branch ,or merge your work with the changes 
+  in the branch resource. Typically you will want to merge, as the other two options 
+  will result in loss of work. </p>
+<p>(End of copy from Eclipse Help, there are lots more, just go there and have 
+  a look) Basically to get all the changes since the last time you took the sources, 
+  then accept all the files that have changed in the CVS and you haven't touched. 
+  If there are some that you have touched and are also touched by someone else 
+  at CVS then you have to inspect the changes, see if they conflict with yours, 
+  and merge both until you have a working set. Then you can upload that &quot;working&quot; 
+  set to CVS. That's more or less the idea.</p>
+</body>
+</html>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_connections.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_connections.html
new file mode 100644
index 0000000..c14d6aa
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_connections.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type"
+ content="text/html; charset=ISO-8859-1">
+  <title>Creating a QuantumDB Bookmark</title>
+  <link rel="stylesheet" href="book.css" charset="ISO-8859-1" type="text/css"></head>
+</head>
+<body>
+<h1>Creating a QuantumDB Bookmark</h1>
+<p>Author: jparrai<br>
+Date: 28-03-2003<br>
+<p>To connect to a database (create a bookmark in quantum) you use the <span
+ style="font-weight: bold;">New Bookmark</span> menu item that appears
+when right-clicking on the blank space in the <span
+ style="font-weight: bold;">Database Bookmarks</span> view.</p>
+ 
+<img src="images/newbookmark_menu.gif" />
+
+<p>Once this menu item is selected, you will see the "New Bookmark" wizard:</p>
+
+<img src="images/newbookmark_wizard.gif" />
+
+<p>The data that the form asks of you is:
+<ul>
+  <li><b>Bookmark name:</b> Is your private name of the bookmark you 
+    are creating. It will appear in the view after is created. For example <span
+ style="font-weight: bold;">Test</span>.</li>
+  <li><b>Username:</b> The username for accessing the database. For 
+    example <span style="font-weight: bold;">SCOTT</span> for the classical Oracle 
+    examples.</li>
+  <li><b>Password:</b> The password for that username. For example 
+    "TIGER" for the "SCOTT" user.</li>
+  <li><b>Prompt for Password:</b> Check this box if you want to be prompted for a password
+    every time you try to connect to the database.</li>
+  <li><b>Schema</b>: (optional): The schema of the user. We can leave 
+    it blank.</li>
+  <li><b>Connect</b>: Connect string, the format is (for Oracle) <font
+ face="Geneva, Arial, Helvetica, sans-serif" size="2"><span
+ style="font-weight: bold;">jdbc:[database]:[type]:@[host]:[port]:[database]</span>, 
+    for example, for an Oracle database called DEV based on the same computer 
+    you could put <span style="font-weight: bold;">jdbc:oracle:thin:@localhost:1521:DEV</span>.</font></li>
+  <li><b>Driver</b>: The driver name, it should be in the documentation 
+    of the JDBC driver. For Oracle, is usually <span
+ style="font-weight: bold;">oracle.jdbc.OracleDriver</span> or <span
+ style="font-weight: bold;">oracle.jdbc.driver.OracleDriver </span> (Oracle before 
+    version 9)</li>
+  <li><b>Type</b>: The type of the database. It will be used by Quantum 
+    to adapt the SQL queries to the particular incompatibilites of each. The generic 
+    should work for most of the features, so if you don't find your database on 
+    the drop-down, use the <span
+ style="font-weight: bold;">Generic SQL</span>.<br>
+  </li>
+  <li><b>Driver Filename</b>: You can select the <span
+ style="font-weight: bold;">.jar</span> or <span
+ style="font-weight: bold;">.zip</span> file where the driver is located. For 
+    example in Oracle is usually at <span
+ style="font-weight: bold;">C:\Oracle\jdbc\lib\classes12.jar</span>, being C:\Oracle 
+    the installation directory of oracle.</li>
+</ul>
+<p>Other examples (only as orientation, your particular data may be
+different)<br>
+<p>
+For <span style="font-weight: bold;">MySql</span> (in Windows):</p>
+<pre>Connect: <span style="font-weight: bold;">jdbc:mysql://localhost/test</span><br>Driver: <span
+ style="font-weight: bold;">com.mysql.jdbc.Driver</span><br>Driver Filename: <span
+ style="font-weight: bold;">C:\mysql\jdbc\mysql-connector-java-2.0.4-bin.jar</span><br>
+</pre>
+ <p>For <span
+ style="font-weight: bold;">PostgreSql</span> (in Linux):</p>
+<pre>
+ <br>Connect: <span
+ style="font-weight: bold;">jdbc:postgresql://localhost/emsdevel</span><br>Driver: <span
+ style="font-weight: bold;">org.postgresql.Driver</span><br>driver filename: <span
+ style="font-weight: bold;">/opt/postgresql/share/java/postgresql.jar</span></pre>
+</body>
+</html>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_perspective.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_perspective.html
new file mode 100644
index 0000000..442ceb9
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/getting_started_perspective.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Opening the Quantum DB Perspective</title>
+  <link rel="stylesheet" href="book.css" charset="ISO-8859-1" type="text/css"></head>
+</head>
+
+<body>
+<h1>Opening the Quantum DB Perspective</h1>
+<p>Typically, the first thing you do with the Quantum plug-in is to open the Quantum DB Perspective.
+Go to <code>Window -&gt; Open Perspective -&gt; Other...</code> to get the "Select Perspective" 
+dialog.</p>
+
+<img src="images/open_perspective.gif"/>
+
+<p>Choose the "Quantum DB Perspective" option from the list:</p>
+
+<img src="images/select_perspective_dialog.gif" />
+
+<p>The Quantum DB Perspective looks like this:</p>
+
+<img src="images/quantum_perspective.gif" />
+
+<p>The first time you open the Quantum DB perspective, you won't see any bookmarks defined.
+</body>
+</html>
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/logo.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..969a593172fa155c90bd65d2e50bc7747e7f3926
GIT binary patch
literal 9740
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_menu.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f6014e299eabb08d44699139e1bf890af4e3c3e2
GIT binary patch
literal 4120
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_wizard.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/newbookmark_wizard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..30f148a8c2c05a5cc5cb98d4f538a5563c29ba71
GIT binary patch
literal 8861
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/open_perspective.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/open_perspective.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a6a299d47a266a017bce73e38e69ae1e78dc9c13
GIT binary patch
literal 32416
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/quantum_perspective.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/quantum_perspective.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6682eb357fc37c5e8e2ff41b835455daaaef3af8
GIT binary patch
literal 27548
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
V?(5F(?e6aH4)5`v?NSgB06RO^2Pgml

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/select_perspective_dialog.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/images/select_perspective_dialog.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bfa3e08c112fdf2bb9312cc0712bea35afb1f61d
GIT binary patch
literal 8360
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/index.html b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/index.html
new file mode 100644
index 0000000..7c337f2
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Quantum DB User's Guide</title>
+  <link rel="stylesheet" href="book.css" charset="ISO-8859-1" type="text/css"></head>
+</head>
+
+<body>
+<img src="images/logo.gif" />
+<h1>QuantumDB User's Guide</h1>
+<p>Quantum is a database access plugin for Eclipse.  
+It can be used to connect to databases, list tables and views, and issue ad-hoc queries.
+<p>The Quantum <a href="http://quantum.sourceforge.net/">home page</a> is hosted by Sourceforge. 
+</body>
+</html>
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/structure.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/structure.gif
new file mode 100644
index 0000000000000000000000000000000000000000..283ee3e59f74a78c33497a04f826361e53c7dbd4
GIT binary patch
literal 3882
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

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/doc/toc.xml b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/toc.xml
new file mode 100644
index 0000000..5af310f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/doc/toc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="QuantumDB User's Guide" topic="doc/index.html">
+	<topic label="Getting Started">
+	  <topic label="Opening the Quantum DB Perspective" href="doc/getting_started_perspective.html" />
+	  <topic label="Creating bookmarks" href="doc/getting_started_connections.html" />
+	</topic>
+</toc>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/.xvpics/fulldata-disabled.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/.xvpics/fulldata-disabled.gif
new file mode 100644
index 0000000..ac825ff
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/.xvpics/fulldata-disabled.gif
@@ -0,0 +1,5 @@
+P7 332
+#IMGINFO:16x16 Greyscale (883 bytes)
+#END_OF_COMMENTS
+16 16 255
+I$IIÛ¶¶¶IH%IÛ¶¶ÚI$IIÛ¶¶¶IH%IÛ¶¶ÚI$IImIIIIHJl%Û¶¶I$II¶’’¶‘’¶’$Û¶ÛÛ¶¶H“H%H%IH“HI$IÛ¶¶H“µ’’¶’’‘II$IÛ¶¶H“H%H%IH“HI$IÛ¶¶H“µ’’¶’’‘II$II$II¶%H%H%I¶$Û¶ÛI$II¶’’¶‘’¶’$Û¶ÛI$II¶%H%H%I¶$Û¶ÛI$II¶’’¶‘’¶’$Û¶ÛÛ¶¶H“H%H%IH“HI$IÛ¶¶H“µ’’¶’’‘II$IÛ¶¶HI%IHÛ¶·¶H%IHÛ¶¶¶I$IIÛ¶¶Ú%H%I
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/add.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/add.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0fc47e193cf88cea7e6718e602e71f560cfad5cd
GIT binary patch
literal 238
zcmZ?wbhEHb6krfw*!-X2|NsBbp8bFN6o~$vIrIO_nWtN}oY}nj%!=g)mn}Qc-Myr{
zYjH!vOa=yq0|yQONyVQmj0_BX3_3tI&;$Vn2NsVDCq1=u7c5DrI3Sv4&~`~6fuo}1
z@}Bps=clP?NquKpb$x5ERD#Erk69j~g)@RC7Ie;KW&Uc~JKK+4^OMiIb&(es5AaN$
zlFY)O_|M-tzo4=xGd-h3!N|bCKq0A8A-FV8!8bFxD8IO}xFj{VSVzG#FIi8)F(*eM
m2&AxBAt<#twWusLMUR)u%g0T@JxC!ewMfBG&w!VU!5RS7JYcT?

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/add_schema.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/add_schema.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dbbb9cf9d12173169650b52a838ef22c229783f0
GIT binary patch
literal 154
zcmZ?wbhEHb6krfw*vtR||NsBLb?5GdOP3EEI&2$c=aOJ%>a4fs*0j(HXP^{V34&1k
z$->CMz{Q{g5(1gQz~UZo(o@^lBD-ed{{$tUPFKmt%hcK&H8?etPkub~Eak?eYya%$
rJ#o;H;%|-4pW1y^gx&jOiA0Ez{fdoB5*2H^8qdyN9CG?82ZJ>L+TAx-

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/append.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/append.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2dbb07370b4403f107b44de031079c9ba3982659
GIT binary patch
literal 164
zcmZ?wbhEHb6krfw*vtR||Ns9tFi5nu&6_y!(7bu)ck=SC;^qA#Dth|l$t#yHzk2lw
zr~s@GL@54bVPs(7VbB3_KxQzo1Wq{VsqK0qtL^N%8-^UonjR6e*ccD;aW7xy7O=tT
zjD%adjA=MSnPZ2?iHVC|XnJr=Iyi|b#X-`qEy2n%asEY@qb_0{+TB}{=6bBL|F9!Q
In32I60Jj4>5C8xG

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/autocommit.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/autocommit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..32b77eee23246aea9b62b83c954d325b0fcc14b2
GIT binary patch
literal 207
zcmZ?wbhEHb6krfwSoELa|NsAI&YVe0o0*oD#=yXE;J^VO2?UBiSr{1@SQ&Ic9FSTD
zX2*zKcdP`2j<fA(Vfe+s*%Hd3vNIxb$J8`-HYM`|7mtaC=LH9rh);{@Vds!=)j7Db
zB4*<>w;SgSU;E1LI-S4U18C|$f9L#y%A(Blj1mPS0|Ntvq)LV0(mVy<%;ci{;>zNZ
z)ZAhn1<$->Jq5>{9EBi|!eWJ>)Z)~lveXnkUM?>mHwE_~g|O5j1w%apUM>b}0RJ^a
A3IG5A

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bigtable.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bigtable.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b90c043b856311e3a5aad26a4fbf5dc63d66544d
GIT binary patch
literal 242
zcmZ?wbhEHb6krfwXl4L`|Ns9R7$n--=1rV<Xu*Pu^X8rB<>fta-~d<>g$OUTRQ$=p
z%)r3Np!hGqIlrK?C^J2yM8U|wz(66XQX#lBPr)}cxhTK5vbZEQw^&EPGcQ?B!7(RC
zAqb?fSRp92IJKxOHARn?%ge`2!97SJEVW3%P|tvui-AE0WEsd^3@qLTCp=fnFugu=
zT;#lSi>rklQ_)1V-#l3t&PKmsZ3*$HWbkH^_1D;ZF=L}b-wp5B8As;lI6uA7)_C{Q
Y^p>>7V_K$S4l~Zb*qrLy$-rO@0P&Dd8~^|S

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarkfile.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarkfile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0684ffb91062132cd8c087c4d03fb8ea5d5060ec
GIT binary patch
literal 933
zcmZ?wbhEHb6krfwXlDR{sHmu*;wT1&27CMc3=IEUfM8C`93a>_XYby<OOLJHdu{K%
zdwc)in{({>xlf-y{r~?TtZ$SU4S^va0*XIbfPVPTpab#=C{HkOG%+Z1h-5G{G&Xav
zYxM*OG&nIciV2mx2vA^R7i4F;!NG8-xr>XbBjkmE6APO>yV;2q9~r%-h=%Lwyx6qN
zc_x!(-WpEf^mDB2EDR4g4?I7=z`1%;4?}_@(*h@Rw+|~PCo?cJg$qd>n7XiOeZoOE
aoefhLp4gmWEGD6_ajgSWo+uj&gEatg|4_C7

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarks.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/bookmarks.gif
new file mode 100644
index 0000000000000000000000000000000000000000..137b3ca6c0de8741b010c454c28b4397306a849c
GIT binary patch
literal 238
zcmZ?wbhEHb6krfw*!-UX2>$>7A6^{UFsG?`UhAx_bCw@kx%2AoV~<XJ`t<4i`SVp(
zRXI61yu7>z4jcd~R{Y7r$iTqIpaaqgGJ}D|<HAYLY}SKW*FWrQ+|C#~Sz%F|>cPe|
z<wv_#vYx1@eQ2UHb;<2Fu9+e{%#8tQt0X3#n$urwqsGY6ut<W%NUV#c)s=6`(fK7T
z42u8!o%0JSi!#$QN)(I?3=9;KDiwlD^AvnDlZ*0;D~n4~bBlEpJoA$E6dZGM6oNns
jixq-Wi&KlrQd9JJxx9Sb6x@Rp!cvPA4D}3nxfrYgU5Hs(

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/clear.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/clear.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5cdb88f89fac214808e201448ec522e509ceb337
GIT binary patch
literal 162
zcmZ?wbhEHb6krfwc+9|X|Ni{?`uO?t>-X=UfB*je|NsB*2eRhRZ)j)$vN3_;PZmZ7
z27U$|1|R^L!NB7G;iTtkQ>E95OBGx_cs$a17J8J$TX7w4-L)iftCkMGjlRORQ|%56
w3~Y@NPhCv->KspPsPH*8%l$=eLP^y2y*wK}^UPrGn2}g(q2M*Qf`!2v0Iirzp#T5?

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/close.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/close.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fed9c3baf7e637fc77f82a7fa9337d13b6082212
GIT binary patch
literal 155
zcmV;M0A&A1Nk%w1VGsZi0OJ4vx3{<d|Nm}oZt3ai<mBW4007?J-r3pN)YR0@&d$ln
z$-~3LzP`S>xw-%U|NsC0EC2ui01yBW000C~5Xebu03z$XuLxi$dgNf9C`J-Q!Llx)
zszzZO^*w*bVgH5RE`TTki-=)j30x+I3I)&>9WH*0t8Fo4FbZBTm@#aa&*)ucz2mqu
Jqj)?506R42Nvr?>

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/column.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/column.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c1e2d4dd081627b1cd93787ef5f583282400fca
GIT binary patch
literal 219
zcmZ?wbhEHb6krfwXl4L`|Ns9R7$n--=1rV<Xu*Pu^X8rB<>fta-~dnxOn}rtK?8&0
zPZnkd21W+Oe*w<<1(ija=@}&oMg|533Q3g;!KHZ$zM08I`NfsRC8@c^Itre7$$AQo
zIXMbJAce&WL8-;5MP;cedc0g-K5h!`K?-51MGA&`2E1Gh3_2iNK<;8-F)=vdxq5BV
zlj!5sOox0AnRg^F$b6yUk-o}n;ha=m^9w(}uChJ7YTB=(LAx0)Zsm#+2uRmrVz34P
DWNJqK

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/commit.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/commit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2d31c8b2ccd48d32acf35dccf6c5689a38a04a36
GIT binary patch
literal 252
zcmZ?wbhEHb6krfw*!-UX2>$>7|LN1G^XJbWI&>&6FE24Mk(ZbEz<~oGISioqlZBCi
zfrCK@Bm**ofhA1fq-VA*!)u*&8cq`!8w*M<E#qRIS@$qP?uh2ZV*%H7F0id<TG-0@
zCWk|4;gL6go7$XAs$3q<YMgVv)uOSa+5hV_(^s2ZLd36$D5);HcuHuMx$ch|76!$C
z{?7RYl|`B986^rv1_lNSNtFu0rFjaznaM@@#g)Y+sky~E3Z8k%dJ2v?ISN4_g~bX%
gsl};9WvMB8yj)&BZVK)}3Sp^53Wj<Hyj%>{0EOIEKL7v#

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/connect.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/connect.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41ca0bc9b1ceca98ebbc9f48a2018f531130b641
GIT binary patch
literal 902
zcmZ?wbhEHb6krfwXlG#H;o%7l4J|J(Pn$V&+O%mi&zw2)|Nn#gj~Pb6Xb6me5K#Qd
z!py+H&Y%PGD=1Gea3nKuvsgH6Sm4+U%pEo-CL|nc<>j|y5m=CPgqewn#~@)r!+~xF
zE*=R>A%`OqRM>5DIyNn7oG8G}q%d<ricb?u+O;J&0}h;-q9rZ#f%8k+!G#Qy)c$IO
TGz2f#)>jJA5KU}sV6X-Nm%}vF

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/connected.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/connected.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f97ce626da0dedbba3daaf6850090956c2e0d3a7
GIT binary patch
literal 152
zcmZ?wbhEHb6krfwXl7vG;NS=<j>^u?Zkf|EXX~7$$JXw>w)fccb3pJP8&Leo!oa}r
zpFsym0!<KLU|?}IIO&-!%a~!CbEsWWiupn)qu83rG*-6=kt1AtHX2^noAusoPLJ3Z
l-b(YueK!^#=yQGEKXVDgG7oMh238K6=!UbeHN%w{tO3P#M8yCA

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/copy.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/copy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fa986813a821559ca5120bf8dfaa3c38cd474190
GIT binary patch
literal 288
zcmZ?wbhEHb6krfwIP#z2|NsBbpZ|aU?Ekap|DQek{}hOx{=0ww=iR&CZr}cL_3Hb}
zm*1W_^Z(45XPY;l*}Un@rp;$IZ921Y<LM0>POe#dY}KkGD^?s@x^&;7MZ4!O*g13N
zCI$wE0|yQONeEE<$->CMAj6;o;)3jSVD(Z^?@O`FYiQOAS&*l?Dz_xJi=knc$F&7Z
zX1!H&iVf(MWENu%DC4`%SaCXX?U6Sxz4j^wUVCSzkbIHBchlvkLfpZ7ly9ljWOphu
zDE{+z&M&Ae%1qBFQ7|$vFi=RUR0uB3Q}E49F3K;iEG|jSE!I)+%uCi&aLmb32m&cA
jRtQQhPAw`+P0{1!^73(0a1T-lOD$3`)HC4aVz34PxRisX

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/cut.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/cut.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14b73a8577fa6d300ddf6ea8b1f999ee214f822f
GIT binary patch
literal 652
zcmZ?wbhEHb6krfw*!-UX2>$>7f8f9Y1A~bb6<0oe`ZRs|^scThUS3|190pMQ$->CM
zz{H>fk^z~)z~U2d!c&`dMF30F*_kX^q2&@m*CU&xW@yZoJbt3<Xw99>Z&fz(Z7ByO
z1ey5?m=t(8wA4#99k?d#JZO4kirf6vC%rW#+BF*w8TmflsKj9X_S)5#ckjHvdGqFy
zB};HQ1MV(}dl-@2!&Z8rp}<3jFZ;xjO<`*;&by$#m`%aTP~GRvR43on?ovL-E~bPm
zT0eDJ=hhh23GT9KxkigapE`?M>1(Q~D2mC}GMe&qb$5rjdr$DGW0*2^8be<P0~4Eo
zpb#@J2RqBm5MvQxAy#fKPCou+6TK4{r*EI)w#&tl!Fu8R?OV5e{`g_>+}Q#C{^ez5
ze}4ad_xA0+y?cQn{QLLsZ{NNFgZJ*;yX)7lcX4rncn#uy1|;{hPiv@eYHn#|s4wRi
z?CR<6>!=qLnJgkOb*ccrz=ZO=n&AB0vV7Juc2<@NRrw2Q%IfQut;n9Uc73^0-RA05
z`Rh8Al%?vjt5=qH?B8)nUaXGAWz}{iIjOUf;&ppYlrO12BX;9f>8hn$uHURKy?CcA
zo0Yx((JPnARqxr4ZunB^G-ugSJ^{rI>*VD;T7~#_F+b=#+%BNZ#>Alb&)+$}pt2}4
zJ)=ay$iTorA*oU!xHM0}H#4~?zqqovBsI5KN5L~MSx><+Cr2R&q_9{aD784Xs4O)_
ZkC)5K$4$XKNFgk>NWoCgfR~HG8UX#k=(GR;

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/delete.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/delete.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f506218aef6a12446aded5188db5c782cb61e05
GIT binary patch
literal 143
zcmZ?wbhEHb6krfwXl7t&VPKeJX}Q<Z@*WV)nR9RN-v0~?|1B;5;{b|3S(q6ZI2d#o
zfB<9$1B;EoNzc`LE#jFvbnddr#0p9zn##S%<Z0L{^+o$gQSM{0@cXPiua7U@!PeCH
XX__+=ljkxYt_g8nuDxZ_j11NQtnxos

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/disconnect.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/disconnect.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7efe1f0ed2007870a2a172bffe9091f7a378af03
GIT binary patch
literal 919
zcmZ?wbhEHb6krfwXlG#H;o-5gv`jN*2n`J_FE3A<Idj^yX*189IrIPjgZq#F|NqZ0
z3PwX<_=bSuPZnkd22KVYkQYIDf`OxifuF_0VZ#E)W(ENs27?6;9h+I$L>w9(9B5?Z
z=Vr19Sdi?_ASs;lC4wR4#6)?{7Lk{N42;a$ybKyYH!Wabmf+vj;u+A;)S|}w$>)J_
t;_*5B-AWlVFETJL_K`pJ#KY)?<4hH9h1wq?4cA+korNT<%aR=!tN}KeJwgBg

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/edit.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f56a27e18cb6b099a14306d402269b5fe080e49a
GIT binary patch
literal 441
zcmV;q0Y?5uNk%w1VGsZi0M-8h00030|NpT;RK8AOz`(%T*Zj)J?9R;a&CBo1%I@3Q
z{n^+1$HnT)$?n$F`PbF@ySm}U#O%k$?ZLq2zrN(Yz2n5g>BGY3&(8GJ)A-WS_Rr7%
zuCCUyve~h**uTH$!NKUm!|Kq`_Mf22p`y&Gs?@c%;Iy^gva{T;u-CY`;g^}iqNL5J
zs?){BM$*$$xs6TPudU|1y7Kb!!^6Y2wziLtkBf_oC@3f!8ygJ`4FCWD0000000000
z00000A^8LW000C4EC2ui01yBW000JqK!R{cED8ZSq*7O-<#4xvP&W%ytAIca7sJht
zfmLgS0&D<WSx!ozmPjYg2bqHjykM3o1%hC5FHc`nGb$b-6(R;WE(2>rSsf7+8V!t&
zY=jaM83_u2cY|OT4hWwwp+!^=2L%k5k3?Aq3l^|es!M=5HdRJeRyb={Mntj2$i+bb
zA^uN8Z*X~XX=iA3ATls8Fd$-iAX9a2AWdmwa&L2ab97~Gb1Wc9ZeuPWL2PUwQfX&s
jbaNn5Wpib6c4cHP4GKz3Mj%I0AXa5^ATcg54GI7|8{5iM

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/entitygroup.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/entitygroup.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8bfe5933f4c3f35913b6c76381df7057b1b45518
GIT binary patch
literal 169
zcmZ?wbhEHb6krfwXl7tAG)%U%%nmA!ii)xX;+7VMDN~NknNvMy&bhsFEbr~L{C{uG
z|NlS)1&Tje7#JA-Gw1+Gpa}vD3@l+API_kZGQ8%=&}>jpSft1%ywSi>bCT0_k=KWE
zXN4GO-;xk&adCTmvc<kL|GKor{0okSh5-@ludyT^Tb;B%O7<)Fy;p3VTcUEO$#8tw
PamQ)>?e`U)EDY8FAcRN&

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/export.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/export.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c501e517774083e6f7de72163e008ff5ac843a3d
GIT binary patch
literal 143
zcmZ?wbhEHb6krfwXl4L{7E8-HmQiyotM^*Y*}M1N-v4-k;!hT41_m|;9gtR#84N5o
z7fyJt-g~2o*XZfI5T57=j-ctHjjDUrc6hB9;9wElEVAx#<Bgo8-!E+(6fQ+%TlMZ-
R5mLn+wf;s#h7cozH2`6>M7#h1

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/filter.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/filter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1492b4efae265051c43c5f2870c1f71f97c899e3
GIT binary patch
literal 159
zcmZ?wbhEHb6krfw*v!CSZy#S@Z~y=Q{QLL!|G#g4f4+Tvy#4<D`xzJ*{{R0EB+-E4
zPZmZ722KVYkT}Q;1{NQKlb)+x-I=PZ*dsQDdSp&hdM>+Q8p}12WsEYxhqZ46z5UO4
xC{IX5qW?tG!t@NQxhzk8CmDO_&kQNvl+<eGee>j$RV9uyFP1Eu=fc2X4FC}0Hs=5U

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/fulldata.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/fulldata.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d1c062dfcf4c8a5408d29245e3d9ab910fce173
GIT binary patch
literal 111
zcmZ?wbhEHb6krfwSj50!A75`@KmY&#{|yZd@$vCM1_Kx<{$ycfU|?m?0r5a;8JJBX
zcHQ}xf5Ng;TIqF;G@k<pi_`Ih*=c(7EvAL9I<~-L9hcT)*X+Y`lI_oS9c|ge*utKv
I!oXk+0NRHov;Y7A

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/greentable.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/greentable.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6fc3743ddfa117a3fa2c1080474a42d0b68afb00
GIT binary patch
literal 120
zcmZ?wbhEHb6krfwSj50!V325Qn>TUdp?UMphZjfw2LlEM2F0H&j0_BH3_3tIP^AC^
z1G8<$t~>t>_A#tjdw|i2O*|&R<lym276YT`bRnhA*eknIjxFHuI>Tb!dTv41gEpJy
Ve8<_M(yc2>v{pu~?`C1J1^~LkD@*_Y

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/grid.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/grid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10b0d034e4ad380335c6a20ad3dec1a6dec72b83
GIT binary patch
literal 152
zcmZ?wbhEHb6krfw*vtR||Ns9tFi5nu&6_y!(7bu)PoF$_<?`iMuU-Mg!SX1C;!hSv
z1_n+B9grx<3<efggOi@C_gdUn-0{9imBrCf=t)D!Vb58O8-kKwvT1SG-3e^%Y-&-E
l{Grjj&}D{zjJkuGp`pQx3WaRegSHjCZ0pl}^!$|=tN~uiGN%9l

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b1b49a9b013643e60fe5f59a62c9bdc54bff3bad
GIT binary patch
literal 217
zcmZ?wbhEHb6krfwIKlt||NsBDwavSA=kA3|mk%5|{QFby?;qFxy`FXA*uFm(lTJ?8
zIXB1f=mf2Kxq^p!)Yhbk?9G-1Y5{8{Oep?jVPs$sV$cC81=-2K8n!^CFC}xH`eq$w
zE2HGeJ3b_O`^&vmN&bJJS>+R#l(Mep;RJ(!GAx14jRm(BENX9xGEFLs)=RRnv*5b9
h!K%lio6VZzh~s)|mKWa}4m=nCSFhL9tfI(Z4FD7vOr-z-

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/import.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/import.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2191d137185daf69bc228709faa765cfe339a6a6
GIT binary patch
literal 141
zcmZ?wbhEHb6krfwXl4L{7E8-HmQiyotM^*Y*}M1N-v4-k;!hT41_m|;9gtR#84N5|
z7fyJt-Ww)TbNJa*wy=91oepXo2Td4OZrsG=xJ5|jdb#X_U9k(wnSa)}J<2($a%)~d
PM#I<DQR~&bSQxAU`F}-$

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/key.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/key.gif
new file mode 100644
index 0000000000000000000000000000000000000000..00d33c9913e2844180de43164f6a198f8ffe25ea
GIT binary patch
literal 156
zcmZ?wbhEHb6krfw*vtR||NsAQnA5cL>h5EYPI!8FG&D5i<m3bg2fMqw1Es)95QO4S
z7DfgJE(RTt5XcM$7SDi_p4q;hvel_d($6!Gh<CXM)+l(baq&^Org*$f@bZ*eVYVad
s9-V&M!hFw#BSndgnQ_6R8aGxiu1}f=x<sz!O=}jY-}-p7Dieb>0ArIhbN~PV

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/keycolumn.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/keycolumn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..65564f8d900bf089ff2726e50cf03a397dcd5fe7
GIT binary patch
literal 251
zcmZ?wbhEHb6krfwXl4L`|Ns9R7$n--=1rV<Xu*Pu^X8rB<>fta-~dnxOn}rtK?8&0
zPZnkd21W+Oe*w<<1(ija=@}&oMg|533Q3g;!KHZ$zM08I`NfsRC8@c^Itre7$$AQo
zIXMbJAce&WL8-;5MP;cedc0g-K5h!`K?-51MGA&`2E1Gh3_2iNK<;8-2{B*^&QdhW
zZvM=BNFdEEv*_Rl8z!Z>YHDkmtq-oyxRv2{Vv^L!PoADpvz!)iT)L^^_3Xiqm?-0>
k1k+odtrO<G4xAlRwtPXZ>u1rbDYF=o;(BkZ3Nly&0C-(fmH+?%

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/log.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/log.gif
new file mode 100644
index 0000000000000000000000000000000000000000..07fdb5afb6c4d004bbd366a4710e7e48ebc91e2a
GIT binary patch
literal 164
zcmZ?wbhEHb6krfwnE0RJ|Ns9C3=9Vj8~~DvKUo+V7?>DzfNY?w0FbRTrGMq>hy2Y<
zTcR2k&HJ9lTNwMbvCkr@{pW(@%w4k1*S#4T6#w}<=ND8KWu|A8C>R+S7$_uFDg>A2
zDfnh47v&dM7MG;v7V9W@<|XSXIOgOi1c4M5D+Hw$rxul^rs(l<dHJ|0xCbeOr4}g|
L>KX8IF<1itb$>Nd

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/missingtable.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/missingtable.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f9cce7151f542953e397a92ea6a1b27a90436cdb
GIT binary patch
literal 256
zcmZ?wbhEHb6krfwXl7tAG)%U%%nmBHthThAGUeFPrPuaaTJDXCI(F>Xy}f(?Gcf$G
zuKte%6#oS{=ND8KWu|A8C>R+S7$_uFDg>A2Dfnh47v&dM7MG;v7V9W@<|XSXIOgOi
z1c4M5D+Hw$rxul^rs(l<dHJ|0xCbeOr4}g|>KX8IF)-*b00GE73@nKgPI|89VR(J!
zFiVp|i>n0}L(xPvZ5FM|XQSU3wuE?CGJ7+~`fF^yn6auQai`Cl0*9%M8v}GC+U|W$
v-yyf6d2z@`TMf4Ja?{Tk@NWrRBfjUN$I39Br1STUr!Y6Naf%5GGFSrux>930

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/next.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/next.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d25a3f956f88b2044da971544cb110250a9aed9f
GIT binary patch
literal 183
zcmZ?wbhEHb6krfwSoELa|NsAI&itP_^9%z6!+`?_fFuMc{$ycfU|?a;0dYZU8JIOa
zcHQxNyjO5hObAEy!h3U#YVMe3EiGwEYhZdSoxkDLrH2+*Eam?>I59CO{_}UvFQ_ca
zOwTA$FfuSOP)Mp&2rkW2@Xbsv$}g@gE=kQT)=}`xOV(3x%*jy*0x2w32udwZEh<Y*
a(c|Uv@^Mpe4^jwAEmAPlGvMW7um%9U06lF0

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/paste.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/paste.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f118c7eab8c450001b762d80446f6b7b9f5222c3
GIT binary patch
literal 298
zcmZ?wbhEHb6krfwIP#z2|Ns9_&+oc>a@(Dg+pZkic;(QBGeEFs^_kskPVZTBc<b_m
zo0o2x*ST(H>)M&EOD8uhozyV5r+Q9L^_14KzJ{W-w6tVH!#HDO1_p)$2Mz#9G@$sC
zg^__ll0gR~4zkmMH6%f;FU2#d!AMr{V?;w|SVQ84X)_nDyTHOTL(iF+LF;gA*P<j&
zZ;i0^A5A3JA5+=bbR{WchICrTt{G?BUvV6b*?L83%5L`XZF2h@Y?EL9PBe^iR%B58
z=kJ_fP+63jo>8J;WME*RkW{G<T$-ogo0(jcUtC#SlA2qrqu`mBtf%0ZlcNv>Qdq1I
hlv<oxRF;~e$IIpA<EG#qq!5-`q+qCLz{|y84FDH*bx;5R

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/play.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/play.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8bfcf5591a2a5299147d2d18fba432f59f49c25
GIT binary patch
literal 186
zcmZ?wbhEHb6krfwSoELa|Ns9pXP!w*n`vyE#=yXE;J^VO2?UBiSr{1@SQ&Ic9FSTE
zW}S##ckCQbFg64S^xS6KddG+(QQSB6+f>#QVz;|l4QFS5>n!?y>au8bK$sWMfPenZ
z`303lnduoN3PuJ71`0`)3c;m$3ci`iMft^*#U-h^#X1U}dC7VTjyX9BK_G?23PGvG
esYPX}DSEtIUOsLL?m-G+sYMEgdIr2)4Auan9z4|m

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/previous.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/previous.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f48362d71c2820bfd6d39acf401b88fb604b3c9c
GIT binary patch
literal 183
zcmZ?wbhEHb6krfwSoELa|NsAI&itP_^9%z6!+`?_fFuMc{$ycfU|?a;0dYZU8JIOa
zcHKGmc(351m=F%_&ur7p8)6sqF8mpLYC&$!@1ln?!tW|~zwo=~5XQuy_|M-tzo4=x
zGd-h3!N|bCKq0A8A-FV8!8bFxD8IO}xFj{VSVzG#FIi8)F(*eM2&AxBAt<#twWusL
aMUR)u%g0T@JxC!ewMfBG&w!VU!5RQ4a6W+m

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/qmodel.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/qmodel.gif
new file mode 100644
index 0000000000000000000000000000000000000000..52ab6dbd0511aeac0bec5c7d07fca294f5c19e4b
GIT binary patch
literal 941
zcmZ?wbhEHb6krfwXlDQcMn*;^CMGsEHhzA7QBhF?gG5`~y!iO|@Z!jXgoNbe<eZ!w
z(XOtX<;xoy8X6lLySlo1dwVBNJT!0K`Q4W;{l7o||D)vx4jedm@Ziy-NAKT1@ZiD0
zM~{yD|NkFs{3tOR0)saM6o0ZXgIuQrB0zb9fuoCokweB~gTg^}4q+t|4TD3h`~r%0
z0S5$}j&$(r=om;GbY^Df)2is$(7@Q##IG0krXXlRBeQ<;A)5z{PY*D23i+JyR9w!;
zFB8RNaKQNaITjOhj=7q~Y5@!FZ37xC7?sX0Fkk63=hegIml}O%#))cuU~Jo*VVH5k
XLCk@LjYq|!!8+VAx{ZyQiNP8G&}?7V

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/quantum-ng.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/quantum-ng.gif
new file mode 100644
index 0000000000000000000000000000000000000000..31e5082fde44b75e5866cb163f04da251147ff20
GIT binary patch
literal 591
zcmbu+O>5I&902gty3RSPbxynawz;ZvvpWB?)x{ZSHv6(})@gUh<pF&zVPG!7Lr$Tz
zsg|h3ODF~py#yqOfOJrh9HIp2p)hbzC=?2%AX1o&;X$ZW{S5xT!Y{TQog<(42p{o<
zAOIi?KtfmqR0Y)nNdpe05aLCw8n{?OauFwa2NWCRUr<$mZG*`|N}w?oWu)lXaB!)L
z%}N3&3c?*I%YYe(Fbsn*#=3>A8g?4E+GedfpOPpb!w}vAm4g%(B&?a(u8WObcDtk4
z-wm~fAz1;H#T?d3*s!@uv%K5=+3S^l{5G9E+uTV(L`9OoD{5=6(d}*3yRy@f%T0^X
zG*%H6Q?)z1)nJP@4U~j<1&Nkm^F~E4)=i_8WQ7FK0x&4aRCs$wXzOZKDB2`N*PzG)
zBLR*8RbljPRQkr%OwrQB6359jkS#EhKsUiakT5{#{kI_T*S`y*e=|*FvQqB(i+tX-
zFYDgl=jlH%aB%RD_wW&4=BRh**zoZae*ehm$y28Zm-o!sv4Qb(6M?|_3!aO_<fW;x
z>C5B6z?G{r*T9u=&t9Jng>T%PBX7-1x2LE(pC%UW(u+&E$$OD#$iEbe#g`MgmDT&v
z<b$>N$V1Po%%jx0y#9gj8+;ukHlJ=d`pd%1<Inj~cY5{haJKqxBONUah1_3#Z`R(g
P6c!U7pT(V7A2I(2qKg_k

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/refresh.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/refresh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aa450f7d30eac19fd15de167b4357181eb282c76
GIT binary patch
literal 937
zcmZ?wbhEHb6krfwXlG!kkGHR{x1SG0^W*2wufIRv{{MaZ|Nnv9`TO?+(f<Gc=l}oz
zpJ5b?hQM$P0mYvz%nS@X3_2jsf${_cM;n7Ahm3~-!@*{DW(k*$3lE&yn0fUi1QHmS
zSeXR{1P(AXG%_nVvh6s*(AdDjY%3+e;BcUEqFSI3O8^4{Gn1VAJdqy)4QE+cxHNPe
z7?vKI!X(V$0My37#3LgY($(;iaT>Fji>$}gMyAz@{1&MS4Gc|<@$6en48)R7&B{x^
M)zf_?*MY$r0I;n>?*IS*

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/rollback.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/rollback.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8fdd814c2f412a1d3de25534f056137fc26f8f1e
GIT binary patch
literal 201
zcmZ?wbhEHb6krfwSj52a|Ns9pXa3Ked4_?3;lP0dKoSBJf3h$#Ft9M_fVd#F49wOZ
zyYAe3d{R(#p-Br@`!%N%nsEa2lv226a2U+vX1KyVySetI_nD}@qHUi()CTc!bsbH<
z(02A%4%Zqr1_s4{{?7RYl|`B986^rv1_lNSNtFu0rFjaznaM@@#g)Y+sky~E3Z8k%
sdJ2v?ISN4_g~bX%sl};9WvMB8yj)&BZVK)}3Sp^53Wj<Hyj%>{0H3u&+5i9m

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/sample.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/sample.gif
new file mode 100644
index 0000000000000000000000000000000000000000..34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610
GIT binary patch
literal 983
zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@<MU=lrfa-=6>9*?jxd%4aX0yzy`dymabz
zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV
zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9
zmo3`hYE<KGQ|@6^6ztNF7&tM)w`%LUlM$ZXF+LNb{aPCe*E?B9-oF0Q%eE%Wqbtg%
z@9CqD9#(CE&J!||x{C9<qx`1E1<#EMm>wTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R
zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<<b<V}>8qA3{r2e5
z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-g<Ko(f<;_oL
zEqXI)#s$xy8I>Jh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#<IVLwl(2N
zbDlnX{r~@ehEXtZA)xq^g^_`wfk6l41W=w};Ml^z$SLEoVZp&>j%uHV4GRvj@+tE@
zQ%F!a)GKcn<q;6D!JEN>^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW
z<qR}<jx?wH%UBk_m}3}x+;6r`C0o`5p=aFFG(%QJbS6DH5nx_(p~G`=8t-hw@-KTT
zjSG%3ippkO@kn%b<6zL?_~%%t)W#~L>Qm#<km7kzO+(7yLxUo7pMn=(Rpi5j!`up<
Pa}@5JsVsJ2V6X-N$YLV6

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/schema.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/schema.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f92eed1274eefff35a10105668f5f4726bb31bd8
GIT binary patch
literal 152
zcmZ?wbhEHb6krfw*vtR||NsBLb?5GdOP3EEI&2$c_wV(rb8`%9LV4%q3Ie6TN)UwN
zPZmZ71}+92kPyfW1{T+Vlb+hP7TGnu{~sv&w7aT4UMA=1q`|Hs&Hm}ovne+wUHfN0
pkHt|(O0YFLf9cCJcI>H|%L^t(99R>iC{eMurC^4ap1%@<H30q(HUR(t

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/script.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/script.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bc278f9ae9b15c27ba6bc9b0541b7836bae74fd5
GIT binary patch
literal 677
zcmZ?wbhEHb6krfwc=n$G2>$>7f8fA@34PlaFFZGO^6rNERrPhtr%gT5*1CSy%;OXK
zceS;ynK$>;)G7OWd$#s;Z=N=F|DuKGCQsV6VE(E3^G?p0ePrg00~04~+rI7TvZWX1
z%s#wg`Nd^R&(E8CbmNBG>(<^_wes?^rRSC`KD}t+$=S0GY}$Bx?V77wx7=H^`ttT|
z_gAhsw|m#)O&f3Q+5LFk+Dkik+&^{lLwozy>guH}EgSm#_jY&hm^g8NN5`hAQxA1_
zZ*6biFk!;3o}R7q=bxE5^T>=Dhv&>WK6UE8<;$-uSa5pQtRssSot-!D#PsR=dwMob
zo3?kwic8CuU0AZ@?5b5)_Uw7Ne*MkWtFIh8_GR<tyN3?F-L&b}#*H`5ocVF$#HUM_
z{_frTWXFzshYr0weE8*!8~-~xxAgYyTDj`dr%#{y`ucczc|qYtRiOBjg^_`Qi9rWs
zDkx4E*w;5OH8r=iwxlq0baf^(wi|Jnahcj#N;#(VHl;|;3GxpQiHwMIOG#>CuwZcJ
zO)%lJa<vI&=wq6bVlL$1?XKV(oVdIxse{EKo{gK+NkC^?^D%ox(EwSEK)tXdvl;wE
zY^*(O#e`!n?wIQ$@1vz26&h=BcNK%0j5xm>tFo%$%OY2Sjf$+DV%ppGyhzJo>tkk?
z(C`dma$XkA)T4T9g@>@BA)`YVPv^x6CmkCZ7!?2cJLeZv7G<VqlqeV(7#JudRVoCR
z<|+7QCKu%wR~DC~<`(NHc;+SRDLCfjC<K8N7Apj$7N-`KrKafda(Vf<DYyqIgrycK
M80s1Daxqu~06}vj!~g&Q

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/sequence.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/sequence.gif
new file mode 100644
index 0000000000000000000000000000000000000000..eaa0812b37b49240e1701d6589f569ef1488e352
GIT binary patch
literal 118
zcmZ?wbhEHb6krfwSi}GV|NsBLb?5GdOP4ddbHa-wfn1=V;!hSv1_m|;9gqr;S_Wq8
zj9quUms+?d%+YacES9;e#F4Nf;<;<2>r%@o#UnC*B%^NjsP->pTQK2imx$_?CCjEA
QzB`L8e#(*$stgR)0M05bwg3PC

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/statement.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/statement.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c65a3b1a7182f1461315032faa66b360bb361e0
GIT binary patch
literal 152
zcmZ?wbhEHb6krfwXl4L`76yi6$BzAHVE8Y=@V}+y|F8defZ|UUW(Ed!1|5)2kQodt
zt{+Z#X0uu(clZ96b6`wx<T<D=mr}V*i(5*Ki^=Kt)q)x4+YTnQU1rQ@id>m~z}IS?
b(|OO6j<Z9$AGCW%>D_y;p`+)o#9$2o<UK{s

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/stop.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/stop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..064202bf39f5f0a44c3088bf3fd599dcb1fece5c
GIT binary patch
literal 254
zcmZ?wbhEHb6krfw*!-UX2>$>7zmS1p9WU=rH@9QK!5ib__vPeV?CZNXd-kVKpLltB
z4;(lEQU?Z#KUo+V7<d?TKs=Bc3@i~7PI_j?GGwRTbmHXT;&!j?EL?HSVV0bSNK>>x
zo+hK_+grL04xcQq^yw|`JD9DQeK7IN4{I%7-}@T{RIjB)-|=1);Sj!BrYEp&mG0A?
z8cu$VH{bg12{AG#{_}UvFQ_caOwTA$FfuSOP)Mp&2rkW2@Xbsv$}g@gE=kQT)=}`x
uOV(3x%*jy*0x2w32udwZEh<Y*(c|Uv@^Mpe4^jwAEmAPlGvMW7um%9IGFV#x

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/subset.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/subset.gif
new file mode 100644
index 0000000000000000000000000000000000000000..23fa7b95e43f26382f4d36f95e2168886132636a
GIT binary patch
literal 156
zcmZ?wbhEHb6krfw*vtR||Ns9#eDp|mO|E}RVAq14itegok4`*(@)#%%mPa8Jf3h$#
zFmN*HfJ8xNFtB(Uob+71_xp>p{HDzp3$Fz599f|#oUtTf$422q`DZibwj6o7LiB0)
qg-jM*$#oJo3aZNz-jw<T@o$?wc~WSuW`}{3gWh+87hhDE7_0%y7dX8D

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/success.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/success.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5748e325f150438a323e2dfd3c64ebbb31370c8d
GIT binary patch
literal 661
zcmZ?wbhEHb6krfwxcZ;r|Ns974jlOY@&AeiJ8xfkIi+{$^a(4rtvk7J)~1ECHr~4Y
z>dn)?_iwyUjxFwKo3m}*sS^k8Et|h%+xnB6*Bslt=IFc`>kjO?aAe<=*H8XVoiumO
zv~{zltlqWx+_C+)kM6s*cKQA_%l0i_xa0oK4^QuZTfAURes=ANgZGZ^yS;Y#fi=ta
zAJ}#E=B4-hc3fJs{J_!ux66v#wr}4a930Hc%gaC<Q2fcl$iTqJpaW74@)HAF-+_h#
z4;`sgk0pg2dpg{>nS=tSM2bkeFE)6%A|*u4>>`879$85po!vP?3!R)77tQoAG-Ebo
zn98HCCm^Sj;AEuCtSQXP#H*&R!`{YdB%vuH)5|M6Nn?r;ODykfULkqON}o7h?RC5w
zf?0`EwPcs<5EPx_#NeT#!>=nD?8abV=xLbk&B$>6!j`j_866p{@%aSP{p|A_7@L|~
zTAO@2I=ea<+CAKz9G&@icx`RueR>&vJdM2A)RdHzS%m~=wL2MDuqv^#s&WXjteoR*
zA)wAK!K%W+qP@+>PC!r6WS=6djOk$qJ+r+kr?pK*58LZXXzybc7vYyW?4~2UoQccS
zTwnUIg1C^FCbtHszO~_Dx#h;|)?1gXkhqrUV8FGZNF>lP<;J4+ZA=U^JT@x1I!kb}
zGBGIr^LNfKs4U7%&nQtaGB7YuNUBr_F3nT$%}g%JFRm;uNzE<RQSi)5)>ClI$x#Rb
lDJ)h9N-a(;Doah#<K^=5aZ_*)QV2^eQZUpr;N@bl1^~i-;dB51

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/table.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/table.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f4056f6669ac074fd3005a0813ef83478b9e2a19
GIT binary patch
literal 237
zcmZ?wbhEHb6krfw*!-UX2>$>7Z(xvUYnwN5;-Li#F3y{Go|l*Rz<~oGISioqlZBCi
zfrCK@Bm**ofyG_mr043r7QqVbA0DXtu&c8)HVVBEn9vZ&lG8OWNOF$Z-F+Mfv|WxU
zHYm3^I=x^}XI_@lY2Y{MirS%2&9-^MQ!03_%{c#@gF*41zjJ;;Wl?5&Mu~!vfq{WS
zQl&z0X`X^_W^z$}ab<ByYHqQPf@fZ`o`PdejzSPfVX;C`YH?~&S!#+NFPE2(n}U0g
QLRe~%f}x%PFBgL~0EK2r_5c6?

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/torque.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/torque.gif
new file mode 100644
index 0000000000000000000000000000000000000000..93de76b7c7882749b010bf8c79ac6523d69c315f
GIT binary patch
literal 1044
zcmeH`{ZGsR9LGQ0T^(Jzq^FHmN?U2I6iJq&RGP?^xmhS$9-=2JR^f1`I7Q~6wmh7%
zvege<?B+3bwa!DHlBDH&GW1}lsinL>zWot?^WN)+_fPMA_I~dZy(VgDXtJE-R7gZ?
zKyjdTp!J}QpiLkpXfr4gv<0*kv<(u$B!QAa+d(N1r-F8a_JGnr`#|Zi&4677C>x?|
zP!1>;bO7Q^SZ9I`g7QH5paRel%*uvs4rb-T<}e%&fmEQQpktupAT>w>Duh@KE5V-x
zm4Gh7S%o<o*lS^b8ZPJIS%L*6@I3|J68IOx`x1Q0;8Tu(3Itw7$Yq3;AykK`D~Pxb
z#Z4%0A+ZKY)kxCwj=R{YNBTXa8F;S&S@)6q7<rG7{{-p=s2ll&k+nvgdCuodIQIe<
zTLieQg>~<6qZO6!QQeN)9ng1ht-vQ3I{Cq8erV>pZf@v-u@_CfZ0bkr0NMul!ywv+
zxO14hez4iX-4^b#aQ{#4AK`&tJTS_GqdYvuBjfz*H;<0<=md{X@`S)2o&-aHrzEWO
zU;n59k8!b(%;YzfKlKwNwUG0I*xIUVD_8HYtqL@JJ*#sHO07MpFN&{lUpFWZR({b;
zllXT@zt@YRT_Po-q0*ox&*qQ~{spS+O7jJ;@FnreX^N*dUJkKq-{_^Mi>zjd#b4`=
zMik4WdsDvYW1=-PeO6WNdZufXT7|!T9qQQ^<G66q_PG>Kk=Ax`Wn{8=+m*Z7C}hGt
zDy_YvTebO4^D8G?QA{S8RU+whxtH8kz3bI%nSE+-&B_L2u}4COpRc;9=(t0Gj8v9J
zZTYeUoBEH*-GwffJY1dnJSD437tdSqrR`;u$zi$nSzS@{s<HVBW#?p8OMp9t{RK~_
BdoTb1

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/Thumbs.db b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..ee5733362bdd1b5709df89d8312f6995ef79667a
GIT binary patch
literal 9216
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
DM5-^g

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/bluegroup.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/bluegroup.gif
new file mode 100644
index 0000000000000000000000000000000000000000..105d9373d737c341a884de916d978d7ae86ca299
GIT binary patch
literal 157
zcmZ?wbhEHb6krfw*vtR||NsBLb?5GdOP3EEI_#5IYY`Y@Qrw$6Z*$l2heDysCywm{
zDgY}45sE)q7#SFN7<51!kQodtUK37wuHL&nqcQ!X_jgs5#hGo6qA9P{mVH0Rny$1t
znrBksleMw$8xB0>v1xnnpkr0Yc4&g<TBSuo2VYKkrL`pTV1kX>jI(pM%o1W`um%7w
CuRsU@

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..67f2f04af91c3ae19f1d556a69b1e4c6ebff58b6
GIT binary patch
literal 159
zcmZ?wbhEHb6krfw*vtR||NsBLb?5GdOP3EEIxG~b?2=%X(hyd^D6e~C<(ga5LMxn4
z9NPy}16IqR_>+Z^fq|Dn2gC)L!NB6P;iTv4z2%vW&p-Km*GyTQ+2*L5@>*-z_jBCo
zYMXcSOlo|h%e+3(LZ!em@qK}V%zXFO#tkV^>pNDu6nItcWqlQ9pfQ~@qa^+8G8YC0
FYXA;1Kt})o

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_schema.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_schema.gif
new file mode 100644
index 0000000000000000000000000000000000000000..621f5000daf9f4deb4052d4f7aa518d53406bcb4
GIT binary patch
literal 152
zcmZ?wbhEHb6krfw*vtR||NsBLb?5GdOP3EEI&2$c=aOJ%>a4fs*0j(HXP^{V34&1k
z$->CMz{Q{g5(1gQz~UNk(o@^lBD-ed{{$tUPFKmt%hcK&H8?etPkub~Eak?eYya%$
pJ#o;H;%|-4U;6Tl9cQZM@`8y52i62BN>uD^DVX7<=dZ+I4FGtGHMRf%

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_view_group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/green_view_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3fcef0a19af268b722238af0dae08c7a1098a2c
GIT binary patch
literal 254
zcmZ?wbhEHb6krfwIKlt||Ns9tFi5nu&AWBy?uAR24;(tY?8K>)A3yK7dw=KE-NzoC
zsGnSY;@G~E({;|xF+4g!YhJG4p&qq0DI$BbW%>E}f!e{wU?&uRvM@3*h%xAZq(OEv
zuvRZn?Mtz=>wheu_A`Pb$<a4^Z()w7&C}pT?s*<A46Qr499EtQ<mgj$a10HZbHO>u
zQlMnFw@V9yr-~LAWAa%E4TeWfmC-+|SRZ;gE;3~nYv2~;G_0zr_3>s%;}m3TXRqy<
f+{a=sEG#%{_AF*LF_wj_ix;ykTW+>ek--`O#{XBS

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6ab7f3481a184cc9b9bef1773ada217f290d37c7
GIT binary patch
literal 155
zcmZ?wbhEHb6krfw*v!DtFsEtO);T+`?mqVDL_<SEPEL-yyE_8|!~g&Pfg~nS{K>+|
zz`((v1Cj!n!NB4n;F%mS(c--2x^tn15_hL}J`R}GsxaYI6<edVK+CH{R)^abbC-!9
p;LNj}*^=SH<-aejs6fJv^Z4?u8MkXYO!ZHzn?;^V3ua-k1^`1IG0^}3

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key2.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/key2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a286412feaddb2d5e5db19066b934fc5ecb9eed8
GIT binary patch
literal 153
zcmZ?wbhEHb6krfw*vtR||NsAQnA5cL>h5EYPBb($<mBW82M4>my933+@+gGjPZmZ7
z22KVYkSNFu1{ODilb+eG8j{tjO483WkBE1%1+Ge;x=yPwB0omtmCx006L+tQK4*Tx
mx2A>ZlYs;W!&KGFng&4~K8~SNW@N3Mb9j0+>ttO)25SI->@t1;

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/margarita.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/margarita.gif
new file mode 100644
index 0000000000000000000000000000000000000000..77cd2a3f5c9e9411cdfd5966181cb253ba3ccb73
GIT binary patch
literal 152
zcmZ?wbhEHb6krfw*vtR||NsC0x%2j7??sKa4L^7O`1ki8Gcz+#5G;vKDE?$&WMJT6
z&;dz+%wS+~6*%d+dhN4QHoltE6(we>b4>pr`h4ZqHwTpt2W)lMyRt`j<*GXk20B4D
kZOkj5&z=*ZeUJBsQ{;;M*Gg4??pPMQI?ZRF3j>2S051MFJOBUy

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/quantum.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/quantum.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e964a2fd7aa3f316e6a7221241ca9cdaa289963f
GIT binary patch
literal 93
zcmZ?wbhEHb6k!lySjYeZdl{UvGuLKkZq)(tK;jHcW-W%xPrucj$5QB|x@oD}YuU=F
ss(sM{H36NAmhR-q-5_~*?zIzZ{l4G5`G?PdU0|`dU6<*yO$-dy017c6e*gdg

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/sequence_group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/sequence_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16b07bb143cb4ec318a8e55d49cf77805b077a94
GIT binary patch
literal 248
zcmZ?wbhEHb6krfwIKlt||NsBDwavSA=kA3|mk%5|oY|cdUL5)F&&=PSdjGv^`S+yc
z#Ib$fF6aEYm~?Ww&bc{;M<-~_%N0D-qqZhRWN)@CP&?Qd?1bV^7DfgJF$NuwG{{Z{
z*3t#4eJPes7e4c-aYlM3x%y=9_2`QTj{hqvs3K-8!*^tcs)deJ|4EnB4*^H|jysn8
ziV)b?vLZzwQ-HmB!wiAK8N%luZB$hBxx;+;^Md2o-t+QCuroI^3$ZpdCNvdyFgu8d
Z2u+zfg^5)xBa>w=3+sY~W{VXWtN|A$TnhjI

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/subset.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/subset.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ae12ef235046b75550c60684ce077994b81edc53
GIT binary patch
literal 621
zcmb7>>q}E%0LEWUGKkP5N+<}s5#)8<W~<1wm8O=rvRb*7+CBWxACQTGvxu;q7ZTAX
z*0k8orEWvmm~T7hjO~ba-1VGy?>kBJ66uE^sIC8?hlhvXm*@HNoGp}!a}~)T8AJe>
z^043Mml)b@GWjhQ-elrzHfr3AG(+^zFg<SefBeK~hT!NJXE3s(V{Wr0nl8;Sr8lyA
zqkH5t`(9(y8(n%MGx%XbYhbkox7NT6432w!#Op&HU24Z9qw4H;Owt|QYE@VNn~vVL
z_MX?Op0@V4USD8!ZOt1DSc%gb{$fSYN}v@(YZwZP*g>2Q3|$M<)EvczA&a0837|zc
zzd#EMv>(Ii8J3Sgp1{aF!(+&YAun)VA3Hrm3sFW<>riwGL9Y*DqQhi_5FJ7~5(9`a
zB*cjj42780RlKsy;4maehhw(zAw~#B0e+ifek^mLAWIO$h!H{*AEYAD@c=#hm71U9
z2;%r4x3awS=bym;DD7858~_a<Jywc+0ur51GM{E<H9yPBXizpZWr{>O**Q5GS6ZJp
ziN*POCl4Pwt$HacC@eg8wYXSb)h8048aQ83Sy`cY)Y_b@Eh@Vvlh@w4AE!KW^!SP5
zn$nB1I?sbMn-Z!eHzk*9E|g#Q)J^T*r#x`%Vae_K`Wu&br=@Pd%7f|mq<3#g<2NU5
z+xU|=mnp!+tDVWet9s>qc6Cz9jy>*dg)KgDSCLqT8}l1mwwI=ZycD~7-PY81)t#t7
b`a-q7RzAw^ZRu8RdE7f&ZZAn`1VHi^WEWog

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/table_group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/table_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a852e085c02cc6c08bf590c79e2fcf95d2d8e52
GIT binary patch
literal 252
zcmZ?wbhEHb6krfwIKlt||Ns9tFi5nu&6_y!(7bu)Z{4|j;nL*;hYp7qNB;XW^Y^FT
zfA3oUJt;YHY~Q!bIe#uDot&<7ZjRy630m`V1rPP8tw|Btn=K181Z)^Oq4<-9k%2*i
zK?fuOvXg<eQbDaR#nLNCL{d#Nv8&0~uY0fezJ$>Fzv2^J+;x(g4j*;ckYmK!-K}^i
zKuxG6`ytm<H!1GMZ?k-P#6%81xmd7k;grKHp9DI%l$u`1tiQlsS*}#TUdNyB$1lRs
k#^2XJp^JmfK}<|!#>^Sa91?8v*%vP4ShCb?xgvu#08+DHE&u=k

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view.gif
new file mode 100644
index 0000000000000000000000000000000000000000..649207f2ec78aa50ce544e89e9c7a3ccbae105c6
GIT binary patch
literal 149
zcmZ?wbhEHb6krfw*v!CSV325Qo451o?qiQm)K9Md^Xu3D|Nj{n7$78&fd&+RvM@3*
za4_hA#6e~-us8{v^jy8y;<ax7f4MS_l*))W0fyIHEtfe2N@O|O1-XlTnJr@5pD(^!
hw6VGCXpN#~dt*tJhDgAI^Iwx*RJG12P-9}S1^}<CF!TTb

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view_group.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/unused/view_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c1d09a9c0adff643d4331120e7f3f0009ab798bf
GIT binary patch
literal 254
zcmZ?wbhEHb6krfwIKlt||Ns9tFi5nu&AWBy?uAR24;(tY^Xl$nk51H2uKxYw+Sd;U
z-anl6@Aa&IZ<n4pw(sP0opW;xk515<mn(RvM{P}t$lh#OM+b-4m>8frVDnH2#h)yU
z3=EPCIv`PyoeZqi32J>QmTrP9f@+efU6VZhXYVbX6S(JT^dgTuj}V4d%QLPk&qQ)e
zc=*)8HepV{u_Q}@lHF%H9WO;B@HMqq8E(*0WBnxd`775UR<Ff-Tz?2k@ER6~@Kp2q
qc#Bu_3A44fwNL8lW3d+%6`nPF7Bib9%R<)0i`kYfH(RO5U=0ALpJKWI

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/user.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/user.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5fb6a5d1c1f25295dd6a3be207494abbe5e70e37
GIT binary patch
literal 134
zcmZ?wbhEHb6krfwXl4L`W5<sDCmJaJWC3dV&!7X+2{MC$#W>)EXEv(^v-Z~e*Qd9}
uD>PhIpOLX@ZTjurG~Mj4TE`>zecpLMf7#&zD}#p<r~jGib~=NF!5RP$97`Mk

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/view.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/view.gif
new file mode 100644
index 0000000000000000000000000000000000000000..585ff3c09276f487c377c4f62171d439adc88447
GIT binary patch
literal 148
zcmZ?wbhEHb6krfw*vtR||Ns9tFi5nu&8weW{pZ&&H#avkGc%wdSQ4F3{K>+|z`((v
z1Cjul!NB4uaME-2UW?bd{T~-Jc3w@aJ*=?ejr&X{#q-QbER!wHY;KU*!KZXg`AVL!
ef7VfvnkLKB3j-$9t(*5s^}t&v%LE@525SJ7f-pV+

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/icons/xml.gif b/archive/net.sourceforge.phpeclipse.quantum.sql/icons/xml.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1dff5505c85ed0f0619887499c8699a8c2080677
GIT binary patch
literal 159
zcmZ?wbhEHb6krfw*v!B%Z{GP8D{k)D^LD|JRa<WC+xO_iiX*G`+}QX3|NoC4KR$o{
zoPmJ>$Oe)Sp!k!8k%57SK?lSInZdx~Ght(ER;-ctmP!9Pml;k^n)S#d&gnJR%WW(r
zvB$+1ym#0W+q&R_dz4JyiN)`eGOVU|Pv_2B{m5dE?8Qw2RSR1-MAXFcoO^Nb+M#s@
HN(|Njq(Vp(

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/install.txt b/archive/net.sourceforge.phpeclipse.quantum.sql/install.txt
new file mode 100644
index 0000000..b05046b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/install.txt
@@ -0,0 +1,24 @@
+Quick and Dirty Install Instructions:
+1. Download and unpack eclipse 2.1.1 into a directory [e.g. C:\Test\eclipse]
+2. Download Quantum
+3. Unzip quantum into the parent directory of eclipse [e.g. C:\Test]. The zip file has the relative path
+   eclipse/plugins/com.quantum.Quantum_2.2.0 So if you have called the eclipse directory by any other
+   name you should unzip into a temporary directory, take the com.quantum.Quantum_2.2.0 directory,
+   and copy it into your plugins directory.
+4. Launch eclipse. You need java 1.4 or higher to run Quantum. So if you don't have it installed,
+   you can install it to use only with Eclipse. Install it into some directory, and run eclipse with
+   the -vm parameter:
+   
+   		Eclipse.exe -d C:\Test\workspace -vm C:\java\jre1.4.2\bin\javaw.exe
+   		
+   		or
+   		
+   		Eclipse.exe -d /home/panic/workspace -vm /usr/java/bin/
+   
+5. Open the Quantum DB Perspective [Go to Windows -> Open Perspective -> Other and select Quantum DB Perspective]
+6. Right click any where on the Bookmark view and select "New Bookmark..."
+7. If you need more instructions, check the documentation (/doc directory under com.quantum.Quantum_2.2.0), and
+   the online documentation in the sourceforge page (http://sourceforge.net/docman/?group_id=7746).
+   
+8. If you update to Quantum 2.2.3 from a previous version, you may get warnings about not being able
+   to restore some views.  Close your Quantum perspective and re-open it.
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/lib/junit.jar b/archive/net.sourceforge.phpeclipse.quantum.sql/lib/junit.jar
new file mode 100644
index 0000000000000000000000000000000000000000..674d71e89ea154dbe2e3cd032821c22b39e8fd68
GIT binary patch
literal 121070
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
F`9DH82$KK+

literal 0
HcmV?d00001

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/plugin-3.0.xml b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin-3.0.xml
new file mode 100644
index 0000000..213fbe7
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin-3.0.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="com.quantum.Quantum"
+   name="%quantum.name"
+   version="2.2.4"
+   provider-name="Tom Schneider"
+   class="com.quantum.QuantumPlugin">
+
+   <runtime>
+      <library name="quantum.jar"/>
+   </runtime>
+   <requires>
+      <import plugin="org.eclipse.core.boot"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.text"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+   </requires>
+
+
+<!-- Pop-up Menus -->
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.sql"
+            id="com.quantum">
+         <menu
+               label="Quantum"
+               path="additions"
+               id="com.quantum.menu1">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Execute Against..."
+               class="com.quantum.actions.ExecuteAgainstAction"
+               menubarPath="com.quantum.menu1/group1"
+               enablesFor="1"
+               id="com.quantum.actions.ExecuteAgainstAction">
+         </action>
+      </objectContribution>
+   </extension>
+<!--   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="Execute Query"
+            visible="true"
+            id="com.quantum.actionssets">
+         <action
+               label="Execute Query"
+               icon="icons/play.gif"
+               class="com.quantum.actions.ExecuteAction"
+               tooltip="Execute Query"
+               toolbarPath="quantumGroup"
+               id="com.quantum.actions.ExecuteAction">
+         </action>
+      </actionSet>
+   </extension> -->
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="%category.name"
+            description="%category.description"
+            id="com.quantum.category">
+      </category>
+      <command
+            name="%command.execute.name"
+            category="com.quantum.category"
+            description="%command.execute.description"
+            id="com.quantum.actions.ExecuteAction">
+      </command>
+      <keyBinding
+            string="Ctrl+Shift+Q"
+            scope="com.quantum.view.sql"
+            command="com.quantum.actions.ExecuteAction"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <scope
+            name="%scope.name"
+            description="%scope.description"
+            id="com.quantum.view.sql">
+      </scope>
+   </extension>
+<!-- Perspective -->
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            name="%perspective.name"
+            icon="icons/quantum-ng.gif"
+            class="com.quantum.perspective.DBPerspective"
+            id="com.quantum.dbperspective">
+      </perspective>
+   </extension>
+<!-- Views -->
+   <extension
+         point="org.eclipse.ui.views">
+      <category
+            name="%category.name"
+            id="com.quantum.views">
+      </category>
+      <view
+            name="%sqllogview.name"
+            icon="icons/log.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.SQLLogView"
+            id="com.quantum.view.logview">
+      </view>
+      <view
+            name="%tableview.name"
+            icon="icons/table.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.tableview.TableView"
+            id="com.quantum.view.tableview.TableView">
+      </view>
+      <view
+            name="%bookmarkview.name"
+            icon="icons/bookmarks.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.bookmark.BookmarkView"
+            id="com.quantum.view.bookmarkview">
+      </view>
+      <view
+            name="%subsetview.name"
+            icon="icons/subset.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.subset.SubsetView"
+            id="com.quantum.view.subsetview">
+      </view>
+      <view
+            name="%sqlqueryview.name"
+            icon="icons/script.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.SQLQueryView"
+            id="com.quantum.view.sqlqueryview">
+      </view>
+   </extension>
+<!-- Editors -->
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            name="Quantum SQL Editor"
+            extensions="sql,ddl"
+            icon="icons/script.gif"
+            class="com.quantum.editors.SQLEditor"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            id="com.quantum.editors.SQLEditor">
+      </editor>
+      <editor
+            name="Table Data Editor"
+            icon="icons/greentable.gif"
+            class="com.quantum.editors.dataeditor.DataEditor"
+            id="com.quantum.editors.dataeditor.DataEditor">
+      </editor>
+   </extension>
+<!-- Preferences -->
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            name="Quantum DB"
+            class="com.quantum.preferences.GlobalPreferences"
+            id="com.quantum.preferences">
+      </page>
+      <page
+            name="SQL Editor"
+            category="com.quantum.preferences"
+            class="com.quantum.preferences.SQLEditorPreferences"
+            id="com.quantum.preferences.editor">
+      </page>
+      <page
+            name="Copy"
+            category="com.quantum.preferences"
+            class="com.quantum.preferences.CopyPreferences"
+            id="com.quantum.preferences.copy">
+      </page>
+      <page
+            name="Custom Copy 1"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences"
+            id="com.quantum.preferences.customcopy">
+      </page>
+      <page
+            name="Custom Copy 2"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences2"
+            id="com.quantum.preferences.customcopy2">
+      </page>
+      <page
+            name="Custom Copy 3"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences3"
+            id="com.quantum.preferences.customcopy3">
+      </page>
+   </extension>
+<!-- Menu for Bookmark View -->
+   <extension
+         point="org.eclipse.ui.viewActions">
+      <viewContribution
+            targetID="com.quantum.view.bookmarkview"
+            id="com.quantum.view.bookmarkview.menu">
+<!-- Export Bookmarks -->
+         <action
+               label="%bookmarkview.exportbookmarks"
+               icon="icons/export.gif"
+               class="com.quantum.actions.ExportBookmarksAction"
+               tooltip="Exports bookmarks to a file"
+               menubarPath="additions"
+               id="com.quantum.action.importbookmarks">
+         </action>
+<!-- Import Bookmarks -->
+         <action
+               label="%bookmarkview.importboomarks "
+               icon="icons/import.gif"
+               class="com.quantum.actions.ImportBookmarksAction"
+               tooltip="Imports bookmarks from a file"
+               menubarPath="additions"
+               id="com.quantum.action.importbookmarks">
+         </action>
+      </viewContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.ui.resourcePerspective">
+      </perspectiveExtension>
+   </extension>
+<!-- Property Pages -->
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            objectClass="com.quantum.view.bookmark.TreeNode"
+            name="Database"
+            class="com.quantum.properties.DatabaseInformationPropertyPage"
+            nameFilter="*"
+            id="com.quantum.properties.DatabaseInformationPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.BookmarkNode"
+            name="Bookmark"
+            class="com.quantum.properties.BookmarkPropertyPage"
+            nameFilter="*"
+            id="com.quantum.properties.BookmarkPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.BookmarkNode"
+            name="Schemas"
+            class="com.quantum.properties.SchemaPropertyPage"
+            nameFilter="*"
+            id="com.quantum.properties.SchemaPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.EntityNode"
+            name="Tables, Views and Sequences"
+            class="com.quantum.properties.EntityPropertyPage"
+            nameFilter="*"
+            id="com.quantum.properties.EntityPropertyPage">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.exportWizards">
+      <wizard
+            name="Export to Quantum Bookmark File"
+            icon="./icons/bookmarkfile.gif"
+            class="com.quantum.wizards.ExportBookmarkWizard"
+            id="com.quantum.wizards.ExportBookmarkWizard">
+         <description>
+            A wizard that exports the list of database bookmarks to a Quantum bookmark file.
+         </description>
+      </wizard>
+      <wizard
+            name="Export to Torque Configuration File"
+            icon="./icons/torque.gif"
+            class="com.quantum.wizards.ExportTorqueWizard"
+            id="com.quantum.wizards.ExportTorqueWizard">
+         <description>
+            A wizard that exports the database structure to a Torque-compatible XML file.
+         </description>
+         <selection
+               class="com.quantum.view.bookmark.BookmarkNode">
+         </selection>
+      </wizard>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="doc/toc.xml"
+            primary="true">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.properties b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.properties
new file mode 100644
index 0000000..b67550a
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.properties
@@ -0,0 +1,15 @@
+quantum.name = Quantum DB Utility
+perspective.name = Quantum DB Perspective
+sqllogview.name = Quantum SQL Log
+tableview.name = Quantum Table View
+sqlqueryview.name = Quantum SQL Query Editor
+bookmarkview.name = Database Bookmarks
+bookmarkview.importboomarks = Import Bookmarks
+bookmarkview.exportbookmarks = Export Bookmarks
+subsetview.name = Subsets
+category.name = QuantumDB
+category.description = Quantum Database Tools
+scope.name = Quantum UI Scope
+scope.description = Quantum UI Scope
+command.execute.name = Execute SQL
+command.execute.description = Execute the SQL statements against a database bookmark
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.xml b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.xml
new file mode 100644
index 0000000..e8df2c8
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/plugin.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="com.quantum.Quantum"
+   name="%quantum.name"
+   version="2.3.0"
+   provider-name="Tom Schneider"
+   class="com.quantum.QuantumPlugin">
+
+   <runtime>
+      <library name="quantum.jar"/>
+   </runtime>
+   <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.core.boot"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.apache.xerces"/>
+   </requires>
+
+
+   <extension-point id="metadata" name="Metadata" schema="schema/metadata.exsd"/>
+   <extension-point id="data" name="Data" schema="schema/data.exsd"/>
+
+<!-- Pop-up Menus -->
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.sql"
+            id="com.quantum">
+         <menu
+               label="Quantum"
+               path="additions"
+               id="com.quantum.menu1">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Execute Against..."
+               class="com.quantum.actions.ExecuteAgainstAction"
+               menubarPath="com.quantum.menu1/group1"
+               enablesFor="1"
+               id="com.quantum.actions.ExecuteAgainstAction">
+         </action>
+      </objectContribution>
+   </extension>
+<!--   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="Execute Query"
+            visible="true"
+            id="com.quantum.actionssets">
+         <action
+               label="Execute Query"
+               icon="icons/play.gif"
+               class="com.quantum.actions.ExecuteAction"
+               tooltip="Execute Query"
+               toolbarPath="quantumGroup"
+               id="com.quantum.actions.ExecuteAction">
+         </action>
+      </actionSet>
+   </extension> -->
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="%category.name"
+            description="%category.description"
+            id="com.quantum.category">
+      </category>
+      <command
+            name="%command.execute.name"
+            description="%command.execute.description"
+            category="com.quantum.category"
+            id="com.quantum.actions.ExecuteAction">
+      </command>
+      <keyBinding
+            string="Ctrl+Shift+Q"
+            scope="com.quantum.view.sql"
+            command="com.quantum.actions.ExecuteAction"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+      <scope
+            name="%scope.name"
+            description="%scope.description"
+            id="com.quantum.view.sql">
+      </scope>
+   </extension>
+<!-- Perspective -->
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            name="%perspective.name"
+            icon="icons/quantum-ng.gif"
+            class="com.quantum.perspective.DBPerspective"
+            id="com.quantum.dbperspective">
+      </perspective>
+   </extension>
+<!-- Views -->
+   <extension
+         point="org.eclipse.ui.views">
+      <category
+            name="%category.name"
+            id="com.quantum.views">
+      </category>
+      <view
+            name="%sqllogview.name"
+            icon="icons/log.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.SQLLogView"
+            id="com.quantum.view.logview">
+      </view>
+      <view
+            name="%tableview.name"
+            icon="icons/table.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.tableview.TableView"
+            id="com.quantum.view.tableview.TableView">
+      </view>
+      <view
+            name="%bookmarkview.name"
+            icon="icons/bookmarks.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.bookmark.BookmarkView"
+            id="com.quantum.view.bookmarkview">
+      </view>
+      <view
+            name="%subsetview.name"
+            icon="icons/subset.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.subset.SubsetView"
+            id="com.quantum.view.subsetview">
+      </view>
+      <view
+            name="%sqlqueryview.name"
+            icon="icons/script.gif"
+            category="com.quantum.views"
+            class="com.quantum.view.SQLQueryView"
+            id="com.quantum.view.sqlqueryview">
+      </view>
+   </extension>
+<!-- Editors -->
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            name="Quantum SQL Editor"
+            icon="icons/script.gif"
+            extensions="sql,ddl"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            class="com.quantum.editors.SQLEditor"
+            id="com.quantum.editors.SQLEditor">
+      </editor>
+      <editor
+            name="Table Data Editor"
+            icon="icons/greentable.gif"
+            class="com.quantum.editors.dataeditor.DataEditor"
+            id="com.quantum.editors.dataeditor.DataEditor">
+      </editor>
+   </extension>
+<!-- Preferences -->
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            name="Quantum DB"
+            class="com.quantum.preferences.GlobalPreferences"
+            id="com.quantum.preferences">
+      </page>
+      <page
+            name="SQL Editor"
+            category="com.quantum.preferences"
+            class="com.quantum.preferences.SQLEditorPreferences"
+            id="com.quantum.preferences.editor">
+      </page>
+      <page
+            name="Copy"
+            category="com.quantum.preferences"
+            class="com.quantum.preferences.CopyPreferences"
+            id="com.quantum.preferences.copy">
+      </page>
+      <page
+            name="Custom Copy 1"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences"
+            id="com.quantum.preferences.customcopy">
+      </page>
+      <page
+            name="Custom Copy 2"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences2"
+            id="com.quantum.preferences.customcopy2">
+      </page>
+      <page
+            name="Custom Copy 3"
+            category="com.quantum.preferences.copy"
+            class="com.quantum.preferences.CustomCopyPreferences3"
+            id="com.quantum.preferences.customcopy3">
+      </page>
+   </extension>
+<!-- Menu for Bookmark View -->
+   <extension
+         point="org.eclipse.ui.viewActions">
+      <viewContribution
+            targetID="com.quantum.view.bookmarkview"
+            id="com.quantum.view.bookmarkview.menu">
+<!-- Export Bookmarks -->
+         <action
+               label="%bookmarkview.exportbookmarks"
+               icon="icons/export.gif"
+               tooltip="Exports bookmarks to a file"
+               class="com.quantum.actions.ExportBookmarksAction"
+               menubarPath="additions"
+               id="com.quantum.action.importbookmarks">
+         </action>
+<!-- Import Bookmarks -->
+         <action
+               label="%bookmarkview.importboomarks "
+               icon="icons/import.gif"
+               tooltip="Imports bookmarks from a file"
+               class="com.quantum.actions.ImportBookmarksAction"
+               menubarPath="additions"
+               id="com.quantum.action.importbookmarks">
+         </action>
+      </viewContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.ui.resourcePerspective">
+      </perspectiveExtension>
+   </extension>
+<!-- Property Pages -->
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            objectClass="com.quantum.view.bookmark.TreeNode"
+            name="Database"
+            nameFilter="*"
+            class="com.quantum.properties.DatabaseInformationPropertyPage"
+            id="com.quantum.properties.DatabaseInformationPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.BookmarkNode"
+            name="Bookmark"
+            nameFilter="*"
+            class="com.quantum.properties.BookmarkPropertyPage"
+            id="com.quantum.properties.BookmarkPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.BookmarkNode"
+            name="Schemas"
+            nameFilter="*"
+            class="com.quantum.properties.SchemaPropertyPage"
+            id="com.quantum.properties.SchemaPropertyPage">
+      </page>
+      <page
+            objectClass="com.quantum.view.bookmark.EntityNode"
+            name="Tables, Views and Sequences"
+            nameFilter="*"
+            class="com.quantum.properties.EntityPropertyPage"
+            id="com.quantum.properties.EntityPropertyPage">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.exportWizards">
+      <wizard
+            name="Export to Quantum Bookmark File"
+            icon="./icons/bookmarkfile.gif"
+            class="com.quantum.wizards.ExportBookmarkWizard"
+            id="com.quantum.wizards.ExportBookmarkWizard">
+         <description>
+            A wizard that exports the list of database bookmarks to a Quantum bookmark file.
+         </description>
+      </wizard>
+      <wizard
+            name="Export to Torque Configuration File"
+            icon="./icons/torque.gif"
+            class="com.quantum.wizards.ExportTorqueWizard"
+            id="com.quantum.wizards.ExportTorqueWizard">
+         <description>
+            A wizard that exports the database structure to a Torque-compatible XML file.
+         </description>
+         <selection
+               class="com.quantum.view.bookmark.BookmarkNode">
+         </selection>
+      </wizard>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="doc/toc.xml"
+            primary="true">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/schema/data.exsd b/archive/net.sourceforge.phpeclipse.quantum.sql/schema/data.exsd
new file mode 100644
index 0000000..765ec41
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/schema/data.exsd
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.quantum.Quantum">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.quantum.Quantum" id="data" name="Data"/>
+      </appInfo>
+      <documentation>
+         This extension point allow other plug-ins to act on data information extracted by Quantum.
+For each registered extension, Quantum will add a menu entry in the context menu of the Table View.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="dataActor" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="dataActor">
+      <complexType>
+         <attribute name="label" type="string">
+            <annotation>
+               <documentation>
+                  The label of the dataActor. Will be used to appear in the context menu.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  The class acting on the data. Will be supplied by the external plug-in, not by Quantum.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         2.3
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/schema/metadata.exsd b/archive/net.sourceforge.phpeclipse.quantum.sql/schema/metadata.exsd
new file mode 100644
index 0000000..25ea75f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/schema/metadata.exsd
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.quantum.Quantum">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.quantum.Quantum" id="metadata" name="Metadata"/>
+      </appInfo>
+      <documentation>
+         This extension point allow other plug-ins to act on metadata information extracted by Quantum.
+For each registered extension, Quantum will add a menu entry in the context menu of the Bookmarks View.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="metadataActor" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="metadataActor">
+      <complexType>
+         <attribute name="label" type="string">
+            <annotation>
+               <documentation>
+                  The label of the metadataActor. Will be used to appear in the context menu.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  The class acting on the metadata. Will be supplied by the external plug-in, not by Quantum.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         2.3
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src-test/com/quantum/util/StringUtilTest.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src-test/com/quantum/util/StringUtilTest.java
new file mode 100644
index 0000000..8e9670f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src-test/com/quantum/util/StringUtilTest.java
@@ -0,0 +1,71 @@
+/* Created on Jan 19, 2004 */
+package com.quantum.util;
+
+import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
+
+/**
+ * @author holmesbc
+ */
+public class StringUtilTest extends TestCase {
+	public void testSubstituteString() throws Exception {
+		
+		String sample = "This is a test of ${variable} substitution.";
+		String replaceAll = replaceAll(sample, "\\$\\{variable\\}", "parameter");
+		
+		assertEquals("replaceAll", "This is a test of parameter substitution.", replaceAll);
+		System.out.println(StringUtil.substituteString(sample, "${variable}", "parameter"));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "${variable}", "parameter"));
+	}
+
+	public void testSubstituteStringAtEnd() throws Exception {
+		
+		String sample = "Substitute ${variable}";
+		String replaceAll = replaceAll(sample, "\\$\\{variable\\}", "parameter");
+		
+		System.out.println(StringUtil.substituteString(sample, "${variable}", "parameter"));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "${variable}", "parameter"));
+	}
+
+	public void testSubstituteStringAtBeginning() throws Exception  {
+		
+		String sample = "${variable} substitution";
+		String replaceAll = replaceAll(sample, "\\$\\{variable\\}", "parameter");
+		
+		System.out.println(StringUtil.substituteString(sample, "${variable}", "parameter"));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "${variable}", "parameter"));
+	}
+
+	public void testSubstituteStringMultipleTokens() throws Exception  {
+		
+		String sample = "${variable}${variable}";
+		String replaceAll = replaceAll(sample, "\\$\\{variable\\}", "parameter");
+		
+		System.out.println(StringUtil.substituteString(sample, "${variable}", "parameter"));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "${variable}", "parameter"));
+	}
+
+	public void testSubstituteStringZeroLength() throws Exception  {
+		
+		String sample = "This is a test of ${variable} substitution.";
+		String replaceAll = replaceAll(sample, "\\$\\{variable\\}", "");
+		
+		System.out.println(StringUtil.substituteString(sample, "${variable}", ""));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "${variable}", ""));
+	}
+
+	public void testSubstituteStringSpecialChars() throws Exception  {
+		
+		String sample = "This is a test of \r substitution.";
+		String replaceAll = replaceAll(sample, "\r", "");
+		
+		System.out.println(StringUtil.substituteString(sample, "\r", ""));		
+		assertEquals("substitute String", replaceAll, StringUtil.substituteString(sample, "\r", ""));
+	}
+	
+	private String replaceAll(String original, String regex, String newValue) throws Exception {
+		Method method = String.class.getMethod("replaceAll", new Class[] { String.class, String.class } );
+		return (String) method.invoke(original, new Object[] { regex, newValue } );
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/IQuantumConstants.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/IQuantumConstants.java
new file mode 100644
index 0000000..3f5dc51
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/IQuantumConstants.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 12-jul-2003
+ *
+ */
+package com.quantum;
+
+/**
+ * @author panic
+ *
+ * Constants for general use in the quantum plug-in
+ */
+public interface IQuantumConstants {
+	public static final String PLUGIN_ID ="com.quantum"; //$NON-NLS-1$
+	public static final String PREFIX = PLUGIN_ID+"."; //$NON-NLS-1$
+
+	public static final String ADD_SCHEMA_DIALOG_CONTEXT = PREFIX+"add_schema_dialog_context"; //$NON-NLS-1$
+
+	//Constants for specifying Tables, Views and Sequences to the JDBC driver
+	public static final String Table = "TABLE";		
+	public static final String View = "VIEW";
+	public static final String Sequence = "SEQUENCE";
+
+	public static final String autoCommitTrue = "Always True";
+	public static final String autoCommitFalse = "Always False";
+	public static final String autoCommitSaved = "Last Saved";
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/Messages.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/Messages.java
new file mode 100644
index 0000000..ed81afc
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/Messages.java
@@ -0,0 +1,41 @@
+package com.quantum;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+
+	private static final String BUNDLE_NAME = "com.quantum.QuantumResources"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+    public static String getString(Class resourceClass, String key) {
+        return getString(
+            createKey(resourceClass, key));
+    }
+
+    private static String createKey(Class resourceClass, String key) {
+        return resourceClass.getName() + (key.startsWith(".") ? key : "." + key);
+    }
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+
+    public static String getString(Class resourceClass, String key, Object[] arguments) {
+        return getString(createKey(resourceClass, key), arguments);
+    }
+    
+    public static String getString(String key, Object[] arguments) {
+        String string = getString(key);
+        return MessageFormat.format(string, arguments);
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumPlugin.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumPlugin.java
new file mode 100644
index 0000000..154604a
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumPlugin.java
@@ -0,0 +1,310 @@
+package com.quantum;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.model.BookmarkCollection;
+import com.quantum.util.xml.XMLHelper;
+import com.quantum.view.subset.SubsetContentProvider;
+
+import org.eclipse.core.resources.ISaveContext;
+import org.eclipse.core.resources.ISaveParticipant;
+import org.eclipse.core.resources.ISavedState;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+/**
+ * @author root
+ * Main class of the quantum plugin, sets defaults, saves and recovers state.
+ */
+public class QuantumPlugin extends AbstractUIPlugin {
+     
+	private static QuantumPlugin plugin;
+	private Clipboard sysClip;
+
+	
+	public QuantumPlugin(IPluginDescriptor descriptor) {
+		super(descriptor);
+		plugin = this;
+	}
+
+	public static QuantumPlugin getDefault() {
+		return plugin;
+	}
+	/**
+	 * Reads the Quantum Plugin state from a file. The file has been created with writeImportantState
+	 * @param target
+	 */
+	protected void readStateFrom(File target) {
+		String fileName = target.getName();
+		if (!fileName.endsWith(Messages.getString("QuantumPlugin.saveFileExtension"))){ //$NON-NLS-1$
+            try {
+    			// It's the 2.0 format for preferences
+    			BookmarkCollection.getInstance().load(target);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+		} else {
+			//It's the 2.1 format for preferences and subsets
+			FileInputStream source = null;
+			try {
+				source = new FileInputStream(target);
+			} catch (FileNotFoundException e1) {
+				e1.printStackTrace();
+				return;
+			}
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			DocumentBuilder parser;
+			try {
+				parser = factory.newDocumentBuilder();
+                Document doc = parser.parse(source);
+
+                Element root = doc.getDocumentElement();
+                BookmarkCollection.getInstance().importXML(root);
+                BookmarkCollection.getInstance().setChanged(false);
+                SubsetContentProvider.getInstance().importXML(root);
+
+			} catch (ParserConfigurationException e) {
+				e.printStackTrace();
+			} catch (SAXException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#startup()
+	 */
+	public void startup() throws CoreException {
+		super.startup();
+		ISaveParticipant saveParticipant = new QuantumSaveParticipant();
+		ISavedState lastState =
+			ResourcesPlugin.getWorkspace().addSaveParticipant(
+				this,
+				saveParticipant);
+		if (lastState != null) {
+    		IPath location = lastState.lookup(new Path(Messages.getString("QuantumPlugin.saveDir"))); //$NON-NLS-1$
+    		if (location != null) {
+        		// the plugin instance should read any important state from the file. 
+        		File f = getStateLocation().append(location).toFile();
+        		readStateFrom(f);
+        		
+            }
+        }
+        sysClip = new Clipboard(null);
+ 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#shutdown()
+	 */
+	public void shutdown() throws CoreException {
+		super.shutdown();
+		sysClip.dispose();
+	}
+
+	/**
+	 * Write the bookmarks and subsets to a file, saving them for next use of the quantum plugin
+	 * @param target
+	 */
+	protected void writeImportantState(File target) {
+        try {
+            Document document = XMLHelper.createEmptyDocument();
+            
+    		Element root = (Element) document.appendChild(
+                document.createElement(Messages.getString("ExportXMLAction.SavedData"))); //$NON-NLS-1$
+    		
+    		BookmarkCollection.getInstance().exportXML(root);
+    		SubsetContentProvider.getInstance().exportXML(root);
+
+            FileWriter writer =  new FileWriter(target);
+            try {
+                XMLHelper.createDOMSerializer(writer).serialize(document);
+    		} finally {
+    			writer.close();
+    		}
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+	}
+	
+	/**
+	 *  Gets an image descriptof from a file in the icons directory 
+	 * @param name of the file to get
+	 * @return ImageDescriptor or null if not found
+	 */
+	public static ImageDescriptor getImageDescriptor(String name) {
+		ImageDescriptor descriptor = null;
+		try {
+			URL installURL =
+				QuantumPlugin.getDefault().getDescriptor().getInstallURL();
+			URL url = new URL(installURL, Messages.getString("QuantumPlugin.iconsDir") + name); //$NON-NLS-1$
+			descriptor = ImageDescriptor.createFromURL(url);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return descriptor;
+	}
+	public static Image getImage(String name) {
+        ImageDescriptor imageDescriptor = getImageDescriptor(name);
+		return imageDescriptor == null ? null : imageDescriptor.createImage();
+	}
+
+	protected void initializeDefaultPluginPreferences() {
+		RGB BACKGROUND = new RGB(255, 255, 255);
+		RGB COMMENT = new RGB(88, 148, 64);
+		RGB KEYWORD = new RGB(126, 0, 75);
+		RGB STRING = new RGB(0, 0, 255);
+		RGB NUMERIC = new RGB(255, 0, 0);
+		RGB DEFAULT = new RGB(0, 0, 0);
+		IPreferenceStore store = getPreferenceStore();
+		PreferenceConverter.setDefault(store,
+			"quantum.background.color", BACKGROUND); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.text.color", DEFAULT); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.keyword.color", KEYWORD); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.comment.color", COMMENT); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.string.color", STRING); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.numeric.color", NUMERIC); //$NON-NLS-1$
+		getPreferenceStore().setDefault("quantum.text.bold", false); //$NON-NLS-1$
+		getPreferenceStore().setDefault("quantum.keyword.bold", true); //$NON-NLS-1$
+		getPreferenceStore().setDefault("quantum.string.bold", false); //$NON-NLS-1$
+		getPreferenceStore().setDefault("quantum.comment.bold", false); //$NON-NLS-1$
+		getPreferenceStore().setDefault("quantum.numeric.bold", false); //$NON-NLS-1$
+		PreferenceConverter.setDefault(getPreferenceStore(), "quantum.font", (FontData) null); //$NON-NLS-1$
+        getPreferenceStore().setDefault("com.quantum.model.Bookmark.queryHistorySize", 20); //$NON-NLS-1$
+	}
+	// Returns the active page
+	public IWorkbenchPage getActivePage()
+	{
+		IWorkbench workbench = getWorkbench();
+		IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+		if (window == null)	return null;
+		IWorkbenchPage page = window.getActivePage();
+		return page;
+	}
+	/**
+	 * returns a view in the active page, creating it if needed
+	 * @param view, the name of the view (e.g com.quantum.view.tableview)
+	 * @return true if successful, false if not
+	 */
+	public IViewPart getView(String view)
+	{
+		IViewPart tableView = null;
+		try {
+			IWorkbenchPage page = QuantumPlugin.getDefault().getActivePage();
+			tableView =  page.findView(view);
+			if (tableView == null){
+				// showView will give focus to the created view, we don't want that
+				// so we save the active part
+				IWorkbenchPart part = page.getActivePart();
+				tableView = page.showView(view);
+				// and return the focus to it
+				page.activate(part);
+			}
+		} catch (PartInitException e) {
+			e.printStackTrace();
+		}
+		return tableView;
+	}
+
+
+
+	class QuantumSaveParticipant implements ISaveParticipant {
+		/**
+		* @see org.eclipse.core.resources.ISaveParticipant#doneSaving(ISaveContext)
+		*/
+		public void doneSaving(ISaveContext context) {
+		}
+		/**
+		 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(ISaveContext)
+		 */
+		public void prepareToSave(ISaveContext context) throws CoreException {
+		}
+
+		/**
+		 * @see org.eclipse.core.resources.ISaveParticipant#rollback(ISaveContext)
+		 */
+		public void rollback(ISaveContext context) {
+		}
+
+		/**
+		 * @see org.eclipse.core.resources.ISaveParticipant#saving(ISaveContext)
+		 */
+		public void saving(ISaveContext context) throws CoreException {
+			switch (context.getKind()) {
+				case ISaveContext.FULL_SAVE :
+					QuantumPlugin quantumPluginInstance = QuantumPlugin.getDefault();
+					// save the plug in state 
+					if (BookmarkCollection.getInstance().isAnythingChanged()
+						|| SubsetContentProvider.getInstance().hasChanged()) {
+
+						int saveNumber = context.getSaveNumber();
+						String saveFileName = Messages.getString("QuantumPlugin.saveDir") + "-" + Integer.toString(saveNumber) + Messages.getString("QuantumPlugin.saveFileExtension"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						File f = quantumPluginInstance.getStateLocation().append(saveFileName).toFile();
+
+						// if we fail to write, an exception is thrown and we do not update the path 
+						quantumPluginInstance.writeImportantState(f);
+
+						context.map(new Path(Messages.getString("QuantumPlugin.saveDir")), new Path(saveFileName)); //$NON-NLS-1$
+						context.needSaveNumber();
+
+					} else {
+						System.out.println("Not saving unchanged bookmarks"); //$NON-NLS-1$
+					}
+					break;
+				case ISaveContext.PROJECT_SAVE :
+					// get the project related to this save operation 
+					//IProject project = context.getProject(); 
+					// save its information, if necessary 
+					break;
+				case ISaveContext.SNAPSHOT :
+					// This operation needs to be really fast because 
+					// snapshots can be requested frequently by the 
+					// workspace. 
+					break;
+			}
+		}
+	}
+	/**
+	 * @return
+	 */
+	public Clipboard getSysClip() {
+		return sysClip;
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumResources.properties b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumResources.properties
new file mode 100644
index 0000000..d0a7e30
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/QuantumResources.properties
@@ -0,0 +1,286 @@
+bookmarkview.done = Done
+bookmarkview.editBookmark = Edit Bookmark...
+bookmarkview.refresh = Refresh
+bookmarkview.viewTableDetails = View Table Details
+bookmarkview.exportXML = Export XML
+bookmarkview.noSequence = Database type does not support sequences
+bookmarkview.noViews = Database type does not support views
+bookmarkview.noTables = Database type does not support tables
+bookmarkview.retrieveDbElementData = Retrieving data of type 
+bookmarkview.retrieveEntities = Retrieving table/view/sequence information 
+bookmarkview.done = Done
+bookmarkview.metaDataError = Error while retrieving metadata
+bookmarkview.confirm = Are you sure you want to delete bookmark 
+bookmarkview.disconnect = Disconnecting from 
+bookmarkview.deleteAllRows = Delete all rows from
+bookmarkview.deleteRowsAction = Delete all rows
+bookmarkview.customCopyAction = Custom Copy
+bookmarkview.confirmDeleteAllRows = Are you sure you want to delete all the rows from this table?
+sqlqueryview.executeQuery = Execute Query (Ctrl+Shift+Q)
+sqlqueryview.importQuery = Import Query
+sqlqueryview.exportQuery = Export Query
+sqlqueryview.clear = Clear
+sqlqueryview.copy = Copy
+sqlqueryview.paste = Paste
+sqlqueryview.done = Done
+tableview.refresh = Refresh Table
+tableview.copy = Copy Table Selection To Clipboard
+tableview.selectAll = Select All Table Rows
+tableview.close = Close Table
+tableview.update = Update...
+tableview.insert = Insert...
+tableview.delete = Delete...
+tableview.filterSort = Sort or Filter Table...
+tableview.showAll = Toggle Show All Table Rows
+tableview.defaultEncoding = Set Default Encoding
+tableview.UTF8Encoding = Set UTF-8
+tableview.UTF16Encoding = Set UTF-16
+tableview.QuantumTableViewName=Quantum Table View
+tableview.ViewNameFinalDecoration=)
+tableview.BookmarkSeparator=:
+tableview.ViewNameInitialDecoration=\ (
+filedialog.preferences = Preferences (*.ini)
+filedialog.allfiles = All Files (*.*)
+filedialog.sqlFiles = SQL query (*.sql)
+filedialog.ddlFiles = SQL query (*.ddl)
+filedialog.exportxml.name = XML files (*.xml)
+filedialog.exportxml.filter = *.xml
+filedialog.exportxml.name = XML files (*.xml)
+filedialog.exportxml.filter = *.xml
+filedialog.exportxml.name = XML files (*.xml)
+filedialog.exportxml.filter = *.xml
+filedialog.allfiles.name = All Files (*.*)
+filedialog.allfiles.filter = *.*
+filedialog.message.CannotOpenFileTitle=Cannot open file
+filedialog.message.CannotOpenFileMessage=Cannot open file to write : 
+filedialog.message.CannotOpenFileExplain=\n\nProbably is\'t read-only or used by another process.
+filedialog.options.ConfirmOverwrite = y
+filedialog.message.ConfirmOverwriteTitle = Confirm Overwrite
+filedialog.message.ConfirmOverwriteMessage = This file already exists : 
+filedialog.message.ConfirmOverwriteQuestion= \n\nDo you want to overwrite it?
+adapters.generic = Generic JDBC
+adapters.oracle = Oracle
+adapters.postgres = Postgres
+adapters.mysql = MySQL
+adapters.db2 = DB2
+adapters.db2as400 = DB2 for AS400
+adapters.adabasd = Adabas-D
+adapters.informix = Informix
+adapters.redbrick = Red Brick
+adapters.sybase = Sybase
+QuantumPlugin.save_2=save
+QuantumPlugin.icons_3=icons/
+QuantumPlugin.quantum.keyword.color_6=quantum.keyword.color
+QuantumPlugin.quantum.string.bold_12=quantum.string.bold
+QuantumPlugin.save_espace=save 
+QuantumPlugin.Not_saving_unchanged_bookmarks_18=Not saving unchanged bookmarks
+QuantumPlugin.iconsDir=icons/
+QuantumPlugin.saveDir=save
+QuantumPlugin.saveFileExtension=.xml
+ExecuteAction.Executing_Query3=Executing Query...
+ExecuteAction.Executing_Query2=Executing Query..
+ExecuteAction.Parsing_sql_script3=Parsing sql script...
+ExecuteAction.QueriesExecuted=\ queries executed, 
+ExecuteAction.RowsUpdated=\ rows updated, 
+ExecuteAction.Errors=\ errors, 
+ExecutAction.TimeExec=\ seconds
+ExecuteAction.Done=Done
+ExecuteAction.RowUpdated=\ rows updated, 
+ExecuteAction.ResultsDisplayed=\ results displayed, 
+ExportXMLAction.XMLExporting=XML struct: Exporting to file: 
+ExportXMLAction.Metadata=Metadata
+ExportXMLAction.Author=Author
+ExportXMLAction.Quantum=Quantum
+ExportXMLAction.Version=Version
+ExportXMLAction.XMLVersionNumber=0.4
+ExportXMLAction.Table=TABLE
+ExportXMLAction.View=VIEV
+ExportXMLAction.TableName=NAME
+ExportXMLAction.SchemaName=SCHEMA
+ExportXMLAction.OtherSchemas=Other_Schemas
+ExportXMLAction.BookmarkName=BOOKMARK
+ExportXMLAction.Subsets=SUBSETS
+ExportXMLAction.Subset=SUBSET
+ExportXMLAction.SubsetName=NAME
+ExportXMLAction.SavedData=SAVED_DATA
+ExportXMLAction.TableColumn=COLUMN
+ExportXMLAction.ColumnName=NAME
+ExportXMLAction.UNKNOWN=UNKNOWN
+ExportXMLAction.NO=NO
+ExportXMLAction.YES=YES
+ExportXMLAction.ColumnNullable=Nullable
+ExportXMLAction.ColumnAutoIncrement=Auto_Increment
+ExportXMLAction.PrimaryKey=Primary_Key
+ExportXMLAction.PKName=Name
+ExportXMLAction.PKColumn=Column
+ExportXMLAction.PKColumnName=Name
+ExportXMLAction.PKSequence=Sequence
+ExportXMLAction.ForeignKey=Foreign_Key
+ExportXMLAction.FKName=Name
+ExportXMLAction.FKType=Type
+ExportXMLAction.FKImported=Imported
+ExportXMLAction.FKExported=Exported
+ExportXMLAction.FKCascadeUpdate=Cascade_Update
+ExportXMLAction.FKCascadeDelete=Cascade_Delete
+ExportXMLAction.FKColumn=Column
+ExportXMLAction.FKSequence=Sequence
+ExportXMLAction.FKPrimarySchema=Primary_Schema
+ExportXMLAction.FKPrimaryTable=Primary_Table
+ExportXMLAction.FKPrimaryColumn=Primary_Column
+ExportXMLAction.FKForeignSchema=Foreign_Schema
+ExportXMLAction.FKForeignTable=Foreign_Table
+ExportXMLAction.FKForeignColumn=Foreign_Column
+SetSchemaAction.SetSchema=Set Schema
+SetSchemaAction.PleaseEnterName=Please enter the name of new schema:
+MetaDataKey=METADATA
+MetaDataKeySeparator=:
+NoFeature.Views=Views
+NoFeature.Sequences=Sequences
+Error.NoDatabase=Database not supported: 
+PreferencesPage.PickFont=Pick Font
+PreferencesPage.DefaultFont=Default Font
+PreferencesPage.BackgroundColor=Background Color
+PreferencesPage.DefaultTextColor=Default Text Color
+PreferencesPage.quantum.keyword.color_26=quantum.keyword.color
+PreferencesPage.KeywordTextColor=Keyword Text Color
+PreferencesPage.Bold=Bold
+PreferencesPage.CommentTextColor=Comment Text Color
+PreferencesPage.StringTextColor=String Text Color
+PreferencesPage.NumericTextColor=Numeric Text Color
+PreferencesPage.Font_Default=Font: default
+PreferencesPage.regular=regular
+PreferencesPage.bold=bold
+PreferencesPage.italic=italic
+PreferencesPage.boldItalic=bold italic
+PreferencesPage.FontPrompt=Font: 
+BookmarkLabelProvider.TablePrefix= 
+BookmarkLabelProvider.ViewPrefix= 
+BookmarkLabelProvider.SequencePrefix= 
+DeleteColumnAction.DeleteColumns=Delete Columns...
+DeleteColumnAction.ConfirmDeleteColumns=Are you sure you want to delete the selected columns? 
+DeleteObjectAction.DeleteSubset=Delete Subset...
+DeleteObjectAction.ConfirmDeleteSubset=Are you sure you want to delete the selected subset ?
+DeleteObjectAction.DeleteItems=Delete items...
+DeleteObjectAction.ConfirmDeleteItems=Are you sure you want to delete the selected tables/views? 
+DeleteSubsetAction.DeleteSubset=Delete Subset...
+DeleteSubsetAction.ConfirmDeleteSubset=Are you sure you want to delete the selected subset?
+NewSubsetAction.CreatingNewSubset=Creating new subset..
+NewSubsetAction.NameOfNewSubset=Name of the new Subset
+NewSubsetAction.PleaseEnterName=Please enter name
+OracleAdapter.._3=.
+BookmarkView.ShowTableSizes=Show Table Sizes
+BookmarkView.ShowDatabaseData=Show Database Info
+BookmarkView.Paste=Paste
+BookmarkView.Copy=Copy
+BookmarkView.CopyOf=Copy of 
+SQLLogView.ClearLog=Clear Log
+SQLQueryView.Commit=Commit
+SQLQueryView.RollBack=RollBack
+SQLQueryView.AutoCommit=AutoCommit
+SubsetView.Paste=Paste
+SubsetView.Delete=Delete
+SubsetView.CreatesANewEmptySubset=Creates a new empty subset
+SubsetView.DeletesTheSelectedColumns=Deletes the selected column
+SubsetView.DeletesTheSelectedObject=Deletes the selected object
+SubsetView.DeletesTheSelectedSubset=Deletes the selected subset
+TableView.FilterAndSort=Filter and Sort
+TableView.UpdateRow=Update Row
+TableView.InsertRow=Insert Row
+TableView.DeleteRow=Delete Row
+TableAdapter.to=\ to 
+TableAdapter.of=\ of 
+TableAdapter.full=\ (FULL)
+BookmarkWizard.NewBookmark=New Bookmark
+BookmarkWizard.Testing=Testing...
+BookmarkWizard.JarFiles=Jar Files (*.jar)
+BookmarkWizard.ZipFiles=Zip Files (*.zip)
+BookmarkWizard.AllFiles=All Files (*.*)
+BookmarkWizard.BookmarkNameAst=*Bookmark Name
+BookmarkWizard.UsernameAst=*Username
+BookmarkWizard.PasswordAst=Password
+BookmarkWizard.Schema=Schema (optional)
+BookmarkWizard.ConnectAst=*JDBC URL
+BookmarkWizard.DriverAst=*Driver
+BookmarkWizard.TypeAst=*Type
+BookmarkWizard.Prompt=Prompt for password
+BookmarkWizard.DriverFilenameAst=*Driver Filename
+BookmarkWizard.Browse=Browse...
+DeleteRowPage.ColumnName=Column Name
+DeleteRowPage.Value=Value
+DeleteRowPage.IncludeIn=Include in?
+DeleteRowPage.WhereClause=Where clause
+DeleteRowPage.UpdatingQuery=Updating query
+DeleteRowPage.WarningNoWhere=Warning: no \"where clause\" columns selected, all rows will be deleted
+InsertRowPage.ColumnName=Column Name
+InsertRowPage.Value=Value
+UpdateRowPage.ColumnName=Column Name
+UpdateRowPage.OldValue=Old Value
+UpdateRowPage.NewValue=New Value
+UpdateRowPage._13=
+UpdateRowPage.SetValue=Set Value
+ConnectAction.ConnectingTo=Connecting to 
+ConnectAction.ErrorConnecting=Error while connecting to 
+BookmarkView.SetExtraSchemas=Set Extra Schemas
+BookmarkView.CopyColumnSeparator=\ 
+MultiSQLServer.Enter_Password=Enter Password
+MultiSQLServer.PasswordNotProvided=Password not provided in Bookmark
+BookmarkSelectionDialog.text=Select a bookmark
+BookmarkSelectionDialog.title=Bookmark Selection
+ExecuteAgainstAction.IOException=An I/O Exception was encountered while \ntrying to read the input file.
+ExecuteAgainstAction.SQLException=A database error was encountered while \ntrying to execute the SQL statements.
+ExecuteAgainstAction.title=Problem Encountered
+ExceptionDisplayDialog.stackTrace=Stack trace:
+
+# Actions
+com.quantum.actions.AddToQuickListAction.text=Add to Quick List
+com.quantum.actions.RemoveFromQuickListAction.text=Remove from Quick List
+com.quantum.actions.ConnectAction.text = Connect
+com.quantum.actions.ConnectAction.singleSuccessMessage = Connected to {0}
+com.quantum.actions.ConnectAction.singleFailureMessage = Could not connect to {0}
+com.quantum.actions.ConnectAction.multiSuccessMessage = {0} databases successfully connected.
+com.quantum.actions.ConnectAction.multiFailureMessage = {0} database(s) successfully connected.  {1} error(s).
+com.quantum.actions.DisconnectAction.text = Disconnect
+com.quantum.actions.DisconnectAction.message = Disconnected
+com.quantum.actions.ViewTableAction.text = View Table
+com.quantum.actions.OpenQueryAction.text = Open
+com.quantum.actions.DeleteBookmarkAction.text = Delete
+com.quantum.actions.RefreshBookmarkAction.text = Refresh
+com.quantum.actions.NextSequenceAction.text = Increment Sequence Value
+com.quantum.actions.PrevSequenceAction.text = Current Sequence Value
+com.quantum.actions.NewBookmarkAction.text = New Bookmark...
+com.quantum.actions.NewBookmarkAction.toolTip = Create a new bookmark
+com.quantum.actions.DeleteAllRowsAction.text = Delete All Rows
+com.quantum.actions.DeleteAllRowsAction.confirmTitle = Warning
+com.quantum.actions.DeleteAllRowsAction.confirmText = Are you sure you want to delete all the rows from the table {0}?
+com.quantum.actions.ViewTableDetailsAction.text = View Table Details
+
+com.quantum.util.connection.ConnectionUtil.title = Connection Not Established
+com.quantum.util.connection.ConnectionUtil.message = The bookmark could not be connected.
+
+com.quantum.view.bookmark.CopyAction.text = Copy
+com.quantum.view.bookmark.PasteAction.text = Paste
+com.quantum.view.bookmark.RenameAction.text = Rename
+com.quantum.view.bookmark.QuickListNode.labelName=Quick List
+com.quantum.view.bookmark.QueryListNode.labelName=Recent SQL Statements
+com.quantum.view.bookmark.GroupNode.TABLE=Tables
+com.quantum.view.bookmark.GroupNode.VIEW=Views
+com.quantum.view.bookmark.GroupNode.SEQUENCE=Sequences
+
+com.quantum.preferences.GlobalPreferences.com.quantum.model.Bookmark.queryHistorySize=Maximum size of query history:
+
+com.quantum.wizards.ExportBookmarkWizardPage.title = Export Bookmark List
+com.quantum.wizards.ExportBookmarkWizardPage.selectAll = Select All
+com.quantum.wizards.ExportBookmarkWizardPage.deselectAll = Deselect All
+com.quantum.wizards.ExportBookmarkWizardPage.fileName = File name:
+com.quantum.wizards.ExportBookmarkWizardPage.browse = Browse
+com.quantum.wizards.ExportBookmarkWizardPage.error.IOException.title = I/O Exception
+com.quantum.wizards.ExportBookmarkWizardPage.error.IOException.message = A problem was encountered with the file: "{0}"
+
+
+# Exception Dialog
+com.quantum.ui.dialog.ExceptionDisplayDialog.java.sql.IOException.title=I/O Exception
+com.quantum.ui.dialog.ExceptionDisplayDialog.java.sql.IOException.message=A problem was encountered while trying to access the file.
+com.quantum.ui.dialog.ExceptionDisplayDialog.java.sql.SQLException.title=SQL Exception
+com.quantum.ui.dialog.ExceptionDisplayDialog.java.sql.SQLException.message=An SQL Exception was encountered while trying to process your request.
+BookmarkWizard.Error=Error
+BookmarkWizard.bookmarkAlreadyExists=The selected bookmark name already exists.
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/AddToQuickListAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/AddToQuickListAction.java
new file mode 100644
index 0000000..e773620
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/AddToQuickListAction.java
@@ -0,0 +1,56 @@
+package com.quantum.actions;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.view.bookmark.EntityNode;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * <p>This action takes an EntityNode and adds a copy of it to the quicklist
+ * of a bookmark.</p>
+ * 
+ * @author bcholmes
+ */
+public class AddToQuickListAction extends SelectionListenerAction {
+    private IViewPart view;
+    private List entities = Collections.synchronizedList(new ArrayList());
+    
+    public AddToQuickListAction(IViewPart view) {
+        super(Messages.getString(AddToQuickListAction.class.getName() + ".text"));
+        this.view = view;
+    }
+    
+	public void run() {
+        for (Iterator i = this.entities.iterator(); i.hasNext(); ) {
+            EntityNode entityNode = (EntityNode) i.next();
+            entityNode.getBookmark().addQuickListEntry(entityNode.getEntity());
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        this.entities.clear();
+        for (Iterator i = selection.iterator(); enabled && i.hasNext(); ) {
+            Object object = i.next();
+            if (object != null && object instanceof EntityNode) {
+                EntityNode node = (EntityNode) object;
+                enabled &= !(node.getBookmark().isInQuickList(node.getEntity()));
+                this.entities.add(node);
+            } else {
+                enabled = false;
+            }
+        }
+        
+        return enabled;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSQLAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSQLAction.java
new file mode 100644
index 0000000..e651640
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSQLAction.java
@@ -0,0 +1,25 @@
+package com.quantum.actions;
+
+import java.sql.Connection;
+
+import com.quantum.model.Bookmark;
+import com.quantum.util.connection.ConnectionUtil;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author BC
+ */
+public abstract class BaseSQLAction extends Action {
+    
+    private ConnectionUtil connectionUtil = new ConnectionUtil();
+    
+    protected abstract Shell getShell();
+    
+    protected abstract Bookmark getBookmark();
+
+    protected Connection getConnection() {
+        return this.connectionUtil.getConnection(getBookmark(), getShell());
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSequenceAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSequenceAction.java
new file mode 100644
index 0000000..0e967c4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/BaseSequenceAction.java
@@ -0,0 +1,53 @@
+package com.quantum.actions;
+
+import java.sql.Connection;
+import java.util.List;
+
+import com.quantum.model.Bookmark;
+import com.quantum.util.connection.ConnectionUtil;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author BC
+ */
+public abstract class BaseSequenceAction extends SelectionListenerAction {
+    
+    protected IViewPart view;
+    private ConnectionUtil connectionUtil = new ConnectionUtil();
+
+    protected BaseSequenceAction(String text, IViewPart view) {
+        super(text);
+        
+    }
+
+    protected Bookmark getBookmark() {
+        TreeNode node = getEntityNode();
+        return node.getBookmark();
+    }
+    
+    protected Connection getConnection() {
+        return connectionUtil.getConnection(getBookmark(), getShell());
+    }
+
+    protected EntityNode getEntityNode() {
+        List list = getSelectedNonResources();
+        return (EntityNode) list.get(0);
+    }
+
+    protected Shell getShell() {
+        return this.view.getViewSite().getShell();
+    }
+    
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        return enabled && selection.size() == 1 
+            && (selection.getFirstElement() instanceof EntityNode) 
+            && ((EntityNode) selection.getFirstElement()).isSequence();
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CloseTableAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CloseTableAction.java
new file mode 100644
index 0000000..dc99395
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CloseTableAction.java
@@ -0,0 +1,40 @@
+package com.quantum.actions;
+
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ *
+ */
+public class CloseTableAction extends Action implements IViewActionDelegate {
+	TableView view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (TableView) view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	public void run() {
+		view.closeCurrent();
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ConnectAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ConnectAction.java
new file mode 100644
index 0000000..05eeed9
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ConnectAction.java
@@ -0,0 +1,115 @@
+package com.quantum.actions;
+
+import java.sql.Connection;
+import java.util.Iterator;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.util.connection.ConnectionUtil;
+import com.quantum.view.bookmark.BookmarkNode;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+public class ConnectAction extends SelectionListenerAction {
+	/**
+     * @param text
+     */
+    public ConnectAction(IViewPart view) {
+        super(Messages.getString(ConnectAction.class.getName() + ".text"));
+        this.view = view;
+        setImageDescriptor(
+            QuantumPlugin.getImageDescriptor("connect.gif")); //$NON-NLS-1$
+    }
+
+    private IViewPart view;
+    private ConnectionUtil connectionUtil = new ConnectionUtil();
+
+	/**
+	 * @see IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = view;
+	}
+
+	/**
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+        
+        int bookmarks = 0;
+        int errors = 0;
+        String lastBookmarkName = null;
+        for (Iterator i = getSelectedNonResources().iterator(); i.hasNext();) {
+            Bookmark bookmark = ((BookmarkNode) i.next()).getBookmark();
+            Connection connection = this.connectionUtil.connect(bookmark, getShell());
+            if (connection == null) {
+                errors++;
+            }
+            bookmarks++;
+            lastBookmarkName = bookmark.getName();
+        }
+        
+        if (bookmarks == 1 && errors == 0) {
+            updateStatusLine(getMessage("singleSuccessMessage", 
+                new Object[] {lastBookmarkName}));
+        } else if (bookmarks == 1 && errors == 1) {
+            updateStatusLine(getMessage("singleFailureMessage", 
+                new Object[] {lastBookmarkName}));
+        } else if (bookmarks > 1 && errors == 0) {
+            updateStatusLine(getMessage("multiSuccessMessage", 
+                new Object[] {String.valueOf(bookmarks)}));
+        } else if (bookmarks > 1 && errors > 0) {
+            updateStatusLine(getMessage("multiFailureMessage", 
+            new Object[] {String.valueOf(bookmarks - errors), 
+                String.valueOf(errors)}));
+        }
+	}
+    
+    private String getMessage(String key, Object[] arguments) {
+        return Messages.getString(getClass().getName() + "." + key, arguments);
+    }
+    
+    /**
+     * Updates the message shown in the status line.
+     *
+     * @param message the message to display
+     */
+    protected void updateStatusLine(String message) {
+        this.view.getViewSite().getActionBars().getStatusLineManager().setMessage(message);
+    }
+    
+    protected Shell getShell() {
+        return this.view.getSite().getShell();
+    }
+
+    /**
+     * 
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        for (Iterator i = selection.iterator();
+            enabled && i.hasNext();
+            ) {
+            Object object = i.next();
+            if (object instanceof BookmarkNode) {
+                BookmarkNode node = (BookmarkNode) object;
+                enabled &= !node.getBookmark().isConnected();
+            } else {
+                enabled = false;
+            }
+        }
+        return enabled;
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CustomCopyAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CustomCopyAction.java
new file mode 100644
index 0000000..24ea456
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/CustomCopyAction.java
@@ -0,0 +1,73 @@
+/*
+ * Created on 11/08/2003
+ *
+ */
+package com.quantum.actions;
+
+import java.util.Iterator;
+
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Column;
+import com.quantum.model.EntityHolder;
+import com.quantum.util.NthLevelConverter;
+import com.quantum.util.QuantumUtil;
+import com.quantum.util.StringUtil;
+import com.quantum.view.bookmark.ColumnNode;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+
+public class CustomCopyAction extends SelectionListenerAction {
+	private final IViewPart view;
+	private final int ind;
+	/**
+	 * @param BookmarkView
+	 */
+	public CustomCopyAction(IViewPart view, int ind) {
+        super(null);
+		this.view = view;
+		this.ind = ind;
+	}
+	public void run() {
+		String copyText = "";
+		Iterator iter = getSelectedNonResources().iterator();
+		NthLevelConverter converter = new NthLevelConverter();
+		// Fill up the converter. We iterate the selection items
+		while (iter.hasNext()) {
+			Object current = iter.next();
+			if (current instanceof ColumnNode) {
+				ColumnNode column = (ColumnNode) current;
+				if (column != null) {
+					converter.add(column.getColumn().getName(), 
+                        column.getColumn().getParentEntity().getCondQualifiedName(), 0);
+				}
+			} else if (current instanceof EntityHolder) {
+                EntityHolder currentSelec = (EntityHolder) current;
+				converter.add(currentSelec.getEntity().getCondQualifiedName(), null, 1);
+				Column[] columns = currentSelec.getEntity().getColumns();
+				for (int i = 0, length = (columns == null) ? 0 : columns.length;
+                    i < length;
+                    i++) {
+					converter.add(columns[i].getName(), 
+                        currentSelec.getEntity().getCondQualifiedName(), 0);
+				}					
+			}
+		}
+		IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
+	
+		
+		converter.convert(Integer.toString(ind));
+		
+		String template = QuantumUtil.trasposeEscape(store.getString("customCopyTemplate" + Integer.toString(ind)));
+		copyText = StringUtil.substituteString(template, "${table_list}", converter.getTableList());
+		
+		
+		QuantumPlugin.getDefault().getSysClip().setContents(
+			new Object[] { copyText },
+			new Transfer[] { TextTransfer.getInstance()});
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteAllRowsAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteAllRowsAction.java
new file mode 100644
index 0000000..09f67bd
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteAllRowsAction.java
@@ -0,0 +1,77 @@
+package com.quantum.actions;
+
+import java.sql.SQLException;
+
+import com.quantum.Messages;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.Table;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.view.bookmark.EntityNode;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author root
+ *
+ */
+public class DeleteAllRowsAction extends SelectionListenerAction {
+    private IViewPart view;
+    
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public DeleteAllRowsAction(IViewPart view) {
+        super(Messages.getString(DeleteAllRowsAction.class.getName() + ".text"));
+		this.view = view;
+	}
+
+	public void run() {
+        try {
+            Table table = getTable();
+			if (table != null) {
+				boolean flag = MessageDialog.openConfirm(
+                    view.getSite().getShell(), 
+                    Messages.getString(DeleteAllRowsAction.class.getName() + ".confirmTitle"),
+                    Messages.getString(DeleteAllRowsAction.class.getName() + ".confirmText",  
+                    new Object[] { table.getCondQualifiedName() }));
+				if (flag) {
+					table.deleteAllRows();
+				}
+			}
+        } catch (SQLException e) {
+            ExceptionDisplayDialog.openError(getShell(), 
+                Messages.getString("ExecuteAgainstAction.title"), 
+                Messages.getString("ExecuteAgainstAction.ConnectionException"), e);
+        } catch (ConnectionException e) {
+            ExceptionDisplayDialog.openError(getShell(), 
+                Messages.getString("ExecuteAgainstAction.title"), 
+                Messages.getString("ExecuteAgainstAction.ConnectionException"), e);
+        }
+	}
+
+    private Table getTable() {
+        EntityNode node = (EntityNode) getSelectedNonResources().get(0);
+        return node == null ? null : (Table) node.getEntity();
+    }
+    
+    
+
+    protected Shell getShell() {
+        return this.view.getViewSite().getShell();
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        return enabled && selection.size() == 1 && 
+            (selection.getFirstElement() instanceof EntityNode) &&
+            ((EntityNode) selection.getFirstElement()).isTable();
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteBookmarkAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteBookmarkAction.java
new file mode 100644
index 0000000..a00c028
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteBookmarkAction.java
@@ -0,0 +1,59 @@
+package com.quantum.actions;
+
+import java.util.Iterator;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.view.bookmark.BookmarkNode;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author root
+ *
+ */
+public class DeleteBookmarkAction extends SelectionListenerAction {
+    
+    private IViewPart view;
+    
+	public DeleteBookmarkAction(IViewPart view) {
+        super(Messages.getString(DeleteBookmarkAction.class.getName() + ".text"));
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("delete.gif"));
+		this.view = view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	
+	public void run() {
+		List bookmarkNodes = getSelectedNonResources();
+        boolean flag = MessageDialog.openConfirm(view.getSite().getShell(), Messages.getString("bookmarkview.deleteBookmark"), Messages.getString("bookmarkview.confirm")); //$NON-NLS-1$ //$NON-NLS-2$
+
+        for (Iterator i = bookmarkNodes.iterator(); flag && i.hasNext();) {
+            BookmarkNode bookmarkNode = (BookmarkNode) i.next();
+            if (bookmarkNode != null) {
+                BookmarkCollection.getInstance().removeBookmark(bookmarkNode.getBookmark());
+            }
+        }
+	}
+
+	public boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        for (Iterator i = selection.iterator(); enabled && i.hasNext(); ) {
+            enabled &= (i.next() instanceof BookmarkNode);
+        }
+        
+        return enabled;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteColumnAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteColumnAction.java
new file mode 100644
index 0000000..37e38ff
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteColumnAction.java
@@ -0,0 +1,63 @@
+package com.quantum.actions;
+
+import java.util.Iterator;
+
+import com.quantum.Messages;
+import com.quantum.view.bookmark.ColumnNode;
+import com.quantum.view.subset.SubsetView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * Deletes the selected columns from the Subset items (Tables)
+ * @author root
+ *
+ */
+public class DeleteColumnAction extends Action implements IViewActionDelegate  {
+   	SubsetView view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (SubsetView) view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	
+	public void run() {
+		StructuredSelection selection = view.getSelection();
+		Iterator iter = selection.iterator();
+		if (! MessageDialog.openConfirm(view.getSite().getShell(), 
+						Messages.getString("DeleteColumnAction.DeleteColumns"),  //$NON-NLS-1$
+						Messages.getString("DeleteColumnAction.ConfirmDeleteColumns") )) //$NON-NLS-1$
+			return;
+		
+		while (iter.hasNext()) {
+			Object current = iter.next();
+			if (current instanceof ColumnNode) {
+				ColumnNode column = (ColumnNode) current;
+				if (column != null) {
+					view.deleteColumn(column);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteObjectAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteObjectAction.java
new file mode 100644
index 0000000..4d83cee
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteObjectAction.java
@@ -0,0 +1,77 @@
+package com.quantum.actions;
+
+import java.util.Iterator;
+
+import com.quantum.Messages;
+import com.quantum.view.subset.ObjectNode;
+import com.quantum.view.subset.SubsetNode;
+import com.quantum.view.subset.SubsetView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * Deletes an entire object (Table) from the SubsetView
+ * @author root
+ *
+ */
+public class DeleteObjectAction extends Action implements IViewActionDelegate  {
+   	SubsetView view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (SubsetView) view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	
+	public void run() {
+		Object selection = view.getCurrent();
+		if (selection instanceof SubsetNode) {
+			SubsetNode node = (SubsetNode) selection;
+			if (node != null) {
+				boolean flag = MessageDialog.openConfirm(view.getSite().getShell(), 
+								Messages.getString("DeleteObjectAction.DeleteSubset"),  //$NON-NLS-1$
+								Messages.getString("DeleteObjectAction.ConfirmDeleteSubset") + node.getName()); //$NON-NLS-1$
+				if (flag) {
+					view.deleteCurrent();
+				}
+			}
+		} else if (selection instanceof ObjectNode) {
+			StructuredSelection allSelected = view.getSelection();
+			Iterator iter = allSelected.iterator();
+			if (! MessageDialog.openConfirm(view.getSite().getShell(), 
+							Messages.getString("DeleteObjectAction.DeleteItems"),  //$NON-NLS-1$
+							Messages.getString("DeleteObjectAction.ConfirmDeleteItems") )) //$NON-NLS-1$
+				return;
+		
+			while (iter.hasNext()) {
+				Object current = iter.next();
+				if (current instanceof ObjectNode) {
+					ObjectNode node = (ObjectNode) current;
+					if (node != null) {
+							view.deleteObject(node);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteSubsetAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteSubsetAction.java
new file mode 100644
index 0000000..086d543
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DeleteSubsetAction.java
@@ -0,0 +1,55 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.view.subset.SubsetNode;
+import com.quantum.view.subset.SubsetView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ *	Deletes a complete subset from the subset view
+ */
+public class DeleteSubsetAction extends Action implements IViewActionDelegate  {
+   	SubsetView view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (SubsetView) view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	
+	public void run() {
+		Object selection = view.getCurrent();
+		if (selection instanceof SubsetNode) {
+			SubsetNode node = (SubsetNode) selection;
+			if (node != null) {
+				boolean flag = MessageDialog.openConfirm(view.getSite().getShell(), 
+								Messages.getString("DeleteSubsetAction.DeleteSubset"),  //$NON-NLS-1$
+								Messages.getString("DeleteSubsetAction.ConfirmDeleteSubset") + node.getName()); //$NON-NLS-1$
+				if (flag) {
+					view.deleteCurrent();
+				}
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DisconnectAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DisconnectAction.java
new file mode 100644
index 0000000..7966a08
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/DisconnectAction.java
@@ -0,0 +1,81 @@
+package com.quantum.actions;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.ConnectionException;
+import com.quantum.view.bookmark.BookmarkNode;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * Disconnects from the database
+ * 
+ * @author root
+ */
+public class DisconnectAction extends SelectionListenerAction {
+    private IViewPart view;
+    private List selections = new Vector();
+
+    /**
+     * @param text
+     */
+    public DisconnectAction(IViewPart view) {
+        super(Messages.getString(DisconnectAction.class.getName() + ".text"));
+        this.view = view;
+        setImageDescriptor(
+            QuantumPlugin.getImageDescriptor("disconnect.gif")); //$NON-NLS-1$
+    }
+
+
+    public void run() {
+        for (Iterator i = this.selections.iterator(); i.hasNext();) {
+            Bookmark bookmark = (Bookmark) i.next();
+            try {
+                bookmark.disconnect();
+            } catch (ConnectionException e) {
+                e.printStackTrace();
+            }
+        }
+        updateStatusLine(getMessage("message"));
+    }
+
+    private String getMessage(String key) {
+        return Messages.getString(getClass().getName() + "." + key);
+    }
+    
+    /**
+     * Updates the message shown in the status line.
+     *
+     * @param message the message to display
+     */
+    protected void updateStatusLine(String message) {
+        this.view.getViewSite().getActionBars().getStatusLineManager().setMessage(message);
+    }
+    
+
+    /**
+     * 
+     */
+    public boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        this.selections.clear();
+        for (Iterator i = selection.iterator(); enabled && i.hasNext(); ) {
+            Object object = i.next();
+            if (object instanceof BookmarkNode) {
+                BookmarkNode node = (BookmarkNode) object;
+                this.selections.add(node.getBookmark());
+                enabled &= node.getBookmark().isConnected();
+            } else {
+                enabled = false;
+            }
+        }
+        return enabled;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAction.java
new file mode 100644
index 0000000..f8c4418
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAction.java
@@ -0,0 +1,142 @@
+package com.quantum.actions;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.SQLParser;
+import com.quantum.sql.SQLResults;
+import com.quantum.view.LogProxy;
+import com.quantum.view.SQLQueryView;
+import com.quantum.view.bookmark.BookmarkNode;
+import com.quantum.view.bookmark.BookmarkView;
+import com.quantum.view.tableview.DefaultSizes;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author panic
+ *
+ *	Executes a query from the QueryView
+ */
+public class ExecuteAction extends BaseSQLAction implements IViewActionDelegate {
+	SQLQueryView view;
+	boolean flag = false;
+	String execute1 = Messages.getString("ExecuteAction.Executing_Query3"); //$NON-NLS-1$
+	String execute2 = Messages.getString("ExecuteAction.Executing_Query2"); //$NON-NLS-1$
+    
+	public ExecuteAction() {
+		setActionDefinitionId("com.quantum.actions.ExecuteAction");
+	}
+    
+	public void init(IViewPart view) {
+		this.view = (SQLQueryView) view;
+	}
+
+	public void run(IAction action) {
+		run();
+	}
+    
+	public void run() {
+		BookmarkNode current = BookmarkView.getInstance().getCurrentBookmark();
+		if (current == null)
+		{
+			 MessageDialog.openInformation(
+			   view.getSite().getShell(),"Sorry","Please select a bookmark to use as connection.");
+			 return;
+		}		   
+		Connection con = getConnection();
+		view.setStatus(execute1);
+		MultiSQLServer server = MultiSQLServer.getInstance();
+		view.setStatus(Messages.getString("ExecuteAction.Parsing_sql_script3")); //$NON-NLS-1$
+		Vector queries = new Vector();
+		String viewQuery = view.getQuery();
+		// We parse the executable units to send to the JDBC driver
+		queries = SQLParser.parse(viewQuery);
+		for (int i = 0; i < queries.size(); i++) {
+			String query = (String) queries.elementAt(i);
+			System.out.println(query);
+		}
+		int resultCount = 0;
+		int resultUpdateCount = 0;
+		int errorCount = 0;
+		int resultsDisplayed = 0;
+		double startTime = 0.0; // stores the time when query is started
+		double queryDuration= 0.0; // stores query's execution time
+		
+		for (int i = 0; i < queries.size(); i++) {
+			if (flag) {
+				view.setStatus(execute1);
+			} else {
+				view.setStatus(execute2);
+			}
+		   
+		   String query = (String) queries.elementAt(i);
+		   System.out.println(">" + query + "<"); //$NON-NLS-1$ //$NON-NLS-2$
+		   if (con != null && !query.equals("")) { //$NON-NLS-1$
+	
+			SQLResults results;
+			try {
+				startTime = System.currentTimeMillis(); // Start the measure of execution time
+				results = server.execute(con, query, 1, DefaultSizes.PAGE_SIZE, DefaultSizes.MAX_COLUMN_SIZE);
+				queryDuration = (System.currentTimeMillis() - startTime)/1000; // calculate the execution time (in seconds)				 
+				current.getBookmark().addQuery(query);
+			} catch (SQLException e) {
+				 errorCount++;
+				LogProxy log = LogProxy.getInstance();
+				log.addText(
+					LogProxy.ERROR,
+					"Error Executing: " + query + ":" + e.toString(), e); //$NON-NLS-1$ //$NON-NLS-2$
+				MessageDialog.openConfirm(view.getSite().getShell(), "Database returned error", e.getLocalizedMessage());  //$NON-NLS-1$ 
+				continue;
+			}
+			   resultCount++;
+			   if (results.isResultSet()) {
+				 TableView.getInstance().loadQuery(current.getBookmark(), results);
+				 resultsDisplayed++;
+			   } else {
+				 int count = results.getUpdateCount();
+				 if (count > 0) {
+					resultUpdateCount += results.getUpdateCount();
+				 }
+			   }
+		   }
+		   flag = !flag;
+		   view.setProgress(i + 1, queries.size());
+		}
+		Image statImage = QuantumPlugin.getImage((errorCount > 0) ? "stop.gif" : "success.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+		view.setStatus(statImage, Messages.getString("ExecuteAction.Done") + "(" + //$NON-NLS-1$ //$NON-NLS-2$
+						resultCount + Messages.getString("ExecuteAction.QueriesExecuted") +  //$NON-NLS-1$
+						resultUpdateCount + Messages.getString("ExecuteAction.RowsUpdated") +  //$NON-NLS-1$
+						resultsDisplayed + Messages.getString("ExecuteAction.ResultsDisplayed") +  //$NON-NLS-1$
+						errorCount + Messages.getString("ExecuteAction.Errors") +  //$NON-NLS-1$
+						queryDuration  + Messages.getString("ExecutAction.TimeExec") + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		view.setProgress(0, 1);
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+	protected Bookmark getBookmark() {
+		BookmarkNode current = BookmarkView.getInstance().getCurrentBookmark();
+		return current.getBookmark();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.quantum.actions.BaseSQLAction#getShell()
+	 */
+	protected Shell getShell() {
+		return this.view.getViewSite().getShell();
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAgainstAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAgainstAction.java
new file mode 100644
index 0000000..c1e2486
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExecuteAgainstAction.java
@@ -0,0 +1,184 @@
+package com.quantum.actions;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.model.ConnectionException;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.SQLParser;
+import com.quantum.sql.SQLResults;
+import com.quantum.ui.dialog.BookmarkSelectionDialog;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.util.io.InputStreamHelper;
+import com.quantum.view.tableview.DefaultSizes;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * This action can be executed against any .sql file, regardless of 
+ * whether or not the Quantum perspective is open.
+ * 
+ * @author BC
+ */
+public class ExecuteAgainstAction extends BaseSQLAction
+    implements IObjectActionDelegate, PropertyChangeListener {
+
+    private String selectedBookmark = null;
+    private IFile[] files = null;
+
+    private IWorkbenchPart workbenchPart;
+
+    /**
+     * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
+     */
+    public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+        this.workbenchPart = targetPart;
+    }
+
+    protected Shell getShell() {    
+        return this.workbenchPart.getSite().getShell();
+    }
+
+    /**
+     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+     */
+    public void run(IAction action) {
+        
+        BookmarkSelectionDialog dialog = new BookmarkSelectionDialog(getShell());
+        dialog.addPropertyChangeListener(this);
+        int result = dialog.open();
+
+        if (result == Window.OK) {
+            try {
+                executeAgainstBookmark();
+            } catch (SQLException e) {
+                ExceptionDisplayDialog.openError(getShell(), 
+                    null, 
+                    null, e);
+            } catch (IOException e) {
+                ExceptionDisplayDialog.openError(getShell(), 
+                    Messages.getString("ExecuteAgainstAction.title"), 
+                    Messages.getString("ExecuteAgainstAction.IOException"), e);
+            } catch (ConnectionException e) {
+                ExceptionDisplayDialog.openError(getShell(), 
+                    null, 
+                    null, e);
+            } catch (CoreException e) {
+                ErrorDialog.openError(getShell(), null, null, e.getStatus());
+            }
+        }
+    }
+    
+    protected Bookmark getBookmark() {
+        return BookmarkCollection.getInstance().find(this.selectedBookmark);
+    }
+    
+    private void executeAgainstBookmark()
+        throws SQLException, IOException, CoreException, ConnectionException {
+        Bookmark bookmark = getBookmark();
+        if (bookmark != null) {
+            boolean alreadyConnected = bookmark.isConnected();
+            Connection connection = getConnection();
+            try {
+                for (int i = 0,
+                    length = (this.files == null) ? 0 : this.files.length;
+                    connection != null && i < length;
+                    i++) {
+                    executeAgainstBookmark(bookmark, connection, this.files[i]);
+                }
+            } finally {
+                if (!alreadyConnected && connection != null) {
+                    bookmark.disconnect();
+                }
+            }
+        }
+    }
+
+    private void executeAgainstBookmark(
+        Bookmark bookmark,
+        Connection connection,
+        IFile file)
+        throws SQLException, IOException, CoreException {
+        executeAgainstBookmark(
+            bookmark,
+            connection,
+            InputStreamHelper.readIntoString(file.getContents()));
+    }
+
+    private void executeAgainstBookmark(
+        Bookmark bookmark,
+        Connection connection,
+        String queries)
+        throws SQLException {
+        List queryList = SQLParser.parse(queries);
+        MultiSQLServer server = MultiSQLServer.getInstance();
+        
+        for (Iterator i = queryList.iterator(); i.hasNext();) {
+            String query = (String) i.next();
+            SQLResults results =
+                server.execute(
+                    connection,
+                    query,
+                    1,
+                    DefaultSizes.PAGE_SIZE,
+                    DefaultSizes.MAX_COLUMN_SIZE);
+            if (results.isResultSet()) {
+                TableView view = TableView.getInstance();
+                if (view != null) {
+                    view.loadQuery(bookmark, results);
+                }
+            }
+        }
+    }
+
+    /**
+     * This method is called with a new selection has been made on one 
+     * of the views.
+     * 
+     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
+     */
+    public void selectionChanged(IAction action, ISelection selection) {
+        if (selection instanceof IStructuredSelection) {
+            IStructuredSelection structuredSelection =
+                (IStructuredSelection) selection;
+            List list = new ArrayList();
+
+            for (Iterator i = structuredSelection.iterator(); i.hasNext();) {
+                Object temp = i.next();
+                if (temp != null && temp instanceof IFile) {
+                    System.out.println(((IFile) temp).getName());
+                    list.add(temp);
+                }
+            }
+            this.files = (IFile[]) list.toArray(new IFile[list.size()]);
+        }
+    }
+
+    /**
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("selection".equals(event.getPropertyName())) {
+            this.selectedBookmark = (String) event.getNewValue();
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportBookmarksAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportBookmarksAction.java
new file mode 100644
index 0000000..06be066
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportBookmarksAction.java
@@ -0,0 +1,42 @@
+package com.quantum.actions;
+
+import com.quantum.wizards.ExportBookmarkWizard;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ * Asks the user for a file name and saves there the bookmarks in xml format 
+ */
+public class ExportBookmarksAction implements IViewActionDelegate {
+		
+	private IViewPart view;
+
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = view;		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+        
+        ExportBookmarkWizard wizard = new ExportBookmarkWizard();
+        WizardDialog dialog =
+            new WizardDialog(this.view.getSite().getShell(), wizard);
+        dialog.open();
+	}
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportQueryAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportQueryAction.java
new file mode 100644
index 0000000..081897e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportQueryAction.java
@@ -0,0 +1,83 @@
+package com.quantum.actions;
+
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.StringTokenizer;
+
+import com.quantum.Messages;
+import com.quantum.util.StringUtil;
+import com.quantum.view.LogProxy;
+import com.quantum.view.SQLLogView;
+import com.quantum.view.SQLQueryView;
+import com.quantum.view.ViewHelper;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+public class ExportQueryAction extends Action implements IViewActionDelegate  {
+	SQLQueryView view;
+	
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (SQLQueryView) view;		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+
+	public void run() {
+		FileOutputStream out = ViewHelper.askSaveFile("exportquery", view.getSite().getShell(), 
+														new String[]{"*.sql", "*.ddl", "*.*"},
+														new String[]{
+																	Messages.getString("filedialog.sqlFiles"),
+																	Messages.getString("filedialog.ddlFiles"),
+																	Messages.getString("filedialog.allfiles")
+														});
+		if (out == null)
+			return;
+			
+		try {
+			FileWriter fileWriter = new FileWriter(out.getFD());
+			PrintWriter writer = new PrintWriter(fileWriter);
+			String output = view.getQuery();
+			output = StringUtil.substituteString(output, "\r", "");
+			StringTokenizer tokenizer = new StringTokenizer(output, "\n", true); //$NON-NLS-1$
+			String prevToken = "";
+			while (tokenizer.hasMoreElements()) {
+				String token = (String) tokenizer.nextElement();
+				// If it's a normal line end, we won't write it, because the println() will
+				// adapting it to the OS (have to test that). But if it's a line end after
+				// another, then it's a blank line.
+				if (token.equals("\n"))
+					if (prevToken.equals("\n"))
+						writer.println(); // Two consecutives "\n", means a separate line
+				else
+					; // Do nothing, the end of line is already written 
+				else
+					writer.println(token); //Normal line
+				prevToken = token;
+			}
+			writer.close();
+		} catch (IOException e) {
+			LogProxy.getInstance().addText(SQLLogView.ERROR, e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportXMLAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportXMLAction.java
new file mode 100644
index 0000000..2dbd6ae
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ExportXMLAction.java
@@ -0,0 +1,130 @@
+package com.quantum.actions;
+
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.Messages;
+import com.quantum.model.xml.ModelToXMLConverter;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+import com.quantum.util.xml.XMLHelper;
+import com.quantum.view.ViewHelper;
+import com.quantum.view.bookmark.BookmarkView;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.bookmark.TreeNode;
+import com.quantum.view.subset.SubsetView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * @author root
+ */
+public class ExportXMLAction extends Action implements IViewActionDelegate {
+    
+	IViewPart view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+		
+	public void run() {
+		
+		FileOutputStream out = ViewHelper.askSaveFile("exportxml", view.getSite().getShell());
+		if (out == null)
+			return;
+		StructuredSelection selection = null;
+		if (view instanceof BookmarkView){
+			BookmarkView bookmarkView = (BookmarkView) view;
+			selection = bookmarkView.getSelection(); 
+		} else if (view instanceof SubsetView){
+			SubsetView subsetView = (SubsetView) view;
+			selection = subsetView.getSelection();
+		}
+
+		try {
+            Document doc = XMLHelper.createEmptyDocument();
+            exportXMLSelection(doc, selection);
+            try {
+                XMLHelper.write(out, doc);
+            } finally {
+    			out.close();
+            }
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		
+	}
+
+	/**
+	 * Exports to an XmlDocument the items selected in a StructuredSelection.
+	 * @param doc
+	 * @param selection
+	 */
+	public void exportXMLSelection(Document doc, StructuredSelection selection) {
+		Element root = (Element) doc.appendChild(doc.createElement(Messages.getString("ExportXMLAction.Metadata"))); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Author"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.Quantum")); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Version"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.XMLVersionNumber")); //$NON-NLS-1$
+		Iterator iter = selection.iterator();
+		while (iter.hasNext()) {
+			TreeNode current = (TreeNode) iter.next();
+// TODO: reinstate this
+//			if (current instanceof SubsetNode){
+//				SubsetNode subset = (SubsetNode) current;
+//				MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Subset"), //$NON-NLS-1$
+//												subset.getName()); //$NON-NLS-1$
+//				Object[] children = subset.getChildren();
+//				for (int i = 0; i < children.length; i++) {
+//					TreeNode objectNode = (TreeNode) children[i];
+//					if (objectNode instanceof SelectableNode)
+//						ExportXMLAction.exportObject(root, (SelectableNode)objectNode);					
+//				}
+//			} else {
+                exportObject(root, current);                    
+//			}
+		}
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+	/**
+	 * Exports a TreeNode metadata representation to an XmlDocument, based on a an already-created root Element
+	 * @param doc The XmlDocument to receive the metadata representation
+	 * @param node The node with the metadata to export
+	 * @param root The root element (already present in the XmlDocument) that will hold the metadata
+	 */
+	public void exportObject(Element root, TreeNode node) {
+		if (node instanceof EntityNode) { 
+			EntityNode entityNode = (EntityNode) node;
+	        ModelToXMLConverter.getInstance().convert(root, entityNode.getEntity());
+		}
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportBookmarksAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportBookmarksAction.java
new file mode 100644
index 0000000..9477bdd
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportBookmarksAction.java
@@ -0,0 +1,88 @@
+package com.quantum.actions;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.util.xml.XMLHelper;
+import com.quantum.view.bookmark.BookmarkView;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+/**
+ * @author root
+ *
+ * To change this generated comment edit the template variable "typecomment":
+ * Window>Preferences>Java>Templates.
+ * To enable and disable the creation of type comments go to
+ * Window>Preferences>Java>Code Generation.
+ */
+public class ImportBookmarksAction implements IViewActionDelegate {
+	BookmarkView view;
+	FileDialog dialog;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (BookmarkView) view;
+		dialog = new FileDialog(view.getSite().getShell(), SWT.OPEN);
+		dialog.setFilterExtensions(new String[]{"*.xml","*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
+		dialog.setFilterNames(new String[]{Messages.getString("filedialog.xmlFiles"),Messages.getString("filedialog.xmlFiles")}); //$NON-NLS-1$ //$NON-NLS-2$
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		dialog.setFilterPath(QuantumPlugin.getDefault().getPreferenceStore().getString("quantum.dialogs.importbookmark.path"));
+		String filename = dialog.open();
+		if (filename != null) {
+			QuantumPlugin.getDefault().getPreferenceStore().setValue("quantum.dialogs.importbookmark.path", filename);
+			File importFile = new File(filename);
+			
+			FileInputStream source = null;
+			try {
+				source = new FileInputStream(importFile);
+			} catch (FileNotFoundException e1) {
+				e1.printStackTrace();
+				return;
+			}
+			try {
+				Document doc = XMLHelper.createFromInputStream(source);
+    			Element root = doc.getDocumentElement();
+    			BookmarkCollection.getInstance().importXML(root);
+    		
+    			view.refresh();		
+            } catch (ParserConfigurationException e) {
+                e.printStackTrace();
+            } catch (SAXException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportQueryAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportQueryAction.java
new file mode 100644
index 0000000..6d9654b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ImportQueryAction.java
@@ -0,0 +1,80 @@
+package com.quantum.actions;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.view.LogProxy;
+import com.quantum.view.SQLLogView;
+import com.quantum.view.SQLQueryView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ *
+ */
+public class ImportQueryAction extends Action implements IViewActionDelegate {
+	SQLQueryView view;
+		FileDialog dialog;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (SQLQueryView) view;
+		dialog = new FileDialog(view.getSite().getShell(), SWT.OPEN);
+		dialog.setFilterExtensions(new String[]{"*.sql", "*.ddl", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		dialog.setFilterNames(new String[]{Messages.getString("filedialog.sqlFiles"), //$NON-NLS-1$
+			Messages.getString("filedialog.ddlFiles"), Messages.getString("filedialog.allfiles")}); //$NON-NLS-1$ //$NON-NLS-2$
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+
+	public void run() {
+		dialog.setFilterPath(QuantumPlugin.getDefault().getPreferenceStore().getString("quantum.dialogs.importquery.path"));
+		String filename = dialog.open();
+		if (filename != null) {
+			QuantumPlugin.getDefault().getPreferenceStore().setValue("quantum.dialogs.importquery.path", filename);
+
+			try {
+				File importFile = new File(filename);
+				FileReader fileReader = new FileReader(importFile);
+				BufferedReader reader = new BufferedReader(fileReader);
+				String line;
+				StringBuffer buffer = new StringBuffer();
+				
+				while ((line = reader.readLine()) != null) {
+					buffer.append(line);
+					buffer.append('\n');
+				}
+				view.setQuery(buffer.toString());
+				reader.close();
+			} catch (IOException e) {
+				LogProxy.getInstance().addText(SQLLogView.ERROR, e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewBookmarkAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewBookmarkAction.java
new file mode 100644
index 0000000..b3dbd19
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewBookmarkAction.java
@@ -0,0 +1,32 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.wizards.BookmarkWizard;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ *
+ */
+public class NewBookmarkAction extends Action {
+    private IViewPart view;
+
+    public NewBookmarkAction(IViewPart view) {
+        this.view = view;
+        setText(Messages.getString(getClass().getName() + ".text")); //$NON-NLS-1$
+        setToolTipText(Messages.getString(getClass().getName() + ".text")); //$NON-NLS-1$
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("bookmarks.gif")); //$NON-NLS-1$
+    }
+
+    public void run() {
+        BookmarkWizard wizard = new BookmarkWizard();
+        wizard.init();
+        WizardDialog dialog =
+            new WizardDialog(view.getSite().getShell(), wizard);
+        dialog.open();
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewSubsetAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewSubsetAction.java
new file mode 100644
index 0000000..8732413
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NewSubsetAction.java
@@ -0,0 +1,53 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.view.subset.SubsetNode;
+import com.quantum.view.subset.SubsetView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ *
+ */
+public class NewSubsetAction extends Action implements IViewActionDelegate {
+   IViewPart view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = view;
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	public void run() {
+		System.out.println(Messages.getString("NewSubsetAction.CreatingNewSubset")); //$NON-NLS-1$
+		InputDialog dialog = new InputDialog(view.getSite().getShell(), 
+			Messages.getString("NewSubsetAction.NameOfNewSubset"), Messages.getString("NewSubsetAction.PleaseEnterName"), null, null); //$NON-NLS-1$ //$NON-NLS-2$
+		dialog.open();
+		String value = dialog.getValue();
+		if (value != null) {
+			SubsetNode subset = new SubsetNode(value);
+			((SubsetView) view).addNewSubset(subset);
+		}
+			
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NextSequenceAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NextSequenceAction.java
new file mode 100644
index 0000000..88331d8
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/NextSequenceAction.java
@@ -0,0 +1,42 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.sql.SQLResults;
+import com.quantum.view.ViewHelper;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.ui.IViewPart;
+
+public class NextSequenceAction extends BaseSequenceAction {
+    
+    /**
+     * @param text
+     * @param view
+     */
+    public NextSequenceAction(IViewPart view) {
+        super(Messages.getString(NextSequenceAction.class.getName() + ".text"), view);
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("append.gif"));    
+    }
+    
+	public void run() {
+		EntityNode node = getEntityNode();
+		String name = null;
+		if (node.isSequence()) {
+			EntityNode sequence = (EntityNode) node;
+			Bookmark bookmark = sequence.getBookmark();
+			DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+			if (adapter == null) return;
+			name = sequence.getName();
+			String query = adapter.getNextValue(name, sequence.getEntity().getSchema());
+			
+			SQLResults results = ViewHelper.tryGetResults(view, getConnection(), query);
+			if (results != null && ! results.isError()) 
+				TableView.getInstance().loadQuery(bookmark, results);
+		}
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/OpenQueryAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/OpenQueryAction.java
new file mode 100644
index 0000000..8a78c6e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/OpenQueryAction.java
@@ -0,0 +1,43 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.view.SQLQueryView;
+import com.quantum.view.bookmark.QueryNode;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author BC
+ */
+public class OpenQueryAction extends SelectionListenerAction {
+
+    /**
+     * @param text
+     */
+    public OpenQueryAction(IViewPart viewPart) {
+        super(Messages.getString(OpenQueryAction.class.getName() + ".text"));
+    }
+
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        enabled &= (selection.size() == 1 &&
+            selection.getFirstElement() instanceof QueryNode);
+        return enabled;
+    }
+    public void run() {
+        SQLQueryView queryView = SQLQueryView.getInstance();
+        if (queryView != null) {
+            queryView.setQuery(getQuery());
+        }
+    }
+    private String getQuery() {
+        if (isEnabled()) {
+            QueryNode node = (QueryNode) getSelectedNonResources().get(0);
+            return node.getQuery();
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/PrevSequenceAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/PrevSequenceAction.java
new file mode 100644
index 0000000..875df6d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/PrevSequenceAction.java
@@ -0,0 +1,44 @@
+/*
+ * Created on 22-jul-2003
+ *
+ */
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.sql.SQLResults;
+import com.quantum.view.ViewHelper;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.ui.IViewPart;
+
+public class PrevSequenceAction extends BaseSequenceAction {
+	/**
+     * @param text
+     * @param view
+     */
+    public PrevSequenceAction(IViewPart view) {
+        super(Messages.getString(PrevSequenceAction.class.getName() + ".text"), view);
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("grid.gif"));
+    }
+
+    public void run() {
+		EntityNode node = getEntityNode();
+		if (((EntityNode) node).isSequence()) {
+            EntityNode sequence = (EntityNode) node;
+			Bookmark bookmark = sequence.getBookmark();
+			DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(
+                bookmark.getType());
+			if (adapter == null) return;
+			String name = sequence.getName();
+			String query = adapter.getPrevValue(name, sequence.getEntity().getSchema());
+			SQLResults results = ViewHelper.tryGetResults(view, getConnection(), query);
+			if (results != null && ! results.isError()) 
+				TableView.getInstance().loadQuery(bookmark, results);
+		}
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshBookmarkAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshBookmarkAction.java
new file mode 100644
index 0000000..525503f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshBookmarkAction.java
@@ -0,0 +1,37 @@
+package com.quantum.actions;
+
+import java.util.Iterator;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.sql.SQLHelper;
+import com.quantum.view.bookmark.BookmarkView;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author root
+ */
+public class RefreshBookmarkAction extends SelectionListenerAction {
+	SQLHelper helper = new SQLHelper();
+
+    BookmarkView view;
+	public RefreshBookmarkAction(IViewPart view) {
+        super(Messages.getString(RefreshBookmarkAction.class.getName() + ".text"));
+		this.view = (BookmarkView) view;
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("refresh.gif"));
+	}
+
+	public void run() {
+		List list = getSelectedNonResources();
+        for (Iterator i = list.iterator(); i.hasNext(); ) {
+            Object object = i.next();
+            if (object != null && object instanceof TreeNode) {
+                ((TreeNode) object).reload();
+            }
+        }
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshTableAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshTableAction.java
new file mode 100644
index 0000000..d987d8a
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RefreshTableAction.java
@@ -0,0 +1,40 @@
+package com.quantum.actions;
+
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author root
+ * Implements the "Refresh Table" action for the TableView view
+ */
+public class RefreshTableAction extends Action implements IViewActionDelegate {
+	TableView view;
+	/**
+	 * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart)
+	 */
+	public void init(IViewPart view) {
+		this.view = (TableView) view;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
+	 */
+	public void run(IAction action) {
+		run();
+	}
+	public void run() {
+		view.refreshCurrent();
+	}
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RemoveFromQuickListAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RemoveFromQuickListAction.java
new file mode 100644
index 0000000..a677733
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/RemoveFromQuickListAction.java
@@ -0,0 +1,56 @@
+package com.quantum.actions;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.view.bookmark.EntityNode;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * <p>This action takes an EntityNode and adds a copy of it to the quicklist
+ * of a bookmark.</p>
+ * 
+ * @author bcholmes
+ */
+public class RemoveFromQuickListAction extends SelectionListenerAction  {
+    private IViewPart view;
+    private List entities = Collections.synchronizedList(new ArrayList());
+
+    public RemoveFromQuickListAction(IViewPart view) {
+        super(Messages.getString(RemoveFromQuickListAction.class.getName() + ".text"));
+        this.view = view;
+    }
+
+    public void run() {
+        for (Iterator i = this.entities.iterator(); i.hasNext(); ) {
+            EntityNode entityNode = (EntityNode) i.next();
+            entityNode.getBookmark().removeQuickListEntry(entityNode.getEntity());
+        }
+    }
+
+    /**
+     * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
+     */
+    public boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        this.entities.clear();
+        for (Iterator i = selection.iterator(); enabled && i.hasNext(); ) {
+            Object object = i.next();
+            if (object != null && object instanceof EntityNode) {
+                EntityNode node = (EntityNode) object;
+                enabled &= node.getBookmark().isInQuickList(node.getEntity());
+                this.entities.add(node);
+            } else {
+                enabled = false;
+            }
+        }
+        
+        return enabled;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableAction.java
new file mode 100644
index 0000000..6da4e9f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableAction.java
@@ -0,0 +1,59 @@
+package com.quantum.actions;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Entity;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author root
+ * Implements action for "View Table"
+*/
+public class ViewTableAction extends SelectionListenerAction {
+    private IViewPart view;
+    private Entity entity;
+    
+	public ViewTableAction(IViewPart view) {
+        super(Messages.getString(ViewTableAction.class.getName() + ".text"));
+		this.view = view;
+        setImageDescriptor(
+            QuantumPlugin.getImageDescriptor("table.gif")); //$NON-NLS-1$
+	}
+
+	public void run() {
+		TableView.getInstance().loadTable(this.entity);
+        // TODO: reinstate this
+//		} else if (view instanceof SubsetView){
+//			SubsetView subsetView = (SubsetView) view;
+//			node = (TreeNode) subsetView.getCurrent();
+//			if (!(node instanceof ObjectNode)) return;
+//			ObjectNode objectNode = (ObjectNode) node;
+//
+//			String query = objectNode.getQuery();
+//			
+//			SQLResults results = ViewHelper.tryGetResults(view, objectNode.getConnection(), query);
+//			if (results != null && ! results.isError()) 
+//				TableView.getInstance().loadQuery(bookmark.getBookmark(), results);
+//
+	}
+
+	public boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        enabled &= (selection.size() == 1);
+        
+        if (enabled) {
+            Object object = selection.getFirstElement();
+            if (object != null && object instanceof EntityNode) {
+                EntityNode entityNode = (EntityNode) object;
+                this.entity = entityNode.getEntity();
+                enabled &= (entityNode.isTable() || entityNode.isView());
+            }
+        }
+        return enabled;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableDetailsAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableDetailsAction.java
new file mode 100644
index 0000000..5215912
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/actions/ViewTableDetailsAction.java
@@ -0,0 +1,66 @@
+package com.quantum.actions;
+
+import java.sql.Connection;
+import java.util.List;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+import com.quantum.sql.SQLResults;
+import com.quantum.util.connection.ConnectionUtil;
+import com.quantum.view.ViewHelper;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+public class ViewTableDetailsAction extends SelectionListenerAction  {
+	private IViewPart view;
+    private ConnectionUtil connectionUtil = new ConnectionUtil();
+	
+	public ViewTableDetailsAction(IViewPart view) {
+        super(Messages.getString(ViewTableDetailsAction.class, "text"));
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("table.gif")); //$NON-NLS-1$
+		this.view = view;
+	}
+
+	public void run() {
+        Entity entity = getEntity();
+		StringBuffer query = new StringBuffer();
+		query.append(Messages.getString("MetaDataKey")+Messages.getString("MetaDataKeySeparator")); //$NON-NLS-1$ //$NON-NLS-2$
+	    query.append(entity.getQuotedTableName());
+        Connection connection = connectionUtil.getConnection(getBookmark(), getShell());
+        if (connection != null) {
+            SQLResults results = ViewHelper.tryGetResults(view, connection, query.toString());
+            if (results != null && ! results.isError()) 
+                TableView.getInstance().loadQuery(entity.getBookmark(), results);
+        }
+	}
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+    protected Bookmark getBookmark() {
+        return getEntity().getBookmark();
+    }
+    protected Shell getShell() {
+        return this.view.getViewSite().getShell();
+    }
+    protected Entity getEntity() {
+        List list = getSelectedNonResources();
+        return ((EntityNode) list.get(0)).getEntity();
+    }
+
+    /**
+     * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        return enabled && selection.size() == 1;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdabasDAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdabasDAdapter.java
new file mode 100644
index 0000000..42c403a
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdabasDAdapter.java
@@ -0,0 +1,11 @@
+package com.quantum.adapters;
+
+
+public class AdabasDAdapter extends DatabaseAdapter {
+    public String getShowTableQuery(String qualifier, boolean isDefault) {
+        return "SELECT OWNER, TABLENAME FROM TABLES WHERE OWNER = '" + qualifier.toUpperCase() + "'"; //$NON-NLS-1$
+    }
+    public String getShowViewQuery(String qualifier, boolean isDefault) {
+        return "SELECT OWNER, VIEWNAME FROM VIEWS WHERE OWNER = '" + qualifier.toUpperCase() + "'"; //$NON-NLS-1$
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdapterFactory.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdapterFactory.java
new file mode 100644
index 0000000..f26b278
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/AdapterFactory.java
@@ -0,0 +1,93 @@
+package com.quantum.adapters;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.quantum.Messages;
+
+/**
+ * @author root
+ * Basically this Factory is a Singleton that is used to return the proper adapter
+ */
+public class AdapterFactory {
+	public static final String GENERIC = "GENERIC"; //$NON-NLS-1$
+    public static final String ORACLE = "ORACLE"; //$NON-NLS-1$
+    public static final String POSTGRES = "POSTGRES"; //$NON-NLS-1$
+    public static final String MYSQL = "MYSQL"; //$NON-NLS-1$
+    public static final String DB2 = "DB2"; //$NON-NLS-1$
+    public static final String DB2AS400 = "DB2AS400"; //$NON-NLS-1$
+	public static final String ADABASD = "ADABASD"; //$NON-NLS-1$
+    public static final String INFORMIX = "INFORMIX"; //$NON-NLS-1$
+	public static final String REDBRICK = "REDBRICK"; //$NON-NLS-1$
+    public static final String SYBASE = "SYBASE"; //$NON-NLS-1$
+
+    private static AdapterFactory instance;
+    
+    private ArrayList drivers;
+    
+    private AdapterFactory() {
+    	loadDrivers();
+    }
+    public static synchronized AdapterFactory getInstance() {
+    	if (instance == null) {
+    		instance = new AdapterFactory();
+    	}
+    	return instance;
+    }
+
+    /**
+     * Master list of supported drivers
+     */
+    private void loadDrivers() {
+    	drivers = new ArrayList();
+
+		DriverInfo generic = new DriverInfo(GENERIC, Messages.getString("adapters.generic"), new GenericAdapter()); //$NON-NLS-1$
+		DriverInfo oracle = new DriverInfo(ORACLE, Messages.getString("adapters.oracle"), new OracleAdapter()); //$NON-NLS-1$
+		DriverInfo db2 = new DriverInfo(DB2,  Messages.getString("adapters.db2"), new DB2Adapter()); //$NON-NLS-1$
+		DriverInfo db2as400 = new DriverInfo(DB2AS400,  Messages.getString("adapters.db2as400"), new DB2AS400Adapter()); //$NON-NLS-1$
+		DriverInfo postgres = new DriverInfo(POSTGRES,  Messages.getString("adapters.postgres"), new PostgresAdapter()); //$NON-NLS-1$
+		DriverInfo mysql = new DriverInfo(MYSQL,  Messages.getString("adapters.mysql"), new GenericAdapter()); //$NON-NLS-1$
+		DriverInfo adabasd = new DriverInfo(ADABASD, Messages.getString("adapters.adabasd"), new AdabasDAdapter()); //$NON-NLS-1$
+        DriverInfo informix = new DriverInfo(INFORMIX, Messages.getString("adapters.informix"), new GenericAdapter()); //$NON-NLS-1$
+		DriverInfo redbrick = new DriverInfo(REDBRICK, Messages.getString("adapters.redbrick"), new RedBrickAdapter()); //$NON-NLS-1$
+        DriverInfo sybase = new DriverInfo(SYBASE, Messages.getString("adapters.sybase"), new GenericAdapter()); //$NON-NLS-1$
+
+    	drivers.add(generic);
+    	drivers.add(oracle);
+    	drivers.add(db2);
+    	drivers.add(db2as400);
+    	drivers.add(postgres);
+    	drivers.add(mysql);
+		drivers.add(adabasd);
+        drivers.add(informix);
+		drivers.add(redbrick);
+        drivers.add(sybase);
+    }
+    
+    public synchronized DatabaseAdapter getAdapter(String type){
+    	if (drivers == null) {
+    		loadDrivers();
+    	}
+    	for (int i = 0; i < drivers.size(); i++) {
+    		DriverInfo info = (DriverInfo) drivers.get(i);
+    		if (type.equals(info.getDriverType())) {
+    			return info.getAdapter();
+    		}
+    	}
+    	// If its not a recognized driver, we return the generic one
+		for (int i = 0; i < drivers.size(); i++) {
+			DriverInfo info = (DriverInfo) drivers.get(i);
+			if (type.equals(GENERIC)) {
+				return info.getAdapter();
+			}
+		}
+		return null;
+    }
+    
+    public synchronized DriverInfo[] getDriverList() {
+        List list = new ArrayList(this.drivers);
+        Collections.sort(list);
+    	return (DriverInfo[]) list.toArray(new DriverInfo[list.size()]);
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2AS400Adapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2AS400Adapter.java
new file mode 100644
index 0000000..ff6bf2e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2AS400Adapter.java
@@ -0,0 +1,15 @@
+package com.quantum.adapters;
+
+
+public class DB2AS400Adapter extends DatabaseAdapter {
+    public String getShowTableQuery(String qualifier, boolean isDefault) {
+        return "SELECT TABLE_NAME FROM QSYS2.SYSTABLES WHERE table_schema  = '" + 
+        		qualifier.toUpperCase() + 
+				"' AND TABLE_TYPE IN ('T', 'P') AND SYSTEM_TABLE= 'N'"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    public String getShowViewQuery(String qualifier, boolean isDefault) {
+        return "SELECT TABLE_NAME FROM QSYS2.SYSTABLES WHERE table_schema  = '" +
+        		qualifier.toUpperCase() +
+        		 "' AND TABLE_TYPE IN ('V', 'L') AND SYSTEM_TABLE= 'N'"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2Adapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2Adapter.java
new file mode 100644
index 0000000..ca5dd76
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DB2Adapter.java
@@ -0,0 +1,21 @@
+package com.quantum.adapters;
+
+import com.quantum.sql.SQLHelper;
+
+public class DB2Adapter extends DatabaseAdapter {
+    public String getShowTableQuery(String qualifier, boolean isDefault) {
+        return "SELECT TABNAME FROM syscat.tables WHERE tabschema = '" + qualifier.toUpperCase() + "' AND TYPE='T'"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    public String getShowViewQuery(String qualifier, boolean isDefault) {
+        return "SELECT TABNAME FROM syscat.tables WHERE tabschema = '" + qualifier.toUpperCase() + "' AND TYPE='V'"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    public String getShowSequenceQuery(String qualifier, boolean isDefault) {
+        return "SELECT SEQNAME FROM sysibm.syssequences WHERE seqschema = '" + qualifier.toUpperCase() + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    public String getNextValue(String sequence, String owner) {
+		return "VALUES NEXTVAL FOR " + SQLHelper.getQualifiedName(owner, sequence); //$NON-NLS-1$
+    }
+	public String getPrevValue(String sequence, String owner) {
+		return "VALUES PREVVAL FOR " + SQLHelper.getQualifiedName(owner, sequence); //$NON-NLS-1$
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DatabaseAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DatabaseAdapter.java
new file mode 100644
index 0000000..d17e8b0
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DatabaseAdapter.java
@@ -0,0 +1,198 @@
+package com.quantum.adapters;
+
+import com.quantum.sql.SQLHelper;
+import com.quantum.util.StringUtil;
+
+/**
+ * Abstract base class for all the adapter classes. Most functions can be redefined in
+ * the adapters for the different databases. If the functions is not redefined, the base
+ * implementation (usually a direct call to the JDBC driver) is used.
+ * 
+ * @author root
+ */
+public abstract class DatabaseAdapter {
+    
+	/**
+	 * Returns the SQL Query to get a list of the tables for the current user (schema) 
+	 * @param info
+	 * @return - A String with the SQL query 
+	 */
+	public String getShowTableQuery(String schema, boolean isDefault) {
+		return null;
+	}
+	/**
+	 * Returns the SQL Query to get a list of the queries for the current user (schema) 
+	 * @param info
+	 * @return - A String with the SQL query
+	 */
+	public String getShowViewQuery(String schema, boolean isDefault) {
+		return null;
+	}
+	/**
+	 * Returns the SQL Query to get a list of the sequences for the current user (schema) 
+	 * @param info
+	 * @return - A String with the SQL query
+	 */
+	public String getShowSequenceQuery(String schema, boolean isDefault) {
+        return null;
+	}
+
+	/** Returns the SQL Query to access all the columns of a table (SELECT)
+	 * @param info
+	 * @param table
+	 * @return - A String with the SQL query
+	 */
+	public String getTableQuery( String table) {
+			return "SELECT * FROM " + filterTableName(table); //$NON-NLS-1$
+	}
+    
+	/**
+	 * Gets the SQL query to get the next value of a sequence, (incrementing it).
+	 * @param sequence - The name of the sequence
+	 * @param owner - The owner (schema) of it
+	 * @return - A string with the SQL query
+	 */
+	public String getNextValue(String sequence, String owner) {
+        return null;
+	}
+	/**
+	 * Gets the SQL query to get the actual value (previously used) of a sequence, (the sequence is not altered).
+	 * @param sequence - The name of the sequence
+	 * @param owner - The owner (schema) of it
+	 * @return - A string with the SQL query
+	 */
+	public String getPrevValue(String sequence, String owner) {
+		return null;
+	}
+	/**
+	 * Returns a query to get the comments on the columns of a table. 
+	 * Should return a query to generate a recordset with one row where
+	 * the first and only column is the comment
+	 * @param tableName - The full name of the table qualified with schema if applicable
+	 * @param columnName - The name of the column
+	 */
+	public String getCommentsQuery(String tableName, String columnName) {
+		return null;
+	}
+
+	/**
+	 * @param table
+	 * @return : A query to get an empty ResultSet (null if failed) for that table or view.
+	 * Subclassed if needed by the different database adapters
+	 */
+	public String getEmptySetQuery(String table){
+		return "SELECT * FROM " + filterTableName(table) + " WHERE (1 = 0)"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+    
+	/**
+	 * Quotes a string according to the type of the column 
+	 * @param string to be quoted
+	 * @param type according to java.sql.Types
+	 * @return
+	 */
+	public String quote(String string, int type, String typeString) {
+		if (isTextType(type, typeString)) {
+			return "'" + StringUtil.substituteString(string, "'", "''") + "'";
+		} else if (type == java.sql.Types.DATE || type == java.sql.Types.TIMESTAMP){		
+			string = string.trim();
+			//Check if we have to strip the millisecods
+			String sub = string.substring(string.length() - 2, string.length() - 1);
+			if (string.length() > 1 && sub.equals(".")) //$NON-NLS-1$
+				string = string.substring(0, string.length() - 2); // strip the milliseconds
+				
+			return "'" + string + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+
+		}
+		return string;
+	}
+    
+    /**
+     * Indicates whether or not a particular type should be quoted in 
+     * SQL statements.  Some databases support non-standard types such as
+     * TEXT that aren't normally recognized as quoted types.
+     * 
+     * @param type according to java.sql.Types
+     * @param typeString if the type is "Other".
+     * @return
+     */
+    protected boolean isTextType(int type, String typeString) {
+        return SQLHelper.isText(type);
+    }
+    
+    
+	/**
+	 * Makes an SQL insert string with the given table, names of columns and values
+	 * @param string
+	 * @param namesClause
+	 * @param valuesClause
+	 * @return
+	 */
+	public String getInsert(String tableName, String namesClause, String valuesClause) {
+		String query = "INSERT INTO " + filterTableName(tableName);
+		if (namesClause != "") {
+					query += " (" + namesClause + ")";
+					query += " VALUES " + "(" + valuesClause; //$NON-NLS-1$
+					query += " )"; //$NON-NLS-1$
+				}
+		return query;
+	}
+	/**
+	 * Changes the name of the table, usually to allow for lowercase situations.
+	 * The parent implementation does nothing to the tableName, simply returns it.
+	 * @param tableName
+	 * @return
+	 */
+	public String filterTableName(String tableName) {
+		return tableName;
+	}
+	/**
+	 * Returns a query to get the number of registers from a table
+	 * @param tableName
+	 * @return
+	 */
+	public String getCountQuery(String tableName) {
+		return "SELECT COUNT(*) FROM " + filterTableName(tableName);	
+	}
+	/**
+	 * @param string
+	 * @param string2
+	 * @param whereClause
+	 * @param string3
+	 */
+	public void getUpdate(String tableName, String string2, StringBuffer whereClause, String string3) {
+		// TODO Auto-generated method stub
+		
+	}
+	/**
+	 * Returns an SQL UPDATE statement
+	 * @param string
+	 * @param string2
+	 * @param string3
+	 */
+	public String getUpdate(String tableName, String setClause, String whereClause) {
+		String query = "UPDATE " + filterTableName(tableName); //$NON-NLS-1$
+		query += " SET " + setClause; //$NON-NLS-1$
+		if (!whereClause.equals("")) query += " WHERE " + whereClause; //$NON-NLS-1$
+		return query;
+	}
+	/**
+	 * Returns an SQL DELETE statement
+	 * @param string
+	 * @param string2
+	 * @return
+	 */
+	public String getDelete(String tableName, String whereClause) {
+		String query = "DELETE FROM " + filterTableName(tableName); //$NON-NLS-1$
+		if (!whereClause.equals("")) {
+			query += " WHERE " + whereClause; //$NON-NLS-1$
+		}
+		return query;
+	}
+    /**
+     * @param userid - the userid used to connect to the database
+     * @return the default schema for the database
+     */
+    public String getDefaultSchema(String userid) {
+        return userid;
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DriverInfo.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DriverInfo.java
new file mode 100644
index 0000000..6b13c1d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/DriverInfo.java
@@ -0,0 +1,57 @@
+package com.quantum.adapters;
+
+import java.util.Vector;
+
+public class DriverInfo implements Comparable {
+	private String driverType;
+	private String displayName;
+	private Vector driverNames = new Vector();
+	private DatabaseAdapter adapter;
+	public DriverInfo(String driverType, String displayName, DatabaseAdapter adapter) {
+		this.driverType = driverType;
+		this.displayName = displayName;
+		this.adapter = adapter;
+	}
+
+	public String getDriverType() {
+		return driverType;
+	}
+
+	public void setDriverType(String driverType) {
+		this.driverType = driverType;
+	}
+
+	public void addDriverName(String driverName) {
+		driverNames.addElement(driverName);
+	}
+	
+	public String[] getDriverNames() {
+		String retVal[] = new String[driverNames.size()];
+		for (int i = 0; i < driverNames.size(); i++) {
+			retVal[i] = (String) driverNames.elementAt(i);
+		}
+		return retVal;
+	}
+
+	public DatabaseAdapter getAdapter() {
+		return adapter;
+	}
+
+	public void setAdapter(DatabaseAdapter adapter) {
+		this.adapter = adapter;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+    public int compareTo(Object o) {
+        DriverInfo that = (DriverInfo) o;
+        return this.getDisplayName().compareTo(that.getDisplayName());
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/FeatureNotSupported.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/FeatureNotSupported.java
new file mode 100644
index 0000000..f80aa56
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/FeatureNotSupported.java
@@ -0,0 +1,7 @@
+package com.quantum.adapters;
+
+public class FeatureNotSupported extends Error {
+    public FeatureNotSupported(String error) {
+        super(error);
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/GenericAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/GenericAdapter.java
new file mode 100644
index 0000000..bb4eb6b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/GenericAdapter.java
@@ -0,0 +1,20 @@
+package com.quantum.adapters;
+
+
+
+
+public class GenericAdapter extends DatabaseAdapter {
+
+	public String getShowTableQuery(String qualifier, boolean isDefault) {
+		return null;
+	}
+    public String getShowViewQuery(String qualifier, boolean isDefault) {
+		return null;
+    }
+    
+    public String getShowSequenceQuery(String qualifier, boolean isDefault) {
+        return null;
+    }
+
+    
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/MySQLAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/MySQLAdapter.java
new file mode 100644
index 0000000..d764095
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/MySQLAdapter.java
@@ -0,0 +1,9 @@
+package com.quantum.adapters;
+
+
+
+public class MySQLAdapter extends DatabaseAdapter {
+    public String getShowTableQuery(String qualifier, boolean isDefault) {
+        return "SHOW TABLES"; //$NON-NLS-1$
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/NoSuchAdapterException.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/NoSuchAdapterException.java
new file mode 100644
index 0000000..ec71a00
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/NoSuchAdapterException.java
@@ -0,0 +1,9 @@
+package com.quantum.adapters;
+
+import com.quantum.Messages;
+
+public class NoSuchAdapterException extends Exception {
+    public NoSuchAdapterException(String driverName) {
+        super(Messages.getString("Error.NoDatabase") + driverName + Messages.getString("NoSuchAdapterException.<-_2")); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/OracleAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/OracleAdapter.java
new file mode 100644
index 0000000..a7fc544
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/OracleAdapter.java
@@ -0,0 +1,67 @@
+package com.quantum.adapters;
+
+import com.quantum.Messages;
+import com.quantum.sql.SQLHelper;
+import com.quantum.util.QuantumUtil;
+
+
+
+public class OracleAdapter extends DatabaseAdapter {
+	public String getShowSequenceQuery(String qualifier, boolean isDefault) {
+        return "SELECT SEQUENCE_OWNER, SEQUENCE_NAME FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '" + qualifier + "'"; //$NON-NLS-1$
+	}
+	public String getPrevValue(String sequence, String owner) {
+    	return "SELECT LAST_NUMBER FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '" + owner + "' AND SEQUENCE_NAME = '" + sequence + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+	}	
+	public String getNextValue(String sequence, String owner) {
+		return "SELECT " + SQLHelper.getQualifiedName(owner, sequence) + ".NEXTVAL FROM DUAL";
+	}
+	public String getCommentsQuery(String tableName, String column) {
+		String query = "SELECT COMMENTS FROM ALL_COL_COMMENTS WHERE TABLE_NAME = '"; 
+		query += QuantumUtil.getTableName(tableName) + "' AND COLUMN_NAME = '" + column + "'" ;
+		if (!(QuantumUtil.getSchemaName(tableName).equals("")))
+			query += " AND OWNER = '" + QuantumUtil.getSchemaName(tableName) + "'";
+		return query;
+	}
+	/**
+	 * Quotes a string according to the type of the column 
+	 * @param string to be quoted
+	 * @param type according to java.sql.Types
+	 * @return
+	 */
+	public String quote(String string, int type, String typeString) {
+		if (type == java.sql.Types.DATE || type == java.sql.Types.TIMESTAMP) {
+			string = string.trim();
+			String sub = string.substring(string.length()-2, string.length()-1);
+			if (string.length() > 1 &&  sub.equals(Messages.getString("OracleAdapter.._3"))) //$NON-NLS-1$
+				string = string.substring(0,string.length()-2);
+			return "TO_DATE('" + string + "','yyyy-mm-dd hh24:mi:ss')"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		// use the default (upper type)
+		return super.quote(string, type, typeString);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.quantum.adapters.DatabaseAdapter#filterTableName(java.lang.String)
+	 */
+	public String filterTableName(String tableName) {
+		// If there is no mixed case, better not quote, it's prettier on display
+		if (tableName.equals(tableName.toUpperCase())) return tableName;
+		// We quote the table name (and only the table name) because it has mixed case
+		if (QuantumUtil.getSchemaName(tableName).equals(""))
+			return "\"" + tableName +"\""; //$NON-NLS-1$
+		else
+			return QuantumUtil.getSchemaName(tableName) + ".\"" + 
+					QuantumUtil.getTableName(tableName) + "\"";
+}
+
+    /**
+     * The default schema for Oracle is the upper-case userid.
+     * @see com.quantum.adapters.DatabaseAdapter#getDefaultSchema(java.lang.String)
+     */
+    public String getDefaultSchema(String userid) {
+        return super.getDefaultSchema(userid).toUpperCase();
+    }
+  
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/PostgresAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/PostgresAdapter.java
new file mode 100644
index 0000000..8389bf1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/PostgresAdapter.java
@@ -0,0 +1,70 @@
+package com.quantum.adapters;
+
+import com.quantum.sql.SQLHelper;
+import com.quantum.util.QuantumUtil;
+import com.quantum.util.sql.TypesHelper;
+
+
+public class PostgresAdapter extends DatabaseAdapter {
+    public String getShowTableQuery(String qualifier, boolean isDefault) {
+        return "SELECT SCHEMANAME, TABLENAME FROM PG_TABLES WHERE SCHEMANAME = '" 
+            + qualifier + "'";
+    }
+    public String getShowViewQuery(String qualifier, boolean isDefault) {
+        return "SELECT SCHEMANAME, VIEWNAME FROM PG_VIEWS WHERE SCHEMANAME = '" 
+            + qualifier + "'";
+    }
+    public String getShowSequenceQuery(String qualifier, boolean isDefault) {
+        return "SELECT SCHEMANAME, relname FROM pg_class WHERE relkind = 'S'" +
+            "AND SCHEMANAME = '" + qualifier + "'";
+    }
+	public String getNextValue(String sequence, String owner) {
+		return "SELECT NEXTVAL('" + SQLHelper.getQualifiedName(owner, sequence) + "')";
+	}
+	public String getPrevValue(String sequence, String owner) {
+		return "SELECT * FROM " + SQLHelper.getQualifiedName(owner, sequence);
+	}
+
+	/**
+	 * Quotes a string according to the type of the column 
+	 * @param string to be quoted
+	 * @param type according to java.sql.Types
+	 * @return
+	 */
+	public String quote(String string, int type, String typeString) {
+		// Booleans in PostgreSQL are queried "t" or "f", but require "true" or "false" when inputed.
+		if (type == TypesHelper.BIT || type == TypesHelper.BOOLEAN ) // Postgresql seems to identify booleans as BITs
+		{
+			if (string.indexOf('t') >= 0 || string.indexOf('T') >= 0 )
+				return "true";
+			else if (string.indexOf('f') >= 0 || string.indexOf('F') >= 0 )
+				return "false";
+			else 
+				return string;
+		}
+		// use the default (upper type)
+		return super.quote(string, type, typeString);
+	}
+
+    /**
+     * @see com.quantum.adapters.DatabaseAdapter#filterTableName(java.lang.String)
+     */
+    public String filterTableName(String tableName) {
+        // If there is no mixed case, better not quote, it's prettier on display
+        if (tableName.equals(tableName.toUpperCase())) return tableName;
+        // We quote the table name (and only the table name) because it has mixed case
+        if (QuantumUtil.getSchemaName(tableName).equals("")) {
+            return "\"" + tableName +"\""; //$NON-NLS-1$
+        } else {
+            return QuantumUtil.getSchemaName(tableName) + ".\"" + 
+                    QuantumUtil.getTableName(tableName) + "\"";
+        }
+    }
+    /**
+     * @see com.quantum.adapters.DatabaseAdapter#getDefaultSchema(java.lang.String)
+     */
+    public String getDefaultSchema(String userid) {
+        return "public";
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/RedBrickAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/RedBrickAdapter.java
new file mode 100644
index 0000000..623c3be
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/adapters/RedBrickAdapter.java
@@ -0,0 +1,23 @@
+package com.quantum.adapters;
+
+
+/**
+ * @author bcholmes
+ */
+public class RedBrickAdapter extends DatabaseAdapter {
+
+	public String getShowTableQuery(String qualifier, boolean isDefault) {
+		return "select name from rbw_tables where type = 'TABLE'";
+	}
+
+	public String getShowViewQuery(String qualifier, boolean isDefault) {
+		return "select name from rbw_tables where type = 'VIEW'";
+	}
+    /**
+     * @see com.quantum.adapters.DatabaseAdapter#getDefaultSchema(java.lang.String)
+     */
+    public String getDefaultSchema(String userid) {
+        return null;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/ColorManager.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/ColorManager.java
new file mode 100644
index 0000000..a7a662c
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/ColorManager.java
@@ -0,0 +1,28 @@
+package com.quantum.editors;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+public class ColorManager {
+
+	protected Map fColorTable = new HashMap(10);
+
+	public void dispose() {
+		Iterator e= fColorTable.values().iterator();
+		while (e.hasNext())
+			((Color) e.next()).dispose();
+	}
+	public Color getColor(RGB rgb) {
+		Color color= (Color) fColorTable.get(rgb);
+		if (color == null) {
+			color= new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/NonRuleBasedDamagerRepairer.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/NonRuleBasedDamagerRepairer.java
new file mode 100644
index 0000000..6829684
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/NonRuleBasedDamagerRepairer.java
@@ -0,0 +1,135 @@
+package com.quantum.editors;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.presentation.IPresentationDamager;
+import org.eclipse.jface.text.presentation.IPresentationRepairer;
+import org.eclipse.jface.util.Assert;
+import org.eclipse.swt.custom.StyleRange;
+
+public class NonRuleBasedDamagerRepairer
+	implements IPresentationDamager, IPresentationRepairer {
+
+	/** The document this object works on */
+	protected IDocument fDocument;
+	/** The default text attribute if non is returned as data by the current token */
+	protected TextAttribute fDefaultTextAttribute;
+
+	/**
+	 * Constructor for NonRuleBasedDamagerRepairer.
+	 */
+	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
+		Assert.isNotNull(defaultTextAttribute);
+
+		fDefaultTextAttribute = defaultTextAttribute;
+	}
+
+	/**
+	 * @see IPresentationRepairer#setDocument(IDocument)
+	 */
+	public void setDocument(IDocument document) {
+		fDocument = document;
+	}
+
+	public void setTextAttribute(TextAttribute attr) {
+		fDefaultTextAttribute = attr;
+	}
+
+	/**
+	 * Returns the end offset of the line that contains the specified offset or
+	 * if the offset is inside a line delimiter, the end offset of the next line.
+	 *
+	 * @param offset the offset whose line end offset must be computed
+	 * @return the line end offset for the given offset
+	 * @exception BadLocationException if offset is invalid in the current document
+	 */
+	protected int endOfLineOf(int offset) throws BadLocationException {
+
+		IRegion info = fDocument.getLineInformationOfOffset(offset);
+		if (offset <= info.getOffset() + info.getLength())
+			return info.getOffset() + info.getLength();
+
+		int line = fDocument.getLineOfOffset(offset);
+		try {
+			info = fDocument.getLineInformation(line + 1);
+			return info.getOffset() + info.getLength();
+		} catch (BadLocationException x) {
+			return fDocument.getLength();
+		}
+	}
+
+	/**
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(
+		ITypedRegion partition,
+		DocumentEvent event,
+		boolean documentPartitioningChanged) {
+		if (!documentPartitioningChanged) {
+			try {
+
+				IRegion info = fDocument.getLineInformationOfOffset(event.getOffset());
+				int start = Math.max(partition.getOffset(), info.getOffset());
+
+				int end =
+					event.getOffset()
+						+ (event.getText() == null ? event.getLength() : event.getText().length());
+
+				if (info.getOffset() <= end && end <= info.getOffset() + info.getLength()) {
+					// optimize the case of the same line
+					end = info.getOffset() + info.getLength();
+				} else
+					end = endOfLineOf(end);
+
+				end = Math.min(partition.getOffset() + partition.getLength(), end);
+				return new Region(start, end - start);
+
+			} catch (BadLocationException x) {
+			}
+		}
+
+		return partition;
+	}
+
+	/**
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	public void createPresentation(
+		TextPresentation presentation,
+		ITypedRegion region) {
+		addRange(
+			presentation,
+			region.getOffset(),
+			region.getLength(),
+			fDefaultTextAttribute);
+	}
+
+	/**
+	 * Adds style information to the given text presentation.
+	 *
+	 * @param presentation the text presentation to be extended
+	 * @param offset the offset of the range to be styled
+	 * @param length the length of the range to be styled
+	 * @param attr the attribute describing the style of the range to be styled
+	 */
+	protected void addRange(
+		TextPresentation presentation,
+		int offset,
+		int length,
+		TextAttribute attr) {
+		if (attr != null)
+			presentation.addStyleRange(
+				new StyleRange(
+					offset,
+					length,
+					attr.getForeground(),
+					attr.getBackground(),
+					attr.getStyle()));
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLColorConstants.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLColorConstants.java
new file mode 100644
index 0000000..ae519bf
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLColorConstants.java
@@ -0,0 +1,13 @@
+package com.quantum.editors;
+
+import org.eclipse.swt.graphics.RGB;
+
+public class SQLColorConstants {
+	public static RGB BACKGROUND = new RGB(255, 0, 255);
+	public static RGB COMMENT = new RGB(88, 148, 64);
+	public static RGB IDENTIFIER = new RGB(0, 0, 0);
+	public static RGB KEYWORD = new RGB(126, 0, 75);
+	public static RGB STRING = new RGB(0, 0, 255);
+	public static RGB NUMERIC = new RGB(255, 0, 0);
+	public static RGB DEFAULT = new RGB(0, 0, 0);
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLConfiguration.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLConfiguration.java
new file mode 100644
index 0000000..985c0d8
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLConfiguration.java
@@ -0,0 +1,89 @@
+package com.quantum.editors;
+
+import java.util.HashMap;
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+public class SQLConfiguration extends SourceViewerConfiguration {
+	private PresentationReconciler reconciler = new PresentationReconciler();
+	private ColorManager colorManager;
+	private HashMap cache = new HashMap();
+	private boolean textBold = false;
+	private boolean keywordBold = true;
+	private boolean stringBold = false;
+	private boolean commentBold = false;
+	private boolean numericBold = false;
+	public SQLConfiguration(ColorManager colorManager) {
+		this.colorManager = colorManager;
+	}
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return new String[] {
+			IDocument.DEFAULT_CONTENT_TYPE,
+			SQLPartitionScanner.SQL_COMMENT,
+			SQLPartitionScanner.SQL_KEYWORD,
+			SQLPartitionScanner.SQL_IDENTIFIER};
+	}
+
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		initializeColors();
+		return reconciler;
+	}
+	public void loadPrefs() {
+		IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
+		textBold = store.getBoolean("quantum.text.bold"); //$NON-NLS-1$
+		keywordBold = store.getBoolean("quantum.keyword.bold"); //$NON-NLS-1$
+		stringBold = store.getBoolean("quantum.string.bold"); //$NON-NLS-1$
+		commentBold = store.getBoolean("quantum.comment.bold"); //$NON-NLS-1$
+		numericBold = store.getBoolean("quantum.numeric.bold"); //$NON-NLS-1$
+		SQLColorConstants.BACKGROUND = PreferenceConverter.getColor(store, "quantum.background.color"); //$NON-NLS-1$
+		SQLColorConstants.DEFAULT = PreferenceConverter.getColor(store, "quantum.text.color"); //$NON-NLS-1$
+		SQLColorConstants.IDENTIFIER = PreferenceConverter.getColor(store, "quantum.text.color"); //$NON-NLS-1$
+		SQLColorConstants.KEYWORD = PreferenceConverter.getColor(store, "quantum.keyword.color"); //$NON-NLS-1$
+		SQLColorConstants.STRING = PreferenceConverter.getColor(store, "quantum.string.color"); //$NON-NLS-1$
+		SQLColorConstants.COMMENT = PreferenceConverter.getColor(store, "quantum.comment.color"); //$NON-NLS-1$
+		SQLColorConstants.NUMERIC = PreferenceConverter.getColor(store, "quantum.numeric.color"); //$NON-NLS-1$
+	}
+	public void initializeColors() {
+		setDamageRepairer(getAttr(SQLColorConstants.KEYWORD, keywordBold), SQLPartitionScanner.SQL_KEYWORD);
+		setDamageRepairer(getAttr(SQLColorConstants.COMMENT, commentBold), SQLPartitionScanner.SQL_COMMENT);
+		setDamageRepairer(getAttr(SQLColorConstants.STRING, stringBold), SQLPartitionScanner.SQL_STRING);
+		setDamageRepairer(getAttr(SQLColorConstants.DEFAULT, textBold), IDocument.DEFAULT_CONTENT_TYPE);
+		setDamageRepairer(getAttr(SQLColorConstants.DEFAULT, textBold), SQLPartitionScanner.SQL_SYMBOL);
+		setDamageRepairer(getAttr(SQLColorConstants.DEFAULT, textBold), SQLPartitionScanner.SQL_IDENTIFIER);
+		setDamageRepairer(getAttr(SQLColorConstants.DEFAULT, textBold), SQLPartitionScanner.SQL_SEPARATOR);
+		setDamageRepairer(getAttr(SQLColorConstants.NUMERIC, numericBold), SQLPartitionScanner.SQL_NUMERIC);
+	}
+	public TextAttribute getAttr(RGB color, boolean bold) {
+		colorManager.getColor(SQLColorConstants.BACKGROUND);
+		Color foreground = colorManager.getColor(color);
+		TextAttribute attr = new TextAttribute(foreground);
+		if (bold) {
+			return new TextAttribute(foreground, attr.getBackground(), SWT.BOLD);
+		}
+		return attr;
+	}
+	public void setDamageRepairer(TextAttribute attr, String token) {
+		NonRuleBasedDamagerRepairer ndr = (NonRuleBasedDamagerRepairer) cache.get(token);
+		if (ndr == null) {
+			ndr =
+				new NonRuleBasedDamagerRepairer(attr);
+			reconciler.setDamager(ndr, token);
+			reconciler.setRepairer(ndr, token);
+			cache.put(token, ndr);
+		} else {
+			ndr.setTextAttribute(attr);
+		}
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLDocumentProvider.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLDocumentProvider.java
new file mode 100644
index 0000000..1fab1c3
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLDocumentProvider.java
@@ -0,0 +1,35 @@
+package com.quantum.editors;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.DefaultPartitioner;
+import org.eclipse.ui.editors.text.FileDocumentProvider;
+
+public class SQLDocumentProvider extends FileDocumentProvider {
+	
+	public SQLDocumentProvider() {
+		super();
+	}
+
+	protected IDocument createDocument(Object element) throws CoreException {
+		IDocument document = super.createDocument(element);
+		if (document != null) {
+			IDocumentPartitioner partitioner =
+				new DefaultPartitioner(
+					new SQLPartitionScanner(),
+					new String[] { 
+						IDocument.DEFAULT_CONTENT_TYPE,
+						SQLPartitionScanner.SQL_KEYWORD, 
+						SQLPartitionScanner.SQL_COMMENT,
+						SQLPartitionScanner.SQL_IDENTIFIER,
+						SQLPartitionScanner.SQL_STRING,
+						SQLPartitionScanner.SQL_SEPARATOR,
+						SQLPartitionScanner.SQL_SYMBOL,
+						SQLPartitionScanner.SQL_NUMERIC });
+			partitioner.connect(document);
+			document.setDocumentPartitioner(partitioner);
+		}
+		return document;
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLEditor.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLEditor.java
new file mode 100644
index 0000000..1ceab17
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLEditor.java
@@ -0,0 +1,59 @@
+package com.quantum.editors;
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.editors.text.TextEditor;
+
+public class SQLEditor extends TextEditor {
+	SQLConfiguration config;
+	private ColorManager colorManager;
+	/**
+	 * An editor capable of editing SQL scripts
+	 */
+	public SQLEditor() {
+		super();
+		colorManager = new ColorManager();
+		config = new SQLConfiguration(colorManager);
+		config.loadPrefs();
+		
+		setPreferenceStore(QuantumPlugin.getDefault().getPreferenceStore());
+		IPropertyChangeListener preferenceListener = new IPropertyChangeListener() {
+			public void propertyChange(PropertyChangeEvent event) {
+				config.loadPrefs();
+				config.initializeColors();
+				getSourceViewer().invalidateTextPresentation();
+				StyledText widget = getSourceViewer().getTextWidget();
+				FontData font = PreferenceConverter.getFontData(getPreferenceStore(), "quantum.font"); //$NON-NLS-1$
+				widget.setFont(new Font(Display.getCurrent(), font));
+				Color background = colorManager.getColor(SQLColorConstants.BACKGROUND);
+				widget.setBackground(background);
+			}
+		};
+		getPreferenceStore().
+			addPropertyChangeListener(preferenceListener);
+
+		setSourceViewerConfiguration(config);
+		setDocumentProvider(new SQLDocumentProvider());
+	}
+	public void dispose() {
+		colorManager.dispose();
+		super.dispose();
+	}
+	public void createPartControl(Composite arg0) {
+		super.createPartControl(arg0);
+		StyledText widget = getSourceViewer().getTextWidget();
+		FontData font = PreferenceConverter.getFontData(getPreferenceStore(), "quantum.font"); //$NON-NLS-1$
+		widget.setFont(new Font(Display.getCurrent(), font));
+		Color background = colorManager.getColor(SQLColorConstants.BACKGROUND);
+		widget.setBackground(background);
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLPartitionScanner.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLPartitionScanner.java
new file mode 100644
index 0000000..01898d1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/editors/SQLPartitionScanner.java
@@ -0,0 +1,225 @@
+package com.quantum.editors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+
+public class SQLPartitionScanner extends RuleBasedPartitionScanner {
+	public final static String SQL_COMMENT = "__sql_comment"; //$NON-NLS-1$
+	public final static String SQL_IDENTIFIER = "__sql_word"; //$NON-NLS-1$
+	public final static String SQL_STRING = "__sql_string"; //$NON-NLS-1$
+	public final static String SQL_KEYWORD = "__sql_keyword"; //$NON-NLS-1$
+	public final static String SQL_SYMBOL = "__sql_symbol"; //$NON-NLS-1$
+	public final static String SQL_SEPARATOR = "__sql_separator"; //$NON-NLS-1$
+	public final static String SQL_NUMERIC = "__sql_numeric"; //$NON-NLS-1$
+	
+	private final static String[] KEYWORDS = {
+		"ALTER", //$NON-NLS-1$
+		"AND", //$NON-NLS-1$
+		"BY", //$NON-NLS-1$
+		"COLUMN", //$NON-NLS-1$
+		"CREATE", //$NON-NLS-1$
+		"DELETE", //$NON-NLS-1$
+		"DROP", //$NON-NLS-1$
+		"FROM", //$NON-NLS-1$
+		"GROUP",  //$NON-NLS-1$
+		"INSERT", //$NON-NLS-1$
+		"INTO", //$NON-NLS-1$
+		"NOT", //$NON-NLS-1$
+		"NULL", //$NON-NLS-1$
+		"OR", //$NON-NLS-1$
+		"ORDER", //$NON-NLS-1$
+		"SELECT", //$NON-NLS-1$
+		"SEQUENCE", //$NON-NLS-1$
+		"SET",  //$NON-NLS-1$
+		"TABLE", //$NON-NLS-1$
+		"UNION", //$NON-NLS-1$
+		"UNIQUE", //$NON-NLS-1$
+		"UPDATE", //$NON-NLS-1$
+		"USING", //$NON-NLS-1$
+		"VALUES", //$NON-NLS-1$
+		"VIEW", //$NON-NLS-1$
+		"WHEN", //$NON-NLS-1$
+		"WHERE" //$NON-NLS-1$
+	};
+
+	public SQLPartitionScanner() {
+
+		List rules = new ArrayList();
+
+		IToken comment = new Token(SQL_COMMENT);
+		IToken string = new Token(SQL_STRING);
+		IToken identifier = new Token(SQL_IDENTIFIER);
+		IToken keyword = new Token(SQL_KEYWORD);
+		IToken separator = new Token(SQL_SEPARATOR);
+		IToken symbol = new Token(SQL_SYMBOL);
+		IToken whitespace = new Token(IDocument.DEFAULT_CONTENT_TYPE);
+		IToken numeric = new Token(SQL_NUMERIC);
+		
+		rules.add(new PredicateRuleAdapter(new WhitespaceRule(new WhitespaceDetector()), whitespace));
+		rules.add(new MultiLineRule("/*", "*/", comment)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new EndOfLineRule("--", comment)); //$NON-NLS-1$
+		rules.add(new SingleLineRule("'", "'", string)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new PredicateRuleAdapter(new SQLNumberRule(numeric), numeric));
+		SQLWordRule wordRule = new SQLWordRule(identifier);
+		for (int i = 0; i < KEYWORDS.length; i++) {
+			wordRule.addKeyword(KEYWORDS[i], keyword);
+		}
+		rules.add(new PredicateRuleAdapter(wordRule, keyword));
+		rules.add(new PredicateRuleAdapter(wordRule, identifier));
+		rules.add(new PredicateRuleAdapter(new SQLSeparatorRule(separator), separator));
+		rules.add(new PredicateRuleAdapter(new SymbolRule(symbol), symbol));
+		
+		IPredicateRule[] result= new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+	}
+}
+
+class PredicateRuleAdapter implements IPredicateRule {
+	IRule rule;
+	IToken token;
+	public PredicateRuleAdapter(IRule rule, IToken token) {
+		this.rule = rule;
+		this.token = token;
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		return rule.evaluate(scanner);
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return rule.evaluate(scanner);
+	}
+
+}
+
+class SQLSeparatorRule implements IRule {
+	IToken token;
+	public SQLSeparatorRule(IToken token) {
+		this.token = token;
+	}
+	public IToken evaluate(ICharacterScanner scanner) {
+		char c = (char) scanner.read();
+		if (c == ';') {
+			return token;
+		}
+		scanner.unread();
+		return Token.UNDEFINED;
+	}
+
+}
+
+class SymbolRule implements IRule {
+	IToken token;
+	public SymbolRule(IToken token) {
+		this.token = token;
+	}
+	public IToken evaluate(ICharacterScanner scanner) {
+		int val = scanner.read();
+		if (val != ICharacterScanner.EOF) {
+			char c = (char) val;
+			if (!Character.isWhitespace(c) && !Character.isLetterOrDigit(c) && c != '_') {
+				return token;
+			}
+		}
+		scanner.unread();
+		return Token.UNDEFINED;
+	}
+
+}
+
+class WhitespaceDetector implements IWhitespaceDetector {
+
+	public boolean isWhitespace(char c) {
+		return Character.isWhitespace(c);
+	}
+}
+
+class SQLNumberRule implements IRule {
+	private IToken token;
+	
+	public SQLNumberRule(IToken token) {
+		this.token = token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		char c = (char) scanner.read();
+		if (Character.isDigit(c)) {
+			// postive numbers and zero
+			do {
+				c= (char) scanner.read();
+			} while (Character.isDigit(c) || c == '.');
+			scanner.unread();
+			return token;
+		} else if (c == '-') {
+			// negative numbers
+			c = (char) scanner.read();
+			if (Character.isDigit(c)) {
+				do {
+					c= (char) scanner.read();
+				} while (Character.isDigit(c) || c == '.');
+				scanner.unread();
+				return token;
+			} else {
+				scanner.unread();
+				scanner.unread();
+				return Token.UNDEFINED;
+			}
+		} else {
+			scanner.unread();
+			return Token.UNDEFINED;
+		}
+	}
+}
+
+class SQLWordRule implements IRule {
+	private IToken token;
+	private HashMap keywords = new HashMap();
+	
+	public SQLWordRule(IToken token) {
+		this.token = token;
+	}
+
+	public void addKeyword(String word, IToken token) {
+		keywords.put(word.toUpperCase(), token);
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		char c = (char) scanner.read();
+		if (Character.isLetter(c) || c == '_') {
+			StringBuffer value = new StringBuffer();
+			do {
+				value.append(c);
+				c= (char) scanner.read();
+			} while (Character.isLetterOrDigit(c) || c == '_');
+			scanner.unread();
+			IToken retVal = (IToken) keywords.get(value.toString().toUpperCase());
+			if (retVal != null) {
+				return retVal;
+			} else {
+				return token;
+			}
+		} else {
+			scanner.unread();
+			return Token.UNDEFINED;
+		}
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ExtensionAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ExtensionAction.java
new file mode 100644
index 0000000..50a35db
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ExtensionAction.java
@@ -0,0 +1,132 @@
+/*
+ * Created on 17/02/2004
+ *
+ */
+package com.quantum.extensions;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Iterator;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.xml.ModelToXMLConverter;
+import com.quantum.sql.TableRow;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+import com.quantum.util.xml.XMLHelper;
+import com.quantum.view.bookmark.BookmarkView;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.bookmark.TreeNode;
+import com.quantum.view.tableview.TableView;
+
+/**
+ * @author panic
+ *
+ * Defines an Action Class to implement extension Actions. 
+ * An external plug-in that wants to extend quantum will 
+ * generate one ExtensionAction object for each action it
+ * wants to perform.
+ */
+public class ExtensionAction extends SelectionListenerAction {
+	private IViewPart view;
+	private IQuantumExtension extension;
+	private TableRow tableRow;
+	
+	public ExtensionAction(IViewPart view, String label, String toolTip, IQuantumExtension extension) {
+		super(label);
+		this.view = view;
+		this.extension = extension;
+
+		setText(label);
+		setToolTipText(toolTip); //$NON-NLS-1$
+		tableRow = null;
+	}
+	
+	public void run() {
+		if (extension instanceof IMetadataExtension &&	view instanceof BookmarkView)
+			runMetadataExtension();
+		else if (extension instanceof IDataExtension &&	view instanceof TableView)
+			runDataExtension();
+	}
+
+	/**
+	 * 
+	 */
+	private void runDataExtension() {
+		IDataExtension dataExtension = (IDataExtension) extension;
+		if (tableRow == null) return;
+		Document doc;
+		try {
+			doc = XMLHelper.createEmptyDocument();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+			return;
+		}
+		Element root = (Element) doc.appendChild(doc.createElement(Messages.getString("ExportXMLAction.Metadata"))); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Author"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.Quantum")); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Version"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.XMLVersionNumber")); //$NON-NLS-1$
+		ModelToXMLConverter.getInstance().convert(root, tableRow.getEntity() );                  
+		MetaDataXMLInterface.stringMatrixToXML(tableRow.getRowTableData(), doc, root, "DataRow"); //$NON-NLS-1$
+
+		dataExtension.run(doc);
+	}
+
+	private void runMetadataExtension() {
+		IMetadataExtension metadataExtension = (IMetadataExtension) extension;
+		BookmarkView bookmarkView = (BookmarkView) view;
+		StructuredSelection selection = bookmarkView.getSelection();
+		if (selection == null) return;
+		Document doc;
+		try {
+			doc = XMLHelper.createEmptyDocument();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return;
+		}
+		Element root = (Element) doc.appendChild(doc.createElement(Messages.getString("ExportXMLAction.Metadata"))); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Author"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.Quantum")); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(root, Messages.getString("ExportXMLAction.Version"), //$NON-NLS-1$
+									Messages.getString("ExportXMLAction.XMLVersionNumber")); //$NON-NLS-1$
+		Iterator iter = selection.iterator();
+		while (iter.hasNext()) {
+			TreeNode current = (TreeNode) iter.next();
+			EntityNode entityNode = (EntityNode) current;
+			ModelToXMLConverter.getInstance().convert(root, entityNode.getEntity() );                  
+		}
+		
+		StringWriter text = new StringWriter();
+		try {
+			XMLHelper.createDOMSerializer(text).serialize(doc);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		String textXml = new String(text.getBuffer());
+		QuantumPlugin.getDefault().getSysClip().setContents(
+			new Object[] { textXml },
+			new Transfer[] { TextTransfer.getInstance()});
+		
+		metadataExtension.run(doc);
+	}
+
+	/**
+	 * @param row
+	 */
+	public void addRowData(TableRow row) {
+		tableRow = row;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IDataExtension.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IDataExtension.java
new file mode 100644
index 0000000..9149235
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IDataExtension.java
@@ -0,0 +1,21 @@
+/*
+ * Created on 21/03/2004
+ *
+ */
+package com.quantum.extensions;
+
+import org.w3c.dom.Document;
+
+/**
+ * @author panic
+ *
+ */
+public interface IDataExtension extends IQuantumExtension {
+	/**
+	 * Callback method for data export
+	 * 
+	 * @param doc. An org.w3c.dom.Document with the XML data on the selected items 
+	 */
+	public void run(Document doc);
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IMetadataExtension.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IMetadataExtension.java
new file mode 100644
index 0000000..34298c7
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IMetadataExtension.java
@@ -0,0 +1,21 @@
+/*
+ * Created on 15/02/2004
+ *
+ */
+package com.quantum.extensions;
+
+import org.w3c.dom.Document;
+
+/**
+ * @author panic
+ *
+ */
+public interface IMetadataExtension extends IQuantumExtension{
+	/**
+	 * Callback method for metadata export
+	 * 
+	 * @param doc. An org.w3c.dom.Document with the XML data on the selected items 
+	 */
+	public void run(Document doc);
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IQuantumExtension.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IQuantumExtension.java
new file mode 100644
index 0000000..e9806c3
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/IQuantumExtension.java
@@ -0,0 +1,13 @@
+/*
+ * Created on 17/02/2004
+ *
+ */
+package com.quantum.extensions;
+
+/**
+ * @author panic
+ * A commom parent for the Quantum Extensions
+ */
+public interface IQuantumExtension {
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ProcessServiceMembers.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ProcessServiceMembers.java
new file mode 100644
index 0000000..30ca7f2
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/extensions/ProcessServiceMembers.java
@@ -0,0 +1,281 @@
+
+/*
+ * Created on 16-feb-2004
+ *
+ */
+package com.quantum.extensions;
+import java.util.Vector;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IPluginRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.WorkbenchException;
+import org.w3c.dom.Document;
+
+import com.quantum.view.bookmark.BookmarkView;
+import com.quantum.view.tableview.TableView;
+
+/**
+ * Extension processing logic for the <code>functions</code> extension-point.
+ * Extract specific information about each function. Create callback
+ * function object when required.
+ * 
+ * @author panic
+ *
+ */
+public class ProcessServiceMembers {
+
+	/**
+	 * The fully-qualified name of the functions extension-point for this plug-in.
+	 */
+	private static final String EXTENSION_POINT_METADATA =
+		"com.quantum.Quantum.metadata";
+	private static final String EXTENSION_POINT_DATA =
+		"com.quantum.Quantum.data";
+
+	/**
+	 * Name of the XML attribute designating a metadata actor label.
+	 */
+	private static final String FUNCTION_NAME_ATTRIBUTE = "label";
+
+	/**
+	 * Name of the XML attribute designating the fully-qualified name 
+	 * of the implementation class of a function.
+	 */
+	private static final String CLASS_ATTRIBUTE = "class";
+
+	/**
+	 * Perform initial extension processing for the members of the
+	 * <code>functions</code> extension-point. Make calls to the user interface
+	 * module to add the functions of an extension to the UI functions grid.
+	 * For each function, a virtual proxy callback object is created and handed
+	 * to the user interface module. The proxy class is a nested top-level 
+	 * class and is therefore known at compile time. The actual (real) callback
+	 * objects configured into extensions are instantiated and initialized in 
+	 * a lazy fashion by the proxy callback objects.
+	 * 
+	 * @param grid The UI functions grid exposing the functions configured
+	 * 		into <code>functions</code> extensions.
+	 * 
+	 */
+	public static void process(IViewPart view, Vector extensionActions) throws WorkbenchException {
+		
+		extensionActions.clear();
+		
+		IPluginRegistry registry = Platform.getPluginRegistry();
+		String extPointId; 
+		// We have two different extension points, we choose the needed one based
+		// on the view that calls this function. 
+		// Our two extension points have the same attributes, so the only change is the name
+		// If the implementation differed more, we should probably make two different functions
+		if (view instanceof BookmarkView)
+			extPointId = EXTENSION_POINT_METADATA;
+		else if (view instanceof TableView)
+			extPointId = EXTENSION_POINT_DATA;
+		else
+			return;
+		
+		IExtensionPoint extensionPoint =
+			registry.getExtensionPoint(extPointId);
+		if (extensionPoint == null) {
+			throw new WorkbenchException(
+				"unable to resolve extension-point: " + extPointId);
+		}
+		IConfigurationElement[] members =
+			extensionPoint.getConfigurationElements();
+
+		// For each service:
+		for (int m = 0; m < members.length; m++) {
+			IConfigurationElement member = members[m];
+			// Get the label of the extender plugin and the ID of the extension.
+			IExtension extension = member.getDeclaringExtension();
+			String pluginLabel =
+				extension.getDeclaringPluginDescriptor().getLabel();
+			if (pluginLabel == null) {
+				pluginLabel = "[unnamed plugin]";
+			}
+			// Get the name of the operation implemented by the service.
+			// The operation name is a service attribute in the extension's XML specification.
+			String functionName = member.getAttribute(FUNCTION_NAME_ATTRIBUTE);
+			if (functionName == null) {
+				functionName = "[unnamed function]";
+			}
+			String label = pluginLabel + "/" + functionName;
+			// Add a row to support this operation to the UI grid.
+			IQuantumExtension proxy = null;
+			if (view instanceof BookmarkView)
+				proxy = (IMetadataExtension) new MetadataFunctionProxy(member);
+			else if (view instanceof TableView)
+				proxy = (IDataExtension) new DataFunctionProxy(member);
+			//grid.addFunction(proxy, functionName, label);
+			extensionActions.add(new ExtensionAction(view, label, label, proxy));
+		}
+	}
+
+	/**
+	 * Virtual proxy class for function invokation.
+	 * Members of this class support lazy processing by fronting the real 
+	 * implementations of arithmetic functions configured into extensions.
+	 */
+	private static class MetadataFunctionProxy implements IMetadataExtension {
+		// The "real" implementation of the function.
+		private IMetadataExtension delegate = null;
+		// The configured state of the extension element representing this arithmetic function.
+		private IConfigurationElement element;
+		// Whether this function has been invoked before. 
+		// Used for lazy evaluation of the service.
+		private boolean invoked = false;
+
+		/**
+		 * Construct a virtual proxy to stand in place of an extension function.
+		 * The constructor simply keeps track of an arithmetic function's configured state
+		 * without at this time instantiating the implementation of the function.
+		 * 
+		 * @param element The configuration of this arithmetic function.
+		 */
+		public MetadataFunctionProxy(IConfigurationElement element) {
+			this.element = element;
+		}
+
+		/**
+		 * Compute the function value. 
+		 * The proxy computation first instantiates the implementation
+		 * of the function, if this is the first time the function is called,
+		 * and then delegates to that implementation. The instantiation and
+		 * initialization of the delegate implementation uses the standard 
+		 * callback object instantiation and initialization methods of Eclipse.
+		 * 
+		 * @see com.bolour.sample.eclipse.service.ui.IFunction#compute(long)
+		 */
+		public final void run(Document doc) {
+			try {
+				getDelegate().run(doc);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		/**
+		 * Instantiate and initialize the implementation of the function if
+		 * this is the first time the proxy has been called.
+		 * 
+		 * @return The implementation delegate (same as the instance variable <code>delegate</code>.
+		 * @throws Exception If the callback object is misconfigured.
+		 */
+		private final IMetadataExtension getDelegate() throws Exception {
+			if (invoked) {
+				return delegate;
+			}
+			invoked = true;
+			try {
+				Object callback =
+					element.createExecutableExtension(CLASS_ATTRIBUTE);
+				if (!(callback instanceof IMetadataExtension)) {
+					String message =
+						"callback class '"
+							+ callback.getClass().getName()
+							+ "' is not an IFunction";
+					System.err.println(message);
+					throw new ClassCastException(message);
+				}
+				delegate = (IMetadataExtension) callback;
+			} catch (CoreException ex) {
+				System.err.println(ex.getMessage());
+				ex.printStackTrace();
+				throw ex;
+			} catch (Error err) {
+				System.err.println(err.getMessage());
+				err.printStackTrace();
+				throw err;
+			}
+			return delegate;
+		}
+	}
+	/**
+	 * Virtual proxy class for function invokation.
+	 * Members of this class support lazy processing by fronting the real 
+	 * implementations of arithmetic functions configured into extensions.
+	 */
+	private static class DataFunctionProxy implements IDataExtension {
+		// The "real" implementation of the function.
+		private IDataExtension delegate = null;
+		// The configured state of the extension element representing this arithmetic function.
+		private IConfigurationElement element;
+		// Whether this function has been invoked before. 
+		// Used for lazy evaluation of the service.
+		private boolean invoked = false;
+
+		/**
+		 * Construct a virtual proxy to stand in place of an extension function.
+		 * The constructor simply keeps track of an arithmetic function's configured state
+		 * without at this time instantiating the implementation of the function.
+		 * 
+		 * @param element The configuration of this arithmetic function.
+		 */
+		public DataFunctionProxy(IConfigurationElement element) {
+			this.element = element;
+		}
+
+		/**
+		 * Compute the function value. 
+		 * The proxy computation first instantiates the implementation
+		 * of the function, if this is the first time the function is called,
+		 * and then delegates to that implementation. The instantiation and
+		 * initialization of the delegate implementation uses the standard 
+		 * callback object instantiation and initialization methods of Eclipse.
+		 * 
+		 * @see com.bolour.sample.eclipse.service.ui.IFunction#compute(long)
+		 */
+		public final void run(Document doc) {
+			try {
+				getDelegate().run(doc);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		/**
+		 * Instantiate and initialize the implementation of the function if
+		 * this is the first time the proxy has been called.
+		 * 
+		 * @return The implementation delegate (same as the instance variable <code>delegate</code>.
+		 * @throws Exception If the callback object is misconfigured.
+		 */
+		private final IDataExtension getDelegate() throws Exception {
+			if (invoked) {
+				return delegate;
+			}
+			invoked = true;
+			try {
+				Object callback =
+					element.createExecutableExtension(CLASS_ATTRIBUTE);
+				if (!(callback instanceof IDataExtension)) {
+					String message =
+						"callback class '"
+							+ callback.getClass().getName()
+							+ "' is not an IFunction";
+					System.err.println(message);
+					throw new ClassCastException(message);
+				}
+				delegate = (IDataExtension) callback;
+			} catch (CoreException ex) {
+				System.err.println(ex.getMessage());
+				ex.printStackTrace();
+				throw ex;
+			} catch (Error err) {
+				System.err.println(err.getMessage());
+				err.printStackTrace();
+				throw err;
+			}
+			return delegate;
+		}
+	}
+
+}
+
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Bookmark.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Bookmark.java
new file mode 100644
index 0000000..d2dff2b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Bookmark.java
@@ -0,0 +1,525 @@
+package com.quantum.model;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.quantum.IQuantumConstants;
+import com.quantum.QuantumPlugin;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.sql.ConnectionEstablisher;
+import com.quantum.sql.MultiSQLServer;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * Class Bookmark holds the "static" information of a bookmark, that is the data that
+ * is saved and loaded from the external file and describes a bookmark. This info will
+ * be filled up by the end user.
+ * 
+ * @author root
+ */
+public class Bookmark {
+    
+    private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+	private String name = ""; //$NON-NLS-1$
+	private String username = ""; //$NON-NLS-1$
+    private String password = ""; //$NON-NLS-1$
+    private String connect = ""; //$NON-NLS-1$
+    private String driver = ""; //$NON-NLS-1$
+    private String type = ""; //$NON-NLS-1$
+    private String driverFile = ""; //$NON-NLS-1$
+    
+    /**
+     * A quick list is a list of favourite tables that a person might want to view
+     * without having to look at the entire list of tables.
+     */
+    private Map quickList = new Hashtable();
+	private Set schemas = new HashSet();   
+	private Connection connection = null;
+    private ConnectionEstablisher connectionEstablisher;
+    private boolean changed = true;
+    private List queries = Collections.synchronizedList(new ArrayList());
+    private boolean promptForPassword = false;
+    private boolean autoCommit = true;
+    private String autoCommitPreference = IQuantumConstants.autoCommitTrue;
+	
+	public Bookmark() {
+        this(MultiSQLServer.getInstance());
+	}
+    
+    public Bookmark(ConnectionEstablisher connectionEstablisher) {
+        this.connectionEstablisher = connectionEstablisher;
+    }
+
+	public Bookmark(Bookmark data) {
+		this();
+		setName(data.getName());
+		setUsername(data.getUsername());
+		setPassword(data.getPassword());
+		setConnect(data.getConnect());
+		setDriver(data.getDriver());
+		setType(data.getType());
+		setDriverFile(data.getDriverFile());
+        setPromptForPassword(data.getPromptForPassword());
+        setAutoCommit(data.isAutoCommit());
+        setAutoCommitPreference(data.getAutoCommitPreference());
+        
+        this.schemas.addAll(data.schemas);
+        this.quickList = new Hashtable(data.quickList);
+	}
+
+	/**
+	 * Returns the JDBC URL.
+	 * @return String
+	 */
+	public String getConnect() {
+		return connect;
+	}
+
+	/**
+	 * Returns the driver.
+	 * @return String
+	 */
+	public String getDriver() {
+		return driver;
+	}
+
+	/**
+	 * Returns the driverFile.
+	 * @return String
+	 */
+	public String getDriverFile() {
+		return driverFile;
+	}
+
+	/**
+	 * Returns the password.
+	 * @return String
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * Returns the username.
+	 * @return String
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * Sets the connect.
+	 * @param connect The connect to set
+	 */
+	public void setConnect(String connect) {
+		if (connect == null) {
+			connect = ""; //$NON-NLS-1$
+		}
+		this.connect = connect;
+	}
+
+	/**
+	 * Sets the driver.
+	 * @param driver The driver to set
+	 */
+	public void setDriver(String driver) {
+		if (driver == null) {
+			driver = ""; //$NON-NLS-1$
+		}
+		this.driver = driver;
+	}
+
+	/**
+	 * Sets the driverFile.
+	 * @param driverFile The driverFile to set
+	 */
+	public void setDriverFile(String driverFile) {
+		if (driverFile == null) {
+			driverFile = ""; //$NON-NLS-1$
+		}
+		this.driverFile = driverFile;
+	}
+
+	/**
+	 * Sets the password.
+	 * @param password The password to set
+	 */
+	public void setPassword(String password) {
+		if (password == null) {
+			password = ""; //$NON-NLS-1$
+		}
+		this.password = password;
+	}
+
+	/**
+	 * Sets the username.
+	 * @param username The username to set
+	 */
+	public void setUsername(String username) {
+		if (username == null) {
+			username = ""; //$NON-NLS-1$
+		}
+		this.username = username;
+	}
+
+	/**
+	 * Returns the name.
+	 * @return String
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the name.
+	 * @param name The name to set
+	 */
+	public void setName(String name) {
+		if (name == null) {
+			name = ""; //$NON-NLS-1$
+		}
+        if (!name.equals(this.name)) {
+         
+            String oldName = this.name;
+            this.name = name;
+            this.propertyChangeSupport.firePropertyChange("name", oldName, this.name);
+            this.changed = true;
+        }
+	}
+
+	public boolean isEmpty() {
+		if (name.equals("") && //$NON-NLS-1$
+		username.equals("") && //$NON-NLS-1$
+		password.equals("") && //$NON-NLS-1$
+		connect.equals("") && //$NON-NLS-1$
+		driver.equals("") && //$NON-NLS-1$
+		type.equals("") && //$NON-NLS-1$
+		driverFile.equals("")) { //$NON-NLS-1$
+			return true;
+		}
+		return false;
+	}
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("["); //$NON-NLS-1$
+		buffer.append("name="); //$NON-NLS-1$
+		buffer.append(name);
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("username="); //$NON-NLS-1$
+		buffer.append(username);
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("password=****"); //$NON-NLS-1$
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("connect="); //$NON-NLS-1$
+		buffer.append(connect);
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("driver="); //$NON-NLS-1$
+		buffer.append(driver);
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("type="); //$NON-NLS-1$
+		buffer.append(type);
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("driverFile="); //$NON-NLS-1$
+		buffer.append(driverFile);
+		buffer.append("]"); //$NON-NLS-1$
+		return buffer.toString();
+	}
+	
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+    public Connection connect(PasswordFinder passwordFinder) throws ConnectionException {
+        boolean isConnected = isConnected();
+        if (this.connection == null) {
+            this.connection = this.connectionEstablisher.connect(this, passwordFinder);
+        }
+        
+        if (isConnected() != isConnected) {
+            this.propertyChangeSupport.firePropertyChange(
+                "connected", isConnected, isConnected());
+        }
+        return this.connection;
+    }
+
+    /**
+	 * Returns the connection object. 
+	 * @return the Connection object associated with the current JDBC source.
+	 * 
+	 */
+    public Connection getConnection() throws NotConnectedException {
+    	if (this.connection == null) {
+            throw new NotConnectedException();
+    	}
+        return this.connection;
+    }
+
+    /**
+	 * @return true if the BookmarkNode is connected to a JDBC source
+	 */
+    public boolean isConnected() {
+    	return (connection != null);
+    }
+
+    /**
+	 * Sets the connection member. From that moment on the BookmarkNode is "connected" (open)
+	 * @param connection : a valid connection to a JDBC source
+	 */
+    public void setConnection(Connection connection) {
+    	this.connection = connection;
+    }
+
+    public void disconnect() throws ConnectionException {
+        boolean isConnected = isConnected();
+        try {
+            if (this.connection != null) {
+                this.connectionEstablisher.disconnect(this.connection);
+            }
+        } finally {
+            this.connection = null;
+            if (isConnected() != isConnected) {
+                this.propertyChangeSupport.firePropertyChange(
+                    "connected", isConnected, isConnected());
+            }
+        }
+    }
+    public void addSchema(String schema) {
+        if (schema != null && schema.trim().length() > 0) {
+            addSchema(new Schema(schema));
+        }
+    }
+
+    public void addSchema(Schema qualifier) {
+        if (qualifier != null) {
+            this.schemas.add(qualifier);
+            this.changed = true;
+            this.propertyChangeSupport.firePropertyChange("schemas", null, null);
+        }
+    }
+
+    public void setSchemas(Schema[] schemas) {
+        this.schemas.clear();
+        for (int i = 0, length = (schemas == null) ? 0 : schemas.length;
+            i < length;
+            i++) {
+            this.schemas.add(schemas[i]);
+            
+        }
+        this.changed = true;
+        this.propertyChangeSupport.firePropertyChange("schemas", null, null);
+    }
+
+    /**
+     * @return a list of all the schemas that have been set up.
+     */
+    public Schema[] getSchemas() {
+        Set set = new HashSet();
+        set.addAll(this.schemas);
+        if (set.isEmpty()) {
+            set.add(new Schema(getAdapter().getDefaultSchema(this.username), 
+                this.username, true));
+        }
+        List list = new ArrayList(set);
+        Collections.sort(list);
+        return (Schema[]) list.toArray(new Schema[list.size()]);
+    }
+
+	/**
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof Bookmark)) return false;
+		String name = ((Bookmark)obj).getName();
+		if (name.equals(this.getName())) return true;
+		return false;
+	}
+
+    /**
+     * @param listener
+     */
+    public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * @param listener
+     */
+    public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+
+    public void addQuickListEntry(String type, String schemaName, String name) {
+        Entity entity = EntityFactory.getInstance().create(this, schemaName, name, type);
+        this.quickList.put(entity.getCondQualifiedName(), entity);
+        this.propertyChangeSupport.firePropertyChange("quickList", null, null);
+        this.changed = true;
+    }
+    
+    public void addQuickListEntry(Entity entity) {
+        addQuickListEntry(entity.getType(), entity.getSchema(), entity.getName());
+    }
+    
+    public void removeQuickListEntry(Entity entity) {
+        if (entity != null  && this.quickList.containsKey(entity.getCondQualifiedName())) {
+            this.quickList.remove(entity.getCondQualifiedName());
+            this.propertyChangeSupport.firePropertyChange("quickList", null, null);
+            this.changed = true;
+        }
+    }
+    
+    public Entity[] getQuickListEntries() {
+        return (Entity[]) this.quickList.values().toArray(new Entity[this.quickList.size()]);
+    }
+    
+    public boolean hasQuickList() {
+        return !this.quickList.isEmpty();
+    }
+    /**
+     * @return
+     */
+    public boolean isChanged() {
+        return changed;
+    }
+
+    /**
+     * @param b
+     */
+    public void setChanged(boolean b) {
+        changed = b;
+    }
+    
+    public Database getDatabase() throws NotConnectedException {
+        if (!isConnected()) {
+            throw new NotConnectedException();
+        }
+        return new Database(this);
+    }
+    
+    public DatabaseAdapter getAdapter() {
+        return AdapterFactory.getInstance().getAdapter(getType());
+    }
+
+    public Entity[] getEntitiesForSchema(Schema schema, String type) throws SQLException {
+        try {
+            Entity[] entities = getDatabase().getEntities(this, schema, type);
+            return entities;
+        } catch (NotConnectedException e) {
+            return new Entity[0];
+        }
+    }
+    
+    public Entity getEntity(Schema schema, String name) throws SQLException {
+        Entity result = null;
+        if (schema != null && name != null) {
+            Entity[] entities = getEntitiesForSchema(schema, null);
+            for (int i = 0, length = (entities == null) ? 0 : entities.length;
+                result == null && i < length;
+                i++) {
+                if (schema.equals(entities[i].getSchema()) &&
+                    name.equals(entities[i].getName())) {
+                    result = entities[i];
+                }
+            }
+        }
+        return result;
+    }
+    
+    public boolean isInQuickList(Entity entity) {
+        return this.quickList.containsKey(entity.getCondQualifiedName());
+    }
+    
+    /**
+     * 
+     * @param queryString
+     */
+    public void addQuery(String queryString) {
+        if (this.queries.contains(queryString)) {
+            this.queries.remove(queryString);
+        }
+        this.queries.add(queryString);
+        
+        int size = getQueryHistorySize();
+        
+        while (this.queries.size() > size) {
+            this.queries.remove(0);
+        }
+        this.propertyChangeSupport.firePropertyChange("queries", null, null);
+        this.changed = true;
+    }
+    
+    public String[] getQueries() {
+        return (String[]) this.queries.toArray(new String[this.queries.size()]);
+    }
+    
+    private int getQueryHistorySize() {
+        IPreferenceStore store =
+            QuantumPlugin.getDefault().getPreferenceStore();
+        return store.getInt(getClass().getName() + ".queryHistorySize"); //$NON-NLS-1$
+    }
+    /**
+     * @return
+     */
+    public boolean getPromptForPassword() {
+        return promptForPassword;
+    }
+
+    /**
+     * @param b
+     */
+    public void setPromptForPassword(boolean b) {
+        promptForPassword = b;
+    }
+
+	/**
+	 * @return
+	 */
+	public boolean isAutoCommit() {
+		return autoCommit;
+	}
+
+	/**
+	 * @return
+	 */
+	public String getAutoCommitPreference() {
+		return autoCommitPreference;
+	}
+
+	/**
+	 * @param b
+	 */
+	public void setAutoCommit(boolean b) {
+		autoCommit = b;
+	}
+
+	/**
+	 * @param string
+	 */
+	public void setAutoCommitPreference(String string) {
+		autoCommitPreference = string;
+	}
+
+	// Returns true or false indicating whether this bookmark must be set to AutoCommit on connection or not 
+	public boolean getDefaultAutoCommit(){
+		if (autoCommitPreference.equals(IQuantumConstants.autoCommitTrue)) return true;
+		else if (autoCommitPreference.equals(IQuantumConstants.autoCommitFalse)) return false;
+		else if (autoCommitPreference.equals(IQuantumConstants.autoCommitSaved)) return autoCommit;
+		
+		return true;	
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkCollection.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkCollection.java
new file mode 100644
index 0000000..58a854e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkCollection.java
@@ -0,0 +1,312 @@
+package com.quantum.model;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
+
+import com.quantum.IQuantumConstants;
+import com.quantum.Messages;
+import com.quantum.model.xml.ModelToXMLConverter;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * The collection of database bookmarks that the Quantum plug-in knows about.
+ * This collection is loaded by the QuantumPlugin class before any Quantum plugin 
+ * extension is invoked.
+ * 
+ * @author BC
+ */
+public class BookmarkCollection {
+    
+    private static BookmarkCollection instance = new BookmarkCollection();
+    private List bookmarks = new Vector();
+    private boolean changed = false;
+    private PropertyChangeSupport support = new PropertyChangeSupport(this);
+    
+    private BookmarkCollection() {
+    }
+
+    /**
+     * Singleton accessor
+     */
+    public static BookmarkCollection getInstance() {
+        return BookmarkCollection.instance;
+    }
+    
+    /**
+     * Imports the bookmars from a properties file.  This load method is 
+     * provided for backwards compatability only; we no longer persist 
+     * bookmarks as properties files.
+     * @param file
+     */
+    public void load(File file) throws IOException {
+        Properties props = new Properties();
+        FileInputStream in = new FileInputStream(file);
+        props.load(in);
+        in.close();
+        fromProperties(true, props);
+    }
+     
+    private void fromProperties(boolean overwrite, Properties props) {
+        List newBookmarks = new Vector();
+        int i = 0;
+        while (true) {
+            Bookmark bookmark = new Bookmark();
+            String name = props.getProperty(i + ".name"); //$NON-NLS-1$
+            if (name == null) {
+                break;
+            }
+            bookmark.setName(name);
+            bookmark.setUsername(props.getProperty(i + ".username")); //$NON-NLS-1$
+            bookmark.setPassword(props.getProperty(i + ".password")); //$NON-NLS-1$
+            bookmark.setConnect(props.getProperty(i + ".connect")); //$NON-NLS-1$
+            bookmark.setDriver(props.getProperty(i + ".driver")); //$NON-NLS-1$
+            String schema = props.getProperty(i + ".schema"); //$NON-NLS-1$
+            if (schema != null) {
+                bookmark.addSchema(schema);
+            }
+            String type = props.getProperty(i + ".type"); //$NON-NLS-1$
+            if (type != null) {
+                bookmark.setType(type);
+            } else {
+                bookmark.setType(""); //$NON-NLS-1$
+            }
+            String driverFile = props.getProperty(i + ".driverLocation"); //$NON-NLS-1$
+            if (driverFile != null) {
+                bookmark.setDriverFile(driverFile);
+            } else {
+                bookmark.setDriverFile(""); //$NON-NLS-1$
+            }
+            System.out.println(bookmark.toString());
+            if (!bookmark.isEmpty()) {
+                newBookmarks.add(bookmark);
+            }
+            i++;
+        }
+        if (overwrite) {
+            this.bookmarks = newBookmarks;
+        } else {
+            this.bookmarks.addAll(newBookmarks);
+        }
+    }
+    /**
+     * Finds a Bookmark with the specified name.
+     * 
+     * @param name
+     * @return the bookmark with the specified name, or null if no bookmark can be found
+     */
+    public Bookmark find(String name){
+        Bookmark result = null;
+        if (name != null) {
+            for (Iterator i = this.bookmarks.iterator(); result == null && i.hasNext(); ) {
+                Bookmark temp = (Bookmark) i.next();
+                if (name.equals(temp.getName())) {
+                    result = temp;
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Exports a Bookmark data to an XMLDocument Element
+     * The complementary function is importXML()
+     * @param root  The Element to fill up with the bookmark info
+     */
+    public void exportXML(Element root) {
+        System.out.println("Bookmarks: Saving to Element"); //$NON-NLS-1$
+        Element bookmarkRoot = MetaDataXMLInterface.createElementText(root,"bookmarks", ""); //$NON-NLS-1$ //$NON-NLS-2$
+        for (int i = 0; i < bookmarks.size(); i++) {
+            Bookmark b = (Bookmark) bookmarks.get(i);
+            ModelToXMLConverter.getInstance().convert(bookmarkRoot, b);
+        }
+    }
+
+    /**
+     * Imports a Bookmark data from an XMLDocument Element
+     * The complementary function is exportXML()
+     * @param root  The Element from which to load
+     */
+    public void importXML(Element root) {
+        this.changed = true;
+        System.out.println("Bookmarks: Loading from Element"); //$NON-NLS-1$
+        Vector newBookmarks = new Vector();
+        NodeList nodes = root.getElementsByTagName("bookmark"); //$NON-NLS-1$
+        for (int i = 0; i < nodes.getLength(); i++) {
+            Bookmark bookmark = new Bookmark();
+            Element column = (Element) nodes.item(i);
+            
+            String name = MetaDataXMLInterface.getElementText(column,"name"); //$NON-NLS-1$
+            if (name == null) break;
+            bookmark.setName(name);
+            
+            MetaDataXMLInterface.getElementText(column,"name"); //$NON-NLS-1$
+            bookmark.setUsername(MetaDataXMLInterface.getElementText(column,"username")); //$NON-NLS-1$
+            bookmark.setPassword(MetaDataXMLInterface.getElementText(column,"password")); //$NON-NLS-1$
+            bookmark.setPromptForPassword(Boolean.TRUE.toString().equalsIgnoreCase(
+                MetaDataXMLInterface.getElementText(column,"prompt"))); //$NON-NLS-1$
+            bookmark.setConnect(MetaDataXMLInterface.getElementText(column,"connect")); //$NON-NLS-1$
+			bookmark.setAutoCommit(Boolean.TRUE.toString().equalsIgnoreCase(
+				MetaDataXMLInterface.getElementText(column,"autoCommit", "True"))); //$NON-NLS-1$
+			bookmark.setAutoCommitPreference(MetaDataXMLInterface.getElementText(column,"autoCommitPreference", IQuantumConstants.autoCommitTrue)); //$NON-NLS-1$
+            bookmark.setDriver(MetaDataXMLInterface.getElementText(column,"driver")); //$NON-NLS-1$
+            bookmark.addSchema(MetaDataXMLInterface.getElementText(column,"schema")); //$NON-NLS-1$
+            bookmark.setType(MetaDataXMLInterface.getElementText(column,"type")); //$NON-NLS-1$
+            bookmark.setDriverFile(MetaDataXMLInterface.getElementText(column,"driverLocation")); //$NON-NLS-1$
+            NodeList children = column.getElementsByTagName(Messages.getString("ExportXMLAction.OtherSchemas"));
+            if (children.getLength() > 0) {
+                importSchemas((Element) children.item(0), bookmark);
+            }
+            System.out.println(bookmark.toString());
+            if (!bookmark.isEmpty()) {
+                newBookmarks.addElement(bookmark);
+            }
+            importQuickList(bookmark, column);
+            importQueryList(bookmark, column);
+        }
+        this.bookmarks.addAll(newBookmarks);
+        this.support.firePropertyChange("bookmarks", null, null);
+    }
+
+    private void importSchemas(Element otherSchemas, Bookmark bookmark) {
+        Vector vector = MetaDataXMLInterface.getVectorText(otherSchemas, Messages.getString("ExportXMLAction.SchemaName"));
+        List list = new ArrayList();
+        for (Iterator i = vector.iterator(); i.hasNext();) {
+            String schemaName = (String) i.next();
+            list.add(new Schema(schemaName));
+        }
+        bookmark.setSchemas((Schema[]) list.toArray(new Schema[list.size()]));
+    }
+
+    private void importQuickList(Bookmark bookmark, Element bookmarkElement) {
+        NodeList quickList = bookmarkElement.getElementsByTagName("quickList");
+        for (int j = 0,
+            length = (quickList == null) ? 0 : quickList.getLength();
+            j < length;
+            j++) {
+            
+            Element element = (Element) quickList.item(j);
+            NodeList childNodes = element.getChildNodes();
+                
+            for (int k = 0,
+                length2 = (childNodes == null) ? 0 : childNodes.getLength();
+                k < length2;
+                k++) {
+                if (Node.ELEMENT_NODE == childNodes.item(k).getNodeType()) {
+                    Element entity = (Element) childNodes.item(k);
+                    bookmark.addQuickListEntry(entity.getTagName(), 
+                        entity.getAttribute("schema"), entity.getAttribute("name"));
+                }
+            }
+        }
+    }
+    
+    private void importQueryList(Bookmark bookmark, Element bookmarkElement) {
+        NodeList queryList = bookmarkElement.getElementsByTagName("queryList");
+        for (int i = 0,
+            length = (queryList == null) ? 0 : queryList.getLength();
+            i < length;
+            i++) {
+            
+            Element element = (Element) queryList.item(i);
+            NodeList childNodes = element.getElementsByTagName("query");
+                
+            for (int k = 0,
+                length2 = (childNodes == null) ? 0 : childNodes.getLength();
+                k < length2;
+                k++) {
+
+                Element query = (Element) childNodes.item(k);
+                bookmark.addQuery(MetaDataXMLInterface.getElementText(query,"queryString"));
+        
+            }
+        }
+    }
+    
+    public void addBookmark(Bookmark b) {
+        this.changed = true;
+        if (!bookmarks.contains(b)) {
+            Bookmark[] original = getBookmarks();
+            bookmarks.add(b);
+            this.support.firePropertyChange("bookmarks", original, getBookmarks());
+        }
+    }
+    public void removeBookmark(Bookmark b) {
+        this.changed = true;
+        if (bookmarks.contains(b)) {
+            Bookmark[] original = getBookmarks();
+            bookmarks.remove(b);
+            this.support.firePropertyChange("bookmarks", original, getBookmarks());
+        }
+    }
+    
+    public Bookmark[] getBookmarks() {
+        return (Bookmark[]) this.bookmarks.toArray(new Bookmark[this.bookmarks.size()]);
+    }
+    /**
+     * @return
+     */
+    public boolean isAnythingChanged() {
+        boolean anythingChanged = this.changed;
+        for (Iterator i = this.bookmarks.iterator(); !anythingChanged && i.hasNext();) {
+            Bookmark bookmark = (Bookmark) i.next();
+            anythingChanged |= bookmark.isChanged();
+        }
+        return anythingChanged;
+    }
+    
+    public boolean isChanged() {
+        return this.changed;
+    }
+
+    /**
+     * @param b
+     */
+    public void setChanged(boolean changed) {
+        this.changed = changed;
+    }
+
+    /**
+     * @param listener
+     */
+    public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+        this.support.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * @param listener
+     */
+    public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+        this.support.removePropertyChangeListener(listener);
+    }
+
+	/**
+	 * @param string
+	 * @return
+	 */
+	public String getCopyName(String name) {
+		
+		String copyName = Messages.getString("BookmarkView.CopyOf") + name;
+		int i = 1;
+		while (find(copyName) != null)
+		{
+			copyName = Messages.getString("BookmarkView.CopyOf") + name + "(" + String.valueOf(i) + ")";
+			i++;
+		}
+		
+		return copyName;
+	}
+
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkHolder.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkHolder.java
new file mode 100644
index 0000000..1f4a35c
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/BookmarkHolder.java
@@ -0,0 +1,17 @@
+/*
+ * Created on 22-jul-2003
+ *
+ */
+package com.quantum.model;
+
+
+/**
+ * User interface components that can provide a connection to the database they
+ * relate to implement this interface.  Such components must know how to obtain a 
+ * password, as required.
+ * 
+ * @author panic
+ */
+public interface BookmarkHolder {
+	public Bookmark getBookmark();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Column.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Column.java
new file mode 100644
index 0000000..53923e4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Column.java
@@ -0,0 +1,21 @@
+package com.quantum.model;
+
+/**
+ * 
+ * @author bcholmes
+ */
+public interface Column {
+	public int getSize();
+	public int getPrimaryKeyOrder();
+    public boolean isPrimaryKey();
+	public String getName();
+	public int getNumberOfFractionalDigits();
+	public String getTypeName();
+	public boolean isReal();
+    public boolean isNullable();
+	public boolean isNumeric();
+	public int getType();
+	public Entity getParentEntity();
+	public String getQualifiedTableName();
+    public String getRemarks();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ColumnImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ColumnImpl.java
new file mode 100644
index 0000000..eb4e6cb
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ColumnImpl.java
@@ -0,0 +1,148 @@
+package com.quantum.model;
+
+import com.quantum.sql.SQLHelper;
+
+/**
+ * @author BC
+ */
+class ColumnImpl implements Column, Comparable {
+
+    private int size;
+    private boolean nullable;
+    private int primaryKeyOrder;
+    private String name;
+    private Entity entity;
+    private int numberOfFractionalDigits;
+    private String typeName;
+    private int type;
+    private int position;
+    private String remarks;
+    
+    ColumnImpl(Entity entity, String name, String typeName, int type, 
+        int size, int numberOfFractionalDigits, boolean nullable, int position,
+        String remarks) {
+           
+        this.entity = entity;
+        this.name = name;
+        this.typeName = typeName;
+        this.type = type;
+        this.size = size;
+        this.numberOfFractionalDigits = numberOfFractionalDigits;
+        this.nullable = nullable;
+        this.position = position;
+        this.remarks = remarks;
+    }
+
+    /**
+     * @see com.quantum.model.Column#getPrimaryKeyOrder()
+     */
+    public int getPrimaryKeyOrder() {
+        return this.primaryKeyOrder;
+    }
+
+    /**
+     * @see com.quantum.model.Column#isPrimaryKey()
+     */
+    public boolean isPrimaryKey() {
+        return getPrimaryKeyOrder() > 0;
+    }
+
+    /**
+     * @see com.quantum.model.Column#getName()
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * @see com.quantum.model.Column#getTypeName()
+     */
+    public String getTypeName() {
+        return this.typeName;
+    }
+
+    /**
+     * @see com.quantum.model.Column#isReal()
+     */
+    public boolean isReal() {
+        return false;
+    }
+
+    /**
+     * @see com.quantum.model.Column#isNullable()
+     */
+    public boolean isNullable() {
+        return this.nullable;
+    }
+
+    /**
+     * @see com.quantum.model.Column#isNumeric()
+     */
+    public boolean isNumeric() {
+        return SQLHelper.isNumeric(this.type);
+    }
+
+    /**
+     * @see com.quantum.model.Column#getType()
+     */
+    public int getType() {
+        return this.type;
+    }
+
+    /**
+     * @see com.quantum.model.Column#getParentEntity()
+     */
+    public Entity getParentEntity() {
+        return this.entity;
+    }
+
+    /**
+     * @see com.quantum.model.Column#getQualifiedTableName()
+     */
+    public String getQualifiedTableName() {
+        return this.entity.getCondQualifiedName();
+    }
+    /**
+     * @param i
+     */
+    void setPrimaryKeyOrder(int i) {
+        this.primaryKeyOrder = i;
+    }
+
+    /**
+     * @see java.lang.Comparable#compareTo(java.lang.Object)
+     */
+    public int compareTo(Object o) {
+        ColumnImpl that = (ColumnImpl) o;
+        if (this.isPrimaryKey() && that.isPrimaryKey()) {
+            return this.primaryKeyOrder - that.primaryKeyOrder;
+        } else if (this.isPrimaryKey()) {
+            return -1;
+        } else if (that.isPrimaryKey()) {
+            return 1;
+        } else {
+            return this.position - that.position;
+        }
+    }
+    /**
+     * @return
+     */
+    public int getSize() {
+        return size;
+    }
+
+    /**
+     * @return
+     */
+    public int getNumberOfFractionalDigits() {
+        return numberOfFractionalDigits;
+    }
+
+    /**
+     * @return
+     */
+    public String getRemarks() {
+        return this.remarks == null ? "" : this.remarks;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ConnectionException.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ConnectionException.java
new file mode 100644
index 0000000..f1da0bf
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ConnectionException.java
@@ -0,0 +1,56 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public class ConnectionException extends Exception {
+
+    private Throwable cause = null;
+
+    /**
+     * 
+     */
+    public ConnectionException() {
+        super();
+    }
+
+    /**
+     * @param message
+     */
+    public ConnectionException(String message) {
+        super(message);
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public ConnectionException(String message, Throwable cause) {
+        super(message);
+        this.cause = cause;
+    }
+
+    /**
+     * @param cause
+     */
+    public ConnectionException(Throwable cause) {
+        super(cause.getMessage());
+        this.cause = cause;
+    }
+
+    public Throwable getCause() {
+        return this.cause;
+    }
+
+    public String toString() {
+        String base = super.toString();
+        if (this.cause != null) {
+            base += System.getProperty("line.separator")
+                + "Root cause:"
+                + System.getProperty("line.separator")
+                + this.cause.toString();
+        }
+        return base;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Constraint.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Constraint.java
new file mode 100644
index 0000000..f927ffc
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Constraint.java
@@ -0,0 +1,8 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface Constraint {
+    public Entity getEntity();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Database.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Database.java
new file mode 100644
index 0000000..b6dee05
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Database.java
@@ -0,0 +1,214 @@
+package com.quantum.model;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.quantum.IQuantumConstants;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.SQLResults;
+
+/**
+ * @author BC
+ */
+public class Database {
+    
+    private DatabaseAdapter databaseAdapter;
+    private Bookmark bookmark;
+    
+    public Database(Bookmark bookmark) {
+        this.bookmark = bookmark;
+        this.databaseAdapter = bookmark.getAdapter();
+    }
+
+    private static final String[] ALL_TYPES = { 
+        IQuantumConstants.Table, 
+        IQuantumConstants.View, 
+        IQuantumConstants.Sequence };
+        
+    private static final List STANDARD_TABLE_TYPES = 
+        Collections.synchronizedList(new ArrayList());
+        
+    static {
+        for (int i = 0, length = (ALL_TYPES == null) ? 0 : ALL_TYPES.length;
+            i < length;
+            i++) {
+            STANDARD_TABLE_TYPES.add(ALL_TYPES[i]);
+        }
+    }
+    
+    public String[] getEntityTypes() 
+        throws NotConnectedException, SQLException {
+        return getEntityTypes(this.bookmark.getConnection(), this.bookmark.getSchemas()[0]);
+    }
+
+
+    /**
+     * <p>This method returns a list of entity types supported by the database
+     * adapter.  This list will always be limited to Tables, Views and 
+     * Sequences.</p>
+     * 
+     * <p>Not all databases support all types.  MySQL only supports 
+     * Tables.  Informix supports Tables and Views.  Oracle and DB2 support
+     * Tables, Views and Sequences.</p>
+     * 
+     * @param connection
+     * @param schema -
+     *      This parameter is somewhat bogus.  It is used to determine if the
+     *      adapter defines an SQL statement for finding entities of a 
+     *      particular types.  
+     * @return
+     * @throws SQLException
+     */
+    public String[] getEntityTypes(Connection connection, Schema schema) 
+        throws SQLException {
+        
+        Set set = new HashSet();
+        if (this.databaseAdapter.getShowTableQuery(schema.getName(), false) != null) {
+            set.add(IQuantumConstants.Table);
+        } else if (this.databaseAdapter.getShowViewQuery(schema.getName(), false) != null) {
+            set.add(IQuantumConstants.View);
+        } else if (this.databaseAdapter.getShowSequenceQuery(schema.getName(), false) != null) {
+            set.add(IQuantumConstants.Sequence);
+        }
+        
+        DatabaseMetaData metaData = connection.getMetaData();
+        ResultSet resultSet = metaData.getTableTypes();
+        while (resultSet.next()) {
+            String type = resultSet.getString("TABLE_TYPE");
+            if (type != null) {
+                type = type.trim();
+            }
+            if (STANDARD_TABLE_TYPES.contains(type)) {
+                set.add(type);
+            }
+        }
+        
+        return (String[]) set.toArray(new String[set.size()]);
+    }
+
+    public String getInformation() throws SQLException {
+        try {
+            Connection connection = this.bookmark.getConnection();
+            DatabaseMetaData metaData = connection.getMetaData();
+        
+            return metaData == null ? null : metaData.getDatabaseProductName() + " " 
+                    + metaData.getDatabaseProductVersion();
+        } catch (NotConnectedException e) {
+            // TODO: think about this...
+            return "";
+        }
+    }
+    
+    /**
+     * Get a list of entities (tables, views, sequences) for a particular
+     * bookmark. This function is usually not redefined because it gives
+     * an external interface. You will usually redefine the getShowTableQuery(), 
+     * getShowViewQuery(), etc.
+     * 
+     * @param bookmark -
+     *     the bookmark that describes the database that is being accessed.
+     * @param passwordFinder -
+     *     a utility class that knows how to obtain a password, if required
+     * @param schema -
+     *     the schema from which to extract
+     * @param type -
+     *     the type ("VIEW", "TABLE", etc.) of entities to extract or null
+     *     if all entity types should be extracted
+     * @return 
+     *     an array of entity objects representing the tables, views and sequences.
+     * @throws SQLException
+     */
+    public Entity[] getEntities(Bookmark bookmark, Schema schema, String type) 
+        throws SQLException, NotConnectedException {
+        Connection connection = bookmark.getConnection();
+        Entity[] result = getEntities(bookmark, connection, schema, type);
+        return (result == null) ? new Entity[0] : result;
+    }
+    
+    protected Entity[] getEntities(Bookmark bookmark, Connection connection, Schema schema, String type) 
+        throws SQLException {
+        
+        List list = new ArrayList();
+        String[] types = (type == null) ? ALL_TYPES : new String[] { type };
+            
+        for (int i = 0; i < types.length; i++) {
+            list.addAll(getEntitiesList(bookmark, connection, types[i], schema));
+        }
+
+        return (Entity[]) list.toArray(new Entity[list.size()]);
+    }
+
+    protected List getEntitiesList(Bookmark bookmark, Connection connection, String type, Schema schema)
+        throws SQLException {
+
+        String sql = getSQL(bookmark, type, schema);
+        List list = new ArrayList();
+        SQLResults results = null;
+        if (sql != null) {
+            results = MultiSQLServer.getInstance().execute(connection, sql);
+            for (int i = 1, size = (results == null) ? 0 : results.getRowCount(); i <= size; i++) {
+                String schemaName = results.getColumnCount() == 1 
+                    ? schema.getName() : results.getElement(1, i).toString();
+                String tableName = results.getColumnCount() == 1 
+                    ? results.getElement(1, i).toString() 
+                    : results.getElement(2, i).toString();
+                if (tableName != null && tableName.length() > 0) {
+                    Entity entity = EntityFactory.getInstance().create(
+                        bookmark, schemaName, tableName, type);
+                    if (entity != null) {
+                        list.add(entity);
+                    }
+                }
+            }
+        }
+        // If we have some results, we go back
+        if (results != null) return list;
+        // Else, we try the JDBC driver
+        DatabaseMetaData metaData = connection.getMetaData();
+        // getTables needs a null schema to get all the schemas. So we don't pass a "" schema, but a null one
+		ResultSet set = null;
+		if (metaData.supportsSchemasInTableDefinitions())
+	        set = metaData.getTables(null, (schema != null) ? schema.getName() : null, "%", new String[] { type });
+	    else
+			set = metaData.getTables(null, null, "%", new String[] { type });
+	    
+        while (set.next()) {
+            String tempSchema = set.getString("TABLE_SCHEM");
+            tempSchema = (tempSchema == null) ? "" : tempSchema.trim();
+            String tableName = set.getString("TABLE_NAME");
+            tableName = (tableName == null) ? "" : tableName.trim();
+
+            if (tableName != null && tableName.length() > 0) {
+                Entity entity = EntityFactory.getInstance().create(bookmark, tempSchema, tableName, type);
+                if (entity != null) {
+                    list.add(entity);
+                }
+            }
+        }
+        set.close();
+        return list;
+    }
+
+
+    private String getSQL(Bookmark bookmark, String type, Schema schema) {
+        if (Entity.TABLE_TYPE.equals(type)) {
+            return this.databaseAdapter.getShowTableQuery(schema.getName(), schema.isDefault());
+        } else if (Entity.VIEW_TYPE.equals(type)) {
+            return this.databaseAdapter.getShowViewQuery(schema.getName(), schema.isDefault());
+        } else if (Entity.SEQUENCE_TYPE.equals(type)) {
+            return this.databaseAdapter.getShowSequenceQuery(schema.getName(), schema.isDefault());
+        } else {
+            return null;
+        }
+    }
+    
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Entity.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Entity.java
new file mode 100644
index 0000000..845c751
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Entity.java
@@ -0,0 +1,40 @@
+package com.quantum.model;
+
+import com.quantum.IQuantumConstants;
+
+/**
+ * @author BC
+ */
+public interface Entity extends BookmarkHolder {
+    
+    public static final String TABLE_TYPE = IQuantumConstants.Table;
+    public static final String VIEW_TYPE = IQuantumConstants.View;
+    public static final String SEQUENCE_TYPE = IQuantumConstants.Sequence;
+    
+    public String getName();
+    public String getSchema();
+    public String getType();
+    public Column[] getColumns();
+    public Index[] getIndexes();
+    public Column getColumn(String columnName);
+    /**
+     * Returns a String with the qualified name of the Entity.
+     * That is, "schema.name". The difference with getQualifiedName() 
+     * is that the schema may be absent if it's not defined in the bookmark
+	 */
+	public String getCondQualifiedName();
+    
+    /**
+     * @return - TRUE if the entity exists in the database<br />
+     *         - FALSE if the entity does not exist in the database<br />
+     *         - null if it's not known whether or not the 
+     *           entity exists in the database.
+     */
+    public Boolean exists();
+    /**
+     * Some databases support mixed-case table names.  Queries issued
+     * against these tables must be quoted.
+     * @return
+     */
+    public String getQuotedTableName();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityFactory.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityFactory.java
new file mode 100644
index 0000000..de48c0f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityFactory.java
@@ -0,0 +1,36 @@
+package com.quantum.model;
+
+
+/**
+ * 
+ * 
+ * @author BC
+ */
+public class EntityFactory {
+    
+    private static EntityFactory instance = new EntityFactory();
+    
+    private EntityFactory() {
+    }
+    
+    public static EntityFactory getInstance() {
+        return EntityFactory.instance;
+    }
+    
+    public Entity create(Bookmark bookmark, String schema, String name, String type) {
+        if (type != null) {
+            type = type.toUpperCase().trim();
+        }
+        
+        if (Entity.TABLE_TYPE.equals(type)) {
+            return new TableImpl(bookmark, schema, name);
+        } else if (Entity.VIEW_TYPE.equals(type)) {
+            return new ViewImpl(bookmark, schema, name);
+        } else if (Entity.SEQUENCE_TYPE.equals(type)) {
+            return new SequenceImpl(bookmark, schema, name);
+        } else {
+            return null;
+//            throw new IllegalArgumentException("Unknown type: " + type);
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityHolder.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityHolder.java
new file mode 100644
index 0000000..897c82b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityHolder.java
@@ -0,0 +1,8 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface EntityHolder {
+    public Entity getEntity();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityImpl.java
new file mode 100644
index 0000000..a960fbb
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/EntityImpl.java
@@ -0,0 +1,182 @@
+	package com.quantum.model;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+
+/**
+ * This class models a table or view.
+ * 
+ * @author bcholmes
+ */
+abstract class EntityImpl implements Entity {
+    private String schema;
+    private String name;
+    private String type;
+    private Bookmark bookmark;
+    private Boolean exists = Boolean.TRUE;
+    
+    public EntityImpl(Bookmark bookmark, String schema, String name, String type) {
+        this.schema = schema;
+        this.name = name;
+        this.type = type;
+        this.bookmark = bookmark;
+    }
+    public Bookmark getBookmark() {
+        return this.bookmark;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public String getSchema() {
+        return this.schema;
+    }
+    public String getType() {
+        return this.type;
+    }
+    public String getCondQualifiedName() {
+        return (this.schema == null || this.schema.length() == 0) ?
+            this.name : this.schema + "." + this.name;
+    }
+    public Column getColumn(String columnName) {
+        Column column = null;
+        Column[] columns = getColumns();
+        for (int i = 0, length = (columns == null) ? 0 : columns.length;
+            column == null && i < length;
+            i++) {
+            if (columnName != null && columnName.equals(columns[i].getName())) {
+                column = columns[i];
+            }
+        }
+        return column;
+    }
+    public Column[] getColumns() {
+        
+        Column[] columns = new Column[0];
+        try {
+            // TODO: Some DBs (like DB2) don't support metadata
+            Map temp = new HashMap();
+            Connection connection = this.bookmark.getConnection();
+            DatabaseMetaData metaData = connection.getMetaData();
+            ResultSet resultSet = metaData.getColumns(null, getSchema(), getName(), null);
+            
+            while (resultSet.next()) {
+                ColumnImpl column = new ColumnImpl(
+                    this, 
+                    resultSet.getString("COLUMN_NAME"),
+                    resultSet.getString("TYPE_NAME"),
+                    resultSet.getInt("DATA_TYPE"),
+                    resultSet.getInt("COLUMN_SIZE"),
+                    resultSet.getInt("DECIMAL_DIGITS"),
+                    "YES".equalsIgnoreCase(resultSet.getString("IS_NULLABLE")),
+                    resultSet.getInt("ORDINAL_POSITION"),
+					getComments(resultSet.getString("REMARKS"),getCondQualifiedName(), resultSet.getString("COLUMN_NAME"))
+                    );
+                temp.put(column.getName(), column);
+            }
+            resultSet.close();
+
+            resultSet = metaData.getPrimaryKeys(null, getSchema(), getName());
+            while (resultSet.next()) {
+                String name = resultSet.getString("COLUMN_NAME");
+                short keySequence = resultSet.getShort("KEY_SEQ");
+                ColumnImpl column = (ColumnImpl) temp.get(name);
+                if (column != null) {
+                    column.setPrimaryKeyOrder(keySequence);
+                }
+            }
+            resultSet.close();
+            
+            List columnList = Collections.synchronizedList(
+                new ArrayList(temp.values()));
+            Collections.sort(columnList);
+            columns = (Column[]) columnList.toArray(new Column[columnList.size()]);
+            
+        } catch (NotConnectedException e) {
+        } catch (SQLException e) {
+        }
+        return columns;
+    }
+    
+    /**
+     * Some JDBC drivers (Oracle for example) won't return the comments
+     * We recheck with a custom query, if it's defined
+	 * @param iniComment The already got comment
+	 * @param tableName The fully qualified table name
+	 * @param columnName The column name
+	 */
+	private String getComments( String iniComment, String tableName, String columnName) {
+		if (iniComment != null && iniComment.length() > 0) 
+			return iniComment;
+		String comment = "";
+		try {
+			Connection con = this.bookmark.getConnection();
+			Statement stmt = con.createStatement();
+			DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(this.bookmark.getType());
+			if (adapter != null && stmt != null && adapter.getCommentsQuery(tableName, columnName) != null) {
+			
+				stmt.execute(adapter.getCommentsQuery(tableName, columnName));
+				ResultSet set = stmt.getResultSet();
+				if (set.next())
+					comment = set.getString(1);
+			}
+		} catch (NotConnectedException e) {
+		} catch (SQLException e) {
+		}
+            
+		return comment;
+	}
+	public Index[] getIndexes() {
+        
+        List indexList = new ArrayList();
+        Map temp = new HashMap();
+        try {
+            Connection connection = this.bookmark.getConnection();
+            DatabaseMetaData metaData = connection.getMetaData();
+            ResultSet resultSet = metaData.getIndexInfo(null, getSchema(), getName(), false, false);
+            
+            while (resultSet.next()) {
+                String indexName = resultSet.getString("INDEX_NAME");
+                IndexImpl index = (IndexImpl) temp.get(indexName);
+                if (index == null) {
+                    index = new IndexImpl(this, indexName);
+                    temp.put(indexName, index);
+                }
+                String columnName = resultSet.getString("COLUMN_NAME");
+                String ascending = resultSet.getString("ASC_OR_DESC");
+                index.addColumn(columnName, ascending == null 
+                    ? null : (ascending.toUpperCase().startsWith("A") 
+                        ? Boolean.TRUE : Boolean.FALSE));
+            }
+            resultSet.close();
+            indexList.addAll(temp.values());
+            
+        } catch (NotConnectedException e) {
+        } catch (SQLException e) {
+        }
+        return (Index[]) indexList.toArray(new Index[indexList.size()]);
+    }
+    
+    public Boolean exists() {
+        return this.exists;
+    }
+    
+    
+    /**
+     * @see com.quantum.model.Entity#getQuotedTableName()
+     */
+    public String getQuotedTableName() {
+        return getBookmark().getAdapter().filterTableName(getCondQualifiedName());
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ForeignKey.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ForeignKey.java
new file mode 100644
index 0000000..6a39917
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ForeignKey.java
@@ -0,0 +1,15 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface ForeignKey extends Constraint {
+    public String getName();
+    public Entity getForeignEntity();
+    public String getForeignEntityName();
+    public String getForeignEntitySchema();
+    public int getNumberOfColumns();
+    public String getLocalColumnName(int index);
+    public String getForeignColumnName(int index);
+    public int getDeleteRule();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/HasMetaData.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/HasMetaData.java
new file mode 100644
index 0000000..6d1ab1f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/HasMetaData.java
@@ -0,0 +1,24 @@
+/*
+ * Created on 22-jul-2003
+ *
+ */
+package com.quantum.model;
+
+import com.quantum.sql.metadata.ObjectMetaData;
+
+/**
+ * Interface for objects that offer metadata support
+ * @author panic
+ *
+ */
+public interface HasMetaData {
+	public ObjectMetaData getMetaData() throws NotConnectedException;
+	/**
+	 * Returns a String with the qualified name of the Entity.
+	 * That is, "schema.name". The difference with getConQualifiedName() 
+	 * is that the schema is always present if the database supports schemas.
+	 * @return
+	 */
+	public String getQualifiedName();
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Index.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Index.java
new file mode 100644
index 0000000..3aa5cf5
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Index.java
@@ -0,0 +1,13 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface Index {
+    public String getName();
+    public int getNumberOfColumns();
+    public String getColumnName(int ordinalPosition);
+    public Entity getParentEntity();
+    public boolean isAscending(int ordinalPosition);
+    public boolean isDescending(int ordinalPosition);
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/IndexImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/IndexImpl.java
new file mode 100644
index 0000000..2bda513
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/IndexImpl.java
@@ -0,0 +1,69 @@
+package com.quantum.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author BC
+ */
+/*package*/ class IndexImpl implements Index {
+    
+    private String name;
+    private List columnNames = Collections.synchronizedList(new ArrayList()); 
+    private Entity entity;
+    private List ascending = Collections.synchronizedList(new ArrayList());
+    
+    IndexImpl(Entity entity, String name) {
+            
+        this.name = name;
+        this.entity = entity;
+    }
+    
+    void addColumn(String columnName, Boolean ascending) {
+        this.columnNames.add(columnName);
+        this.ascending.add(ascending);
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * @see com.quantum.model.Index#getNumberOfColumns()
+     */
+    public int getNumberOfColumns() {
+        return this.columnNames.size();
+    }
+
+    /**
+     * @see com.quantum.model.Index#getColumnName(int)
+     */
+    public String getColumnName(int ordinalPosition) {
+        return (String) this.columnNames.get(ordinalPosition);
+    }
+
+    /**
+     * @see com.quantum.model.Index#getParentEntity()
+     */
+    public Entity getParentEntity() {
+        return this.entity;
+    }
+
+    /**
+     * @see com.quantum.model.Index#isAscending()
+     */
+    public boolean isAscending(int ordinalPosition) {
+        Boolean ascending = (Boolean) this.ascending.get(ordinalPosition);
+        return Boolean.TRUE.equals(ascending);
+    }
+
+    /**
+     * @see com.quantum.model.Index#isDescending()
+     */
+    public boolean isDescending(int ordinalPosition) {
+        Boolean ascending = (Boolean) this.ascending.get(ordinalPosition);
+        return Boolean.FALSE.equals(ascending);
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/NotConnectedException.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/NotConnectedException.java
new file mode 100644
index 0000000..0f4ee12
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/NotConnectedException.java
@@ -0,0 +1,8 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public class NotConnectedException extends ConnectionException {
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/PasswordFinder.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/PasswordFinder.java
new file mode 100644
index 0000000..4ba0e1d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/PasswordFinder.java
@@ -0,0 +1,15 @@
+package com.quantum.model;
+
+/**
+ * When a bookmark doesn't have a saved password, an
+ * implementation of a password finder class can be called 
+ * to obtain one.
+ * 
+ * @author BC
+ */
+public interface PasswordFinder {
+    
+    public String getPassword();
+    public boolean isPasswordMeantToBeSaved();
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Schema.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Schema.java
new file mode 100644
index 0000000..154e15b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Schema.java
@@ -0,0 +1,109 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public class Schema implements Comparable {
+    
+    private String name;
+    private String displayName;
+    private boolean isDefault;
+    
+    
+    public Schema() {
+    }
+
+    public Schema(String name, String displayName, boolean isDefault) {
+        this.name = name;
+        this.displayName = displayName;
+        this.isDefault = isDefault;
+    }
+    
+    public Schema(String name) {
+        this(name, name, false);
+    }
+    
+    /**
+     * @return
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param string
+     */
+    public void setName(String string) {
+        name = string;
+    }
+
+    /**
+     * @see java.lang.Comparable#compareTo(java.lang.Object)
+     */
+    public int compareTo(Object o) {
+        Schema that = (Schema) o;
+        if (that.isDefault() == this.isDefault()) {
+            return this.getDisplayName().compareTo(that.getDisplayName());
+        } else {
+            return that.isDefault() ? 1 : -1;
+        }
+    }
+    public boolean equals(Object obj) {
+        if (getClass() != obj.getClass()) {
+            return false;
+        } else {
+            Schema that = (Schema) obj;
+            if (this.name == null && !(that.name == null)) {
+                return false;
+            } else if (this.name != null && !this.name.equals(that.name)) {
+                return false;
+            } else if (this.displayName == null && !(that.displayName == null)) {
+                return false;
+            } else if (this.displayName == null && !this.displayName.equals(that.displayName)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+    }
+    public int hashCode() {
+        int hashCode = super.hashCode();
+        if (this.name != null) {
+            hashCode ^= this.name.hashCode();
+        }
+        if (this.displayName != null) {
+            hashCode ^= this.displayName.hashCode();
+        }
+        
+        return hashCode;
+    }
+    
+    /**
+     * @return
+     */
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    /**
+     * @param b
+     */
+    public void setDefault(boolean isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    /**
+     * @return
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param string
+     */
+    public void setDisplayName(String string) {
+        displayName = string;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SchemaHolder.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SchemaHolder.java
new file mode 100644
index 0000000..7961492
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SchemaHolder.java
@@ -0,0 +1,8 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface SchemaHolder {
+    public Schema getSchema();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Sequence.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Sequence.java
new file mode 100644
index 0000000..374af35
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Sequence.java
@@ -0,0 +1,8 @@
+package com.quantum.model;
+
+/**
+ * @author BC
+ */
+public interface Sequence extends Entity {
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SequenceImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SequenceImpl.java
new file mode 100644
index 0000000..0443906
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/SequenceImpl.java
@@ -0,0 +1,13 @@
+package com.quantum.model;
+
+class SequenceImpl extends EntityImpl implements Sequence {
+    public SequenceImpl(Bookmark bookmark, String schema, String name) {
+        super(bookmark, schema, name, SEQUENCE_TYPE);
+    }
+    public Column[] getColumns() {
+        return new Column[0];
+    }
+    public Column getColumn(String columnName) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Table.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Table.java
new file mode 100644
index 0000000..91bbc31
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/Table.java
@@ -0,0 +1,11 @@
+package com.quantum.model;
+
+import java.sql.SQLException;
+
+/**
+ * @author BC
+ */
+public interface Table extends Entity {
+    public Integer getSize();
+    public void deleteAllRows() throws SQLException, ConnectionException;
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/TableImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/TableImpl.java
new file mode 100644
index 0000000..161ab0f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/TableImpl.java
@@ -0,0 +1,31 @@
+package com.quantum.model;
+
+import java.sql.SQLException;
+
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.SQLHelper;
+
+
+class TableImpl extends EntityImpl implements Table {
+    public TableImpl(Bookmark bookmark, String schema, String name) {
+        super(bookmark, schema, name, TABLE_TYPE);
+    }
+    
+    public Integer getSize() {
+        Integer size = null;
+        try {
+            size = new Integer(SQLHelper.getSize(
+                getBookmark().getConnection(), getCondQualifiedName(), 
+                    AdapterFactory.getInstance().getAdapter(getBookmark().getType())));
+        } catch (SQLException e) {
+        } catch (ConnectionException e) {
+        }
+        return size;
+    }
+    
+    public void deleteAllRows() throws SQLException, ConnectionException {
+        String sql = "DELETE FROM " + getCondQualifiedName();
+		MultiSQLServer.getInstance().execute(getBookmark().getConnection(), sql);
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/View.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/View.java
new file mode 100644
index 0000000..2078bf4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/View.java
@@ -0,0 +1,11 @@
+package com.quantum.model;
+
+
+/**
+ * @author BC
+ */
+public interface View extends Entity {
+    
+    public Integer getSize();
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ViewImpl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ViewImpl.java
new file mode 100644
index 0000000..7a49d86
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/ViewImpl.java
@@ -0,0 +1,25 @@
+package com.quantum.model;
+
+import java.sql.SQLException;
+
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.sql.SQLHelper;
+
+
+class ViewImpl extends EntityImpl implements View {
+    public ViewImpl(Bookmark bookmark, String schema, String name) {
+        super(bookmark, schema, name, VIEW_TYPE);
+    }
+
+    public Integer getSize() {
+        Integer size = null;
+        try {
+            size = new Integer(SQLHelper.getSize(
+                getBookmark().getConnection(), getCondQualifiedName(), 
+                    AdapterFactory.getInstance().getAdapter(getBookmark().getType())));
+        } catch (SQLException e) {
+        } catch (ConnectionException e) {
+        }
+        return size;
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/ModelToXMLConverter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/ModelToXMLConverter.java
new file mode 100644
index 0000000..908b239
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/ModelToXMLConverter.java
@@ -0,0 +1,150 @@
+package com.quantum.model.xml;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Column;
+import com.quantum.model.Entity;
+import com.quantum.model.Schema;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+/**
+ * @author BC
+ */
+public class ModelToXMLConverter {
+    
+    private static final ModelToXMLConverter instance = new ModelToXMLConverter();
+    
+    private ModelToXMLConverter() {
+    }
+    
+    public static ModelToXMLConverter getInstance() {
+        return ModelToXMLConverter.instance;
+    }
+
+    public void createRoot(Document document) {
+        document.appendChild(document.createElement("SAVED_DATA"));
+    }
+
+    public void convert(Element bookmarkRoot, Bookmark b) {
+        Document document = bookmarkRoot.getOwnerDocument();
+        Element bookmark = MetaDataXMLInterface.createElementText(bookmarkRoot,"bookmark", ""); //$NON-NLS-1$ //$NON-NLS-2$
+        MetaDataXMLInterface.createElementText(bookmark,"name", b.getName()); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"username", b.getUsername()); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"password", b.getPassword()); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"prompt", b.getPromptForPassword() ? "true" : "false"); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"connect", b.getConnect()); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(bookmark,"autoCommit", b.isAutoCommit() ? "true" : "false"); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(bookmark,"autoCommitPreference", b.getAutoCommitPreference()); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"driver", b.getDriver()); //$NON-NLS-1$
+        MetaDataXMLInterface.createElementText(bookmark,"type", b.getType()); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(bookmark,"driverLocation", b.getDriverFile()); //$NON-NLS-1$
+        Element otherSchemas = (Element) bookmark.appendChild(document.createElement(Messages.getString("ExportXMLAction.OtherSchemas"))); //$NON-NLS-1$
+        Schema[] schemas = b.getSchemas();
+        for (int i = 0, length = (schemas == null) ? 0 : schemas.length;
+            i < length;
+            i++) {
+            if (!schemas[i].isDefault()) {
+                MetaDataXMLInterface.createElementText(
+                    otherSchemas,Messages.getString("ExportXMLAction.SchemaName"), schemas[i].getName()); //$NON-NLS-1$
+            }
+        }
+        Entity[] quickList = b.getQuickListEntries();
+        Element quickListEntity = document.createElement("quickList");
+        for (int j = 0, length = (quickList == null) ? 0 : quickList.length;
+            j < length;
+            j++) {
+            ModelToXMLConverter.getInstance().convert(quickListEntity, quickList[j]);
+        }
+        bookmark.appendChild(quickListEntity);
+        convertQueryList(b, bookmark);
+    }
+
+    
+    public void convert(Element parent, Entity entity) {
+        convert(parent, entity, true);
+    }
+    public void convert(Element parent, Entity entity, boolean recurse) {
+        Document document = parent.getOwnerDocument();
+        Element element = document.createElement(getEntityDOMNodeName(entity));
+        element.setAttribute("name", entity.getName());
+        if (entity.getSchema() != null) {
+            element.setAttribute("schema", entity.getSchema());
+        }
+        if (recurse) {
+            convert(element, entity.getColumns());
+        }
+        parent.appendChild(element);
+    }
+
+    public void convert(Element element, Column[] columns) {
+        for (int i = 0, length = (columns == null) ? 0 : columns.length;
+            i < length;
+            i++) {
+            convert(element, columns[i]);
+        }
+    }
+
+    public void convert(Element parent, Column column) {
+        Document document = parent.getOwnerDocument();
+        Element element = document.createElement("column");
+        element.setAttribute("name", column.getName());
+        element.setAttribute("type", column.getTypeName());
+        element.setAttribute("primaryKey", column.isPrimaryKey() ? "true" : "false");
+        element.setAttribute("nullable", column.isNullable() ? "true" : "false");
+        if (column.isNumeric()) {
+            if (column.getSize() > 0) {
+                element.setAttribute("size", String.valueOf(column.getSize()));
+            }
+            if (column.getNumberOfFractionalDigits() > 0) {
+                element.setAttribute("numberOfFractionalDigits", String.valueOf(column.getNumberOfFractionalDigits()));
+            }
+        } else {
+            if (column.getSize() > 0) {
+                element.setAttribute("size", String.valueOf(column.getSize()));
+            }
+        }
+		if (column.getRemarks().length() > 0)
+			MetaDataXMLInterface.createElementText(element, "remarks", column.getRemarks());
+        parent.appendChild(element);
+    }
+
+
+    public String getEntityDOMNodeName(Entity entity) {
+        if (Entity.TABLE_TYPE.equals(entity.getType())) {
+            return "table";
+        } else if (Entity.VIEW_TYPE.equals(entity.getType())) {
+            return "view";
+        } else if (Entity.SEQUENCE_TYPE.equals(entity.getType())) {
+            return "sequence";
+        } else {
+            return "unknown";
+        }
+    }
+
+    public void convertQueryList(
+        Bookmark bookmark,
+        Element parent) {
+            
+        Document document = parent.getOwnerDocument();
+        String[] queryList = bookmark.getQueries();
+        Element queryListEntity = document.createElement("queryList");
+        for (int j = 0, length = (queryList == null) ? 0 : queryList.length;
+            j < length;
+            j++) {
+            Element query = document.createElement("query");
+            
+            // will have more possibilities later
+            Element queryString = document.createElement("queryString");
+            Text queryText = document.createTextNode(queryList[j]);
+            queryString.appendChild(queryText);
+            query.appendChild(queryString);
+            queryListEntity.appendChild(query);
+        }
+        parent.appendChild(queryListEntity);
+    }
+    
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/TorqueConverter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/TorqueConverter.java
new file mode 100644
index 0000000..15c3c57
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/model/xml/TorqueConverter.java
@@ -0,0 +1,90 @@
+package com.quantum.model.xml;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.Column;
+import com.quantum.model.Entity;
+import com.quantum.model.Schema;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * @author BC
+ */
+public class TorqueConverter {
+    public void createRoot(Document document) {
+        Element root = document.createElement("database");
+        document.appendChild(root);
+    }
+    public void convert(Element root, Bookmark bookmark, Schema schema) {
+        try {
+            Entity[] tables = bookmark.getEntitiesForSchema(
+                schema, Entity.TABLE_TYPE);
+                
+            for (int i = 0, length = (tables == null) ? 0 : tables.length;
+                i < length;
+                i++) {
+                convert(root, tables[i]);
+            }
+        } catch (SQLException e) {
+        }
+    }
+
+    public void convert(Element root, Entity entity) {
+        Element table = root.getOwnerDocument().createElement("table");
+        table.setAttribute("name", entity.getName());
+        
+        Column[] columns = entity.getColumns();
+        for (int i = 0, length = (columns == null) ? 0 : columns.length;
+            i < length;
+            i++) {
+            convert(table, columns[i]);
+        }
+        
+        root.appendChild(table);
+    }
+
+    public void convert(Element root, Column column) {
+        Element element = root.getOwnerDocument().createElement("column");
+        element.setAttribute("name", column.getName());
+        if (column.isPrimaryKey()) {
+            element.setAttribute("primaryKey", "true");
+        }
+        element.setAttribute("required", column.isNullable() ? "false" : "true");
+        if (column.isNumeric() && column.getNumberOfFractionalDigits() > 0) {
+            element.setAttribute("size", String.valueOf(column.getSize()) + 
+                "," + String.valueOf(column.getNumberOfFractionalDigits()));
+        } else if (column.getSize() >= 0) {
+            element.setAttribute("size", String.valueOf(column.getSize()));
+        }
+        element.setAttribute("type", getStandardType(column.getType()));
+        
+        root.appendChild(element);
+    }
+    
+    private String getStandardType(int type) {
+        String result = null;
+        try {
+            Field[] fields = Types.class.getFields();
+            for (int i = 0, length = (fields == null) ? 0 : fields.length;
+                result == null & i < length;
+                i++) {
+                if (fields[i].getDeclaringClass() == Integer.TYPE &&
+                    Modifier.isStatic(fields[i].getModifiers()) &&
+                    Modifier.isPublic(fields[i].getModifiers()) &&
+                    type == fields[i].getLong(null)) {
+                    
+                    result = fields[i].getName();
+                }
+            }
+        } catch (IllegalAccessException e) {
+            // shouldn't happen
+        }
+        return result;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/perspective/DBPerspective.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/perspective/DBPerspective.java
new file mode 100644
index 0000000..c47f2ce
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/perspective/DBPerspective.java
@@ -0,0 +1,30 @@
+package com.quantum.perspective;
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+/**
+ * @author root
+ */
+public class DBPerspective implements IPerspectiveFactory {
+	public void createInitialLayout(IPageLayout layout) {
+		layout.setEditorAreaVisible(false);
+		IFolderLayout side =
+			layout.createFolder(
+				"side", //$NON-NLS-1$
+				IPageLayout.LEFT,
+				0.33F,
+				layout.getEditorArea());
+		side.addView("com.quantum.view.bookmarkview"); //$NON-NLS-1$
+		layout.addView("com.quantum.view.sqlqueryview", IPageLayout.BOTTOM, 0.33F, layout.getEditorArea()); //$NON-NLS-1$
+		IFolderLayout bottomRight =
+			layout.createFolder(
+				"bottomRight", //$NON-NLS-1$
+				IPageLayout.BOTTOM,
+				0.33F,
+                "com.quantum.view.sqlqueryview");
+		bottomRight.addView("com.quantum.view.tableview.TableView"); //$NON-NLS-1$
+		bottomRight.addView("com.quantum.view.logview"); //$NON-NLS-1$
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CopyPreferences.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CopyPreferences.java
new file mode 100644
index 0000000..51df2dc
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CopyPreferences.java
@@ -0,0 +1,37 @@
+package com.quantum.preferences;
+
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class CopyPreferences 
+	extends FieldEditorPreferencePage 
+	implements IWorkbenchPreferencePage {
+
+		public CopyPreferences() {
+			super(FieldEditorPreferencePage.GRID);
+		
+			// Set the preference store for the preference page.
+			IPreferenceStore store =
+				QuantumPlugin.getDefault().getPreferenceStore();
+			setPreferenceStore(store);
+		}
+
+		public void init(IWorkbench workbench) {
+			this.workbench = workbench;
+		}
+
+		IWorkbench workbench;
+		
+		protected void createFieldEditors() {
+			StringFieldEditor copyColumnSeparator = new StringFieldEditor("copyColumnSeparator", "&Normal Copy Separator:", getFieldEditorParent());
+			this.
+			addField(copyColumnSeparator);
+		}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences.java
new file mode 100644
index 0000000..065fbb3
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences.java
@@ -0,0 +1,46 @@
+package com.quantum.preferences;
+
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class CustomCopyPreferences 
+	extends FieldEditorPreferencePage 
+	implements IWorkbenchPreferencePage {
+
+		public CustomCopyPreferences() {
+			super(FieldEditorPreferencePage.GRID);
+		
+			// Set the preference store for the preference page.
+			IPreferenceStore store =
+				QuantumPlugin.getDefault().getPreferenceStore();
+			setPreferenceStore(store);
+		}
+
+		public void init(IWorkbench workbench) {
+			this.workbench = workbench;
+		}
+
+		IWorkbench workbench;
+		
+		protected void createFieldEditors() {
+			StringFieldEditor customCopyName = new StringFieldEditor("customCopyName1", "&Name:", getFieldEditorParent());
+			addField(customCopyName);
+			StringFieldEditor customCopyTableItem = new StringFieldEditor("customCopyTableItem1", "&Table Item:", getFieldEditorParent());
+			addField(customCopyTableItem);
+			StringFieldEditor customCopyTableSeparator = new StringFieldEditor("customCopyTableSeparator1", "&Table Separator:", getFieldEditorParent());
+			addField(customCopyTableSeparator);
+			StringFieldEditor customCopyColumnItem = new StringFieldEditor("customCopyColumnItem1", "&Column Item:", getFieldEditorParent());
+			addField(customCopyColumnItem);
+			StringFieldEditor customCopyColumnSeparator = new StringFieldEditor("customCopyColumnSeparator1", "&Column Separator:", getFieldEditorParent());
+			addField(customCopyColumnSeparator);
+			StringFieldEditor customCopyTemplate = new StringFieldEditor("customCopyTemplate1", "&Template:", getFieldEditorParent());
+			addField(customCopyTemplate);
+		}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences2.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences2.java
new file mode 100644
index 0000000..ad0fbf4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences2.java
@@ -0,0 +1,46 @@
+package com.quantum.preferences;
+
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class CustomCopyPreferences2 
+	extends FieldEditorPreferencePage 
+	implements IWorkbenchPreferencePage {
+
+		public CustomCopyPreferences2() {
+			super(FieldEditorPreferencePage.GRID);
+		
+			// Set the preference store for the preference page.
+			IPreferenceStore store =
+				QuantumPlugin.getDefault().getPreferenceStore();
+			setPreferenceStore(store);
+		}
+
+		public void init(IWorkbench workbench) {
+			this.workbench = workbench;
+		}
+
+		IWorkbench workbench;
+		
+		protected void createFieldEditors() {
+			StringFieldEditor customCopyName = new StringFieldEditor("customCopyName2", "&Name:", getFieldEditorParent());
+			addField(customCopyName);
+			StringFieldEditor customCopyTableItem = new StringFieldEditor("customCopyTableItem2", "&Table Item:", getFieldEditorParent());
+			addField(customCopyTableItem);
+			StringFieldEditor customCopyTableSeparator = new StringFieldEditor("customCopyTableSeparator2", "&Table Separator:", getFieldEditorParent());
+			addField(customCopyTableSeparator);
+			StringFieldEditor customCopyColumnItem = new StringFieldEditor("customCopyColumnItem2", "&Column Item:", getFieldEditorParent());
+			addField(customCopyColumnItem);
+			StringFieldEditor customCopyColumnSeparator = new StringFieldEditor("customCopyColumnSeparator2", "&Column Separator:", getFieldEditorParent());
+			addField(customCopyColumnSeparator);
+			StringFieldEditor customCopyTemplate = new StringFieldEditor("customCopyTemplate2", "&Template:", getFieldEditorParent());
+			addField(customCopyTemplate);
+		}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences3.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences3.java
new file mode 100644
index 0000000..2b3cf1b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/CustomCopyPreferences3.java
@@ -0,0 +1,46 @@
+package com.quantum.preferences;
+
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class CustomCopyPreferences3 
+	extends FieldEditorPreferencePage 
+	implements IWorkbenchPreferencePage {
+
+		public CustomCopyPreferences3() {
+			super(FieldEditorPreferencePage.GRID);
+		
+			// Set the preference store for the preference page.
+			IPreferenceStore store =
+				QuantumPlugin.getDefault().getPreferenceStore();
+			setPreferenceStore(store);
+		}
+
+		public void init(IWorkbench workbench) {
+			this.workbench = workbench;
+		}
+
+		IWorkbench workbench;
+		
+		protected void createFieldEditors() {
+			StringFieldEditor customCopyName = new StringFieldEditor("customCopyName3", "&Name:", getFieldEditorParent());
+			addField(customCopyName);
+			StringFieldEditor customCopyTableItem = new StringFieldEditor("customCopyTableItem3", "&Table Item:", getFieldEditorParent());
+			addField(customCopyTableItem);
+			StringFieldEditor customCopyTableSeparator = new StringFieldEditor("customCopyTableSeparator3", "&Table Separator:", getFieldEditorParent());
+			addField(customCopyTableSeparator);
+			StringFieldEditor customCopyColumnItem = new StringFieldEditor("customCopyColumnItem3", "&Column Item:", getFieldEditorParent());
+			addField(customCopyColumnItem);
+			StringFieldEditor customCopyColumnSeparator = new StringFieldEditor("customCopyColumnSeparator3", "&Column Separator:", getFieldEditorParent());
+			addField(customCopyColumnSeparator);
+			StringFieldEditor customCopyTemplate = new StringFieldEditor("customCopyTemplate3", "&Template:", getFieldEditorParent());
+			addField(customCopyTemplate);
+		}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/GlobalPreferences.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/GlobalPreferences.java
new file mode 100644
index 0000000..05156eb
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/GlobalPreferences.java
@@ -0,0 +1,49 @@
+package com.quantum.preferences;
+
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * PreferencePage for the global options on QuantumDB
+ * @author panic
+ *
+ */
+public class GlobalPreferences 
+extends FieldEditorPreferencePage 
+implements IWorkbenchPreferencePage {
+
+	public GlobalPreferences() {
+		super(FieldEditorPreferencePage.GRID);
+		
+		// Set the preference store for the preference page.
+		IPreferenceStore store =
+			QuantumPlugin.getDefault().getPreferenceStore();
+		setPreferenceStore(store);
+	}
+
+	public void init(IWorkbench workbench) {
+		this.workbench = workbench;
+	}
+
+	IWorkbench workbench;
+		
+	protected void createFieldEditors() {
+        IntegerFieldEditor queryHistorySize = new IntegerFieldEditor(
+            "com.quantum.model.Bookmark.queryHistorySize", 
+            Messages.getString(getClass().getName() + "." 
+                + "com.quantum.model.Bookmark.queryHistorySize"), 
+            getFieldEditorParent());
+        queryHistorySize.setValidRange(0, Integer.MAX_VALUE);
+        this.addField(queryHistorySize);
+		StringFieldEditor askPasswordString = new StringFieldEditor("askPasswordString", "&Ask for password string:", getFieldEditorParent());
+		this.addField(askPasswordString);
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/SQLEditorPreferences.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/SQLEditorPreferences.java
new file mode 100644
index 0000000..b1697ba
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/preferences/SQLEditorPreferences.java
@@ -0,0 +1,339 @@
+package com.quantum.preferences;
+
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.editors.ColorManager;
+import com.quantum.editors.SQLColorConstants;
+import com.quantum.util.versioning.VersioningHelper;
+
+import org.eclipse.jface.preference.ColorFieldEditor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FontDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class SQLEditorPreferences extends PreferencePage
+	implements IWorkbenchPreferencePage {
+	FontDialog fontDialog;
+	ColorFieldEditor backgroundColorEditor;
+	
+	ColorFieldEditor textColorEditor;
+	boolean textFlag;
+	ColorFieldEditor keywordColorEditor;
+	boolean keywordFlag;
+	ColorFieldEditor stringColorEditor;
+	boolean stringFlag;
+	ColorFieldEditor numericColorEditor;
+	boolean numericFlag;
+	ColorFieldEditor commentColorEditor;
+	boolean commentFlag;
+	
+	Button boldText;
+	Button boldKeyword;
+	Button boldString;
+	Button boldNumeric;
+	Button boldComment;
+	
+	IWorkbench workbench;
+	FontData fontData;
+	Label fontDisplay;
+	public void init(IWorkbench workbench) {
+		//Initialize the preference store
+		this.workbench = workbench;
+		setPreferenceStore(QuantumPlugin.getDefault().getPreferenceStore());
+		initializeColorDefaults(getPreferenceStore());
+	}
+
+	private void initializeColorDefaults(IPreferenceStore store) {
+		RGB BACKGROUND = new RGB(255, 255, 255);
+		RGB COMMENT = new RGB(88, 148, 64);
+		RGB KEYWORD = new RGB(126, 0, 75);
+		RGB STRING = new RGB(0, 0, 255);
+		RGB NUMERIC = new RGB(255, 0, 0);
+		RGB DEFAULT = new RGB(0, 0, 0);
+		PreferenceConverter.setDefault(store,
+			"quantum.background.color", BACKGROUND); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.text.color", DEFAULT); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.keyword.color", KEYWORD); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.comment.color", COMMENT); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.string.color", STRING); //$NON-NLS-1$
+		PreferenceConverter.setDefault(store,
+			"quantum.numeric.color", NUMERIC); //$NON-NLS-1$
+	}
+
+	protected void performDefaults() {
+		fontData = null;
+		updateFontDisplay();
+		textFlag = false;
+		keywordFlag = true;
+		stringFlag = false;
+		numericFlag = false;
+		commentFlag = false;
+		updateFlags();
+		backgroundColorEditor.loadDefault();
+		textColorEditor.loadDefault();
+		keywordColorEditor.loadDefault();
+		stringColorEditor.loadDefault();
+		commentColorEditor.loadDefault();
+		numericColorEditor.loadDefault();
+	}
+	/** 
+	 * Save the preferences to the preference store.
+	 */
+	public boolean performOk() {
+		PreferenceConverter.setValue(getPreferenceStore(), "quantum.font", fontData); //$NON-NLS-1$
+		getPreferenceStore().setValue("quantum.text.bold", textFlag); //$NON-NLS-1$
+		getPreferenceStore().setValue("quantum.keyword.bold", keywordFlag); //$NON-NLS-1$
+		getPreferenceStore().setValue("quantum.string.bold", stringFlag); //$NON-NLS-1$
+		getPreferenceStore().setValue("quantum.comment.bold", commentFlag); //$NON-NLS-1$
+		getPreferenceStore().setValue("quantum.numeric.bold", numericFlag); //$NON-NLS-1$
+		backgroundColorEditor.store();
+		textColorEditor.store();
+		keywordColorEditor.store();
+		stringColorEditor.store();
+		commentColorEditor.store();
+		numericColorEditor.store();
+		return super.performOk();
+	}
+	protected Control createContents(Composite parent) {
+		Composite main = new Composite(parent, SWT.NULL);
+		
+		GridLayout innerLayout = new GridLayout();
+		innerLayout.numColumns = 4;
+		main.setLayout(innerLayout);
+
+		fontData = PreferenceConverter.getFontData(getPreferenceStore(), "quantum.font"); //$NON-NLS-1$
+		textFlag = getPreferenceStore().getBoolean("quantum.text.bold"); //$NON-NLS-1$
+		keywordFlag = getPreferenceStore().getBoolean("quantum.keyword.bold"); //$NON-NLS-1$
+		stringFlag = getPreferenceStore().getBoolean("quantum.string.bold"); //$NON-NLS-1$
+		commentFlag = getPreferenceStore().getBoolean("quantum.comment.bold"); //$NON-NLS-1$
+		numericFlag = getPreferenceStore().getBoolean("quantum.numeric.bold"); //$NON-NLS-1$
+		
+		fontDialog = new FontDialog(workbench.getActiveWorkbenchWindow().getShell());
+		Button fontButton = new Button(main, SWT.PUSH);
+		fontButton.setText(Messages.getString("PreferencesPage.PickFont")); //$NON-NLS-1$
+		fontButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				if (fontData != null) {
+                    VersioningHelper.setFont(fontDialog, new FontData[] { fontData} );
+				}
+				FontData data = fontDialog.open();
+				if (data != null) {
+					fontData = data;
+					updateFontDisplay();
+				}
+			}
+		});
+		Button defaultButton = new Button(main, SWT.PUSH);
+		defaultButton.setText(Messages.getString("PreferencesPage.DefaultFont")); //$NON-NLS-1$
+		defaultButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				fontData = null;
+				updateFontDisplay();
+			}
+		});
+
+		fontDisplay = new Label(main, SWT.NULL);
+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
+		data.grabExcessHorizontalSpace = true;
+		fontDisplay.setLayoutData(data);
+		updateFontDisplay();
+
+		ColorManager manager = new ColorManager();
+
+		Composite comp = new Composite(main, SWT.NULL);
+		GridData layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+		
+		manager.getColor(SQLColorConstants.DEFAULT);
+		backgroundColorEditor =
+			new ColorFieldEditor(
+				"quantum.background.color", //$NON-NLS-1$
+				Messages.getString("PreferencesPage.BackgroundColor"), //$NON-NLS-1$
+				comp);				
+
+		Composite temp = new Composite(main, SWT.NULL);
+		temp.setSize(0, 0);
+		
+		comp = new Composite(main, SWT.NULL);
+		layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+		
+		textColorEditor =
+			new ColorFieldEditor(
+				"quantum.text.color", //$NON-NLS-1$
+				Messages.getString("PreferencesPage.DefaultTextColor"), //$NON-NLS-1$
+				comp);				
+
+		boldText = new Button(main, SWT.CHECK);
+		boldText.setSelection(textFlag);
+		boldText.setText(Messages.getString("PreferencesPage.Bold")); //$NON-NLS-1$
+		boldText.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				textFlag = boldText.getSelection();
+			}
+		});
+
+		comp = new Composite(main, SWT.NULL);
+		layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+
+		keywordColorEditor =
+			new ColorFieldEditor(
+				Messages.getString("PreferencesPage.quantum.keyword.color_26"), //$NON-NLS-1$
+				Messages.getString("PreferencesPage.KeywordTextColor"), //$NON-NLS-1$
+				comp);
+
+		boldKeyword = new Button(main, SWT.CHECK);
+		boldKeyword.setSelection(keywordFlag);
+		boldKeyword.setText(Messages.getString("PreferencesPage.Bold")); //$NON-NLS-1$
+		boldKeyword.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				keywordFlag = boldKeyword.getSelection();
+			}
+		});
+
+		comp = new Composite(main, SWT.NULL);
+		layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+
+		commentColorEditor =
+			new ColorFieldEditor(
+				"quantum.comment.color", //$NON-NLS-1$
+				Messages.getString("PreferencesPage.CommentTextColor"), //$NON-NLS-1$
+				comp);
+
+		boldComment = new Button(main, SWT.CHECK);
+		boldComment.setSelection(commentFlag);
+		boldComment.setText(Messages.getString("PreferencesPage.Bold")); //$NON-NLS-1$
+		boldComment.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				commentFlag = boldComment.getSelection();
+			}
+		});
+
+		comp = new Composite(main, SWT.NULL);
+		layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+
+		stringColorEditor =
+			new ColorFieldEditor(
+				"quantum.string.color", //$NON-NLS-1$
+				Messages.getString("PreferencesPage.StringTextColor"), //$NON-NLS-1$
+				comp);
+
+		boldString = new Button(main, SWT.CHECK);
+		boldString.setSelection(stringFlag);
+		boldString.setText(Messages.getString("PreferencesPage.Bold")); //$NON-NLS-1$
+		boldString.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				stringFlag = boldString.getSelection();
+			}
+		});
+
+		comp = new Composite(main, SWT.NULL);
+		layoutData = new GridData();
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+
+		numericColorEditor =
+			new ColorFieldEditor(
+				"quantum.numeric.color", //$NON-NLS-1$
+				Messages.getString("PreferencesPage.NumericTextColor"), //$NON-NLS-1$
+				comp);
+
+		boldNumeric = new Button(main, SWT.CHECK);
+		boldNumeric.setSelection(numericFlag);
+		boldNumeric.setText(Messages.getString("PreferencesPage.Bold")); //$NON-NLS-1$
+		boldNumeric.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				numericFlag = boldNumeric.getSelection();
+			}
+		});
+
+		backgroundColorEditor.setPreferencePage(this);
+		backgroundColorEditor.setPreferenceStore(getPreferenceStore());
+		backgroundColorEditor.load();
+		
+		textColorEditor.setPreferencePage(this);
+		textColorEditor.setPreferenceStore(getPreferenceStore());
+		textColorEditor.load();
+		
+		keywordColorEditor.setPreferencePage(this);
+		keywordColorEditor.setPreferenceStore(getPreferenceStore());
+		keywordColorEditor.load();
+		
+		commentColorEditor.setPreferencePage(this);
+		commentColorEditor.setPreferenceStore(getPreferenceStore());
+		commentColorEditor.load();
+		
+		stringColorEditor.setPreferencePage(this);
+		stringColorEditor.setPreferenceStore(getPreferenceStore());
+		stringColorEditor.load();
+
+		numericColorEditor.setPreferencePage(this);
+		numericColorEditor.setPreferenceStore(getPreferenceStore());
+		numericColorEditor.load();
+
+		return main;
+	}
+	public void updateFontDisplay() {
+		if (fontData == null) {
+			fontDisplay.setText(Messages.getString("PreferencesPage.Font_Default")); //$NON-NLS-1$
+		} else {
+			String style = Messages.getString("PreferencesPage.regular"); //$NON-NLS-1$
+			if (fontData.getStyle() == SWT.BOLD) {
+				style = Messages.getString("PreferencesPage.bold"); //$NON-NLS-1$
+			} else if (fontData.getStyle() == SWT.ITALIC) {
+				style = Messages.getString("PreferencesPage.italic"); //$NON-NLS-1$
+			} else if (fontData.getStyle() == (SWT.BOLD | SWT.ITALIC)) {
+				style = Messages.getString("PreferencesPage.boldItalic"); //$NON-NLS-1$
+			}
+			fontDisplay.setText(Messages.getString("PreferencesPage.FontPrompt") + fontData.getName() + '-' + style + '-' + fontData.getHeight()); //$NON-NLS-1$
+		}
+	}
+	public void updateFlags() {
+		boldText.setSelection(textFlag);
+		boldKeyword.setSelection(keywordFlag);
+		boldString.setSelection(stringFlag);
+		boldNumeric.setSelection(numericFlag);
+		boldComment.setSelection(commentFlag);
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/BookmarkPropertyPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/BookmarkPropertyPage.java
new file mode 100644
index 0000000..42c4065
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/BookmarkPropertyPage.java
@@ -0,0 +1,284 @@
+package com.quantum.properties;
+
+import com.quantum.IQuantumConstants;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DriverInfo;
+import com.quantum.model.Bookmark;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class BookmarkPropertyPage extends PropertyPage {
+    
+    private Text password;
+    private Text userid;
+    private Button prompt;
+    
+    private Text jdbcURL;
+    private Text driverName;
+    private Text driverPath;
+    
+    private Combo type;
+	private Combo autoCommit;
+    private DriverInfo[] adapters = AdapterFactory.getInstance().getDriverList();
+
+    protected Control createContents(Composite parent) {
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.grabExcessHorizontalSpace = true;
+        composite.setLayoutData(data);
+
+		Label nameLabel = new Label(composite, SWT.NONE);
+        nameLabel.setText("Name:");
+
+        Label name = new Label(composite, SWT.NONE);
+
+        Bookmark bookmark = getBookmark();
+        String description = bookmark.getName();
+        name.setText(description);
+        
+        TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
+        layout = new GridLayout();
+        tabFolder.setLayout(layout);
+        data = new GridData(GridData.FILL_BOTH);
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessVerticalSpace = true;
+        data.verticalAlignment = GridData.FILL;
+        data.horizontalSpan = 2;
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        tabFolder.setLayoutData(data);
+        
+        createUserTab(tabFolder);
+        createDriverTab(tabFolder);
+        createOptionsTab(tabFolder);
+        
+        performDefaults();
+        return composite;
+	}
+
+ 	private Bookmark getBookmark() {
+        Bookmark bookmark =
+            ((TreeNode) getElement()).getBookmark();
+        return bookmark;
+    }
+
+    private void createDriverTab(TabFolder tabFolder) {
+        TabItem driverTab = new TabItem(tabFolder, SWT.NONE);
+        driverTab.setText("JDBC Driver");
+        
+        Composite composite = new Composite(tabFolder, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        data.grabExcessHorizontalSpace = true;
+        composite.setLayoutData(data);
+        
+        Label label = new Label(composite, SWT.NONE);
+        label.setText("Connection URL:");
+
+        this.jdbcURL = new Text(composite, SWT.BORDER);
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessHorizontalSpace = true;
+        this.jdbcURL.setLayoutData(data);
+        
+        label = new Label(composite, SWT.NONE);
+        label.setText("Driver Name:");
+
+        this.driverName = new Text(composite, SWT.BORDER);
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        this.driverName.setLayoutData(data);
+
+        label = new Label(composite, SWT.NONE);
+        label.setText("Driver Location:");
+
+        this.driverPath = new Text(composite, SWT.BORDER);
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        this.driverPath.setLayoutData(data);
+
+        label = new Label(composite, SWT.NULL);
+        label.setText("Type:");
+        this.type = new Combo(composite, SWT.SIMPLE | SWT.DROP_DOWN | SWT.READ_ONLY);
+        String adapterNames[] = new String[adapters.length];
+        for (int i = 0; i < adapters.length; i++) {
+            adapterNames[i] = adapters[i].getDisplayName();
+        }
+        this.type.setItems(adapterNames);
+        
+        data = new GridData();
+        data.horizontalAlignment = GridData.FILL;
+        this.type.setLayoutData(data);
+
+        driverTab.setControl(composite);
+    }
+
+    private void createUserTab(TabFolder tabFolder) {
+        TabItem userTab = new TabItem(tabFolder, SWT.NONE);
+        userTab.setText("User");
+        
+        Composite composite = new Composite(tabFolder, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        data.grabExcessHorizontalSpace = true;
+        composite.setLayoutData(data);
+        
+        Label useridLabel = new Label(composite, SWT.NONE);
+        useridLabel.setText("Userid:");
+
+        this.userid = new Text(composite, SWT.BORDER);
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessHorizontalSpace = true;
+        this.userid.setLayoutData(data);
+        
+        Label passworLabel = new Label(composite, SWT.NONE);
+        passworLabel.setText("Password:");
+
+        this.password = new Text(composite, SWT.BORDER);
+        this.password.setEchoChar('*');
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        this.password.setLayoutData(data);
+
+        this.prompt = new Button(composite, SWT.CHECK);
+        this.prompt.setText("Prompt for password");
+        data = new GridData(GridData.FILL);
+        data.horizontalSpan = 2;
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        this.prompt.setLayoutData(data);
+        
+        this.prompt.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                password.setEditable(!((Button) event.getSource()).getSelection()); 
+            }
+        });
+        
+        userTab.setControl(composite);
+    }
+
+	/**
+	  * @param tabFolder
+	  */
+	 private void createOptionsTab(TabFolder tabFolder) {
+		TabItem optionsTab = new TabItem(tabFolder, SWT.NONE);
+		optionsTab.setText("Options");
+        
+		Composite composite = new Composite(tabFolder, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+        
+		Label label;
+		
+		label = new Label(composite, SWT.NULL);
+		label.setText("On connection, Auto-Commit should be:");
+		this.autoCommit = new Combo(composite, SWT.SIMPLE | SWT.DROP_DOWN | SWT.READ_ONLY);
+		String autoCommitTypes[] = new String[] {
+			IQuantumConstants.autoCommitTrue, 
+			IQuantumConstants.autoCommitFalse,
+			IQuantumConstants.autoCommitSaved
+		};
+		this.autoCommit.setItems(autoCommitTypes);
+        
+		data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		this.autoCommit.setLayoutData(data);
+
+		optionsTab.setControl(composite);
+		
+	 }
+
+
+
+    /**
+     * @see org.eclipse.jface.preference.PreferencePage#performApply()
+     */
+    public boolean performOk() {
+        Bookmark bookmark = getBookmark();
+        bookmark.setUsername(this.userid.getText());
+        bookmark.setPromptForPassword(this.prompt.getSelection());
+        if (this.prompt.getSelection()) {
+            bookmark.setPassword("");
+        } else {
+            bookmark.setPassword(this.password.getText());
+        }
+
+        int index = this.type.getSelectionIndex();
+        bookmark.setType(this.adapters[index].getDriverType());
+        bookmark.setConnect(this.jdbcURL.getText());
+        bookmark.setDriver(this.driverName.getText());
+        bookmark.setDriverFile(this.driverPath.getText());
+        if (this.autoCommit.getSelectionIndex() >= 0)
+        	bookmark.setAutoCommitPreference(this.autoCommit.getItem(this.autoCommit.getSelectionIndex()));
+        return super.performOk();
+    }
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+     */
+    protected void performDefaults() {
+        super.performDefaults();
+        Bookmark bookmark = getBookmark();
+
+        this.prompt.setSelection(bookmark.getPromptForPassword());
+        this.password.setEditable(!bookmark.getPromptForPassword());
+        this.password.setText(bookmark.getPassword());
+        this.userid.setText(bookmark.getUsername());
+
+        this.type.select(0);
+        boolean done = false;
+        for (int i = 0,
+            length = (adapters == null) ? 0 : adapters.length;
+            !done && i < length;
+            i++) {
+            if (bookmark.getType() != null && 
+                bookmark.getType().equals(adapters[i].getDriverType())) {
+                this.type.select(i);
+                done = true;
+            }
+        }
+        if (bookmark.getAutoCommitPreference().equals(IQuantumConstants.autoCommitTrue))
+        	this.autoCommit.select(0);
+        else if (bookmark.getAutoCommitPreference().equals(IQuantumConstants.autoCommitFalse))
+			this.autoCommit.select(1);
+		else if (bookmark.getAutoCommitPreference().equals(IQuantumConstants.autoCommitSaved))
+			this.autoCommit.select(2);
+			
+        this.driverName.setText(bookmark.getDriver());
+        this.jdbcURL.setText(bookmark.getConnect());
+        this.driverPath.setText(bookmark.getDriverFile());
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/DatabaseInformationPropertyPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/DatabaseInformationPropertyPage.java
new file mode 100644
index 0000000..e1a0606
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/DatabaseInformationPropertyPage.java
@@ -0,0 +1,60 @@
+package com.quantum.properties;
+
+import java.sql.SQLException;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.NotConnectedException;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class DatabaseInformationPropertyPage extends PropertyPage {
+
+	public DatabaseInformationPropertyPage() {
+		super();
+	}
+
+    protected Control createContents(Composite parent) {
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.grabExcessHorizontalSpace = true;
+        composite.setLayoutData(data);
+
+		Label productLabel = new Label(composite, SWT.NONE);
+		productLabel.setText("Product:");
+
+        Label productDescriptionLabel = new Label(composite, SWT.NONE);
+
+        Bookmark bookmark =
+            ((TreeNode) getElement()).getBookmark();
+        String description = null;
+        try {
+            description = bookmark.getDatabase().getInformation();
+        } catch (NotConnectedException e) {
+        } catch (SQLException e) {
+        }
+        if (description == null) {
+            description = "<unknown>";
+        }
+        productDescriptionLabel.setText(description);
+        return composite;
+	}
+
+	protected void performDefaults() {
+	}
+	
+	public boolean performOk() {
+		return true;
+	}
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/EntityPropertyPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/EntityPropertyPage.java
new file mode 100644
index 0000000..6937c1b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/EntityPropertyPage.java
@@ -0,0 +1,187 @@
+package com.quantum.properties;
+
+import com.quantum.model.Column;
+import com.quantum.model.Entity;
+import com.quantum.model.Index;
+import com.quantum.view.bookmark.EntityNode;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class EntityPropertyPage extends PropertyPage {
+    
+    protected Control createContents(Composite parent) {
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.grabExcessHorizontalSpace = true;
+        composite.setLayoutData(data);
+
+		Label label = new Label(composite, SWT.NONE);
+        label.setText("Name:");
+
+        Entity entity = getEntity();
+
+        Label name = new Label(composite, SWT.NONE);
+        name.setText(entity.getName());
+
+        label = new Label(composite, SWT.NONE);
+        label.setText("Schema:");
+
+        Label schema = new Label(composite, SWT.NONE);
+        schema.setText(entity.getSchema());
+        
+        if (!Entity.SEQUENCE_TYPE.equals(getEntity().getType())) {
+            TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
+            layout = new GridLayout();
+            tabFolder.setLayout(layout);
+            data = new GridData(GridData.FILL_BOTH);
+            data.grabExcessHorizontalSpace = true;
+            data.grabExcessVerticalSpace = true;
+            data.verticalAlignment = GridData.FILL;
+            data.horizontalSpan = 2;
+            data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+            tabFolder.setLayoutData(data);
+            
+            createColumnsTab(tabFolder);
+            createIndexesTab(tabFolder);
+        }
+        
+        return composite;
+	}
+
+    private Entity getEntity() {
+        Entity entity =
+            ((EntityNode) getElement()).getEntity();
+        return entity;
+    }
+
+    private void createColumnsTab(TabFolder tabFolder) {
+        TabItem columnsTab = new TabItem(tabFolder, SWT.NONE);
+        columnsTab.setText("Columns");
+
+        Table table = new Table(tabFolder, SWT.FULL_SELECTION | SWT.MULTI);
+        table.setLinesVisible(true);
+        table.setHeaderVisible(true);
+
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 5;
+        layout.marginHeight = 5;
+        table.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.FILL_VERTICAL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessVerticalSpace = true;
+        table.setLayoutData(data);
+
+        String[] columnNames = { "Name", "Type", "Size", "Digits", 
+            "Primary Key", "Nullable", "Remarks" };
+        
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            TableColumn column = new TableColumn(table, SWT.NONE);
+            column.setText(columnNames[i]);
+        }
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            table.getColumn(i).pack();
+        }
+
+        Column[] columns = getEntity().getColumns();
+        for (int i = 0, length = columns.length; i < length; i++) {
+            TableItem item = new TableItem(table, SWT.NONE);
+            item.setText(new String[] {
+                columns[i].getName(), 
+                columns[i].getTypeName(),
+                String.valueOf(columns[i].getSize()),
+                columns[i].getNumberOfFractionalDigits() == 0 ? "" :
+                    String.valueOf(columns[i].getNumberOfFractionalDigits()),
+                columns[i].isPrimaryKey() ? "Yes" : "No",
+                columns[i].isNullable() ? "Yes" : "No",
+                columns[i].getRemarks() });
+        }
+
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            table.getColumn(i).pack();
+        }
+
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.FILL_VERTICAL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessVerticalSpace = true;
+        table.setLayoutData(data);
+
+        columnsTab.setControl(table);
+    }
+
+    private void createIndexesTab(TabFolder tabFolder) {
+        TabItem indexesTab = new TabItem(tabFolder, SWT.NONE);
+        indexesTab.setText("Indexes");
+
+        Table table = new Table(tabFolder, SWT.FULL_SELECTION | SWT.MULTI);
+        table.setLinesVisible(true);
+        table.setHeaderVisible(true);
+
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 5;
+        layout.marginHeight = 5;
+        table.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.FILL_VERTICAL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessVerticalSpace = true;
+        table.setLayoutData(data);
+
+        String[] columnNames = { "Name", "Column", "Ascending" };
+        
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            TableColumn column = new TableColumn(table, SWT.NONE);
+            column.setText(columnNames[i]);
+        }
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            table.getColumn(i).pack();
+        }
+
+        Index[] indexes = getEntity().getIndexes();
+        for (int i = 0, length = indexes.length; i < length; i++) {
+            for (int j = 0, numberOfColumns = indexes[i].getNumberOfColumns(); 
+                j < numberOfColumns; j++) {
+                    
+                TableItem item = new TableItem(table, SWT.NONE);
+                item.setText(new String[] {
+                    j == 0 ? indexes[i].getName() : "", 
+                    indexes[i].getColumnName(j),
+                    indexes[i].isAscending(j) ? "Yes" 
+                        : (indexes[i].isDescending(j)) ? "No" : "" });
+            }
+        }
+
+        for (int i = 0, length = columnNames.length; i < length; i++) {
+            table.getColumn(i).pack();
+        }
+
+        data = new GridData(GridData.FILL);
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.FILL_VERTICAL;
+        data.grabExcessHorizontalSpace = true;
+        data.grabExcessVerticalSpace = true;
+        table.setLayoutData(data);
+
+        indexesTab.setControl(table);
+    }
+        
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/SchemaPropertyPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/SchemaPropertyPage.java
new file mode 100644
index 0000000..d812f59
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/properties/SchemaPropertyPage.java
@@ -0,0 +1,256 @@
+package com.quantum.properties;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkHolder;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.Schema;
+import com.quantum.sql.SQLHelper;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.util.connection.ConnectionUtil;
+import com.quantum.view.bookmark.AddSchemaDialog;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class SchemaPropertyPage extends PropertyPage {
+    
+    class ContentProviderImpl implements IStructuredContentProvider {
+        public Object[] getElements(Object inputElement) {
+            List list = new ArrayList((Collection) inputElement);
+            Collections.sort(list);
+            return list.toArray();
+        }
+
+        public void dispose() {
+        }
+
+        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+        }
+    }
+    
+    class LabelProviderImpl implements ITableLabelProvider {
+
+        public Image getColumnImage(Object element, int columnIndex) {
+            if (columnIndex == 0) {
+                return QuantumPlugin.getImage("schema.gif");
+            } else {
+                return null;
+            }
+        }
+
+        public String getColumnText(Object element, int columnIndex) {
+            if (columnIndex == 0) {
+                return ((Schema) element).getDisplayName();
+            } else {
+                return null;
+            }
+        }
+
+        public void addListener(ILabelProviderListener listener) {
+        }
+
+        public void dispose() {
+        }
+
+        public boolean isLabelProperty(Object element, String property) {
+            return "displayName".equals(property);
+        }
+
+        public void removeListener(ILabelProviderListener listener) {
+        }
+    }
+    
+    private Set schemas = Collections.synchronizedSet(new HashSet());
+    private TableViewer schemaTable;
+    private Button addButton;
+    private Button removeButton;
+    
+    private ConnectionUtil connectionUtil = new ConnectionUtil();
+    
+    protected Control createContents(Composite parent) {
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+        GridData data = new GridData();
+        composite.setLayoutData(data);
+
+        this.schemaTable = new TableViewer(composite, 
+            SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
+            
+        layout = new GridLayout();
+        layout.marginWidth = 5;
+        layout.marginHeight = 5;
+        
+        this.schemaTable.getTable().setLayout(layout);
+        data = new GridData();
+        data.heightHint = 200;
+        data.widthHint = 200;
+//        data.verticalSpan = 2;
+        this.schemaTable.getTable().setLayoutData(data);
+        this.schemaTable.setLabelProvider(new LabelProviderImpl());
+        this.schemaTable.setContentProvider(new ContentProviderImpl());
+        this.schemaTable.setInput(this.schemas);
+        
+        createButtonArea(composite);
+        
+        performDefaults();
+        return composite;
+    }
+
+    private void createButtonArea(Composite composite) {
+        GridLayout layout;
+        GridData data;
+        Composite buttonArea = new Composite(composite, SWT.NONE);
+        layout = new GridLayout();
+        layout.numColumns = 1;
+        buttonArea.setLayout(layout);
+        data = new GridData();
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        buttonArea.setLayoutData(data);
+        
+        this.addButton = new Button(buttonArea, SWT.NULL);
+        this.addButton.setText("Add");
+        data = new GridData();
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        data.widthHint = 60;
+        this.addButton.setLayoutData(data);
+        this.addButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                addSchema();
+            }
+        });
+        
+        this.removeButton = new Button(buttonArea, SWT.NULL);
+        this.removeButton.setText("Remove");
+        this.removeButton.setEnabled(false);
+        data = new GridData();
+        data.horizontalAlignment = GridData.FILL_HORIZONTAL;
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        data.widthHint = 60;
+        this.removeButton.setLayoutData(data);
+        this.removeButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                removeSchema(SchemaPropertyPage.this.schemaTable.getSelection());
+            }
+        });
+        
+        this.schemaTable.addSelectionChangedListener(new ISelectionChangedListener() {
+            public void selectionChanged(SelectionChangedEvent event) {
+                SchemaPropertyPage.this.removeButton.setEnabled(
+                    !event.getSelection().isEmpty());
+            }
+        });
+    }
+    
+    private void addSchema() {
+        Bookmark bookmark = getBookmark();
+        boolean isAlreadyConnected = bookmark.isConnected();
+        
+        if (!isAlreadyConnected) {
+            boolean confirmed = MessageDialog.openConfirm(getShell(), "Connect Required", 
+                "We must connect to the database to retrieve schemas.");
+            if (confirmed) {
+                this.connectionUtil.connect(bookmark, getShell());
+            }
+        }
+        
+        try {
+            if (bookmark.isConnected()) {
+                Vector schemas = SQLHelper.getSchemas(bookmark.getConnection());
+                AddSchemaDialog dialog = new AddSchemaDialog(getShell(), schemas);
+                dialog.open();
+                if (dialog.getSelectedSchemas() != null) {
+                    Collection temp = dialog.getSelectedSchemas();
+                    for (Iterator i = temp.iterator(); i.hasNext();) {
+                        String name = (String) i.next();
+                        this.schemas.add(new Schema(name));
+                    }
+                    refreshTable();
+                }
+    
+                if (!isAlreadyConnected) {
+                    bookmark.disconnect();
+                }
+            }
+        } catch (ConnectionException e) {
+            ExceptionDisplayDialog.openError(getShell(), null, null, e);
+        }
+    }
+    
+    private void removeSchema(ISelection selection) {
+        IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+        for (Iterator i = structuredSelection.iterator(); i.hasNext();) {
+            Schema element = (Schema) i.next();
+            this.schemas.remove(element);
+        }
+        refreshTable();
+    }
+
+    private Bookmark getBookmark() {
+        Bookmark bookmark =
+            ((BookmarkHolder) getElement()).getBookmark();
+        return bookmark;
+    }
+
+    /**
+     * @see org.eclipse.jface.preference.PreferencePage#performApply()
+     */
+    public boolean performOk() {
+        getBookmark().setSchemas((Schema[]) this.schemas.toArray(
+            new Schema[this.schemas.size()]));
+        return true;
+    }
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+     */
+    protected void performDefaults() {
+        super.performDefaults();
+        Bookmark bookmark = getBookmark();
+
+        this.schemas.clear();
+        Schema[] schemas = bookmark.getSchemas();
+        for (int i = 0, length = (schemas == null) ? 0 : schemas.length;
+            i < length;
+            i++) {
+            if (!schemas[i].isDefault()) {
+                this.schemas.add(schemas[i]);
+            }
+        }
+        refreshTable();
+    }
+
+    private void refreshTable() {
+        this.schemaTable.refresh();
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/ConnectionEstablisher.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/ConnectionEstablisher.java
new file mode 100644
index 0000000..75d9363
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/ConnectionEstablisher.java
@@ -0,0 +1,19 @@
+package com.quantum.sql;
+
+import java.sql.Connection;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.PasswordFinder;
+
+/**
+ * @author BC
+ */
+public interface ConnectionEstablisher {
+    
+    public Connection connect(Bookmark bookmark, PasswordFinder passwordFinder) 
+        throws ConnectionException;
+    public void disconnect(Connection connection)
+        throws ConnectionException;
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/FilterSort.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/FilterSort.java
new file mode 100644
index 0000000..844e6de
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/FilterSort.java
@@ -0,0 +1,83 @@
+package com.quantum.sql;
+
+import java.util.ArrayList;
+
+public class FilterSort {
+	private ArrayList filterList = new ArrayList();
+	private ArrayList sortList = new ArrayList();
+	private ArrayList ascDescList = new ArrayList();
+	public void addFilter(String column, String operator, String value, boolean isString) {
+		FilterRow row = new FilterRow();
+		row.column = column;
+		row.operator = operator;
+		row.value = value;
+		row.isString = isString;
+		filterList.add(row);
+	} 
+	public void clearFilters() {
+		filterList.clear();
+	}
+	public void addSort(String column, String ascDesc) {
+		int ind = sortList.indexOf(column);
+		if (ind < 0) {
+			sortList.add(column);
+			ascDescList.add(ascDesc);
+			return;
+		} 
+		if (ind < ascDescList.size()) {
+			ascDescList.remove(ind);
+		}
+		ascDescList.add(ind, ascDesc);
+	}
+	public void removeSort(String column) {
+		int ind = sortList.indexOf(column);
+		if (ind < 0) return;
+		sortList.remove(ind);
+		ascDescList.remove(ind);
+	}
+	public String toString() {
+		StringBuffer text = new StringBuffer();
+		if (filterList.size() > 0) {
+			text.append(" WHERE "); //$NON-NLS-1$
+			for (int i = 0; i < filterList.size(); i++) {
+				FilterRow row = (FilterRow) filterList.get(i);
+				text.append(row.column);
+				text.append(" "); //$NON-NLS-1$
+				text.append(row.operator);
+				text.append(" "); //$NON-NLS-1$
+				if (row.isString) {
+					text.append(escape(row.value));
+				} else {
+					text.append(row.value);
+				}
+				text.append(" "); //$NON-NLS-1$
+				if (i < filterList.size() - 1) {
+					text.append("AND "); //$NON-NLS-1$
+				}
+			}
+		}
+		if (sortList.size() > 0) {
+			text.append(" ORDER BY "); //$NON-NLS-1$
+			for (int i = 0; i < sortList.size(); i++) {
+				String value = (String) sortList.get(i);
+				text.append(value);
+				text.append(" ");
+				text.append(ascDescList.get(i));
+				if (i < sortList.size() - 1) {
+					text.append(", "); //$NON-NLS-1$
+				}
+			}
+		}
+		return text.toString();
+	}
+	public static String escape(String original) {
+		return '\'' + original + '\'';
+	}
+}
+
+class FilterRow {
+	public String column;
+	public String operator;
+	public String value;
+	public boolean isString;
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/MultiSQLServer.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/MultiSQLServer.java
new file mode 100644
index 0000000..843d57f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/MultiSQLServer.java
@@ -0,0 +1,426 @@
+package com.quantum.sql;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.Driver;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.Entity;
+import com.quantum.model.PasswordFinder;
+import com.quantum.sql.metadata.MetaDataJDBCInterface;
+import com.quantum.sql.metadata.ObjectMetaData;
+import com.quantum.view.LogProxy;
+import com.quantum.view.bookmark.EntityNode;
+import com.quantum.view.bookmark.TreeNode;
+
+
+/**
+ * MultiSQLServer is a Singleton, used  as a interface with the sql drivers.
+ * Use MultiSQLServer.getInstance() to get the object.
+ */
+public class MultiSQLServer implements ConnectionEstablisher {
+    private static final int STREAM = 1024 * 2;
+    public static final String USERNAME = "user"; //$NON-NLS-1$
+    public static final String PASSWORD = "password"; //$NON-NLS-1$
+    private static MultiSQLServer instance = null;
+    private Hashtable classLoaderCache = new Hashtable();
+    boolean running = true;
+
+    public MultiSQLServer() {
+        //start();
+    }
+    public synchronized static MultiSQLServer getInstance() {
+        if (instance == null) {
+            instance = new MultiSQLServer();
+        }
+        return instance;
+    }
+
+    public void commit(Connection con) {
+        LogProxy log = LogProxy.getInstance();
+        try {
+            con.commit();
+        } catch (SQLException e) {
+            log.addText(LogProxy.ERROR, "Error commiting: " + e, e); //$NON-NLS-1$
+        }
+    }
+
+    public void rollback(Connection con) {
+        LogProxy log = LogProxy.getInstance();
+        try {
+            con.rollback();
+        } catch (SQLException e) {
+            log.addText(LogProxy.ERROR, "Error rolling back: " + e, e); //$NON-NLS-1$
+        }
+    }
+
+    public void setAutoCommit(Connection con, boolean enabled) {
+        LogProxy log = LogProxy.getInstance();
+        try {
+            if (con != null) {
+                con.setAutoCommit(enabled);
+            } else {
+                log.addText(LogProxy.ERROR, "Please connect before setting autocommit"); //$NON-NLS-1$
+            }
+        } catch (SQLException e) {
+            log.addText(LogProxy.ERROR, "Error setting autocommit: " + e, e); //$NON-NLS-1$
+        }
+    }
+
+    public void disconnect(Connection connection) throws ConnectionException {
+        try {
+            if (connection != null) {
+                connection.close();
+            }
+        } catch (SQLException e) {
+            throw new ConnectionException(e);
+        }
+    }
+
+    public Vector getSchemas(Connection con) {
+        ResultSet set;
+        Vector schemaList = new Vector();
+        try {
+            DatabaseMetaData meta = con.getMetaData();
+            set = meta.getSchemas();
+            while (set.next()) {
+                schemaList.add(set.getString("TABLE_SCHEM")); //$NON-NLS-1$
+            }
+            set.close();
+        } catch (SQLException e) {
+            LogProxy log = LogProxy.getInstance();
+            log.addText(LogProxy.ERROR, e);
+        }
+        return schemaList;
+    }
+    /**
+     * Makes a connection to a JDBC driver based on the data from a bookmark
+     * @param bookmark - 
+     *     The Bookmark with the data needed to make the connection
+     * @param passwordFinder - 
+     *     A utility class that can be invoked if the bookmark does not 
+     *     include a password
+     * @return The Connection object if everything went OK
+     */
+    public Connection connect(Bookmark bookmark, PasswordFinder passwordFinder)
+        throws ConnectionException {
+
+        String password = bookmark.getPassword();
+        if (bookmark.getPromptForPassword()) {
+            password = passwordFinder.getPassword();
+            if (passwordFinder.isPasswordMeantToBeSaved()) {
+                bookmark.setPassword(password);
+            }
+        }
+		Connection con;
+        if (password != null) {
+            con = connect(bookmark, password);
+        } else {
+            return null;
+        }
+        // Set the autoCommit state of the bookmark to the default on new connections
+ 		bookmark.setAutoCommit(bookmark.getDefaultAutoCommit());
+ 		// Set the autoCommit state of the JDBC connection to the bookmark autoCommit statec
+       	setAutoCommit(con, bookmark.isAutoCommit());
+       	return con;
+        
+    }
+    private Connection connect(Bookmark bookmark, String password)
+        throws ConnectionException {
+        LogProxy log = LogProxy.getInstance();
+        log.addText(LogProxy.QUERY, "Connecting to: " + bookmark.getName()); //$NON-NLS-1$
+        URL urls[] = new URL[1];
+        try {
+            String driverFile = bookmark.getDriverFile();
+            URLClassLoader loader =
+                (URLClassLoader) classLoaderCache.get(driverFile);
+            if (loader == null) {
+                urls[0] = new File(driverFile).toURL();
+                loader = new URLClassLoader(urls);
+                classLoaderCache.put(driverFile, loader);
+                System.out.println("Creating new classloader"); //$NON-NLS-1$
+            } else {
+                System.out.println("Using classloader in cache"); //$NON-NLS-1$
+            }
+            Class driverClass = loader.loadClass(bookmark.getDriver());
+            Driver driver = (Driver) driverClass.newInstance();
+            Properties props = new Properties();
+            props.put(USERNAME, bookmark.getUsername());
+            props.put(PASSWORD, password);
+            Connection connection =
+                driver.connect(bookmark.getConnect(), props);
+            if (connection == null) {
+                throw new ConnectionException("Error: Driver returned a null connection: " + bookmark.toString()); //$NON-NLS-1$
+            }
+            log.addText(LogProxy.RESULTS, "Connected to: " + bookmark.getName()); //$NON-NLS-1$
+            System.out.println("Connected"); //$NON-NLS-1$
+            return connection;
+        } catch (SQLException e) {
+            throw new ConnectionException(e);
+        } catch (MalformedURLException e) {
+            throw new ConnectionException(e);
+        } catch (ClassNotFoundException e) {
+            throw new ConnectionException(e);
+        } catch (InstantiationException e) {
+            throw new ConnectionException(e);
+        } catch (IllegalAccessException e) {
+            throw new ConnectionException(e);
+        }
+    }
+	public SQLResults execute(Connection con, String s) throws SQLException {
+		return execute(con, s, -1, -1);
+	}
+	public SQLResults execute(Connection con, String s, int startRow, int endRow) throws SQLException {
+		return execute(con, s, -1, -1, Integer.MAX_VALUE);
+	}
+
+	public SQLResults execute(Connection con, String s, int startRow, int endRow, int maxLength) throws SQLException {
+		return execute(con, s, startRow, endRow, maxLength, ""); //$NON-NLS-1$
+	}
+	
+	public SQLResults execute(
+		Connection con,
+		String s,
+		int startRow,
+		int endRow,
+		int maxLength,
+		String encoding)
+		throws SQLException {
+
+		SQLResults results = new SQLResults();
+
+		System.out.println("Executing"); //$NON-NLS-1$
+		LogProxy log = LogProxy.getInstance();
+		log.addText(LogProxy.QUERY, "Executing Request [" + s + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+		boolean metadata = false;
+		if (s.startsWith("METADATA")) { //$NON-NLS-1$
+			metadata = true;
+		}
+		if (metadata) {
+			results.setQuery(s);
+			String table = s.substring(s.indexOf(':') + 1);
+			String query = "SELECT * FROM " + table + " WHERE (1 = 0)"; //$NON-NLS-1$ //$NON-NLS-2$
+			s = query;
+			log.addText(LogProxy.QUERY, "Metadata Request [" + s + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			results.setQuery(s);
+		}
+
+		Statement stmt = con.createStatement();
+		boolean flag = stmt.execute(s);
+		results.setResultSet(flag);
+		if (metadata) {
+			genMetadataResultSet(results, stmt);
+			return results;
+		}
+		if (!flag) {
+			int updates = stmt.getUpdateCount();
+			results.setUpdateCount(updates);
+			log.addText(LogProxy.RESULTS, "Success: " + updates + " records updated"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		} else {
+			ResultSet set = stmt.getResultSet();
+			ResultSetMetaData metaData = set.getMetaData();
+			int columnCount = metaData.getColumnCount();
+			Vector columnNames = new Vector();
+			for (int i = 1; i <= columnCount; i++) {
+				columnNames.addElement(metaData.getColumnName(i));
+			}
+			results.setColumnNames(columnNames);
+			Vector columnTypes = new Vector();
+			for (int i = 1; i <= columnCount; i++) {
+				columnTypes.addElement(metaData.getColumnTypeName(i));
+			}
+			results.setColumnTypes(columnTypes);
+			int columnSizes[] = new int[columnCount];
+			for (int i = 1; i <= columnCount; i++) {
+				columnSizes[i - 1] = metaData.getColumnDisplaySize(i);
+			}
+			int rowCount = 1;
+			boolean exitEarly = false;
+			while (set.next()) {
+				boolean disable = startRow < 1 || endRow < 1;
+				boolean start = rowCount >= startRow;
+				boolean end = rowCount <= endRow;
+				if (disable || (start && end)) {
+					Vector row = new Vector();
+					for (int i = 1; i <= columnCount; i++) {
+						String value;
+						if (columnSizes[i - 1] < STREAM
+							&& columnSizes[i - 1] < maxLength) {
+							if (encoding.equals("")) { //$NON-NLS-1$
+								value = set.getString(i);
+							} else {
+								try {
+									value =
+										new String(set.getBytes(i), encoding);
+								} catch (UnsupportedEncodingException e) {
+									log.addText(LogProxy.ERROR, "Error Unsupported encoding " + encoding.toString() + ":" + e.toString(), e); //$NON-NLS-1$ //$NON-NLS-2$
+									value = new String(set.getBytes(i));
+								}
+							}
+						} else {
+							try {
+								if (encoding.equals("")) { //$NON-NLS-1$
+									Reader reader = set.getCharacterStream(i);
+									StringBuffer buffer = new StringBuffer();
+									if (reader != null) {
+										int retVal = reader.read();
+										int count = 0;
+										while (retVal >= 0) {
+											buffer.append((char) retVal);
+											retVal = reader.read();
+											count++;
+											if (count > maxLength) {
+												buffer.append("...>>>"); //$NON-NLS-1$
+												break;
+											}
+										}
+										reader.close();
+									}
+									value = buffer.toString();
+								} else {
+									InputStream binaryStream =
+										set.getBinaryStream(i);
+									ByteArrayOutputStream baos =
+										new ByteArrayOutputStream();
+									if (binaryStream != null) {
+										int retVal = binaryStream.read();
+										int count = 0;
+										while (retVal >= 0) {
+											baos.write(retVal);
+											retVal = binaryStream.read();
+											count++;
+											if (count > maxLength) {
+												break;
+											}
+										}
+										binaryStream.close();
+									}
+									value =
+										new String(
+											baos.toByteArray(),
+											encoding);
+								}
+							} catch (Throwable e) {
+								// hack for mysql which doesn't implement
+								// character streams
+								value = set.getString(i);
+							}
+						}
+						if (set.wasNull()) {
+							row.addElement("<NULL>"); //$NON-NLS-1$
+						} else {
+							row.addElement(value);
+						}
+					}
+					results.addRow(row);
+				}
+				rowCount++;
+				if (!disable && (rowCount > endRow)) {
+					exitEarly = true;
+					break;
+				}
+			}
+			if (exitEarly) {
+				results.setHasMore(set.next());
+			} else {
+				results.setMaxSize(rowCount);
+				results.setHasMore(false);
+			}
+			set.close();
+		}
+		log.addText(LogProxy.RESULTS, "Success: result set displayed"); //$NON-NLS-1$
+		stmt.close();
+		System.out.println("Executed"); //$NON-NLS-1$
+		System.out.println();
+		return results;
+	}
+	private void genMetadataResultSet(SQLResults results, Statement stmt)
+		throws SQLException {
+		ResultSet set = stmt.getResultSet();
+		ResultSetMetaData metaData = set.getMetaData();
+		int columnCount = metaData.getColumnCount();
+		Vector columnNames = new Vector();
+		columnNames.addElement("ColumnName"); //$NON-NLS-1$
+		columnNames.addElement("Type"); //$NON-NLS-1$
+		columnNames.addElement("Size"); //$NON-NLS-1$
+		columnNames.addElement("Nullable"); //$NON-NLS-1$
+		columnNames.addElement("AutoIncrement"); //$NON-NLS-1$
+		results.setColumnNames(columnNames);
+		for (int i = 1; i <= columnCount; i++) {
+			Vector row = new Vector();
+			row.addElement(metaData.getColumnName(i));
+			row.addElement(metaData.getColumnTypeName(i));
+			int textSize = metaData.getColumnDisplaySize(i);
+			int precision = metaData.getPrecision(i);
+			int scale = metaData.getScale(i);
+			if (scale == 0 && precision == 0) {
+				row.addElement(Integer.toString(precision));
+			} else {
+				row.addElement(textSize + ", " + precision + ", " + scale); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			int nullable = metaData.isNullable(i);
+			if (nullable == ResultSetMetaData.columnNoNulls) {
+				row.addElement("Not Null"); //$NON-NLS-1$
+			} else if (nullable == ResultSetMetaData.columnNullable) {
+				row.addElement("Nullable"); //$NON-NLS-1$
+			} else if (
+				nullable == ResultSetMetaData.columnNullableUnknown) {
+				row.addElement("Nullable"); //$NON-NLS-1$
+			} else {
+				row.addElement("<Error>"); //$NON-NLS-1$
+			}
+			row.addElement(
+				(metaData.isAutoIncrement(i)
+					? Boolean.TRUE
+					: Boolean.FALSE)
+					.toString());
+			results.addRow(row);
+		}
+		results.setHasMore(false);
+		set.close();
+	}
+
+	/**
+	 * Returns an ObjectMetadata object got from the connection 'con' using the name and schema of the node.
+	 * @param con
+	 * @param node
+	 * @return
+	 * @throws SQLException
+	 */
+	public ObjectMetaData getObjectMetadata(Connection con, TreeNode node) throws SQLException {
+		ObjectMetaData metadata = new ObjectMetaData();
+		if (!(node instanceof Entity)) return metadata;
+		
+		String schema = ((Entity)node).getSchema();
+		String tableName = node.getName();
+		
+		if (schema.length() == 0) schema = null;
+		metadata.setColumns(MetaDataJDBCInterface.getColumns(con, schema, tableName));
+		if (node instanceof EntityNode && ((EntityNode) node).isTable()) {
+			metadata.setPrimaryKeys(MetaDataJDBCInterface.getPrimaryKeys(con, schema, tableName));
+			metadata.setForeignKeys(MetaDataJDBCInterface.getForeignKeys(con, schema, tableName, true));
+			metadata.setIndexInfo(MetaDataJDBCInterface.getIndexInfo(con, schema, tableName));
+			metadata.setBestRowId(MetaDataJDBCInterface.getBestRowId(con, schema, tableName));
+		}
+		return metadata;
+	}
+	
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLHelper.java
new file mode 100644
index 0000000..7a050d1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLHelper.java
@@ -0,0 +1,73 @@
+package com.quantum.sql;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Vector;
+
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.view.LogProxy;
+
+public class SQLHelper {
+	
+	public static Vector getSchemas(Connection connection) {
+		return MultiSQLServer.getInstance().getSchemas(connection);
+	}
+    public static int getSize(Connection connection, String tableName, DatabaseAdapter adapter) throws SQLException {
+        SQLResults results = MultiSQLServer.getInstance().execute( 
+                connection, adapter.getCountQuery(tableName));
+        if (results.getRowCount() > 0 && results.getColumnCount() > 0) {
+            return Integer.parseInt(results.getElement(1, 1).toString());
+        } else {
+            return -1;
+        }
+    }
+	
+	public static SQLResults getResults(Connection connection, String query, int start, int end, int maxLength, String encoding) {
+		try {
+			return MultiSQLServer.getInstance().execute(connection, 
+			    query, start, end, maxLength, encoding);
+		} catch (SQLException e) {
+			LogProxy log = LogProxy.getInstance();
+			log.addText(
+				LogProxy.ERROR,
+				"Error Executing: " + query + ":" + e.toString(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		SQLResults results = new SQLResults();
+		results.setIsError(true);
+		return results;
+	}
+	
+	/**
+	 * True if the type is Real (numeric and with decimal part) according to java.sql.Types
+	 * @param type
+	 * @return
+	 */
+	public static boolean isReal(int type) {
+		return (type == java.sql.Types.DECIMAL || type == java.sql.Types.DOUBLE || type ==java.sql.Types.FLOAT || 
+			type == java.sql.Types.NUMERIC || type == java.sql.Types.REAL );
+	}
+
+	/**
+	 * True if the type is Numeric according to java.sql.Types
+	 * @param type
+	 * @return
+	 */
+	public static boolean isNumeric(int type) {
+		return (type == java.sql.Types.DECIMAL || type == java.sql.Types.DOUBLE || type ==java.sql.Types.FLOAT || 
+			type == java.sql.Types.NUMERIC || type == java.sql.Types.REAL || type == java.sql.Types.BIGINT ||
+			type == java.sql.Types.TINYINT || type == java.sql.Types.SMALLINT || type == java.sql.Types.INTEGER );
+	}
+	/**
+	 * True if the type is textual according to java.sql.Types
+	 * @param type
+	 * @return
+	 */
+	public static boolean isText(int type) {
+		return (type == java.sql.Types.CLOB || type == java.sql.Types.VARBINARY || type ==java.sql.Types.VARCHAR
+				|| type == java.sql.Types.CHAR || type == java.sql.Types.LONGVARCHAR );
+	}
+	
+	public static String getQualifiedName(String schema, String name) {
+		return (schema != null && schema.length() > 0) ? schema + "." + name : name;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLParser.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLParser.java
new file mode 100644
index 0000000..c2dc2cb
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLParser.java
@@ -0,0 +1,62 @@
+package com.quantum.sql;
+
+import java.util.Vector;
+
+import com.quantum.sql.parser.SQLLexx;
+import com.quantum.sql.parser.Token;
+
+public class SQLParser {
+
+	/**
+	 * Parses a query string into executable units.
+	 * @param query
+	 * @return a Vector of Strings, with the individual executable units.
+	 */
+	public static Vector parse(String query) {
+			Vector commands = new Vector();
+			Vector groups = new Vector();
+		try {
+			Vector tokens = SQLLexx.parse(query);
+			StringBuffer buffer = new StringBuffer();
+			StringBuffer groupBuffer = new StringBuffer();
+			for (int i = 0; i < tokens.size(); i++) {
+				Token t = (Token) tokens.elementAt(i);
+				if (t.getType() == Token.COMMENT) {
+					// ignore comments
+				} else if (t.getType() == Token.SEPARATOR) {
+					groupBuffer.append(t.getValue());
+					String newCommand = buffer.toString().trim();
+					if (!newCommand.equals("")) { //$NON-NLS-1$
+						commands.addElement(newCommand);
+					}
+					buffer = new StringBuffer();
+				} else if (t.getType() == Token.GROUP) {
+					// We don't append the group token because it may be misinterpreted
+					//groupBuffer.append(t.getValue());
+					String newGroup = groupBuffer.toString().trim();
+					if (!newGroup.equals("")) { //$NON-NLS-1$
+						groups.addElement(newGroup);
+						//Groups have precedence over commands, so the preceding commands are erased
+						commands.clear();
+					}
+					groupBuffer = new StringBuffer();
+				} else {	
+					// We append the tokens to the buffer until it's a separator or group.
+					buffer.append(t.getValue());
+					groupBuffer.append(t.getValue());
+				}
+			}
+			String newCommand = buffer.toString().trim();
+			if (!newCommand.equals("")) { //$NON-NLS-1$
+				commands.addElement(newCommand);
+			}
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+		System.out.println("Returning"); //$NON-NLS-1$
+		Vector result = new Vector();
+		result.addAll(groups);
+		result.addAll(commands);
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLResults.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLResults.java
new file mode 100644
index 0000000..3abc2b9
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLResults.java
@@ -0,0 +1,139 @@
+package com.quantum.sql;
+
+import java.util.ArrayList;
+import java.util.Vector;
+
+/**
+ * com.quantum project
+ * @author root
+ *
+*/
+public class SQLResults {
+	private String query;
+	private String table;
+	private ArrayList rows = new ArrayList();
+	private Vector columns;
+	private Vector columnTypes;
+	private int[] columnSizes;
+	private int updateCount = 0;
+	private boolean resultSet = false;
+	private boolean hasMore = false;
+	private boolean isError = false;
+	private int maxSize = -1;
+	
+	public void setColumnNames(Vector columns) {
+		this.columns = columns;
+	}
+	public String getColumnName(int column) {
+		if (columns.size() < column) return ""; //$NON-NLS-1$
+		return columns.elementAt(column - 1).toString();
+			
+	}
+	public void setColumnTypes(Vector columnsTypes) {
+		this.columnTypes = columnsTypes;
+	}
+	public String getColumnType(int column) {
+		if (columnTypes.size() < column) return ""; //$NON-NLS-1$
+		return columnTypes.elementAt(column - 1).toString();
+	}
+	public void setColumnSizes(int[] columnSizes) {
+		this.columnSizes = columnSizes;
+	}
+	public int getColumnSize(int column) {
+		if (columnSizes.length < column) return 0;
+		return columnSizes[column - 1];
+	}
+	public void addRow(Vector row) {
+		rows.add(row);
+	}
+	public Object getElement(int column, int row) {
+		return ((Vector) rows.get(row - 1)).elementAt(column - 1);
+	}
+	public int getColumnCount() {
+		if (columns.size() > 0) {
+			return columns.size();
+		}
+		return 0;
+	}
+	public int getRowCount() {
+		return rows.size();
+	}
+	/**
+	 * Returns the query.
+	 * @return String
+	 */
+	public String getQuery() {
+		return query;
+	}
+
+	/**
+	 * Sets the query.
+	 * @param query The query to set
+	 */
+	public void setQuery(String query) {
+		this.query = query;
+	}
+
+	/**
+	 * Returns the resultSet.
+	 * @return boolean
+	 */
+	public boolean isResultSet() {
+		return resultSet;
+	}
+
+	/**
+	 * Sets the resultSet.
+	 * @param resultSet The resultSet to set
+	 */
+	public void setResultSet(boolean resultSet) {
+		this.resultSet = resultSet;
+	}
+
+	public int getUpdateCount() {
+		return updateCount;
+	}
+
+	public void setUpdateCount(int updateCount) {
+		this.updateCount = updateCount;
+	}
+
+	public String getTable() {
+		return table;
+	}
+
+	public void setTable(String table) {
+		this.table = table;
+	}
+
+	public boolean hasMore() {
+		return hasMore;
+	}
+
+	public void setHasMore(boolean hasMore) {
+		this.hasMore = hasMore;
+	}
+
+	public int getMaxSize() {
+		return maxSize;
+	}
+
+	public void setMaxSize(int maxSize) {
+		this.maxSize = maxSize;
+	}
+
+	public boolean isError() {
+		return isError;
+	}
+
+	public void setIsError(boolean isError) {
+		this.isError = isError;
+	}
+	/**
+	 * 
+	 */
+	public Object[] getRows() {
+		return rows.toArray();		
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/TableRow.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/TableRow.java
new file mode 100644
index 0000000..e263d49
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/TableRow.java
@@ -0,0 +1,60 @@
+package com.quantum.sql;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+import com.quantum.util.StringMatrix;
+
+public class TableRow {
+	private String[] columnNames;
+	private Bookmark bookmark;
+	private String table;
+    private Entity entity;
+    private StringMatrix fullTableData;
+    
+    public TableRow(Entity entity, Bookmark bookmark, String table, StringMatrix tableData) {
+        this.entity = entity;
+        this.table = table;
+        // tableData will contain the first row of the tableData, for compatibility reasons with older code
+        // TODO: refactor the older code to allow for multiple selections
+        this.columnNames = tableData.getHeader();
+        this.bookmark = bookmark;
+        this.fullTableData = tableData;
+    }
+	
+	public int getColumnCount() {
+		return columnNames.length;
+	}
+	
+	public String[] getColumnNames() {
+		return columnNames;
+	}
+
+	public String getTable() {
+		return table;
+	}
+
+	public Bookmark getBookmark() {
+		return this.bookmark;
+	}
+
+    public Entity getEntity() {
+        return this.entity;
+    }
+
+	public void setColumnNames(String[] columnNames) {
+		this.columnNames = columnNames;
+	}
+
+	public String[] getTableData() {
+		return getTableRow(0);
+	}
+	
+	public String[] getTableRow(int i) {
+		return fullTableData.getRow(i);
+	}
+	
+	public StringMatrix getRowTableData() {
+		return fullTableData;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataJDBCInterface.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataJDBCInterface.java
new file mode 100644
index 0000000..b754964
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataJDBCInterface.java
@@ -0,0 +1,195 @@
+/*
+ * Created on 8/04/2003
+ *
+ */
+package com.quantum.sql.metadata;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import com.quantum.util.StringMatrix;
+
+/**
+ *	Groups functions that allow extracting data from a JDBC connection 
+ *  in the form of StringMatrix objects
+ *
+ * @author panic
+ *
+ */
+public class MetaDataJDBCInterface {
+	
+	/**
+	 * @param con : A valid (open) connection to an JDBC database
+	 * @param schema : Schema of the table. Must be null if not given
+	 * @param table : Name of the table.
+	 * @return a StringMatrix with the info of the columns' metadata, null if error
+	 */
+	public static StringMatrix getColumns(Connection con, String schema, String table) 
+			throws SQLException {
+
+		DatabaseMetaData meta = con.getMetaData();
+		ResultSet set = null;
+		StringMatrix columns = null;
+		try {
+			set = meta.getColumns(null, schema, table, null);
+			columns = fillMatrix(set);
+			set.close();
+			
+		} catch (SQLException e) {
+		}
+		if (columns == null) {
+			columns = new StringMatrix();
+			String query = "SELECT * FROM \"" + table + "\" WHERE (1 = 0)"; //$NON-NLS-1$ //$NON-NLS-2$
+			Statement stmt = con.createStatement();
+			stmt.execute(query);
+			ResultSet rset = stmt.getResultSet();
+			ResultSetMetaData rsMetaData = rset.getMetaData();
+			int columnCount = rsMetaData.getColumnCount();
+			String headMatrix[] = {"TABLE_CAT","TABLE_SCHEM","TABLE_NAME","COLUMN_NAME","DATA_TYPE","TYPE_NAME","COLUMN_SIZE",
+									"BUFFER_LENGTH","DECIMAL_DIGITS","NUM_PREC_RADIX","NULLABLE","REMARKS",
+									"COLUMN_DEF","SQL_DATA_TYPE","SQL_DATETIME_SUB","CHAR_OCTET_LENGTH",
+									"ORDINAL_POSITION","IS_NULLABLE","SCOPE_CATLOG","SCOPE_SCHEMA","SCOPE_TABLE","SOURCE_DATA_TYPE"};
+			columns.addMatrixHeader(headMatrix); 
+			for (int i = 0; i < columnCount; i++) {
+				columns.add(null, i); /* TABLE_CAT */
+				columns.add(schema, i); /* TABLE_SCHEM */
+				columns.add(table, i); /* TABLE_NAME */
+				columns.add(rsMetaData.getColumnName(i+1), i); /* COLUMN_NAME */
+				columns.add(String.valueOf(rsMetaData.getColumnType(i+1)), i); /* DATA_TYPE */
+				columns.add(rsMetaData.getColumnTypeName(i+1), i); /* TYPE_NAME */
+				columns.add(String.valueOf(rsMetaData.getPrecision(i+1)), i); /* COLUMN_SIZE */
+				columns.add(null, i); /* BUFFER_LENGTH */
+				columns.add(String.valueOf(rsMetaData.getScale(i+1)), i); /* DECIMAL_DIGITS */
+				columns.add(null, i); /* NUM_PREC_RADIX */
+				int isNullable = rsMetaData.isNullable(i+1);
+				columns.add(String.valueOf(isNullable), i); /* NULLABLE */
+				columns.add(null, i); /* REMARKS */
+				columns.add(null, i); /* COLUMN_DEF */
+				columns.add(null, i); /* SQL_DATA_TYPE */
+				columns.add(null, i); /* SQL_DATETIME_SUB */
+				columns.add(String.valueOf(rsMetaData.getColumnDisplaySize(i+1)), i); /* CHAR_OCTET_LENGTH */
+				columns.add(String.valueOf(i+1), i); /* ORDINAL_POSITION */
+				columns.add(isNullable == DatabaseMetaData.columnNullable ? "YES" : "NO", i );
+				columns.add(null, i); /* SCOPE_CATLOG */
+				columns.add(null, i); /* SCOPE_SCHEMA */
+				columns.add(null, i); /* SCOPE_TABLE */
+				columns.add(null, i); /* SOURCE_DATA_TYPE */
+			}					
+		}
+		return columns;
+	}
+
+	/**
+	 * @param con : A valid (open) connection to an JDBC database
+	 * @param schema : Schema of the table. Must be null if not given
+	 * @param table : Name of the table.
+	 * @return a StringMatrix with the info of the primary keys
+	 */
+	public static StringMatrix getPrimaryKeys(Connection con, String schema, String table) {
+
+		StringMatrix keys = new StringMatrix();
+		try {
+			DatabaseMetaData meta = con.getMetaData();
+			ResultSet set = meta.getPrimaryKeys(null, schema, table);
+			keys = fillMatrix(set);
+			set.close();
+		} catch (SQLException e) {
+			   e.printStackTrace();
+		}
+		return keys;
+	}
+
+	/**
+	 * @param con : A valid (open) connection to an JDBC database
+	 * @param schema : Schema of the table. Must be null if not given
+	 * @param table : Name of the table.
+	 * @param imported : Determines if the foreign keys are the imported or exported ones
+	 * @return a StringMatrix with the info of the foreign keys
+	 */
+	public static StringMatrix getForeignKeys(Connection con, String schema, String table,  boolean imported ) {
+				
+		ResultSet set = null;
+		StringMatrix keys = new StringMatrix();
+		try {
+				DatabaseMetaData meta = con.getMetaData();
+			if (imported){
+				set = meta.getImportedKeys(null, schema, table);
+			} else {
+				set = meta.getExportedKeys(null, schema, table);
+			}
+			keys = fillMatrix(set);
+			set.close();
+		} catch (SQLException e) {
+			   e.printStackTrace();
+		}
+		return keys;
+	}
+
+	/**
+	 * @param con : A valid (open) connection to an JDBC database
+	 * @param schema : Schema of the table. Must be null if not given
+	 * @param table : Name of the table.
+	 * @return a StringMatrix with the info of the indexes on that table
+	 */
+	public static StringMatrix getIndexInfo(Connection con, String schema, String table) {
+
+		ResultSet set = null;
+		DatabaseMetaData meta;
+		StringMatrix keys = new StringMatrix();
+		try {
+			meta = con.getMetaData();
+			set = meta.getIndexInfo(null, schema, table, false, false);
+			keys = fillMatrix(set);
+			set.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return keys;
+	}
+
+
+	/**
+	 * 
+	 * @param set
+	 * @return a filled StringMatrix with the set results
+	 * @throws SQLException
+	 */
+	public static StringMatrix fillMatrix(ResultSet set) throws SQLException {
+		int columnCount = set.getMetaData().getColumnCount();
+		StringMatrix keys = new StringMatrix();
+		for (int i = 1; i <= columnCount; i++) {
+			keys.addHeader(set.getMetaData().getColumnName(i));
+		}
+		int row = 0;
+		while (set.next()) {
+			for (int i = 1; i <= columnCount; i++) {
+				keys.add(set.getString(i), row);
+			}
+			row++;
+		}
+		return keys;
+	}
+
+	/**
+	 * @param con
+	 * @param schema
+	 * @param tableName
+	 */
+	public static StringMatrix getBestRowId(Connection con, String schema, String table) 
+		throws SQLException {
+
+		ResultSet set = null;
+		DatabaseMetaData meta = con.getMetaData();
+		set = meta.getBestRowIdentifier(null, schema, table, DatabaseMetaData.bestRowSession, true);
+		StringMatrix keys = fillMatrix(set);
+		set.close();
+		return keys;
+
+	}
+
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataXMLInterface.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataXMLInterface.java
new file mode 100644
index 0000000..03cc5e4
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/MetaDataXMLInterface.java
@@ -0,0 +1,191 @@
+/*
+ * Created on 15/04/2003
+ *
+ */
+package com.quantum.sql.metadata;
+
+import java.util.Vector;
+
+import com.quantum.util.StringMatrix;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+
+/**
+ * @author panic
+ * Handles interface between an ObjectMetaData and XML storage.
+ * It can write an existing metadata object to XML and generate
+ * a new ObjectMetaData from existing XML.
+ */
+public class MetaDataXMLInterface {
+
+	/**
+	 * Exports an ObjectMetaData to an XML document, under a root Element
+	 * @param metadata The ObjectMetaData to export
+	 * @param doc A valid XML document to receive the export
+	 * @param root The Element under which all the XML data will be written
+	 */
+	public static void metaDataToXML(ObjectMetaData metadata, Document doc, Element root) {
+		StringMatrix columns = metadata.getColumns();
+		if (columns != null)
+			stringMatrixToXML(columns, doc, root, "COLUMN"); //$NON-NLS-1$
+		StringMatrix primaryKeys = metadata.getPrimaryKeys();
+		if (primaryKeys != null)
+			stringMatrixToXML(primaryKeys, doc, root, "PRIMARY_KEY_ITEM"); //$NON-NLS-1$
+		StringMatrix foreignKeys = metadata.getForeignKeys();
+		if (foreignKeys != null)
+			stringMatrixToXML(foreignKeys, doc, root, "FOREIGN_KEY_ITEM"); //$NON-NLS-1$
+		StringMatrix indexInfo = metadata.getIndexInfo();
+		if (indexInfo != null)
+			stringMatrixToXML(indexInfo, doc, root, "INDEX_ITEM"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Imports an  XML element to an ObjectMetaData. The format has to be the same as extracted by
+	 * the MetaDataToXML function.
+	 * @param metadata The ObjectMetaData to fill up. Usually empty.
+	 * @param root The Element having all the XML data
+	 */
+	public static void xmlToMetaData(ObjectMetaData metadata, Element root) {
+		StringMatrix columns = new StringMatrix();
+		MetaDataXMLInterface.xmlToStringMatrix(columns, root, "COLUMN"); //$NON-NLS-1$
+		metadata.setColumns(columns);
+		StringMatrix primaryKeys = new StringMatrix();
+		MetaDataXMLInterface.xmlToStringMatrix(primaryKeys, root, "PRIMARY_KEY_ITEM"); //$NON-NLS-1$
+		metadata.setPrimaryKeys(primaryKeys);
+		StringMatrix foreignKeys = new StringMatrix();
+		MetaDataXMLInterface.xmlToStringMatrix(foreignKeys, root, "FOREIGN_KEY_ITEM"); //$NON-NLS-1$
+		metadata.setForeignKeys(foreignKeys);
+		StringMatrix indexInfo = new StringMatrix();
+		MetaDataXMLInterface.xmlToStringMatrix(indexInfo, root, "INDEX_ITEM"); //$NON-NLS-1$
+		metadata.setIndexInfo(indexInfo);
+	}
+
+	/**
+	 * Adds a StringMatrix to an XML document
+	 * @param matrix The StringMatrix to add
+	 * @param doc The XmlDocument to which it will be added
+	 * @param root An element of the previous document under which the info will be added
+	 * @param sub A key under which each row of the StringMatrix will be added
+	 */
+	public static void stringMatrixToXML(StringMatrix matrix, Document doc, Element root, String sub) {
+		for (int i = 0; i < matrix.size(); i++) {
+			Element localRoot = (Element) root.appendChild(doc.createElement(sub));
+			for (int j = 0; j < matrix.getNumColumns(); j++) {
+				String key = matrix.getHeaderColumn(j);
+				Element tableName = (Element) localRoot.appendChild(doc.createElement(key));
+				String value = matrix.get(key, i);
+				if (value != null)
+					tableName.appendChild(doc.createTextNode(value));
+			}
+		}
+	}
+
+	/**
+	* Fills a StringMatrix with the data from XML, usually extracted with the StringMatrixToXML function
+	* @param matrix The matrix to fill up, usually empty.
+	* @param root The Element with all the data in XML DOM
+	* @param sub The String to select the Nodes which interest us. Only the selected nodes will be added
+	* to the StringMatrix.
+	*/
+	private static void xmlToStringMatrix(StringMatrix matrix, Element root, String sub) {
+		NodeList columns = root.getElementsByTagName(sub);
+		for (int i = 0; i < columns.getLength(); i++) {
+			Node column = columns.item(i);
+			NodeList columnList = column.getChildNodes();
+			for (int j = 0; j < columnList.getLength(); j++) {
+				Node node = columnList.item(j);
+				String header = node.getNodeName();
+				if (header.equals("#text")) //$NON-NLS-1$
+					continue;
+				String value = null;
+				if (node != null && node.hasChildNodes()) {
+					Node valueNode = node.getFirstChild();
+					if (valueNode instanceof Text) {
+						value = valueNode.getNodeValue();
+					}
+				}
+				if (!matrix.contains(header))
+					matrix.addHeader(header);
+				matrix.addAt(header, value, i);
+			}
+		}
+	}
+	/**
+	 * Creates a new Element with a text value
+	 * @param root
+	 * @param key
+	 * @param value
+	 * @return
+	 */
+	public static Element createElementText(Element root, String key, String value){
+		//	get the XmlDocument for use as a factory
+		Document doc = root.getOwnerDocument();
+		Element newElement = doc.createElement(key);
+	
+		root.appendChild(newElement);
+		if (value != null && value.length() > 0)
+		{
+		   Text valueText = doc.createTextNode(value);
+		   newElement.appendChild(valueText);
+		}
+		return newElement;
+	}
+      
+	public static String getElementText(Element root, String key){
+		return getElementText(root, key, "");
+	}
+	/**
+	 * gets the text value from an element or a child of it
+	 * @param root element root
+	 * @param key key to search
+	 * @param defValue default string value if not found
+	 * @return
+	 */
+	public static String getElementText(Element root, String key, String defValue){
+	//	get the XmlDocument for use as a factory
+		String value = defValue;
+		if (root.getNodeName().equals(key)){
+			value = extractText(root, defValue);
+		} else {
+			NodeList children = root.getElementsByTagName(key);
+			if (children.getLength() > 0) {
+				Element column = (Element) children.item(0);
+				value = extractText(column, defValue);
+			}
+		}
+		return value;
+	}
+
+	private static String extractText(Element node, String defValue){
+		String value = defValue;
+		if (node != null && node.hasChildNodes()) {
+			Node valueNode = node.getFirstChild();
+			if (valueNode instanceof Text) {
+				value = valueNode.getNodeValue();
+			}
+		}
+		return value;
+	}
+	
+	/**
+	 * Gets a Vector with the String values of the keys
+	 *  that are children of 'root' and that match 'key'
+	 * @param root
+	 * @param key
+	 * @return
+	 */
+	public static Vector getVectorText(Element root, String key) {
+		Vector result = new Vector();
+		NodeList children = root.getElementsByTagName(key);
+		for (int i = 0; i < children.getLength(); i++) {
+			Element column = (Element) children.item(i);
+			result.add(extractText(column, ""));
+		}
+		return result;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/ObjectMetaData.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/ObjectMetaData.java
new file mode 100644
index 0000000..3858253
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/metadata/ObjectMetaData.java
@@ -0,0 +1,204 @@
+/*
+ * Created on 8/04/2003
+ *
+ */
+package com.quantum.sql.metadata;
+
+import java.util.Vector;
+
+import com.quantum.util.StringMatrix;
+
+
+/**
+ * Class to hold the Metadata of a database element
+ * @author panic
+ */
+public class ObjectMetaData {
+	private StringMatrix columns = new StringMatrix();
+	private StringMatrix primaryKeys = new StringMatrix();
+	private StringMatrix foreignKeys = new StringMatrix();
+	private StringMatrix indexInfo = new StringMatrix();
+	private StringMatrix bestRowId = new StringMatrix();
+	
+	
+	/**
+	 * Gives the order of the column in the primary key
+	 * @param column
+	 * @return the order of the column in the primary key, 0 if it's not part of it.
+	 */
+	public int getPrimaryKeyOrder(String column){
+		if (primaryKeys.size() == 0) return 0;
+		StringMatrix keyColumns = primaryKeys.select("COLUMN_NAME", column); //$NON-NLS-1$
+		if (keyColumns != null && keyColumns.size() > 0) {
+			 String index = keyColumns.get("KEY_SEQ", 0); // We suppose there is only a primary key //$NON-NLS-1$
+			 if (index != null ) return Integer.parseInt(index);
+		}
+		return 0;
+	}
+
+	/**
+	 * Gives the type of the column
+	 * @param column
+	 * @return the type of the column using the values defined in java.sql.Types
+	 */
+	public int getColumnType(String column){
+		StringMatrix selectCol = columns.select("COLUMN_NAME", column); //$NON-NLS-1$
+		if (selectCol != null && selectCol.size() > 0) {
+			 String type = selectCol.get("DATA_TYPE", 0); // It should be only one column //$NON-NLS-1$
+			 if (type != null ) return Integer.parseInt(type);
+		}
+		return 0;
+		
+	}
+
+	/**
+	 * Returns a String with the names of the columns, separated by commas 
+	 */
+	public String getColumnsString() {
+		String result = ""; //$NON-NLS-1$
+		Vector columnNames = columns.getColumn("COLUMN_NAME"); //$NON-NLS-1$
+		for (int i = 0; i < columnNames.size(); i++) {
+			if (i > 0) result += ", "; //$NON-NLS-1$
+			result += (String) columnNames.get(i);
+		}
+		return result;
+	}
+	
+	/**
+	 * Returns a vector of Strings with the names of the columns
+	 */
+	public Vector getColumnNamesVector() {
+		Vector result = new Vector();
+		Vector columnNames = columns.getColumn("COLUMN_NAME"); //$NON-NLS-1$
+		for (int i = 0; i < columnNames.size(); i++) {
+			result.add((String) columnNames.get(i)); 
+		}
+		return result;
+	}
+
+	// Inmediate getters and setters
+
+	/**
+	 * @param matrix
+	 */
+	public void setColumns(StringMatrix matrix) {
+		columns = matrix;
+	}
+	/**
+	 * @param matrix
+	 */
+	public void setForeignKeys(StringMatrix matrix) {
+		foreignKeys = matrix;
+	}
+
+	/**
+	 * @param matrix
+	 */
+	public void setPrimaryKeys(StringMatrix matrix) {
+		primaryKeys = matrix;
+	}
+	/**
+	 * @param matrix
+	 */
+	public void setBestRowId(StringMatrix matrix) {
+		bestRowId = matrix;
+	}
+	
+	/**
+	 * @param matrix
+	 */
+	public void setIndexInfo(StringMatrix matrix) {
+		indexInfo = matrix;
+	}
+
+	/**
+	 * @return
+	 */
+	public StringMatrix getColumns() {
+		return columns;
+	}
+
+	/**
+	 * @return
+	 */
+	public StringMatrix getForeignKeys() {
+		return foreignKeys;
+	}
+
+	/**
+	 * @return
+	 */
+	public StringMatrix getPrimaryKeys() {
+		return primaryKeys;
+	}
+
+	
+	/**
+	 * @return
+	 */
+	public StringMatrix getIndexInfo() {
+		return indexInfo;
+	}
+	/**
+	 * @return
+	 */
+	public StringMatrix getBestRowId() {
+		return bestRowId;
+	}
+
+
+	/**
+	 * @param column
+	 */
+	public void dropColumn(String columnName) {
+		columns.dropMatching("COLUMN_NAME", columnName); //$NON-NLS-1$
+	}
+
+	// Common Object interface
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#clone()
+	 */
+	public Object clone() {
+		ObjectMetaData result = new ObjectMetaData();
+		result.columns = (StringMatrix) columns.clone();
+		result.primaryKeys = (StringMatrix) primaryKeys.clone();
+		result.indexInfo = (StringMatrix) indexInfo.clone();
+		result.foreignKeys = (StringMatrix) foreignKeys.clone();
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof ObjectMetaData)) return false;
+		ObjectMetaData obMd = (ObjectMetaData) obj;
+		return (columns.equals(obMd.columns) && 
+				primaryKeys.equals(obMd.primaryKeys) &&
+				indexInfo.equals(obMd.indexInfo) &&
+				foreignKeys.equals(obMd.foreignKeys) );
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		return (	columns.toString() + 
+					foreignKeys.toString() + 
+					indexInfo.toString() + 
+					primaryKeys.toString());
+	}
+
+	public String getQualifiedTableName(){
+			if (columns.size() < 1) return "";
+			String result = columns.get("TABLE_NAME", 0);
+			String schema = columns.get("TABLE_SCHEM", 0);
+			if (schema != null && schema.length() > 0)
+				result = schema + "." + result;
+			return result;
+
+	}
+
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/SQLLexx.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/SQLLexx.java
new file mode 100644
index 0000000..e901266
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/SQLLexx.java
@@ -0,0 +1,166 @@
+package com.quantum.sql.parser;
+
+import java.util.Vector;
+
+public class SQLLexx {
+	private static String endline = ";"; //$NON-NLS-1$
+	private static String dash = "-"; //$NON-NLS-1$
+	private static String group = "/"; //$NON-NLS-1$
+	/**
+	 * Parses a SQL text into tokens. 
+	 * @param text
+	 * @return a vector of Token objects.
+	 */
+	public static Vector parse(String text) {
+		Vector tokens = new Vector();
+		StringPointer p = new StringPointer(text);
+		try {
+			while (!p.isDone()) {
+				int offset = p.getOffset();
+				char c = p.getNext();
+				// Adds END_OF_LINE token
+				if (c == '\n') {
+					tokens.addElement(new Token(Token.END_OF_LINE, "\n", offset, offset + 1));	
+				}
+				// Adds WHITESPACE token;
+				else if (Character.isWhitespace(c)) {
+					StringBuffer value = new StringBuffer();
+					while (Character.isWhitespace(c) && !p.isDone()) {
+						value.append(c);
+						c = p.getNext();
+					}
+					// done because of is done
+					if (Character.isWhitespace(c)) {
+						value.append(c);
+					} else if (!p.isDone()){
+						p.back();
+					}
+					tokens.addElement(new Token(Token.WHITESPACE, value.toString(), offset, offset + value.length()));
+				// Adds IDENTIFIER token (can be reserved SQL word or not);
+				} else if (Character.isLetter(c) || c == '_' || c == '$') {
+					StringBuffer value = new StringBuffer();
+					while ((Character.isLetterOrDigit(c) || c == '_'  || c == '$') && !p.isDone()) {
+						value.append(c);
+						c = p.getNext();
+					}
+					if ((Character.isLetterOrDigit(c) || c == '_')) {
+						value.append(c);
+					} else if (!p.isDone()){
+						p.back();
+					}
+					tokens.addElement(new Token(Token.IDENTIFIER, value.toString(), offset, offset + value.length()));
+				// Adds LITERAL token;
+				} else if (c == '\'') {
+					StringBuffer value = new StringBuffer();
+					value.append(c);
+					if (!p.isDone()) {
+						c = p.getNext();
+						while (c != '\'' && c != '\n' && !p.isDone()) {
+							value.append(c);
+							c = p.getNext();
+						}
+						if (c == '\'' || p.isDone()) {
+							value.append(c);
+						} else if (!p.isDone()){
+							p.back();
+						}
+					}
+					tokens.addElement(new Token(Token.LITERAL, value.toString(), offset, offset + value.length()));
+				// Adds COMMENT token (or SYMBOL (dash) if only one dash);
+				} else if (c == '-') {
+					p.mark();
+					if (p.isDone()) {
+						tokens.addElement(new Token(Token.SYMBOL, dash, offset, offset + 1));
+					} else {
+						char next = p.getNext();
+						if (next == '-') {
+							StringBuffer value = new StringBuffer("--"); //$NON-NLS-1$
+							if (!p.isDone()) {
+								c = p.getNext();
+								while (c != '\n' && !p.isDone()) {
+									value.append(c);
+									c = p.getNext();
+								}
+								if (p.isDone()) {
+									value.append(c);
+								} else {
+									p.back();
+								}
+							}
+							tokens.addElement(new Token(Token.COMMENT, value.toString(), offset, offset + value.length()));
+						} else {
+							tokens.addElement(new Token(Token.SYMBOL, dash, offset, offset + 1));
+							p.reset();
+						}
+					}
+				// Adds SEPARATOR token (;),  considers the rest of the line as COMMENT token;
+				} else if (c == ';') {
+					tokens.addElement(new Token(Token.SEPARATOR, endline, offset, offset + 1));
+					StringBuffer value = new StringBuffer();
+					if (!p.isDone()) {
+						c = p.getNext();
+						while (c != '\n' && !p.isDone()) {
+							value.append(c);
+							c = p.getNext();
+						}
+						if (p.isDone()) {
+							value.append(c);
+						} else {
+							p.back();
+						}
+						// We add to the offset so as to skip the initial ';'
+						offset++;
+						tokens.addElement(new Token(Token.COMMENT, value.toString(), offset, offset + value.length()));
+					}
+				// Adds NUMERIC token;
+				} else if (Character.isDigit(c)) {
+					StringBuffer value = new StringBuffer();
+					while ((Character.isDigit(c) || c == '.') && !p.isDone()) {
+						value.append(c);
+						c = p.getNext();
+					}
+					if ((Character.isDigit(c) || c == '.')) {
+						value.append(c);
+					} else {
+						p.back();
+					}
+					tokens.addElement(new Token(Token.NUMERIC, value.toString(), offset, offset + value.length()));
+				// Adds COMMENT token (or GROUP (slash) if only one slash);
+				} else if (c == '/') {
+					p.mark();
+					// If we have '/*', it's a comment till '*/' found or eof
+					if (p.peek() == '*') {
+						StringBuffer value = new StringBuffer();
+						c = p.getNext();
+						value.append('/');
+						while (!( c == '*' && p.peek() == '/' ) && !p.isDone()) {
+							value.append(c);
+							c = p.getNext();
+						}
+						if (!p.isDone()){
+							value.append(c);
+							c = p.getNext();
+							value.append(c);	
+						}
+						tokens.addElement(new Token(Token.COMMENT, value.toString(), offset, offset + value.length()));
+					} else {
+						// It's not '/*' , so it's a group token
+						tokens.addElement(new Token(Token.GROUP, group, offset, offset + 1));
+						p.reset();
+					}
+				// Adds SYMBOL token;
+				} else {
+					tokens.addElement(new Token(Token.SYMBOL, new String(new char[] {c}), offset, offset + 1));
+				}
+			}
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+		}
+		
+//		System.out.println("-------------------");
+//		for (int i = 0; i < tokens.size(); i++) {
+//			System.out.println((Token) tokens.elementAt(i));
+//		}
+		return tokens;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/StringPointer.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/StringPointer.java
new file mode 100644
index 0000000..846da29
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/StringPointer.java
@@ -0,0 +1,62 @@
+package com.quantum.sql.parser;
+
+public class StringPointer {
+	char[] value;
+	int offset = 0;
+	int mark = 0;
+	public StringPointer(String s) {
+		value = s.toCharArray();
+	}
+	/**
+	 * Returns the next character. Will return 0 if at end of file, but that's not
+	 * checkeable because it can be a valid character. You should check with isDone();
+	 * @return
+	 */
+	public char getNext() {
+		char retVal = (offset < value.length) ? value[offset] : 0;
+		offset++;
+		return retVal;
+	}
+	/**
+	 * Returns the next character, without advancing the pointer.
+	 *  Will return 0 if at end of file, but that's not
+	 * checkeable because it can be a valid character. You should check with isDone();
+	 * @return
+	 */
+	public char peek() {
+		char retVal = (offset < value.length) ? value[offset] : 0;
+		return retVal;
+	}
+	/**
+	 * Marks a poing of the stream to come back later (using reset());
+	 */
+	public void mark() {
+		mark = offset;
+	}
+	/**
+	 * Returns to a previously marked (with mark()) place.
+	 */
+	public void reset() {
+		offset = mark;
+	}
+	/**
+	 * Sets the pointer back a character, in fact 'pop'ing it back to the stream;
+	 */
+	public void back() {
+		if (offset > 0) offset--;
+	}
+	
+	public int getOffset() {
+		return offset;
+	}
+	/**
+	 * @return true if the stream is at an end
+	 */
+	public boolean isDone() {
+		return offset >= value.length;
+	}
+	
+	public int getLength() {
+		return value.length;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/Token.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/Token.java
new file mode 100644
index 0000000..438ce5c
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/parser/Token.java
@@ -0,0 +1,57 @@
+package com.quantum.sql.parser;
+
+public class Token {
+	public static final char SEPARATOR = 'S';
+	public static final char SYMBOL = 'Y';
+	public static final char LITERAL = 'L';
+	public static final char IDENTIFIER = 'I';
+	public static final char COMMENT = 'C';
+	public static final char WHITESPACE = 'W';
+	public static final char NUMERIC = 'N';
+	public static final char GROUP = 'G';
+	public static final char END_OF_LINE = 'E';
+	private char type;
+	private int start;
+	private int end;
+	private String value;
+	public Token(char type, String value, int start, int end) {
+		this.type = type;
+		this.value = value;
+		this.start = start;
+		this.end = end;
+	}
+	public int getEnd() {
+		return end;
+	}
+
+	public int getStart() {
+		return start;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setEnd(int end) {
+		this.end = end;
+	}
+
+	public void setStart(int start) {
+		this.start = start;
+	}
+
+	public void setType(char type) {
+		this.type = type;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+	public String toString() {
+		return type + " ->" + value + "<- [" + start + ", " + end + "]";  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/BookmarkSelectionDialog.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/BookmarkSelectionDialog.java
new file mode 100644
index 0000000..6707429
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/BookmarkSelectionDialog.java
@@ -0,0 +1,110 @@
+package com.quantum.ui.dialog;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author BC
+ */
+public class BookmarkSelectionDialog extends Dialog {
+    
+    private List list;
+    private String selection = null;
+    private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+
+    /**
+     * @param parentShell
+     */
+    public BookmarkSelectionDialog(Shell parentShell) {
+        super(parentShell);
+        int style = getShellStyle() | SWT.TITLE;
+        setShellStyle(style);
+    }
+    
+    protected void configureShell(Shell shell) {
+        super.configureShell(shell);
+        shell.setText(Messages.getString("BookmarkSelectionDialog.title"));
+    }
+        
+    /**
+     * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+     */
+    protected Control createDialogArea(Composite parent) {
+
+        Composite composite = new Composite(parent, 0);
+        GridLayout layout = new GridLayout();
+        composite.setLayout(layout);
+        layout.numColumns = 1;
+        layout.verticalSpacing = 1;
+
+        Label label = new Label(composite, SWT.NULL);
+        label.setText(Messages.getString("BookmarkSelectionDialog.text"));
+        
+        this.list = new List(composite, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
+        Bookmark[] bookmarks = BookmarkCollection.getInstance().getBookmarks();
+        
+        for (int i = 0, length = (bookmarks == null) ? 0 : bookmarks.length; i < length; i++) {
+            this.list.add(bookmarks[i].getName());
+            if (i == 0) {
+                this.list.select(i);
+                setSelection(bookmarks[i].getName());
+            }
+        }
+
+        final List list = this.list;
+        list.addListener(SWT.Selection, new Listener() {
+                public void handleEvent (Event event) {
+                    String[] selections = list.getSelection();
+                    if (selections != null && selections.length > 0) {
+                        BookmarkSelectionDialog.this.setSelection(selections[0]);
+                    }
+                }        
+            });
+
+        GridData full = new GridData();
+        full.horizontalAlignment = GridData.FILL;
+        full.verticalAlignment = GridData.FILL;
+        full.heightHint = convertHeightInCharsToPixels(3);
+        this.list.setLayoutData(full);
+
+        return composite;
+    }
+    
+    /**
+     * @param listener
+     */
+    public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * @param listener
+     */
+    public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+    
+    private void setSelection(String selection) {
+        String original = this.selection;
+        if (this.selection == null || !this.selection.equals(selection)) {
+            this.selection = selection;
+            this.propertyChangeSupport.firePropertyChange("selection", original, this.selection);
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/ExceptionDisplayDialog.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/ExceptionDisplayDialog.java
new file mode 100644
index 0000000..7917a07
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/ExceptionDisplayDialog.java
@@ -0,0 +1,281 @@
+package com.quantum.ui.dialog;
+
+import com.quantum.Messages;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @author BC
+ */
+public class ExceptionDisplayDialog extends Dialog {
+
+    private Control detailsArea;
+    private Throwable throwable;
+    private String message;
+
+    /**
+     * @param parentShell
+     */
+    public ExceptionDisplayDialog(Shell parentShell, Throwable throwable) {
+        super(parentShell);
+        this.throwable = throwable;
+    }
+
+    /**
+     * The Details button.
+     */
+    private Button detailsButton;
+
+    /**
+     * The title of the dialog.
+     */
+    private String title;
+
+    /**
+     * Indicates whether the error details viewer is currently created.
+     */
+    private boolean detailsShown = false;
+
+    /**
+     * Creates an error dialog.
+     * Note that the dialog will have no visual representation (no widgets)
+     * until it is told to open.
+     * <p>
+     * Normally one should use <code>openError</code> to create and open one of these.
+     * This constructor is useful only if the error object being displayed contains child
+     * items <it>and</it> you need to specify a mask which will be used to filter the
+     * displaying of these children.
+     * </p>
+     *
+     * @param parentShell the shell under which to create this dialog
+     * @param dialogTitle the title to use for this dialog,
+     *   or <code>null</code> to indicate that the default title should be used
+     * @param message the message to show in this dialog, 
+     *   or <code>null</code> to indicate that the error's message should be shown
+     *   as the primary message
+     * @param status the error to show to the user
+     * @param displayMask the mask to use to filter the displaying of child items,
+     *   as per <code>IStatus.matches</code>
+     * @see org.eclipse.core.runtime.IStatus#matches(int)
+     */
+    public ExceptionDisplayDialog(
+        Shell parentShell,
+        String dialogTitle,
+        String message,
+        Throwable throwable) {
+        super(parentShell);
+        
+        this.title = dialogTitle;
+        this.message = message;
+        this.throwable = throwable;
+
+        setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
+    }
+
+    /* (non-Javadoc)
+     * Method declared on Dialog.
+     * Handles the pressing of the Ok or Details button in this dialog.
+     * If the Ok button was pressed then close this dialog.  If the Details
+     * button was pressed then toggle the displaying of the error details area.
+     * Note that the Details button will only be visible if the error being
+     * displayed specifies child details.
+     */
+    protected void buttonPressed(int id) {
+        if (id == IDialogConstants.DETAILS_ID) {
+            // was the details button pressed?
+            toggleDetailsArea();
+        } else {
+            super.buttonPressed(id);
+        }
+    }
+    /* (non-Javadoc)
+     * Method declared in Window.
+     */
+    protected void configureShell(Shell shell) {
+        super.configureShell(shell);
+        shell.setText(title);
+    }
+    /* (non-Javadoc)
+     * Method declared on Dialog.
+     */
+    protected void createButtonsForButtonBar(Composite parent) {
+        // create OK and Details buttons
+        createButton(
+            parent,
+            IDialogConstants.OK_ID,
+            IDialogConstants.OK_LABEL,
+            true);
+        this.detailsButton =
+            createButton(
+                parent,
+                IDialogConstants.DETAILS_ID,
+                IDialogConstants.SHOW_DETAILS_LABEL,
+                false);
+    }
+
+    protected Control createDialogArea(Composite parent) {
+
+        // create a composite with standard margins and spacing
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginHeight =
+            convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+        layout.marginWidth =
+            convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+        layout.verticalSpacing =
+            convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        layout.horizontalSpacing =
+            convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        composite.setLayout(layout);
+        GridData childData = new GridData(GridData.FILL_BOTH);
+        childData.horizontalSpan = 2;
+        composite.setLayoutData(childData);
+        composite.setFont(parent.getFont());
+
+        Label label = new Label(composite, 0);
+        label.setText(this.message);
+        label.setFont(parent.getFont());
+        
+        
+        GridData full = new GridData();
+        full.horizontalAlignment = GridData.FILL;
+        full.verticalAlignment = GridData.FILL;
+        full.heightHint = convertHeightInCharsToPixels(3);
+        full.widthHint = convertWidthInCharsToPixels(60);
+        label.setLayoutData(full);
+
+        return composite;
+
+    }
+
+    /**
+     * Create the expandable details arae.
+     *
+     * @param parent the parent composite
+     * @return the details text control
+     */
+    protected Control createDetailsArea(Composite parent) {
+        
+        // create a composite with standard margins and spacing
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginHeight =
+            convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+        layout.marginWidth =
+            convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+        layout.verticalSpacing =
+            convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        layout.horizontalSpacing =
+            convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        composite.setLayout(layout);
+        GridData childData = new GridData(GridData.FILL_BOTH);
+        childData.horizontalSpan = 2;
+        composite.setLayoutData(childData);
+        composite.setFont(parent.getFont());
+
+        Label label = new Label(composite, 0);
+        label.setText(Messages.getString("ExceptionDisplayDialog.stackTrace"));
+        label.setFont(parent.getFont());
+        
+        GridData full = new GridData();
+        full.horizontalAlignment = GridData.FILL;
+        full.verticalAlignment = GridData.FILL;
+        full.heightHint = convertHeightInCharsToPixels(3);
+        full.widthHint = convertWidthInCharsToPixels(60);
+        label.setLayoutData(full);
+
+        Text text =
+            new Text(
+                composite,
+                SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
+
+        text.setText(this.throwable.getMessage());
+
+        GridData data =
+            new GridData(
+                GridData.HORIZONTAL_ALIGN_FILL
+                    | GridData.GRAB_HORIZONTAL
+                    | GridData.VERTICAL_ALIGN_FILL
+                    | GridData.GRAB_VERTICAL);
+        data.heightHint = convertHeightInCharsToPixels(8);
+        text.setLayoutData(data);
+        text.setFont(parent.getFont());
+
+        this.detailsShown = true;
+        return composite;
+    }
+    /**
+     * Opens an error dialog to display the given error.  Use this method if the
+     * error object being displayed contains child items <it>and</it> you wish to
+     * specify a mask which will be used to filter the displaying of these
+     * children.  The error dialog will only be displayed if there is at
+     * least one child status matching the mask.
+     *
+     * @param parentShell - 
+     *   the parent shell of the dialog, or <code>null</code> if none
+     * @param dialogTitle the title to use for this dialog,
+     *   or <code>null</code> to indicate that the default title should be used
+     * @param message the message to show in this dialog, 
+     *   or <code>null</code> to indicate that the error's message should be shown
+     *   as the primary message
+     *   as per <code>IStatus.matches</code>
+     * @return the code of the button that was pressed that resulted in this dialog
+     *     closing.  This will be <code>Dialog.OK</code> if the OK button was 
+     *     pressed, or <code>Dialog.CANCEL</code> if this dialog's close window 
+     *     decoration or the ESC key was used.
+     * @see org.eclipse.core.runtime.IStatus#matches(int)
+     */
+    public static int openError(
+        Shell parentShell,
+        String title,
+        String message,
+        Throwable throwable) {
+            
+        if (title == null) {
+            title = Messages.getString(ExceptionDisplayDialog.class.getName() +
+                "." + throwable.getClass().getName() + ".title");
+        }
+        if (message == null) {
+            message = Messages.getString(ExceptionDisplayDialog.class.getName() +
+                "." + throwable.getClass().getName() + ".message");
+        }
+        ExceptionDisplayDialog dialog =
+            new ExceptionDisplayDialog(parentShell, title, message, throwable);
+        return dialog.open();
+    }
+
+    /**
+     * Toggles the unfolding of the details area.  This is triggered by
+     * the user pressing the details button.
+     */
+    private void toggleDetailsArea() {
+        Point windowSize = getShell().getSize();
+        Point oldSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
+
+        if (this.detailsShown) {
+            this.detailsArea.dispose();
+            this.detailsShown = false;
+            detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
+        } else {
+            this.detailsArea = createDetailsArea((Composite) getContents());
+            detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
+        }
+
+        Point newSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
+
+        getShell().setSize(
+            new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
+
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/PasswordDialog.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/PasswordDialog.java
new file mode 100644
index 0000000..8e5d5bf
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/ui/dialog/PasswordDialog.java
@@ -0,0 +1,122 @@
+/*
+ * Created on 28-ago-2003
+ *
+ */
+package com.quantum.ui.dialog;
+
+import com.quantum.Messages;
+import com.quantum.model.PasswordFinder;
+
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @author panic
+ *
+ */
+public class PasswordDialog extends InputDialog {
+
+    static class PasswordFinderImpl implements PasswordFinder {
+        private boolean passwordMeantToBeSaved = false;
+        private String password;
+        private boolean prompted = false;
+        private Shell shell;
+        
+        PasswordFinderImpl(Shell shell) {
+            this.shell = shell;
+        }
+
+        protected void prompt() {
+            PasswordDialog dialog =
+                new PasswordDialog(
+                    this.shell,
+                    Messages.getString("MultiSQLServer.PasswordNotProvided"),
+                    Messages.getString("MultiSQLServer.Enter_Password"),
+                    "",
+                    this);
+            dialog.open();
+            this.prompted = true;
+        }
+
+        /**
+         * @return
+         */
+        public String getPassword() {
+            if (!this.prompted) {
+                prompt();
+            }
+            return password;
+        }
+
+        /**
+         * @return
+         */
+        public boolean isPasswordMeantToBeSaved() {
+            if (!this.prompted) {
+                prompt();
+            }
+            return passwordMeantToBeSaved;
+        }
+
+        /**
+         * @param string
+         */
+        public void setPassword(String string) {
+            password = string;
+        }
+
+        /**
+         * @param b
+         */
+        public void setPasswordMeantToBeSaved(boolean b) {
+            passwordMeantToBeSaved = b;
+        }
+
+    }
+
+    private PasswordFinderImpl passwordFinderImpl;
+
+    /**
+     * @param parentShell
+     * @param dialogTitle
+     * @param dialogMessage
+     * @param initialValue
+     * @param validator
+     */
+    protected PasswordDialog(
+        Shell parentShell,
+        String dialogTitle,
+        String dialogMessage,
+        String initialValue,
+        PasswordFinderImpl passwordFinderImpl) {
+        super(parentShell, dialogTitle, dialogMessage, initialValue, null);
+        this.passwordFinderImpl = passwordFinderImpl;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+     */
+    protected Control createDialogArea(Composite parent) {
+
+        Control control = super.createDialogArea(parent);
+        Text text = getText();
+        text.setEchoChar('*');
+        return control;
+    }
+
+    public static PasswordFinder createPasswordFinder(Shell parentShell) {
+        PasswordFinderImpl passwordFinder = new PasswordFinderImpl(parentShell);
+        return passwordFinder;
+    }
+    /**
+     * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+     */
+    protected void okPressed() {
+        this.passwordFinderImpl.setPassword(getText().getText());
+        super.okPressed();
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/NthLevelConverter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/NthLevelConverter.java
new file mode 100644
index 0000000..09352f0
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/NthLevelConverter.java
@@ -0,0 +1,145 @@
+/*
+ * Created on 11/08/2003
+ *
+ */
+package com.quantum.util;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * Class to clasify two levels of strings. It's called Nth Level but in fact it has only two levels :o) 
+ * @author panic
+ *
+ */
+public class NthLevelConverter {
+	private final int DEFAULT_COLUMNS = 10;
+	private final int DEFAULT_INCREMENT = 10;
+	
+	private Vector upper = new Vector(DEFAULT_COLUMNS,DEFAULT_INCREMENT);
+
+	public void add(String id, String parentId, int level) {
+		OneLevelConverter upperLine = new OneLevelConverter(id);
+		if (level == 1) { // If it's an upper leaf
+			if (!upper.contains(upperLine))
+				this.upper.add(upperLine);
+		}
+		else if (level == 0) { // It's a lower leaf
+			if  (parentId == null) return; // No parent, what shall we do.
+			OneLevelConverter upperFinder = new OneLevelConverter(parentId);
+			// Search if its parent is already present in the upper level
+			int ind = upper.indexOf(upperFinder);
+			// If not, addIt and find its index
+			if (ind < 0) {
+				this.upper.add(upperFinder);
+				ind = upper.indexOf(upperFinder);
+			}
+			OneLevelConverter upperItem = (OneLevelConverter) upper.get(ind);
+			// If it has no children, we create a new Vector for the children
+			if (upperItem.getLower() == null)
+				upperItem.setLower(new Vector(DEFAULT_COLUMNS,DEFAULT_INCREMENT));
+			Vector children = upperItem.getLower();
+			// Is the item already present in the children of its parent?
+			int indChildren = children.indexOf(id);
+			// If it's not, we add it
+			if (indChildren < 0) {
+				OneLevelConverter leaf = new OneLevelConverter(id);
+				children.add(leaf);
+			} 		
+		}
+		
+	}
+	
+	
+	/**
+	 * @return
+	 */
+	public Vector getUpper() {
+		return upper;
+	}
+	
+	public Vector getLevel(String id, int level){
+		if (level == 1)
+			return upper;
+		else if (level == 0){
+			if (id == null) return null;
+			OneLevelConverter upperFinder = new OneLevelConverter(id);
+			int ind = upper.indexOf(upperFinder);
+			if (ind < 0) 
+				return null;
+			else {
+				OneLevelConverter upperItem = (OneLevelConverter) upper.get(ind);
+				return upperItem.getLower();
+			}				
+		}
+		return null;
+	}
+	
+	public void convert(String ind){
+		IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
+
+		String tableItem = QuantumUtil.trasposeEscape(store.getString("customCopyTableItem" + ind));
+		String tableSeparator = QuantumUtil.trasposeEscape(store.getString("customCopyTableSeparator" + ind));
+		String columnItem = QuantumUtil.trasposeEscape(store.getString("customCopyColumnItem" + ind));
+		String columnSeparator = QuantumUtil.trasposeEscape(store.getString("customCopyColumnSeparator" + ind));
+
+		for (Iterator iter = upper.iterator(); iter.hasNext();) {
+			OneLevelConverter oneLevel = (OneLevelConverter) iter.next();
+			String upperId = oneLevel.getId();
+			Vector lower = oneLevel.getLower();
+			if (lower != null) {
+				for (Iterator iterator = lower.iterator(); iterator.hasNext();) {
+					OneLevelConverter element = (OneLevelConverter) iterator.next();
+					String convLeaf = 	columnItem + (iterator.hasNext() ? columnSeparator : "");
+					 
+					convLeaf = StringUtil.substituteString(convLeaf, "${schema}", QuantumUtil.getSchemaName(upperId));
+					convLeaf = StringUtil.substituteString(convLeaf, "${qualified}", upperId);
+					convLeaf = StringUtil.substituteString(convLeaf, "${table}", QuantumUtil.getTableName(upperId));
+					convLeaf = StringUtil.substituteString(convLeaf, "${column}", element.getId());
+					
+					element.setResult(convLeaf);
+				}
+			}
+			// We have all the leafs converted, we calculate the parent conversion
+			String convUpper = tableItem + (iter.hasNext() ? tableSeparator : "");
+			convUpper = StringUtil.substituteString(convUpper, "${schema}", QuantumUtil.getSchemaName(upperId));
+			convUpper = StringUtil.substituteString(convUpper, "${qualified}", upperId);
+			convUpper = StringUtil.substituteString(convUpper, "${table}", QuantumUtil.getTableName(upperId));
+			convUpper = StringUtil.substituteString(convUpper, "${column_list}", getColumnList(oneLevel));
+			
+			oneLevel.setResult(convUpper);
+		}
+	}
+
+
+	/**
+	 * Calculates the list of columns for an upper level converter. Has to be already converted.
+	 * @param oneLevel
+	 * @return
+	 */
+	private String getColumnList(OneLevelConverter oneLevel) {
+
+		String result = "";
+		Vector lower = oneLevel.getLower();
+		if (lower != null) {
+			for (Iterator iterator = lower.iterator(); iterator.hasNext();) {
+				OneLevelConverter element = (OneLevelConverter) iterator.next();
+				result += element.getResult();
+			}
+		}
+		return result;
+	}
+
+	public String getTableList() {
+		String result = "";
+		for (Iterator iter = upper.iterator(); iter.hasNext();) {
+			OneLevelConverter oneLevel = (OneLevelConverter) iter.next();
+			result += oneLevel.getResult();
+		}
+		return result;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/OneLevelConverter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/OneLevelConverter.java
new file mode 100644
index 0000000..8763cd5
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/OneLevelConverter.java
@@ -0,0 +1,77 @@
+/*
+ * Created on 11/08/2003
+ *
+ */
+package com.quantum.util;
+
+import java.util.Vector;
+
+/**
+ * "record" class that holds an identifier and the resulting
+ * string. This string comes from applying rules to the identifier
+ * Also, can have a vector of lower-level classifiers.
+ * 
+ * @author panic
+ *
+ */
+public class OneLevelConverter {
+	private String id = "";
+	private String result = "";
+	private Vector lower = null;
+	
+	OneLevelConverter(String id) {
+		this.id = id;
+	}
+	
+	// Getters and setters
+	/**
+	 * @return
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @return
+	 */
+	public Vector getLower() {
+		return lower;
+	}
+
+	/**
+	 * @return
+	 */
+	public String getResult() {
+		return result;
+	}
+
+	/**
+	 * @param string
+	 */
+	public void setId(String string) {
+		id = string;
+	}
+
+	/**
+	 * @param vector
+	 */
+	public void setLower(Vector vector) {
+		lower = vector;
+	}
+
+	/**
+	 * @param string
+	 */
+	public void setResult(String string) {
+		result = string;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof OneLevelConverter)) return false;
+		return this.id.equals(((OneLevelConverter)obj).id);
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/QuantumUtil.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/QuantumUtil.java
new file mode 100644
index 0000000..c789923
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/QuantumUtil.java
@@ -0,0 +1,47 @@
+/*
+ * Created on 24/08/2003
+ *
+ */
+package com.quantum.util;
+
+import java.util.StringTokenizer;
+
+/**
+ * @author panic
+ *
+ */
+public class QuantumUtil {
+	/**
+	 * Gets the first string in a string with the structure XXXX.XXXX
+	 * @param qualifiedName
+	 * @return The schema name if present, else an empty string ("")
+	 */
+	public static String getSchemaName(String qualifiedName) {
+		StringTokenizer st = new StringTokenizer(qualifiedName, "."); //$NON-NLS-1$
+		if (st.countTokens() > 1) {
+			return st.nextToken();
+		} else 
+			return "";
+	}
+
+	/**
+	 * Gets the second string in a string with the structure XXXX.XXXX
+	 * @param qualifiedName
+	 * @return The table name if present, else the received parameter
+	 */
+	public static String getTableName(String qualifiedName) {
+		StringTokenizer st = new StringTokenizer(qualifiedName, "."); //$NON-NLS-1$
+		if (st.countTokens() > 1) {
+			st.nextToken();
+			return st.nextToken();
+		} else 
+			return qualifiedName;
+	}
+
+	public static String trasposeEscape(String untrans){
+		String trasposed = StringUtil.substituteString(untrans, "\\n", "\n");
+		trasposed = StringUtil.substituteString(trasposed, "\\t", "\t");
+		
+		return trasposed;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringMatrix.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringMatrix.java
new file mode 100644
index 0000000..f87f14d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringMatrix.java
@@ -0,0 +1,352 @@
+/*
+ * Created on 8/04/2003
+ *
+ */
+package com.quantum.util;
+
+import java.util.Vector;
+
+/**
+ * @author jparrai
+ * Generic class to hold a Matrix of Strings, that is a Vector of Vectors of Strings.
+ * The first Vector "line" is supposed to have headers to the values of the rest.
+ * Those headers will always be case insensitive
+ */
+public class StringMatrix {
+	private final int DEFAULT_COLUMNS = 10;
+	private final int DEFAULT_ROWS = 10;
+	private final int DEFAULT_INCREMENT = 10;
+	
+	private Vector header = new Vector(DEFAULT_COLUMNS,DEFAULT_INCREMENT);
+	private Vector matrix = new Vector(DEFAULT_ROWS,DEFAULT_INCREMENT);
+	
+	/**
+	 * Adds a String to the end of the header keys
+	 * @param header : The string to be added
+	 */
+	public void addHeader(String header) {
+			this.header.add(header);
+	}
+	/**
+	 * Adds a whole vector to the header
+	 * @param header
+	 */
+	private void addVectorHeader(Vector header){
+			this.header.addAll(header);
+			for (int i = 0; i < this.header.size(); i++) {
+				String element = (String) this.header.get(i);
+				this.header.setElementAt(element, i);			
+			}
+	}
+	/**
+	 * Adds a whole matrix to the header
+	 * @param header
+	 */
+	public void addMatrixHeader(String header[]){
+			for (int i = 0; i < header.length; i++) {	
+				String element = (String) header[i];
+				this.header.add(element);			
+			}
+	}
+	/**
+	 * Adds a String to the end of the row indicated
+	 * @param value : The string to be added
+	 * @param row : The row to 
+	 */
+	public void add(String value, int row) {
+		grow(row);
+		Vector rowVector = (Vector) matrix.get(row);
+		rowVector.add(value);
+	}
+	/**
+	 * Adds a StringMatrix to the end of the row indicated
+	 * @param value : The string to be added
+	 * @param row : The row to 
+	 */
+	public void add(StringMatrix value) {
+		int row = matrix.size();
+		for (int i = 0; i < value.size(); i++){
+			grow(row);
+			for (int j = 0; j < value.getNumColumns(); j++){
+				String header = value.getHeaderColumn(j); 
+				addAt(header, value.get(header,i), row);
+			}
+			row++;
+		}
+		Vector rowVector = (Vector) matrix.get(row);
+		rowVector.add(value);
+	}
+	
+	/**
+	 * Converts the StringMatrix into a copy of the given
+	 * @param origin - The StringMatrix to be copied
+	 */
+	public void copy(StringMatrix origin) {
+		clear();
+		add(origin);
+	}
+	
+	/**
+	 * Clears (emtpies) the StringMatrix
+	 */
+	public void clear(){
+		header.clear();
+		matrix.clear();
+	}
+	/**
+	* Adds a String to the row indicated, to the column that matches the key 
+	* @param value : The string to be added
+	* @param row : The row to 
+	*/
+	public void addAt(String key, String value, int row) {
+		grow(row);
+		Vector rowVector = (Vector) matrix.get(row);
+		int ind = header.indexOf(key);
+		if (ind < 0) return;
+		if (rowVector.size() < ind+1) rowVector.setSize(ind);
+		rowVector.add(ind, value);
+	}
+	/**
+	 * Adds a whole vector to the end of the row indicated
+	 * @param value : The vector to be added
+	 * @param row : The row to 
+	 */
+	private void addVector(Vector value, int row){
+		grow(row);
+		Vector rowVector = (Vector) matrix.get(row);
+		rowVector.addAll(value);
+	}
+	
+	/**
+	 * Tells if you have that particular key in your StringMatrix
+	 * @param key
+	 * @return 
+	 */
+	public boolean contains(String key){
+		return (findKey(key) >= 0);
+	}
+	/**
+	 * Gets a String value from the row indicated, from the column that matches the key
+	 * @param key
+	 * @param row
+	 * @return
+	 */
+	public String get(String key, int row){
+		if (matrix.size() <= row) return null;
+		int col = findKey(key);
+		if (col < 0) return null; 
+		Vector rowVector = (Vector) matrix.get(row);
+		if (rowVector ==  null) return null;
+		return (String) rowVector.get(col);
+	}
+	/**
+	 * Finds the key in the header
+	 * @param key
+	 * @return
+	 */
+	private int findKey(String key) {
+		for (int i = 0; i < header.size(); i++) {
+			String element = (String) header.get(i);
+			if (element.equalsIgnoreCase(key)) return i;
+		}
+		return -1;
+	}
+	/**
+	 * @param key: selects the column
+	 * @return a Vector with all the values in the selected column; null if empty
+	 */
+	public Vector getColumn(String key){
+		if (size() < 1 ) return null;
+		Vector result = new Vector(size(),1);
+		for (int i = 0; i < size(); i++){
+			result.add(get(key, i));
+		}
+		return result;
+	}
+	/**
+	 * @param key: selects the column
+	 * @return a Vector with all the values in the selected column, dropping duplicates; null if empty
+	 */
+	public Vector getUniqueColumn(String key){
+		if (size() < 1 ) return null;
+		Vector result = new Vector(size(),1);
+		for (int i = 0; i < size(); i++){
+			if (!result.contains(get(key, i))) result.add(get(key, i));
+		}
+		return result;
+	}
+	/**
+	 * @param key: selects the column
+	 * @return a Vector of Integers with all the indexes of the rows
+	 * matching the selected column, dropping duplicates; null if empty
+	 */
+	public Vector getIndexes(String key, String value){
+		Vector result = new Vector();
+		for (int i = 0; i < size(); i++){
+			if (get(key, i).equals(value))
+				result.add(new Integer(i));
+		}
+		return result;
+	}
+	/**
+	 * Deletes all the rows that matches the value for the key
+	 * @param key: selects the column
+	 */
+	public void dropMatching(String key, String value){
+		for (int i = 0; i < size(); i++){
+			if (get(key, i).equals(value)) deleteRow(i);
+		}
+	}
+	/**
+	 * Returns a StringMatrix with all the complete rows that match the key - value pair
+	 * @param key The column key
+	 * @param value The value to match
+	 * @return a StringMatrix with only the rows where the key equals the value
+	 */
+	public StringMatrix select(String key, String value){
+		StringMatrix result = new StringMatrix();
+		result.addVectorHeader(header);
+		int j = 0;
+		for (int i = 0; i < size(); i++){
+			if (get(key, i).equals(value)) {
+				result.addVector((Vector)matrix.get(i), j);
+				j++;
+			} 
+		}
+		return result;
+	}
+
+	// Private functions
+	/**
+	 * Grows the StringMatrix till it's able to hold "row" rows.
+	 * @param row : The number of rows that must hold
+	 */
+	private void grow(int row) {
+		if (matrix.size() <= row)
+			for (int i = matrix.size(); i <= row; i++) {
+				matrix.add(new Vector(header.size(), 1));
+			}
+	}
+	/**
+	 * Gets a String value from the row indicated , from the column number
+	 * @param col : 0-index column 
+	 * @param row : 0-index column
+	 * @return
+	 */
+	private String get(int col, int row){
+		if (col < 0 || row < 0) return null; 
+		Vector rowVector = (Vector) matrix.get(row);
+		if (rowVector ==  null) return null;
+		return (String) rowVector.get(col);
+	}
+	
+	// Generic interfaces
+	/**
+	 * @param i
+	 * @return : a StringMatrix with only one row, the selected by i
+	 */
+	public StringMatrix rowMatrix(int i){
+		StringMatrix result = new StringMatrix();
+		result.addVectorHeader(header);
+		result.addVector((Vector)matrix.get(i),0);
+		return result;
+	}
+	
+	/**
+	 * Resturns a String[] with the selected row
+	 * @param i The index of the row
+	 * @return
+	 */
+	public String[] getRow(int i) {
+		if (i < matrix.size()) {
+			String[] result = new String[header.size()];
+			Vector resVector = (Vector)matrix.get(i);
+			resVector.toArray(result); 
+			return result;
+		}
+		return null;
+		
+	}
+
+
+	/**
+	 * @return the number of rows
+	 */
+	public int size() {
+		return matrix.size();
+	}
+	public int getNumColumns() {
+		return header.size();
+	}
+	public String getHeaderColumn(int i){
+		return (String) header.get(i);
+	}
+	public void deleteRow(int i){
+		matrix.remove(i);
+	}
+
+
+	// Common Object interface
+	/* (non-Javadoc)
+	 * @see java.lang.Object#clone()
+	 */
+	public Object clone() {
+		// Deep clone
+		StringMatrix matrix = new StringMatrix();
+		matrix.copy(this);
+		return matrix;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		String result = "";
+		for (int j = 0; j < header.size(); j++){
+			result += (String) header.get(j);
+			result += "\t";
+		}
+		result += "\n";
+		// Write the lines
+		for (int i = 0; i < matrix.size(); i++){
+			for (int j = 0; j < header.size(); j++){
+				result += get(j,i);
+				result += "\t";
+			}
+			result += "\n";
+		}
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof StringMatrix)) return false;
+		StringMatrix sm = (StringMatrix) obj;
+		if (!header.equals(sm.header)) return false;
+		if (matrix.size() != sm.matrix.size()) return false;
+		for (int i = 0; i < matrix.size(); i++){
+			Vector row = (Vector) matrix.get(i);
+			Vector smRow = (Vector) sm.matrix.get(i);
+			if (!(row.equals(smRow))) return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @return
+	 */
+	public Vector getMatrix() {
+		return matrix;
+	}
+	/**
+	 * @return
+	 */
+	public String[] getHeader() {
+		String[] result = new String[header.size()];
+		header.toArray(result);
+		return result;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringUtil.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringUtil.java
new file mode 100644
index 0000000..3ec3d3d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/StringUtil.java
@@ -0,0 +1,33 @@
+/* Created on Jan 19, 2004 */
+package com.quantum.util;
+
+import java.util.Arrays;
+
+/**
+ * @author holmesbc
+ */
+public class StringUtil {
+	
+	public static String substituteString(String original, String placeHolder, String replacementValue) {
+		StringBuffer buffer = new StringBuffer();
+		char[] originalChars = original == null ? new char[0] : original.toCharArray();
+		char[] placeHolderChars = placeHolder.toCharArray();
+		char[] placeHolderComparisonArray = new char[placeHolderChars.length];
+		
+		for (int i = 0, length = originalChars.length; i < length; i++) {
+			if (i <= length - placeHolderChars.length) {
+				System.arraycopy(originalChars, i, placeHolderComparisonArray, 0, placeHolderComparisonArray.length);
+				if (Arrays.equals(placeHolderComparisonArray, placeHolderChars)) {
+					i += placeHolderComparisonArray.length - 1;
+					buffer.append(replacementValue);
+				} else {
+					buffer.append(originalChars[i]);
+				}
+			} else {
+				buffer.append(originalChars[i]);
+			}
+		}
+		
+		return original == null ? null : buffer.toString();
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/connection/ConnectionUtil.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/connection/ConnectionUtil.java
new file mode 100644
index 0000000..ecfe620
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/connection/ConnectionUtil.java
@@ -0,0 +1,46 @@
+package com.quantum.util.connection;
+
+import java.sql.Connection;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.NotConnectedException;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.ui.dialog.PasswordDialog;
+
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * <p>This utility gets a connection from a bookmark, and handles any UI-specific
+ * interactions such as providing messages to the user and/or prompting for a 
+ * password.
+ * 
+ * @author BC
+ */
+public class ConnectionUtil {
+
+    public Connection getConnection(Bookmark bookmark, Shell shell) {
+        Connection connection = null;
+        try {
+            connection = bookmark.getConnection();
+        } catch (NotConnectedException e) {
+            connection = connect(bookmark, shell);
+        }
+        return connection;
+    }
+
+    public Connection connect(Bookmark bookmark, Shell shell) {
+        Connection connection = null;
+        try {
+            connection = bookmark.connect(PasswordDialog.createPasswordFinder(shell));
+        } catch (ConnectionException e) {
+            ExceptionDisplayDialog.openError(shell, 
+                Messages.getString(getClass().getName() + ".title"), 
+                Messages.getString(getClass().getName() + ".message") +
+				" (Bookmark:"+bookmark.getName()+")", e);
+        }
+        return connection;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/io/InputStreamHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/io/InputStreamHelper.java
new file mode 100644
index 0000000..33d4416
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/io/InputStreamHelper.java
@@ -0,0 +1,18 @@
+package com.quantum.util.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author BC
+ */
+public class InputStreamHelper {
+    public static String readIntoString(InputStream inputStream) throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        for (int b = inputStream.read(); b >= 0; b = inputStream.read()) {
+            outputStream.write((byte) b);
+        }
+        return new String(outputStream.toByteArray());
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/sql/TypesHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/sql/TypesHelper.java
new file mode 100644
index 0000000..e8b87f6
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/sql/TypesHelper.java
@@ -0,0 +1,59 @@
+/* Created on Jan 9, 2004 */
+package com.quantum.util.sql;
+
+import java.lang.reflect.Field;
+import java.sql.Types;
+
+/**
+ * @author holmesbc
+ */
+public class TypesHelper {
+	
+	public static final int BIT = Types.BIT;
+	public static final int TINYINT = Types.TINYINT;
+	public static final int SMALLINT = Types.SMALLINT;
+	public static final int INTEGER = Types.INTEGER;
+	public static final int BIGINT = Types.BIGINT;
+	public static final int FLOAT = Types.FLOAT;
+	public static final int REAL = Types.REAL;
+	public static final int DOUBLE = Types.DOUBLE;
+	public static final int NUMERIC = Types.NUMERIC;
+	public static final int DECIMAL = Types.DECIMAL;
+	public static final int CHAR = Types.CHAR;
+	public static final int VARCHAR = Types.VARCHAR;
+	public static final int LONGVARCHAR = Types.LONGVARCHAR;
+	public static final int DATE = Types.DATE;
+	public static final int TIME = Types.TIME;
+	public static final int TIMESTAMP = Types.TIMESTAMP;
+	public static final int BINARY = Types.BINARY;
+	public static final int VARBINARY = Types.VARBINARY;
+	public static final int LONGVARBINARY = Types.LONGVARBINARY;
+	public static final int NULL = Types.NULL;
+	public static final int OTHER = Types.OTHER;
+	public static final int JAVA_OBJECT = Types.JAVA_OBJECT;
+	public static final int DISTINCT = Types.DISTINCT;
+	public static final int STRUCT = Types.STRUCT;
+	public static final int ARRAY = Types.ARRAY;
+	public static final int BLOB = Types.BLOB;
+	public static final int CLOB = Types.CLOB;
+	public static final int REF = Types.REF;
+	public static final int DATALINK;
+	public static final int BOOLEAN;
+	
+	static {
+		// These fields only exist in the JDK 1.4 version of the Types class.
+		BOOLEAN = getType("BOOLEAN", 16);
+		DATALINK = getType("DATALINK", 70);
+	}
+	
+	private static int getType(String typeName, int defaultValue) {
+		try {
+			Field field = Types.class.getField(typeName);
+			defaultValue = field.getInt(null);
+		} catch (NoSuchFieldException e) {
+		} catch (IllegalAccessException e) {
+		}
+		return defaultValue;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/versioning/VersioningHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/versioning/VersioningHelper.java
new file mode 100644
index 0000000..1f3bacf
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/versioning/VersioningHelper.java
@@ -0,0 +1,49 @@
+package com.quantum.util.versioning;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.FontDialog;
+
+/**
+ * This class provides backward compatibility between versions of Eclipse for
+ * known differences.
+ * 
+ * @author BC
+ */
+public class VersioningHelper {
+    
+    public static final int ECLIPSE_VERSION_2_1_1 = 2135;
+
+    /**
+     * Set the font in a FontDialog.  In Eclipse 2.1.1, the 
+     * <code>setFontData()</code> method was deprecated and an alternative
+     * method, <code>setFontList()</code> was suggested in its place.  
+     * 
+     * @param fontDialog
+     * @param fontData
+     */    
+    public static void setFont(FontDialog fontDialog, FontData[] fontData) {
+        try {
+            if (SWT.getVersion() >= ECLIPSE_VERSION_2_1_1) {
+                Method method = fontDialog.getClass().getMethod(
+                    "setFontList", new Class[] { fontData.getClass()});
+                method.invoke(fontDialog, new Object[] {fontData});
+            } else if (fontData.length > 0) {
+                Method method = fontDialog.getClass().getMethod(
+                    "setFontData", new Class[] { FontData.class });
+                method.invoke(fontDialog, new Object[] { fontData[0] });
+            }
+        } catch (NoSuchMethodException e) {
+            // should not happen
+        } catch (IllegalArgumentException e) {
+            // should not happen
+        } catch (IllegalAccessException e) {
+            // should not happen
+        } catch (InvocationTargetException e) {
+            // should not happen
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/xml/XMLHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/xml/XMLHelper.java
new file mode 100644
index 0000000..bf16296
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/util/xml/XMLHelper.java
@@ -0,0 +1,73 @@
+package com.quantum.util.xml;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.xml.serialize.DOMSerializer;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+
+/**
+ * <p>This class constructs a pretty-printing XML Serializer
+ * 
+ * @author BC
+ */
+public class XMLHelper {
+    
+    private XMLHelper() {}
+    
+    public static DOMSerializer createDOMSerializer(Writer writer) 
+        throws IOException {
+        XMLSerializer serializer = new XMLSerializer(writer, createOutputFormat());
+        return serializer.asDOMSerializer();
+    }
+
+    public static DOMSerializer createDOMSerializer(OutputStream stream) 
+        throws IOException {
+        XMLSerializer serializer = new XMLSerializer(stream, createOutputFormat());
+        return serializer.asDOMSerializer();
+    }
+    private static OutputFormat createOutputFormat() {
+        OutputFormat format = new OutputFormat();
+        format.setIndenting(true);
+        format.setLineWidth(80);
+        return format;
+    }
+    
+    public static Document createEmptyDocument() throws ParserConfigurationException {
+        DocumentBuilder builder = createDocumentBuilder();
+        return builder.newDocument();
+    }
+    
+    public static Document createFromInputStream(InputStream stream) 
+        throws IOException, SAXException, ParserConfigurationException {
+        DocumentBuilder builder = createDocumentBuilder();
+        return builder.parse(stream);
+    }
+
+    private static DocumentBuilder createDocumentBuilder()
+        throws FactoryConfigurationError, ParserConfigurationException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        return factory.newDocumentBuilder();
+    }
+    
+    public static void write(Writer writer, Document document) 
+        throws IOException {
+        createDOMSerializer(writer).serialize(document);
+    }
+
+    public static void write(OutputStream stream, Document document) 
+        throws IOException {
+        createDOMSerializer(stream).serialize(document);
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/CopyAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/CopyAction.java
new file mode 100644
index 0000000..27fe957
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/CopyAction.java
@@ -0,0 +1,40 @@
+/*
+ * Created on 28-jul-2003
+ *
+ */
+package com.quantum.view;
+
+import com.quantum.QuantumPlugin;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+
+
+public final class CopyAction extends Action {
+	private final TableView view;
+	private final Table table;
+	public CopyAction(TableView view, Table table) {
+		super();
+		this.view = view;
+		this.table = table;
+	}
+	public void run() {
+		TableItem items[] = table.getSelection();
+		StringBuffer text = new StringBuffer();
+		for (int i = 0; i < items.length; i++) {
+			int columns = table.getColumnCount();
+			for (int col = 0; col < columns; col++) {
+				text.append(items[i].getText(col));
+				text.append('\t');
+			}
+			text.append('\n');
+		}
+		QuantumPlugin.getDefault().getSysClip().setContents(
+			new Object[] { text.toString()},
+			new Transfer[] { TextTransfer.getInstance()});
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogConstants.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogConstants.java
new file mode 100644
index 0000000..38e6b0e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogConstants.java
@@ -0,0 +1,9 @@
+package com.quantum.view;
+
+public interface LogConstants {
+	public int QUERY = 1;
+	public int ERROR = 2;
+	public int RESULTS = 3;
+	public int WARNING = 4;
+	public int DEFAULT = 5;
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogProxy.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogProxy.java
new file mode 100644
index 0000000..2c592c1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/LogProxy.java
@@ -0,0 +1,34 @@
+package com.quantum.view;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class LogProxy implements LogConstants {
+	private static LogProxy instance = null;
+	private SQLLogView log = null;
+	private LogProxy() {
+	}
+	public synchronized static LogProxy getInstance() {
+		if (instance == null) {
+			instance = new LogProxy();
+		}
+		return instance;
+	}
+	public void addText(int type, String text) {
+		log = SQLLogView.getInstance();
+		if (log != null) {
+			log.addText(type, text);
+		}
+	}
+
+    public void addText(int type, String text, Exception e) {
+        addText(type, text);
+        StringWriter writer = new StringWriter();
+        e.printStackTrace(new PrintWriter(writer));
+        addText(type, writer.toString());
+    }
+
+    public void addText(int type, Exception e) {
+        addText(type, "Error occured: " + e, e); //$NON-NLS-1$
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLLogView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLLogView.java
new file mode 100644
index 0000000..dfd7465
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLLogView.java
@@ -0,0 +1,109 @@
+package com.quantum.view;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.StyledTextContent;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.part.ViewPart;
+
+public class SQLLogView extends ViewPart implements LogConstants {
+	private Color QUERY_COLOR;
+	private Color WARNING_COLOR;
+	private Color DEFAULT_COLOR;
+	private Color ERROR_COLOR;
+	private Color RESULTS_COLOR;
+	private StyledText widget;
+	private static SQLLogView instance = null;
+	private static final String newLine = "\n"; //$NON-NLS-1$
+	public static SQLLogView getInstance() {
+		return instance;
+	}
+
+	public void createPartControl(Composite parent) {
+	   	instance = this;
+	   	QUERY_COLOR = new Color(parent.getShell().getDisplay(), 0, 255, 0);
+	   	ERROR_COLOR = new Color(parent.getShell().getDisplay(), 255, 0, 0);
+	   	RESULTS_COLOR = new Color(parent.getShell().getDisplay(), 0, 0, 255);
+	   	DEFAULT_COLOR = new Color(parent.getShell().getDisplay(), 0, 0, 0);
+	   	WARNING_COLOR = new Color(parent.getShell().getDisplay(), 255, 127, 0);
+		widget =  new StyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+		IActionBars bars = this.getViewSite().getActionBars();
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, copyAction);
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.SELECT_ALL, selectAllAction);
+
+		IToolBarManager toolBar = getViewSite().getActionBars().getToolBarManager();
+		clearAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("clear.gif")); //$NON-NLS-1$
+		clearAction.setToolTipText(Messages.getString("SQLLogView.ClearLog")); //$NON-NLS-1$
+		toolBar.add(clearAction);
+
+ 		widget.setEditable(false);
+ 		
+		widget.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				instance = null;
+			}
+		});
+	}
+	
+    public void addText(int style, String text) {
+    	text = text + newLine;
+    	int start = widget.getText().length();
+		StyleRange styleRange = new StyleRange();
+		styleRange.start = start;
+		styleRange.length = text.length();
+		if (style == QUERY) {
+			styleRange.foreground = QUERY_COLOR;
+		} else if (style == ERROR) {
+			styleRange.foreground = ERROR_COLOR;
+		} else if (style == RESULTS) {
+			styleRange.foreground = RESULTS_COLOR;
+		} else if (style == WARNING) {
+			styleRange.foreground = WARNING_COLOR;
+		} else {
+			styleRange.foreground = DEFAULT_COLOR;
+		}
+		widget.append(text);
+		widget.setStyleRange(styleRange);
+		revealEndOfDocument();
+    }
+
+	protected void revealEndOfDocument() {
+		StyledTextContent doc= widget.getContent();
+		int docLength= doc.getCharCount();
+		if (docLength > 0) {
+			widget.setCaretOffset(docLength);
+			widget.showSelection();
+		}
+	}
+
+	public void setFocus() {
+		widget.setFocus();
+	}
+
+	private Action copyAction = new Action() {
+		public void run() {
+			widget.copy();
+		}
+	};
+	private Action selectAllAction = new Action() {
+		public void run() {
+			widget.selectAll();
+		}
+	};
+	private Action clearAction = new Action() {
+		public void run() {
+			widget.setText(""); //$NON-NLS-1$
+		}
+	};
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLQueryView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLQueryView.java
new file mode 100644
index 0000000..a8469e7
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SQLQueryView.java
@@ -0,0 +1,517 @@
+package com.quantum.view;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Vector;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ExtendedModifyEvent;
+import org.eclipse.swt.custom.ExtendedModifyListener;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IKeyBindingService;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.part.ViewPart;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.actions.ExecuteAction;
+import com.quantum.actions.ExportQueryAction;
+import com.quantum.actions.ImportQueryAction;
+import com.quantum.model.Bookmark;
+import com.quantum.model.NotConnectedException;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.parser.SQLLexx;
+import com.quantum.sql.parser.Token;
+import com.quantum.view.bookmark.BookmarkNode;
+import com.quantum.view.bookmark.BookmarkView;
+
+public class SQLQueryView extends ViewPart {
+	private ExecuteAction executeAction;
+	private ImportQueryAction importQueryAction;
+	private ExportQueryAction exportQueryAction;
+	private Label statusImage;
+	private Label status;
+	private ProgressBar progress;
+	private StyledText widget;
+	private ToolItem autoCommitItem;
+	private ToolItem commitItem;
+	private ToolItem rollbackItem;
+	private Color STRING_LITERAL;
+	private Color KEYWORD;
+	private Color COMMENT;
+	private Color NUMERIC;
+	private Color DEFAULT;
+	private long parseTime = 0;
+	private long fullTime = 0;
+	public SQLQueryView() {
+		super();
+	}
+	public void setFocus() {
+		
+		String title = "Quantum SQL Query Editor";
+		BookmarkNode bookmarkNode = null;
+		Bookmark bookmark = null;
+		Connection con = null;
+		if (BookmarkView.getInstance() != null ) {
+			bookmarkNode = BookmarkView.getInstance().getCurrentBookmark();
+		}
+		if (bookmarkNode != null)
+			bookmark = bookmarkNode.getBookmark();
+		if (bookmark != null) {		
+			title = bookmark.getName() + " (" + title + ")";
+			setTitle( title );
+			try {
+				con = bookmark.getConnection();
+			} catch (NotConnectedException e) {
+				// Doesn't matter, "con" remains null
+			}
+		}
+		
+		updateAutoCommitState(bookmark, con);
+
+		widget.setFocus();
+
+	}
+	public static SQLQueryView getInstance() {
+		return (SQLQueryView) QuantumPlugin.getDefault().getView("com.quantum.view.sqlqueryview");
+
+	}
+
+	public void createPartControl(org.eclipse.swt.widgets.Composite parent) {
+		initActions();
+	   	KEYWORD = new Color(parent.getShell().getDisplay(), 126, 0, 75);
+	   	STRING_LITERAL = new Color(parent.getShell().getDisplay(), 0, 0, 255);
+	   	COMMENT = new Color(parent.getShell().getDisplay(), 88, 148, 64);
+	   	NUMERIC = new Color(parent.getShell().getDisplay(), 255, 0, 0);
+	    DEFAULT = new Color(parent.getShell().getDisplay(), 0, 0, 0);
+		Composite main = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout(1, false);
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
+		main.setLayout(layout);
+		ToolBar toolbar = new ToolBar(main, SWT.HORIZONTAL);
+		ToolItem item = new ToolItem(toolbar, SWT.PUSH);
+		item.setImage(QuantumPlugin.getImage("play.gif")); //$NON-NLS-1$
+		item.setToolTipText(Messages.getString("sqlqueryview.executeQuery")); //$NON-NLS-1$
+		item.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				executeAction.run();
+			}
+		});
+		item = new ToolItem(toolbar, SWT.SEPARATOR);
+		item = new ToolItem(toolbar, SWT.PUSH);
+		item.setImage(QuantumPlugin.getImage("import.gif")); //$NON-NLS-1$
+		item.setToolTipText(Messages.getString("sqlqueryview.importQuery")); //$NON-NLS-1$
+		item.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				importQueryAction.run();
+			}
+		});
+		item = new ToolItem(toolbar, SWT.PUSH);
+		item.setImage(QuantumPlugin.getImage("export.gif")); //$NON-NLS-1$
+		item.setToolTipText(Messages.getString("sqlqueryview.exportQuery")); //$NON-NLS-1$
+		item.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				exportQueryAction.run();
+			}
+		});
+		item = new ToolItem(toolbar, SWT.PUSH);
+		item.setImage(QuantumPlugin.getImage("clear.gif")); //$NON-NLS-1$
+		item.setToolTipText(Messages.getString("sqlqueryview.clear")); //$NON-NLS-1$
+		item.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				setQuery(""); //$NON-NLS-1$
+			}
+		});
+
+		item = new ToolItem(toolbar, SWT.SEPARATOR);
+
+		commitItem = new ToolItem(toolbar, SWT.PUSH);
+		commitItem.setImage(QuantumPlugin.getImage("commit.gif")); //$NON-NLS-1$
+		commitItem.setToolTipText(Messages.getString("SQLQueryView.Commit")); //$NON-NLS-1$
+		commitItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+                try {
+    				BookmarkNode node = BookmarkView.getInstance().getCurrentBookmark();
+    				if (node != null) MultiSQLServer.getInstance().commit(
+                        node.getBookmark().getConnection());
+                } catch (NotConnectedException e) {
+                    e.printStackTrace();
+                }
+			}
+		});
+		
+		rollbackItem = new ToolItem(toolbar, SWT.PUSH);
+		rollbackItem.setImage(QuantumPlugin.getImage("rollback.gif")); //$NON-NLS-1$
+		rollbackItem.setToolTipText(Messages.getString("SQLQueryView.RollBack")); //$NON-NLS-1$
+		rollbackItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent event) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+                try {
+                    BookmarkNode node = BookmarkView.getInstance().getCurrentBookmark();
+                    if (node != null) MultiSQLServer.getInstance().rollback(
+                        node.getBookmark().getConnection());
+                } catch (NotConnectedException e) {
+                    e.printStackTrace();
+                }
+			}
+		});
+		
+		autoCommitItem = new ToolItem(toolbar, SWT.CHECK);
+		autoCommitItem.setImage(QuantumPlugin.getImage("autocommit.gif")); //$NON-NLS-1$
+		autoCommitItem.setToolTipText(Messages.getString("SQLQueryView.AutoCommit")); //$NON-NLS-1$
+		autoCommitItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+				BookmarkNode node = BookmarkView.getInstance().getCurrentBookmark();
+				if (node == null) return;
+				Connection con = null; 
+				try { 
+					// Get the connection
+					con = node.getBookmark().getConnection();
+					// If connected (else will throw exception and jump out) switchs the state of the
+					// autoCommit option of the JDBC driver
+					MultiSQLServer.getInstance().setAutoCommit(	con, autoCommitItem.getSelection());
+                } catch (NotConnectedException e) {
+                	//Doesn't matter
+                }
+                // Update the bookmark and the buttons
+				updateAutoCommitState(node.getBookmark(), con);
+				
+			}
+		});
+		BookmarkNode node = BookmarkView.getInstance().getCurrentBookmark();
+		if (node == null) autoCommitItem.setSelection(true); 
+		else autoCommitItem.setSelection(node.getBookmark().isAutoCommit());
+		if (autoCommitItem.getSelection()) {
+			commitItem.setEnabled(false);
+			rollbackItem.setEnabled(false);
+		} else {
+			commitItem.setEnabled(true);
+			rollbackItem.setEnabled(true);
+		}
+		widget = new StyledText(main, SWT.H_SCROLL | SWT.V_SCROLL);
+
+		IActionBars bars = this.getViewSite().getActionBars();
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.CUT, cutAction);
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, copyAction);
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.PASTE, pasteAction);
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.SELECT_ALL, selectAllAction);
+
+		widget.setEditable(true);
+		widget.addExtendedModifyListener(modifyListener);
+
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		widget.setLayoutData(gridData);
+
+		Composite bottomStatus = new Composite(main, SWT.NONE);
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		bottomStatus.setLayoutData(gridData);
+		
+		GridLayout horizontal = new GridLayout(3, false);
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		bottomStatus.setLayout(horizontal);
+
+		statusImage = new Label(bottomStatus, SWT.NONE);
+		status = new Label(bottomStatus, SWT.NONE);
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		status.setLayoutData(gridData);
+
+		progress = new ProgressBar(bottomStatus, SWT.HORIZONTAL);
+
+		status.setText(Messages.getString("sqlqueryview.done")); //$NON-NLS-1$
+		statusImage.setImage(QuantumPlugin.getImage("success.gif")); //$NON-NLS-1$
+		progress.setMinimum(0);
+        
+        IKeyBindingService keyBindingService = getSite().getKeyBindingService();
+        // TODO: check the version numbers for this method
+        keyBindingService.setScopes(new String[] {
+            "org.eclipse.ui.globalScope",
+            "com.quantum.view.sql"
+        });
+        keyBindingService.registerAction(this.executeAction);
+	}
+
+	/**
+	 * Sets the state of the "Commit", "Rollback" and "autoCommit" buttons
+	 * to reflect the situation in the connection
+	 */
+	protected void updateAutoCommitState(Bookmark bookmark, Connection con) {
+		boolean autoCommit = true;
+		// Calculate the state of the autoCommit option
+		if (con != null)
+		{
+			// If we have a connection, the autoCommit state is that of the connection
+			try {
+				autoCommit = con.getAutoCommit();
+			} catch (SQLException e) {
+				// Doesn't matter, we take default
+			}
+		} else {
+			// if no connection, we try the autoCommit of the bookmark, or else the default
+			if (bookmark != null) autoCommit = bookmark.isAutoCommit();
+		}
+		// Set the autoCommit state of the bookmark to the calculated
+		if (bookmark != null) bookmark.setAutoCommit(autoCommit);
+		// Set the state of the buttons to the correct autoCommit state
+		autoCommitItem.setSelection(autoCommit);
+		if (autoCommitItem.getSelection()) {
+			commitItem.setEnabled(false);
+			rollbackItem.setEnabled(false);
+		} else {
+			commitItem.setEnabled(true);
+			rollbackItem.setEnabled(true);
+		}
+	}
+	public void setProgress(int increment, int max) {
+		progress.setMaximum(max);
+		progress.setSelection(increment);
+	}
+	
+	private void initActions() {
+		executeAction = new ExecuteAction();
+		executeAction.init(this);
+		importQueryAction = new ImportQueryAction();
+		importQueryAction.init(this);
+		exportQueryAction = new ExportQueryAction();
+		exportQueryAction.init(this);
+	}
+
+	public void setStatus(String text) {
+		statusImage.setImage(null);
+		status.setText(text);
+	}
+
+	public void setStatus(Image img, String text) {
+		statusImage.setImage(img);
+		status.setText(text);
+	}
+	
+	public String getQuery() {
+		return widget.getText();
+	}
+	
+	public void setQuery(String text) {
+		widget.setText(text);
+	}
+	
+	private String[] keywords = {
+	"ADD", "ALL", "ALTER", "AND", "ANY",
+	"AS", "ASC", "AUTOINCREMENT", "AVA", "BETWEEN",
+	"BINARY", "BIT", "BOOLEAN", "BY", "CREATE",
+	"BYTE", "CHAR", "CHARACTER", "COLUMN", "CONSTRAINT",
+	"COUNT", "COUNTER", "CURRENCY", "DATABASE", "DATE",
+	"DATETIME", "DELETE", "DESC", "DISALLOW", "DISTINCT",
+	"DISTINCTROW", "DOUBLE", "DROP", "EXISTS", "FROM",
+	"FLOAT", "FLOAT4", "FLOAT8", "FOREIGN", "GENERAL",
+	"GROUP", "GUID", "HAVING", "INNER", "INSERT",
+	"IGNORE", "IMP", "IN", "INDEX", "INT", 
+	"INTEGER", "INTEGER1", "INTEGER2", "INTEGER4", "INTO",
+	"IS", "JOIN", "KEY", "LEFT", "LEVEL", 
+	"LIKE", "LOGICAL", "LONG", "LONGBINARY", "LONGTEXT",
+	"MAX", "MEMO", "MIN", "MOD", "MONEY", 
+	"NOT", "NULL", "NUMBER", "NUMERIC", "OLEOBJECT",
+	"ON", "PIVOT", "OPTION", "PRIMARY", "ORDER",
+	"OUTER", "OWNERACCESS", "PARAMETERS", "PERCENT", "REAL",
+	"REFERENCES", "RIGHT", "SELECT", "SET", "SHORT",
+	"SINGLE", "SMALLINT", "SOME", "STDEV", "STDEVP",
+	"STRING", "SUM", "TABLE", "TABLEID", "TEXT", 
+	"TIME",	"TIMESTAMP", "TOP", "TRANSFORM", "UNION",
+	"UNIQUE", "UPDATE", "VALUE", "VALUES", "VAR",
+	"VARBINARY", "VARCHAR", "VARP", "WHERE", "WITH",
+	"YESNO" };
+	
+	SyntaxHighlighter textUpdater = new SyntaxHighlighter();
+	
+	private class UpdateRequest {
+		public UpdateRequest(String text, int start, int length) {
+			this.text = text;
+			this.start = start;
+			this.length = length;
+		}
+		public String text;
+		public int start;
+		public int length;
+	}
+	
+	private class SyntaxHighlighter extends Thread {
+		private boolean running = true;
+		private LinkedList requests = new LinkedList();
+		public SyntaxHighlighter() {
+			super();
+			setPriority(Thread.MIN_PRIORITY);
+			start();
+		}
+		public synchronized void updateText(String text, int start, int length) {
+			requests.add(new UpdateRequest(text, start, length));
+			notify();
+		}
+		public synchronized void shutdown() {
+			running = false;
+			interrupt();
+		}
+		public void run() {
+			while (running) {
+				try {
+					synchronized (this) {
+						if (requests.size() <= 0) {
+							wait();
+						} else {
+							Thread.sleep(10);
+						}
+					}
+					UpdateRequest request = (UpdateRequest) requests.removeFirst();
+					String text = request.text.toUpperCase();
+					//int dirtyStart = request.start;
+					//int dirtyEnd = request.start + request.length;
+					StyleRange styleRange;
+					long startTime = System.currentTimeMillis();
+					Vector tokens = SQLLexx.parse(text);
+					long subTime = System.currentTimeMillis();
+					Vector styles = new Vector();
+					int min = Integer.MAX_VALUE;
+					int max = 0;
+					for (int i = 0; i < tokens.size(); i++) {
+						Token t = (Token) tokens.elementAt(i);
+						String value = t.getValue();
+						int start = t.getStart();
+						int length = t.getEnd() - t.getStart();
+						styleRange = new StyleRange();
+						styleRange.start = start;
+						styleRange.length = value.length();
+						styleRange.fontStyle = SWT.NULL;
+						styleRange.foreground = DEFAULT;
+						//boolean upper = start <= dirtyEnd && start >= dirtyStart;
+						//boolean lower = ((start + length) >= dirtyStart && (start + length) <= dirtyEnd);
+						//boolean both = (start <= dirtyStart && (start + length) >= dirtyEnd);
+						//if (upper || lower || both) {
+						if (true) { // Let's update the whole text, as some comment changes can alter everything
+							min = Math.min(start, min);
+							max = Math.max(max, start + length);
+							if (t.getType() == Token.IDENTIFIER) {
+								boolean keyword = false;
+								for (int index = 0; index < keywords.length; index++) {
+									if (value.equals(keywords[index])) {
+										keyword = true;
+									}
+								}
+								if (keyword) {
+									styleRange.fontStyle = SWT.BOLD;
+									styleRange.foreground = KEYWORD;
+								} else {
+									styleRange.foreground = DEFAULT;
+								}
+								styles.addElement(styleRange);
+							} else if (t.getType() == Token.COMMENT) {
+								styleRange.foreground = COMMENT;
+								styles.addElement(styleRange);
+							} else if (t.getType() == Token.LITERAL) {
+								styleRange.foreground = STRING_LITERAL;
+								styles.addElement(styleRange);
+							} else if (t.getType() == Token.NUMERIC) {
+								styleRange.foreground = NUMERIC;
+								styles.addElement(styleRange);
+							} else {
+								styles.addElement(styleRange);
+							}
+						}
+					}
+					StyleRange[] ranges = new StyleRange[styles.size()];
+					for (int k = 0; k < ranges.length; k++) {
+						ranges[k] = (StyleRange) styles.elementAt(k);
+					}
+					if (max >= 0 && ranges.length > 0) {
+						setStyles(ranges, min, max - min);
+					}
+					long endTime = System.currentTimeMillis();
+					parseTime = subTime - startTime;
+					fullTime = endTime - startTime;
+				} catch (NoSuchElementException e) {
+					// ignore a missing request
+				} catch (InterruptedException e) {
+					// ignore any interruptions
+				}
+			}
+		}
+	}
+	public void setStyles(final StyleRange[] styles, final int start, final int length) {
+		getViewSite().getShell().getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				try {
+					for (int i = 0; i < styles.length; i++) {
+						widget.setStyleRange(styles[i]);
+					}
+				} catch (Throwable t) {
+					System.out.println("Error with styles: " + t.getClass().toString()); //$NON-NLS-1$
+					// ignore any errors
+				}
+			}
+		});
+	}
+	
+	ExtendedModifyListener modifyListener = new ExtendedModifyListener() {
+		public void modifyText(ExtendedModifyEvent event) {
+			textUpdater.updateText(getQuery(), event.start, event.length);
+		}
+	};
+		
+	private Action cutAction = new Action() {
+		public void run() {
+			widget.cut();
+		}
+	};
+	private Action copyAction = new Action() {
+		public void run() {
+			widget.copy();
+		}
+	};
+	private Action pasteAction = new Action() {
+		public void run() {
+			widget.paste();
+		}
+	};
+	private Action selectAllAction = new Action() {
+		public void run() {
+			widget.selectAll();
+		}
+	};
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/ViewHelper.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/ViewHelper.java
new file mode 100644
index 0000000..e460e44
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/ViewHelper.java
@@ -0,0 +1,101 @@
+/*
+ * Created on 22-jul-2003
+ *
+ */
+package com.quantum.view;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.sql.MultiSQLServer;
+import com.quantum.sql.SQLResults;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+
+/**
+ * @author panic
+ *
+ */
+public class ViewHelper {
+
+	public static SQLResults tryGetResults(IViewPart view, Connection con, String query) {
+		return tryGetResults(view.getSite().getShell(), con, query);
+	}
+
+	public static SQLResults tryGetResults(Shell shell, Connection con, String query) {
+		SQLResults results = null; 	
+		MultiSQLServer server = MultiSQLServer.getInstance();
+		try {
+			results = server.execute(con, query);
+		} catch (SQLException e) {
+			LogProxy log = LogProxy.getInstance();
+			log.addText(LogProxy.ERROR, e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+			results = new SQLResults();
+			results.setIsError(true);
+			MessageDialog.openConfirm(shell, "Database returned error", e.getLocalizedMessage());  //$NON-NLS-1$ 							
+		}
+		return results;
+	}
+	
+	public static FileOutputStream askSaveFile(String key, Shell shell) {
+		return askSaveFile(key, shell, null, null);
+	}
+	/**
+	 * Asks the user for a file to be saved. Uses a key to get the preferences and save the path.
+	 * The preferences should be defined in the Messages file.
+	 * @param key
+	 * @param shell
+	 * @param filterExt
+	 * @param filterNames
+	 * @return - An already opened FileOutputStream, or NULL if nothing selected, dialog canceled or some error.
+	 */
+	public static FileOutputStream askSaveFile(String key, Shell shell, String[] filterExt, String[] filterNames) {
+	
+		FileDialog dialog = new FileDialog(shell, SWT.SAVE);
+		
+		if (filterExt == null) {
+			dialog.setFilterExtensions(new String[]{Messages.getString("filedialog."+key+".filter"),
+													Messages.getString("filedialog.allfiles.filter")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			dialog.setFilterNames(new String[]{	Messages.getString("filedialog."+key+".name"),
+												Messages.getString("filedialog.allfiles.name")}); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			dialog.setFilterExtensions(filterExt);
+			dialog.setFilterNames(filterNames);
+		}	
+		
+		dialog.setFilterPath(QuantumPlugin.getDefault().getPreferenceStore().getString("quantum.dialogs."+ key + ".path"));
+		String filename = dialog.open();
+		if (filename == null) return null;
+		// We save the used path
+		QuantumPlugin.getDefault().getPreferenceStore().setValue("quantum.dialogs."+ key + ".path", filename);
+		
+		FileOutputStream out = null;
+		File target = new File(filename);
+		if (target.exists() && Messages.getString("filedialog.options.ConfirmOverwrite").equals("y")) {
+			boolean confirmOverwrite = 
+				MessageDialog.openConfirm(shell, Messages.getString("filedialog.message.ConfirmOverwriteTitle"), //$NON-NLS-1$
+					Messages.getString("filedialog.message.ConfirmOverwriteMessage") + target.getName() + //$NON-NLS-1$ 
+					Messages.getString("filedialog.message.ConfirmOverwriteQuestion"));  //$NON-NLS-1$
+			if (!confirmOverwrite) return null; 
+		} 
+
+		try {
+			out = new FileOutputStream(target);
+		} catch (FileNotFoundException e) {
+			MessageDialog.openConfirm(shell, Messages.getString("filedialog.message.CannotOpenFileTitle"), //$NON-NLS-1$
+						Messages.getString("filedialog.message.CannotOpenFileMessage") + filename+ //$NON-NLS-1$ 
+						Messages.getString("filedialog.message.CannotOpenFileExplain"));  //$NON-NLS-1$ 
+
+		}
+		return out;		
+	}	
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaAction.java
new file mode 100644
index 0000000..9713922
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaAction.java
@@ -0,0 +1,58 @@
+package com.quantum.view.bookmark;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.NotConnectedException;
+import com.quantum.sql.SQLHelper;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+
+final class AddSchemaAction extends SelectionListenerAction {
+    private final IViewPart view;
+    /**
+     * @param BookmarkView
+     */
+    public AddSchemaAction(IViewPart view) {
+        super(Messages.getString("BookmarkView.SetExtraSchemas")); //$NON-NLS-1$
+        setImageDescriptor(
+            QuantumPlugin.getImageDescriptor("add_schema.gif")); //$NON-NLS-1$
+        this.view = view;
+    }
+    
+    public void run() {
+        Bookmark bookmark = getBookmark();
+        if (bookmark != null) {
+            try {
+    			Vector schemas = SQLHelper.getSchemas(bookmark.getConnection());
+    			AddSchemaDialog dialog = new AddSchemaDialog(this.view.getSite().getShell(), schemas);
+    			dialog.open();
+    			if (dialog.getSelectedSchemas() != null) {
+                    for (Iterator i = dialog.getSelectedSchemas().iterator(); i.hasNext();) {
+        				bookmark.addSchema((String) i.next());
+                    }
+    			}
+            } catch (NotConnectedException e) {
+            }
+        }
+    }
+    
+    protected Bookmark getBookmark() {
+        List list = getSelectedNonResources();
+        return (list.size() > 0) ? ((BookmarkNode) list.get(0)).getBookmark() : null;
+    }
+    
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection) &
+            selection.size() == 1 & 
+            (selection.getFirstElement() instanceof BookmarkNode);
+        return enabled & getBookmark().isConnected();
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaDialog.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaDialog.java
new file mode 100644
index 0000000..ce2819e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/AddSchemaDialog.java
@@ -0,0 +1,86 @@
+/*
+ * Created on 12-jul-2003
+ *
+ */
+package com.quantum.view.bookmark;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
+
+import com.quantum.IQuantumConstants;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.help.WorkbenchHelp;
+
+/**
+ * @author panic
+ *
+ */
+public class AddSchemaDialog extends Dialog {
+
+    protected Vector input;
+    protected List list;
+    private Vector selection;
+    /**
+     * Creates a new AddSchemaDialog.
+     */
+    public AddSchemaDialog(Shell parentShell, Vector input) {
+        super(parentShell);
+        this.input = input;
+        this.list = null;
+        selection = null;
+    }
+    /* (non-Javadoc)
+     * Method declared on Window.
+     */
+    protected void configureShell(Shell newShell) {
+        super.configureShell(newShell);
+        newShell.setText("Set Schemas");
+        WorkbenchHelp.setHelp(
+            newShell,
+            IQuantumConstants.ADD_SCHEMA_DIALOG_CONTEXT);
+    }
+    /* (non-Javadoc)
+     * Method declared on Dialog
+     */
+    protected Control createDialogArea(Composite parent) {
+        Composite composite = (Composite) super.createDialogArea(parent);
+
+        list = new List(composite, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI);
+        GridData data = new GridData(GridData.FILL_BOTH);
+        list.setLayoutData(data);
+        for (Iterator iter = input.iterator(); iter.hasNext();) {
+            String element = (String) iter.next();
+            list.add(element);
+        }
+        return composite;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+     */
+    protected void okPressed() {
+        // If it's OK, then the selection is not null. Null is used to signal a canceled dialog.
+        selection = new Vector();
+        if (list != null) {
+            String selecStr[] = list.getSelection();
+            for (int i = 0; i < selecStr.length; i++) {
+                String string = selecStr[i];
+                selection.add(string);
+            }
+        }
+        super.okPressed();
+    }
+
+    public Collection getSelectedSchemas() {
+        return this.selection == null ? null : new ArrayList(this.selection);
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkClipboard.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkClipboard.java
new file mode 100644
index 0000000..665e50b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkClipboard.java
@@ -0,0 +1,13 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.model.Bookmark;
+
+/**
+ * 
+ * TODO: There must be a better way to do this...
+ * @author BC
+ */
+public interface BookmarkClipboard {
+    public void setBookmark(Bookmark bookmark);
+    public Bookmark getBookmark();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkContentProvider.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkContentProvider.java
new file mode 100644
index 0000000..2335110
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkContentProvider.java
@@ -0,0 +1,40 @@
+package com.quantum.view.bookmark;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class BookmarkContentProvider implements ITreeContentProvider {
+    
+	public Object[] getChildren(Object element) {
+		if (element instanceof TreeNode) {
+			TreeNode node = (TreeNode) element;
+			return node.getChildren();
+		}
+		return BookmarkListNode.EMPTY_ARRAY;
+	}
+	public Object[] getElements(Object inputElement) {
+		return getChildren(inputElement);
+	}
+
+	public Object getParent(Object element) {
+		if (element instanceof TreeNode) {
+			TreeNode node = (TreeNode) element;
+			return node.getParent();
+		}
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		if (element instanceof TreeNode) {
+			TreeNode node = (TreeNode) element;
+			return node.hasChildren();
+		}
+		return false;
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	}
+	
+	public void dispose() {
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkLabelProvider.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkLabelProvider.java
new file mode 100644
index 0000000..71fec68
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkLabelProvider.java
@@ -0,0 +1,74 @@
+package com.quantum.view.bookmark;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author root
+ *
+ * Implements the ILabelProvider for the Bookmarks.
+ */
+public class BookmarkLabelProvider implements ILabelProvider {
+    
+    private LabelDecorationInstructions labelDecorationInstructions = new LabelDecorationInstructions();
+    
+	/**
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
+	 */
+	public Image getImage(Object element) {
+        if (element != null && element instanceof TreeNode) {
+            return ((TreeNode) element).getImage();
+        } else {
+            return null;
+        }
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
+	 */
+	public String getText(Object element) {
+		if (element != null && element instanceof TreeNode) {
+            String labelName = ((TreeNode) element).getLabelName();
+            String decorations = ((TreeNode) element).getLabelDecorations(
+                this.labelDecorationInstructions);
+            if (decorations != null && decorations.trim().length() > 0) {
+                labelName += " " + decorations;
+            }
+			return labelName;
+		} else {
+            return element == null ? "<<empty>>" : element.toString();
+        }
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(ILabelProviderListener)
+	 */
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 */
+	public void dispose() {
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(Object, String)
+	 */
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(ILabelProviderListener)
+	 */
+	public void removeListener(ILabelProviderListener listener) {
+    }
+    /**
+     * @return
+     */
+    public LabelDecorationInstructions getLabelDecorationInstructions() {
+        return labelDecorationInstructions;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkListNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkListNode.java
new file mode 100644
index 0000000..37adfc6
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkListNode.java
@@ -0,0 +1,120 @@
+package com.quantum.view.bookmark;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+
+
+/**
+ * @author root
+ */
+public final class BookmarkListNode extends TreeNode implements PropertyChangeListener {
+    final static BookmarkListNode instance = new BookmarkListNode();
+ 	final static TreeNode[] EMPTY_ARRAY = new TreeNode[0];
+    private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+    private boolean initialized = false;
+   
+    private BookmarkListNode() {
+        super(null);
+    }
+    
+    public static BookmarkListNode getInstance() {
+        return BookmarkListNode.instance;
+    }
+    
+	/**
+	 * @see com.quantum.view.bookmark.TreeNode#getChildren()
+	 */
+	public Object[] getChildren() {
+        if (!initialized) {
+            initializeChildren();
+            BookmarkCollection.getInstance().addPropertyChangeListener(this);
+        }
+        BookmarkNode[] nodes = (BookmarkNode[]) this.children.toArray(
+            new BookmarkNode[this.children.size()]);
+        Arrays.sort(nodes);
+        return nodes;
+	}
+
+	/**
+	 * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+	 */
+	public boolean hasChildren() {
+		return true;
+	}
+	
+	public String getName() {
+		return "ROOT"; //$NON-NLS-1$
+	}
+    protected String getImageName() {
+        return null;
+    }
+    /**
+     * @param listener
+     */
+    public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * @param listener
+     */
+    public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+        this.propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+    protected void firePropertyChange(PropertyChangeEvent event) {
+        this.propertyChangeSupport.firePropertyChange(event);
+    }
+
+    protected synchronized void initializeChildren() {
+        boolean changed = false;
+        Map temp = new Hashtable();
+        for (Iterator i = this.children.iterator(); i.hasNext();) {
+            BookmarkNode bookmark = (BookmarkNode) i.next();
+            temp.put(bookmark.getName(), bookmark);
+        }
+        
+        this.children.clear();
+        
+        Bookmark[] bookmarks = BookmarkCollection.getInstance().getBookmarks();
+        for (int i = 0, length = (bookmarks == null) ? 0 : bookmarks.length; i < length; i++) {
+            
+            BookmarkNode node = (BookmarkNode) temp.remove(bookmarks[i].getName());
+            if (node == null) {
+                this.children.add(new BookmarkNode(this, bookmarks[i]));
+                changed = true;
+            } else {
+                this.children.add(node);
+            }
+        }
+
+        for (Iterator i = temp.values().iterator(); i.hasNext(); ) {
+            ((TreeNode) i.next()).dispose();
+            changed = true;
+        }
+
+        Collections.sort(this.children);
+        this.initialized = true;
+        
+        if (changed) {
+            firePropertyChange("bookmarks", null, null);
+        }
+    }
+
+    /**
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("bookmarks".equals(event.getPropertyName())) {
+            initializeChildren();
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkNode.java
new file mode 100644
index 0000000..c74c555
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkNode.java
@@ -0,0 +1,167 @@
+package com.quantum.view.bookmark;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.NotConnectedException;
+import com.quantum.model.Schema;
+
+public class BookmarkNode extends TreeNode implements PropertyChangeListener {
+    private Bookmark bookmark;
+    
+    private QuickListNode quickListNode;
+    private QueryListNode queryListNode;
+
+    public BookmarkNode(TreeNode parent, Bookmark bookmark) {
+        super(parent);
+    	this.bookmark = bookmark;
+        this.bookmark.addPropertyChangeListener(this);
+    }
+
+	public Object[] getChildren() {
+		if (bookmark.isConnected() && this.children.isEmpty()) {
+            initializeChildren();
+		}
+        if (this.bookmark.isConnected()) {
+            return (TreeNode[]) this.children.toArray(new TreeNode[this.children.size()]);
+        } else {
+            return BookmarkListNode.EMPTY_ARRAY;
+        }
+	}
+
+    protected void initializeChildren() {
+        boolean changed = false;
+        Map temp = new HashMap();
+        for (Iterator i = this.children.iterator(); i.hasNext(); ) {
+            TreeNode node = (TreeNode) i.next();
+            if (node instanceof SchemaNode) {
+                temp.put(node.getName(), node);
+            }
+        }
+        
+        this.children.clear();
+        if (this.quickListNode == null) {
+            this.quickListNode = new QuickListNode(this);
+        }
+        if (this.queryListNode == null) {
+            this.queryListNode = new QueryListNode(this);
+        }
+        this.children.add(this.quickListNode);
+        this.children.add(this.queryListNode);
+        Bookmark bookmark = getBookmark();
+        
+        Schema[] schemas = bookmark.getSchemas();
+        for (int i = 0, length = (schemas == null) ? 0 : schemas.length;
+            i < length;
+            i++) {
+            SchemaNode node = (SchemaNode) temp.remove(schemas[i].getDisplayName());
+            if (node == null) {
+                this.children.add(new SchemaNode(this, schemas[i]));
+            } else {
+                changed = true;
+                this.children.add(node);
+            }
+        }
+        
+        for (Iterator i = temp.values().iterator(); i.hasNext(); ) {
+            ((TreeNode) i.next()).dispose();
+            changed = true;
+        }
+        
+        if (changed) {
+            firePropertyChange("children", null, null);
+        }
+    }
+
+	public boolean hasChildren() {
+		// If the bookmark is connected but hasn't loaded the tables and views, we suppose it may have some
+		if (bookmark.isConnected() && this.children.isEmpty()) {
+            return true;
+        } else if (!bookmark.isConnected()) {
+            return false;
+        } else if (children != null && children.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+
+	protected void dispose() {
+        try {
+            this.bookmark.removePropertyChangeListener(this);
+            if (this.bookmark.isConnected()) {
+                this.bookmark.disconnect();
+            }
+        } catch (ConnectionException e) {
+        }
+	}
+
+    /**
+     * @see com.quantum.model.TreeNode#getName()
+     */
+    public String getName() {
+        return this.bookmark == null ? "<<new>>" : this.bookmark.getName();
+    }
+
+    /**
+     * @return
+     */
+    public Bookmark getBookmark() {
+        return this.bookmark;
+    }
+
+    protected String getImageName() {
+        return this.bookmark.isConnected() ? "connected.gif" : "bookmarks.gif";
+    }
+
+    /* (non-Javadoc)
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("connected".equals(event.getPropertyName())) {
+            if (Boolean.FALSE.equals(event.getNewValue())) {
+                removeAllChildren();
+            }
+            firePropertyChange("connected", event.getOldValue(), event.getNewValue());
+        } else if ("schemas".equals(event.getPropertyName())) {
+            initializeChildren();
+            firePropertyChange("children", event.getOldValue(), event.getNewValue());
+        } else if ("name".equals(event.getPropertyName())) {
+            firePropertyChange("name", event.getOldValue(), event.getNewValue());
+        }
+    }
+
+    protected void removeAllChildren() {
+        if (this.quickListNode != null) {
+            this.quickListNode.dispose();
+            this.quickListNode = null;
+        }
+        if (this.queryListNode != null) {
+            this.queryListNode.dispose();
+            this.queryListNode = null;
+        }
+        super.removeAllChildren();
+        
+    }
+    public String getLabelDecorations(LabelDecorationInstructions labelDecorationInstructions) {
+        if (!labelDecorationInstructions.isDatabaseDataVisible()) {
+            return null;
+        } else if (!this.bookmark.isConnected()) {
+            return null;
+        } else {
+            try {
+                String decoration = this.bookmark.getDatabase().getInformation();
+                return decoration == null ? null : "[" + decoration + "]";
+            } catch (NotConnectedException e) {
+                return null;
+            } catch (SQLException e) {
+                return null;
+            }
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
new file mode 100644
index 0000000..efc055f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
@@ -0,0 +1,269 @@
+package com.quantum.view.bookmark;
+
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Vector;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.IOpenListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.OpenEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.actions.ActionContext;
+import org.eclipse.ui.part.ViewPart;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.actions.CustomCopyAction;
+import com.quantum.extensions.ExtensionAction;
+import com.quantum.extensions.ProcessServiceMembers;
+
+public class BookmarkView extends ViewPart implements PropertyChangeListener {
+	private CustomCopyAction customCopyAction1;
+	private CustomCopyAction customCopyAction2;
+	private CustomCopyAction customCopyAction3;
+	private Vector extensionVector;
+    
+    private BookmarkViewActionGroup actionGroup;
+
+	private TreeViewer treeViewer;
+    private BookmarkLabelProvider labelProvider = new BookmarkLabelProvider();
+    
+	/**
+	 * @return	-
+	 * 	The instance of the BookmarkView. There is no guarantee of it being a singleton
+	 * 	due to the workspace creating a new one (does the workspace call getInstance() ? ).
+	 * 	It seems to work.
+	 */
+	public synchronized static BookmarkView getInstance() {
+		return (BookmarkView) QuantumPlugin.getDefault().getView("com.quantum.view.bookmarkview");
+	}
+	/**
+	 * Returns the current selected object in the tree. If it's a multiple selection, return the first.
+	 * @return
+	 */
+	public Object getCurrent() {
+		if (treeViewer == null) return null;
+		return ((StructuredSelection) treeViewer.getSelection())
+					.getFirstElement();
+	}
+	/**
+	 * Returns the current selected objects in the tree, in the form of a StructuredSelection.
+	 * @return
+	 */
+	public StructuredSelection getSelection() {
+		if (treeViewer == null) return null;
+		return ((StructuredSelection) treeViewer.getSelection());
+	}
+	
+	/** 
+	 * Navigates the tree to get the current bookmark (root) of the selected element.
+	 * If it's a multiple selection, it takes the first one.
+	 * @return
+	 */
+	public BookmarkNode getCurrentBookmark() {
+		TreeNode current = (TreeNode) getCurrent();
+		return getRoot(current);
+	}
+
+	private static BookmarkNode getRoot(TreeNode node){
+		if (node == null) return null;
+		if (! (node instanceof TreeNode)) return null;
+		while (!( node instanceof BookmarkNode))
+		{
+			node = (TreeNode) node.getParent();
+		}
+		if (node instanceof BookmarkNode) return (BookmarkNode) node;
+		else return null;
+
+	}
+	public void refresh() {
+		treeViewer.refresh();
+	}
+	public void createPartControl(org.eclipse.swt.widgets.Composite parent) {
+
+		treeViewer = new TreeViewer(
+            parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+		treeViewer.setContentProvider(new BookmarkContentProvider());
+		treeViewer.setLabelProvider(this.labelProvider);
+        BookmarkListNode input = BookmarkListNode.getInstance();
+		treeViewer.setInput(input);
+        initActions();
+        
+        input.addPropertyChangeListener(this);
+        
+        initializePopUpMenu();
+        fillActionBars();
+        
+		treeViewer.addOpenListener(new IOpenListener() {
+			public void open(OpenEvent event) {
+                ActionContext context = new ActionContext(
+                    getSelection());
+                BookmarkView.this.actionGroup.setContext(context);
+                IAction action = actionGroup.getOpenAction();
+                if (action != null) {
+                    action.run();
+                }
+			}
+		});
+		
+	}
+    private void fillActionBars() {
+        Action enableTableSizes = new Action() {
+        	public void run() {
+        		labelProvider.getLabelDecorationInstructions().setSizeVisible(isChecked());
+                treeViewer.refresh();
+        	}
+        };
+        enableTableSizes.setText(Messages.getString("BookmarkView.ShowTableSizes")); //$NON-NLS-1$
+        enableTableSizes.setChecked(false);
+
+        IActionBars actionBars = getViewSite().getActionBars();
+        actionBars.getMenuManager().add(enableTableSizes);
+        
+        Action showDatabaseData = new Action() {
+            public void run() {
+                labelProvider.getLabelDecorationInstructions().setDatabaseDataVisible(isChecked());
+                treeViewer.refresh();
+            }
+        };
+        showDatabaseData.setText(Messages.getString("BookmarkView.ShowDatabaseData")); //$NON-NLS-1$
+        showDatabaseData.setChecked(false);
+        actionBars.getMenuManager().add(showDatabaseData);
+
+        this.actionGroup.fillActionBars(actionBars);
+    }
+    
+    private void initializePopUpMenu() {
+        MenuManager manager = new MenuManager();
+        manager.setRemoveAllWhenShown(true);
+        manager.addMenuListener(new IMenuListener() {
+            public void menuAboutToShow(IMenuManager mgr) {
+                fillContextMenu(mgr);
+            }
+        });
+        Menu fTextContextMenu =
+            manager.createContextMenu(treeViewer.getControl());
+        treeViewer.getControl().setMenu(fTextContextMenu);
+        // register the menu to the site so that we can allow 
+        // actions to be plugged in
+        getSite().registerContextMenu(manager, this.treeViewer);
+    }
+	public void initActions() {
+        
+        this.actionGroup = new BookmarkViewActionGroup(this, this.treeViewer);
+        
+//		openDataEditorAction = new OpenDataEditorAction();
+//		openDataEditorAction.setText("Edit Data"); 
+//		openDataEditorAction.setImageDescriptor(
+//			QuantumPlugin.getImageDescriptor("greentable.gif")); //$NON-NLS-1$
+//		openDataEditorAction.init(this);
+
+		IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
+		this.customCopyAction1 = new CustomCopyAction(this,1); // 1 is unused, just in case more custom copies are defined        
+		this.customCopyAction1.setText(store.getString("customCopyName1")); //$NON-NLS-1$
+		this.customCopyAction1.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+		this.customCopyAction2 = new CustomCopyAction(this,2); // 1 is unused, just in case more custom copies are defined        
+		this.customCopyAction2.setText(store.getString("customCopyName2")); //$NON-NLS-1$
+		this.customCopyAction2.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+		this.customCopyAction3 = new CustomCopyAction(this,3); // 1 is unused, just in case more custom copies are defined        
+		this.customCopyAction3.setText(store.getString("customCopyName3")); //$NON-NLS-1$
+		this.customCopyAction3.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+
+		extensionVector = new Vector();
+		try {
+			ProcessServiceMembers.process(this, extensionVector);
+		} catch (WorkbenchException e) {
+			e.printStackTrace();
+		}
+
+		}
+	
+	public void dispose(){
+		super.dispose();
+        BookmarkListNode.getInstance().removePropertyChangeListener(this);
+	}
+
+	public Shell getShell() {
+		return getSite().getShell();
+	}
+
+    /**
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("bookmarks".equals(event.getPropertyName())) {
+            refresh();
+        } else if ("name".equals(event.getPropertyName()) && 
+            event.getSource() instanceof BookmarkNode) {
+            refresh();
+        } else if ("connected".equals(event.getPropertyName())) {
+            treeViewer.refresh(event.getSource());
+            if (Boolean.TRUE.equals(event.getNewValue())) {
+                treeViewer.setExpandedState(event.getSource(), true);
+            }
+        } else {
+            treeViewer.refresh(event.getSource());
+        }
+    }
+    
+    private void fillContextMenu(IMenuManager mgr) {
+    // TODO: this method is pretty barfy... make it cleaner
+    
+        IStructuredSelection selection = getSelection();
+        ActionContext context = new ActionContext(selection);
+        this.actionGroup.setContext(context);
+        this.actionGroup.fillContextMenu(mgr);
+        
+        Object sel = getCurrent();
+        // If selection is a BookmarkNode
+        if (sel instanceof EntityNode) {
+            EntityNode entityNode = (EntityNode) sel;
+            if (!entityNode.isSequence()) {
+                mgr.add(new Separator());
+                MenuManager subMenu = new MenuManager(Messages.getString("bookmarkview.customCopyAction")); 
+                subMenu.add(customCopyAction1);
+                subMenu.add(customCopyAction2);
+                subMenu.add(customCopyAction3);
+                mgr.add(subMenu);
+
+				MenuManager subMenuExtension = new MenuManager("Extensions"); 
+				for (int i = 0; i < extensionVector.size(); i++) {
+					ExtensionAction extensionAction = (ExtensionAction) extensionVector.get(i);
+					subMenuExtension.add(extensionAction);
+				}
+				if (extensionVector.size() > 0) mgr.add(subMenuExtension);
+            }
+        } else if (sel instanceof ColumnNode) {
+            MenuManager subMenu = new MenuManager(Messages.getString("bookmarkview.customCopyAction")); 
+            subMenu.add(customCopyAction1);
+            subMenu.add(customCopyAction2);
+            subMenu.add(customCopyAction3);
+            mgr.add(subMenu);
+
+        }
+    }
+    /**
+     * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+     */
+    public void setFocus() {
+    }
+    
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkViewActionGroup.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkViewActionGroup.java
new file mode 100644
index 0000000..9293770
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkViewActionGroup.java
@@ -0,0 +1,266 @@
+package com.quantum.view.bookmark;
+
+import java.util.Iterator;
+
+import com.quantum.QuantumPlugin;
+import com.quantum.actions.AddToQuickListAction;
+import com.quantum.actions.ConnectAction;
+import com.quantum.actions.DeleteAllRowsAction;
+import com.quantum.actions.DeleteBookmarkAction;
+import com.quantum.actions.DisconnectAction;
+import com.quantum.actions.NewBookmarkAction;
+import com.quantum.actions.NextSequenceAction;
+import com.quantum.actions.OpenQueryAction;
+import com.quantum.actions.PrevSequenceAction;
+import com.quantum.actions.RefreshBookmarkAction;
+import com.quantum.actions.RemoveFromQuickListAction;
+import com.quantum.actions.ViewTableAction;
+import com.quantum.actions.ViewTableDetailsAction;
+import com.quantum.model.Bookmark;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.actions.ActionGroup;
+import org.eclipse.ui.actions.ExportResourcesAction;
+import org.eclipse.ui.actions.SelectionListenerAction;
+import org.eclipse.ui.actions.SelectionProviderAction;
+import org.eclipse.ui.dialogs.PropertyDialogAction;
+
+/**
+ * @author BC
+ */
+public class BookmarkViewActionGroup extends ActionGroup 
+    implements BookmarkClipboard {
+        
+    private Bookmark bookmarkClipboard;
+    
+    private Action newBookmarkAction;
+    
+    // bookmark node actions
+    private SelectionListenerAction connectAction;
+    private SelectionListenerAction disconnectAction;
+    private SelectionListenerAction deleteBookmarkAction;
+
+    // Query node actions
+    private SelectionListenerAction openQueryAction;
+
+    // Entity node actions
+    private SelectionListenerAction addToQuickListAction;
+    private SelectionListenerAction removeFromQuickListAction;
+    private SelectionListenerAction viewTableAction;
+    private SelectionListenerAction addSchemaAction;
+    private SelectionListenerAction viewTableDetailsAction;
+
+    private SelectionListenerAction nextSequenceAction;
+    private SelectionListenerAction previousSequenceAction;
+    
+    
+    // other actions
+    private SelectionListenerAction refreshAction;
+    private SelectionListenerAction renameAction;
+
+    private ExportResourcesAction exportAction;
+
+    
+    private SelectionProviderAction propertiesAction;
+    
+    private SelectionListenerAction copyAction;
+    private SelectionListenerAction pasteAction;
+    private SelectionListenerAction deleteAllRowsAction;
+    
+    private IViewPart viewPart;
+    
+    public BookmarkViewActionGroup(
+        IViewPart viewPart, ISelectionProvider selectionProvider) {
+        this.viewPart = viewPart;
+        
+        this.newBookmarkAction = new NewBookmarkAction(this.viewPart);
+        
+        // bookmark actions
+        this.connectAction = new ConnectAction(this.viewPart);
+        this.disconnectAction = new DisconnectAction(this.viewPart);
+        this.deleteBookmarkAction = new DeleteBookmarkAction(this.viewPart);
+
+        // entity actions
+        this.previousSequenceAction = new PrevSequenceAction(this.viewPart);
+        this.nextSequenceAction = new NextSequenceAction(this.viewPart);
+        this.addToQuickListAction = new AddToQuickListAction(this.viewPart);
+        this.removeFromQuickListAction = new RemoveFromQuickListAction(this.viewPart);
+        this.deleteAllRowsAction = new DeleteAllRowsAction(this.viewPart);
+        this.viewTableDetailsAction = new ViewTableDetailsAction(this.viewPart);
+
+        this.openQueryAction = new OpenQueryAction(this.viewPart);
+        
+        this.viewTableAction = new ViewTableAction(this.viewPart);
+        this.addSchemaAction = new AddSchemaAction(this.viewPart);
+        this.refreshAction = new RefreshBookmarkAction(this.viewPart);
+        this.renameAction = new RenameAction(this.viewPart);
+        this.copyAction = new CopyAction(this.viewPart, this, selectionProvider);
+        this.pasteAction = new PasteAction(this.viewPart, this, selectionProvider);
+        this.exportAction = new ExportResourcesAction(
+            this.viewPart.getViewSite().getWorkbenchWindow());
+        this.exportAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("export.gif"));
+        
+        this.propertiesAction = new PropertyDialogAction(
+            this.viewPart.getSite().getShell(), selectionProvider);
+    }
+
+    
+    /**
+     * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
+     */
+    public void fillContextMenu(IMenuManager menu) {
+        
+        menu.add(this.newBookmarkAction);
+        menu.add(new Separator());
+        
+        if (getStructuredSelection().size() > 0 && 
+            isEverySelectionInstanceof(BookmarkNode.class)) {
+                
+            addToMenu(menu, this.connectAction);
+            addToMenu(menu, this.disconnectAction);
+        }
+
+        menu.add(new Separator());
+        menu.add(this.copyAction);
+        // TODO: paste needs to change enablement whenever something is added
+        //       to the clipboard
+        addToMenu(menu, this.pasteAction);
+        addToMenu(menu, this.deleteBookmarkAction);
+
+        if (getStructuredSelection().size() == 1 && 
+            isEverySelectionInstanceof(BookmarkNode.class)) {
+
+            addToMenu(menu, this.renameAction);
+        }
+
+        menu.add(new Separator());
+
+        // NOTE: In Eclipse 3.0.0 M6, Export is no longer a sub-class of 
+        //       SelectionListenerAction.
+        this.exportAction.selectionChanged(getStructuredSelection());
+        menu.add(this.exportAction);
+
+        if (getStructuredSelection().size() == 1 && 
+            isEverySelectionInstanceof(BookmarkNode.class)) {
+                
+            menu.add(new Separator());
+            addToMenu(menu, this.addSchemaAction);
+        }
+
+        if (isEverySelectionInstanceof(QueryNode.class)) {
+            if (getStructuredSelection().size() == 1) {
+                addToMenu(menu, this.openQueryAction);
+            }
+        }
+
+        if (getStructuredSelection().size() > 0 && 
+            isEverySelectionInstanceof(EntityNode.class)) {
+                
+            menu.add(new Separator());
+                
+            if (getStructuredSelection().size() == 1) {
+                if (((EntityNode) getStructuredSelection().getFirstElement()).isSequence()) {
+                    addToMenu(menu, this.nextSequenceAction);
+                    addToMenu(menu, this.previousSequenceAction);
+                } else {
+                    addToMenu(menu, this.viewTableAction);
+                    addToMenu(menu, this.deleteAllRowsAction);
+                    addToMenu(menu, this.viewTableDetailsAction);
+                }
+            }
+            
+            addToMenu(menu, this.addToQuickListAction);
+            addToMenu(menu, this.removeFromQuickListAction);
+        }
+        
+        if (getStructuredSelection().size() == 1) {
+            menu.add(new Separator());
+            addToMenu(menu, this.refreshAction);
+        }
+        
+        createMarkerForActionsProvidedByOtherPlugins(menu);
+        
+        if (getStructuredSelection().size() == 1) {
+            addToMenu(menu, this.propertiesAction);
+        }
+        
+    }
+    
+    private void addToMenu(IMenuManager menu, SelectionListenerAction action) {
+        action.selectionChanged(getStructuredSelection());
+        menu.add(action);
+    }
+    
+    private void addToMenu(IMenuManager menu, SelectionProviderAction action) {
+        action.selectionChanged(getStructuredSelection());
+        menu.add(action);
+    }
+    
+    
+    private IStructuredSelection getStructuredSelection() {
+        return (IStructuredSelection) getContext().getSelection();
+    }
+    
+    private boolean isEverySelectionInstanceof(Class selectedClass) {
+        boolean result = true;
+        IStructuredSelection selection = getStructuredSelection();
+        for (Iterator i = selection.iterator(); result && i.hasNext(); ) {
+            Object object = i.next();
+            result &= selectedClass.isAssignableFrom(object.getClass());
+        }
+        
+        return result;
+    }
+    
+    public IAction getOpenAction() {
+        if (isEverySelectionInstanceof(BookmarkNode.class)) {
+            this.connectAction.selectionChanged(getStructuredSelection());
+            return this.connectAction.isEnabled() ? this.connectAction : null; 
+        } else if (isEverySelectionInstanceof(EntityNode.class)) {
+            this.viewTableAction.selectionChanged(getStructuredSelection());
+            return this.viewTableAction.isEnabled() ? this.viewTableAction : null; 
+        } else if (isEverySelectionInstanceof(QueryNode.class)) {
+            this.openQueryAction.selectionChanged(getStructuredSelection());
+            return this.openQueryAction.isEnabled() ? this.openQueryAction : null; 
+        } else {
+            return null;
+        }
+    }
+
+    private void createMarkerForActionsProvidedByOtherPlugins(IMenuManager mgr) {
+        mgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+        mgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS + "-end")); //$NON-NLS-1$
+        mgr.add(new Separator());
+    }
+    public void fillActionBars(IActionBars actionBars) {
+        IToolBarManager toolBar = actionBars.getToolBarManager();
+        toolBar.add(this.newBookmarkAction);
+        
+        actionBars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, this.copyAction);
+    }
+
+
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.BookmarkClipboard#setBookmark(com.quantum.model.Bookmark)
+     */
+    public void setBookmark(Bookmark bookmark) {
+        this.bookmarkClipboard = bookmark;
+    }
+
+
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.BookmarkClipboard#getBookmark()
+     */
+    public Bookmark getBookmark() {
+        return this.bookmarkClipboard;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/ColumnNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/ColumnNode.java
new file mode 100644
index 0000000..2894c03
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/ColumnNode.java
@@ -0,0 +1,64 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.model.Column;
+
+/**
+ * @author BC
+ */
+public class ColumnNode extends TreeNode {
+    
+    private Column column;
+    
+    public ColumnNode(TreeNode parent, Column column) {
+        super(parent);
+        this.column = column;
+    }
+
+    public Object[] getChildren() {
+        return BookmarkListNode.EMPTY_ARRAY;
+    }
+
+    public boolean hasChildren() {
+        return false;
+    }
+
+    public String getName() {
+        return this.column.getName();
+    }
+
+    protected String getImageName() {
+        return this.column.isPrimaryKey() ? "keycolumn.gif" : "column.gif";
+    }
+
+    public String getLabelName() {
+        String label = getName() + " : " + this.column.getTypeName(); //$NON-NLS-1$
+        if (this.column.isNumeric()) {
+            if (this.column.getSize() > 0 || this.column.getNumberOfFractionalDigits() > 0) {
+                label += "(" + Integer.toString(this.column.getSize()); //$NON-NLS-1$
+                if (this.column.getNumberOfFractionalDigits() > 0) {
+                    label += "," + Integer.toString(this.column.getNumberOfFractionalDigits()); //$NON-NLS-1$
+                }
+                label += ")"; //$NON-NLS-1$
+            }
+        } else if (this.column.getSize() > 0) {
+            label += "(" + Integer.toString(this.column.getSize()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        }
+        return label;
+    }
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#initializeChildren()
+     */
+    protected void initializeChildren() {
+    }
+    protected boolean isInitialized() {
+        return true;
+    }
+
+    /**
+     * @return
+     */
+    public Column getColumn() {
+        return column;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/CopyAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/CopyAction.java
new file mode 100644
index 0000000..5978426
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/CopyAction.java
@@ -0,0 +1,109 @@
+/*
+ * Created on 11/08/2003
+ *
+ */
+package com.quantum.view.bookmark;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.xml.ModelToXMLConverter;
+import com.quantum.util.QuantumUtil;
+import com.quantum.util.xml.XMLHelper;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+
+final class CopyAction extends SelectionListenerAction {
+	private IViewPart view;
+    private BookmarkClipboard bookmarkClipboard;
+    
+	/**
+	 * @param BookmarkView
+	 */
+	public CopyAction(IViewPart view, BookmarkClipboard bookmarkClipboard, 
+        ISelectionProvider selectionProvider) {
+        super(Messages.getString(CopyAction.class.getName() + ".text"));
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("copy.gif"));
+		this.view = view;
+        this.bookmarkClipboard = bookmarkClipboard;
+        selectionProvider.addSelectionChangedListener(this);
+	}
+	public void run() {
+        
+        List list = getSelectedNonResources();
+        Object selection = list.get(0);
+        
+		if (selection instanceof BookmarkNode) {
+            Bookmark bookmark = ((BookmarkNode) selection).getBookmark();
+			this.bookmarkClipboard.setBookmark(bookmark);
+			QuantumPlugin.getDefault().getSysClip().setContents(
+				new Object[] { bookmark.getName()},
+				new Transfer[] { TextTransfer.getInstance()});
+			
+		} else if (selection instanceof EntityNode) {
+            try {
+    			Document doc = XMLHelper.createEmptyDocument();
+                Element root = doc.createElement("metadata");
+                doc.appendChild(root);
+    			ModelToXMLConverter.getInstance().convert(root, ((EntityNode) selection).getEntity());
+    			StringWriter text = new StringWriter();
+    			try {
+                    XMLHelper.createDOMSerializer(text).serialize(doc);
+    			} catch (IOException e) {
+    				e.printStackTrace();
+    			}
+    			String textXml = new String(text.getBuffer());
+                QuantumPlugin.getDefault().getSysClip().setContents(
+    				new Object[] { textXml },
+    				new Transfer[] { TextTransfer.getInstance()});
+            } catch (ParserConfigurationException e) {
+                e.printStackTrace();
+            }
+		} else if (selection instanceof ColumnNode) {
+			String copyText = ""; //$NON-NLS-1$
+			Iterator iter = list.iterator();
+			IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
+	
+			while (iter.hasNext()) {
+				Object current = iter.next();
+				if (current instanceof ColumnNode) {
+					ColumnNode column = (ColumnNode) current;
+					if (column != null) {
+						copyText += column.getName();
+						if (iter.hasNext()) copyText += QuantumUtil.trasposeEscape(store.getString("copyColumnSeparator")); //$NON-NLS-1$
+					}
+				}
+			}
+			
+            QuantumPlugin.getDefault().getSysClip().setContents(
+				new Object[] { copyText },
+				new Transfer[] { TextTransfer.getInstance()});				
+		}
+		
+	}
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        
+        return enabled; 
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/EntityNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/EntityNode.java
new file mode 100644
index 0000000..6d5adbe
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/EntityNode.java
@@ -0,0 +1,128 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.model.Column;
+import com.quantum.model.Entity;
+import com.quantum.model.EntityHolder;
+import com.quantum.model.SchemaHolder;
+import com.quantum.model.Table;
+import com.quantum.model.View;
+
+/**
+ * @author BC
+ */
+public class EntityNode extends TreeNode implements EntityHolder {
+
+    private Entity entity;
+    private boolean longFormName;
+    
+    public EntityNode(TreeNode parent, Entity entity) {
+        this(parent, entity, false);
+    }
+    public EntityNode(TreeNode parent, Entity entity, boolean longFormName) {
+        super(parent);
+        this.entity = entity;
+        this.longFormName = longFormName;
+        
+        if (parent instanceof SchemaHolder) {
+            SchemaHolder schemaHolder = (SchemaHolder) parent;
+            if (!schemaHolder.getSchema().getDisplayName().equals(entity.getSchema())) {
+                this.longFormName = true;
+            }
+        }
+    }
+
+    public Object[] getChildren() {
+        initializeChildren();
+        if (this.children.size() > 0) {
+            return (ColumnNode[]) this.children.toArray(new ColumnNode[this.children.size()]);
+        } else {
+            return BookmarkListNode.EMPTY_ARRAY;
+        }
+    }
+
+    protected synchronized void initializeChildren() {
+        this.children.clear();
+        Column[] columns = this.entity.getColumns();
+        for (int i = 0, length = (columns == null) ? 0 : columns.length;
+            i < length;
+            i++) {
+            this.children.add(new ColumnNode(this, columns[i]));
+        }
+        // TODO: fire property change event
+    }
+
+    public boolean hasChildren() {
+        if (!isSequence()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    
+    public Entity getEntity() {
+        return this.entity;
+    }
+    
+    public String getName() {
+        return this.entity.getName();
+    }
+    
+    public String getLabelName() {
+        return (this.longFormName) ? this.entity.getCondQualifiedName() : this.entity.getName();
+    }
+    
+    public boolean isTable() {
+        return Entity.TABLE_TYPE.equals(this.entity.getType());
+    }
+
+    public boolean isView() {
+        return Entity.VIEW_TYPE.equals(this.entity.getType());
+    }
+
+    public boolean isSequence() {
+        return Entity.SEQUENCE_TYPE.equals(this.entity.getType());
+    }
+
+    protected String getImageName() {
+        if (isSequence()) {
+            return "sequence.gif";
+        } else if (isView()) {
+            return "view.gif";
+        } else {
+            return (this.entity.exists() == null || this.entity.exists().booleanValue()) 
+                ? "bigtable.gif" : "missingtable.gif";
+        }
+    }
+
+    public String getLabelDecorations(LabelDecorationInstructions instructions) {
+        String decoration = null;
+        if (instructions.isSizeVisible()) {
+            Integer size = getSize();
+            if (size != null) {
+                decoration = ((decoration == null) ? "" : decoration) 
+                    + "[" + size + "]";
+            }
+        }
+        return decoration;
+    }
+    
+    private Integer getSize() {
+        if (isTable()) {
+            return ((Table) this.entity).getSize();
+        } else if (isView()) {
+            return ((View) this.entity).getSize();
+        } else {
+            return null;
+        }
+    }
+    
+    public int compareTo(Object o) {
+        if (o instanceof EntityNode) {
+            EntityNode that = (EntityNode) o;
+            return this.entity.getCondQualifiedName().compareTo(
+                that.entity.getCondQualifiedName());
+        } else {
+            return super.compareTo(o);
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/GroupNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/GroupNode.java
new file mode 100644
index 0000000..1064faa
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/GroupNode.java
@@ -0,0 +1,92 @@
+/*
+ * Created on 27/06/2003
+ *
+ */
+package com.quantum.view.bookmark;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+import com.quantum.model.Schema;
+import com.quantum.model.SchemaHolder;
+
+/**
+ * GroupNode represents a level of grouping in the BookmarkView hierarchy
+ * It will have categories like "TABLE", "VIEW" and so on, usually gotten from
+ * the JDBC driver.
+ * 
+ * @author panic
+ */
+public class GroupNode extends TreeNode implements Comparable, SchemaHolder {
+	private String type = null;
+    private Schema schema = null;
+
+	public GroupNode(TreeNode parent, Schema schema, String type) {
+        super(parent);
+        this.schema = schema;
+		this.type = type;
+	}
+	public boolean hasChildren() {
+		if (!isInitialized()) {
+			return true;
+		} else {
+            return !this.children.isEmpty();
+		}
+	}
+	public Object[] getChildren() {
+        if (!isInitialized() && getBookmark().isConnected()) {
+            initializeChildren();
+        }
+		return (TreeNode[]) this.children.toArray(new TreeNode[this.children.size()]);
+	}
+    protected void initializeChildren() {
+        try {
+            boolean firstTimeInitialization = !isInitialized();
+            boolean changed = false;
+            Map temp = new HashMap();
+            for (Iterator i = this.children.iterator(); i.hasNext();) {
+                TreeNode treeNode = (TreeNode) i.next();
+                temp.put(treeNode.getName(), treeNode);
+            }
+            this.children.clear();
+            
+            Bookmark bookmark = getBookmark();
+            Entity[] entities = bookmark.getEntitiesForSchema(schema, type);
+            for (int i = 0,
+                length = (entities == null) ? 0 : entities.length;
+                i < length;
+                i++) {
+                
+                String name = entities[i].getName();
+                EntityNode entityNode = (EntityNode) temp.remove(name);
+                if (entityNode == null) {
+                    this.children.add(new EntityNode(this, entities[i]));
+                    changed = true;
+                } else {
+                    this.children.add(entityNode);
+                }
+            }
+            if (changed && !firstTimeInitialization) {
+                firePropertyChange("children", null, null);
+            }
+        } catch (SQLException e) {
+        }
+    }
+	public String getName() {
+		return Messages.getString(getClass().getName() + "." + this.type);
+	}
+	protected String getImageName() {
+		return "entitygroup.gif"; //$NON-NLS-1$
+	}
+    /**
+     * @return
+     */
+    public Schema getSchema() {
+        return schema;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/LabelDecorationInstructions.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/LabelDecorationInstructions.java
new file mode 100644
index 0000000..c82df4b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/LabelDecorationInstructions.java
@@ -0,0 +1,39 @@
+package com.quantum.view.bookmark;
+
+/**
+ * <p>Label decorations are specified for the entire view<p>.
+ * 
+ * @author BC
+ */
+public class LabelDecorationInstructions {
+    private boolean sizeVisible = false;
+    private boolean databaseDataVisible = false;
+    /**
+     * @return
+     */
+    public boolean isSizeVisible() {
+        return sizeVisible;
+    }
+
+    /**
+     * @param b
+     */
+    public void setSizeVisible(boolean b) {
+        sizeVisible = b;
+    }
+
+    /**
+     * @return
+     */
+    public boolean isDatabaseDataVisible() {
+        return databaseDataVisible;
+    }
+
+    /**
+     * @param b
+     */
+    public void setDatabaseDataVisible(boolean b) {
+        databaseDataVisible = b;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/PasteAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/PasteAction.java
new file mode 100644
index 0000000..a7bf476
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/PasteAction.java
@@ -0,0 +1,46 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+
+final class PasteAction extends SelectionListenerAction {
+    private IViewPart view;
+    private BookmarkClipboard bookmarkClipboard;
+    /**
+     * @param BookmarkView
+     */
+    public PasteAction(IViewPart view, BookmarkClipboard bookmarkClipboard, 
+        ISelectionProvider selectionProvider) {
+        super(Messages.getString(PasteAction.class.getName() + ".text"));
+        setImageDescriptor(QuantumPlugin.getImageDescriptor("paste.gif"));
+        this.view = view;
+        selectionProvider.addSelectionChangedListener(this);
+        this.bookmarkClipboard = bookmarkClipboard;
+    }
+    public void run() {
+		if (this.bookmarkClipboard.getBookmark() != null) {
+			Bookmark bookmark = new Bookmark(this.bookmarkClipboard.getBookmark());
+			String copyName = BookmarkCollection.getInstance().getCopyName(bookmark.getName());
+			bookmark.setName(copyName); //$NON-NLS-1$
+			BookmarkCollection.getInstance().addBookmark(bookmark);
+		}
+	}
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        enabled &= this.bookmarkClipboard.getBookmark() != null;
+        return enabled;
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryListNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryListNode.java
new file mode 100644
index 0000000..eb8b173
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryListNode.java
@@ -0,0 +1,76 @@
+package com.quantum.view.bookmark;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import com.quantum.Messages;
+
+/**
+ * @author BC
+ */
+public class QueryListNode extends TreeNode implements PropertyChangeListener {
+
+    /**
+     * @param parent
+     */
+    public QueryListNode(TreeNode parent) {
+        super(parent);
+        getBookmark().addPropertyChangeListener(this);
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getChildren()
+     */
+    public Object[] getChildren() {
+        initializeChildren();
+        return (TreeNode[]) this.children.toArray(new TreeNode[this.children.size()]);
+    }
+
+    protected void initializeChildren() {
+        this.children.clear();
+        String[] queries = getBookmark().getQueries();
+        for (int i = 0, length = (queries == null) ? 0 : queries.length;
+            i < length;
+            i++) {
+            this.children.add(new QueryNode(this, queries[i]));
+        }
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+     */
+    public boolean hasChildren() {
+        return getBookmark().getQueries().length > 0;
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getName()
+     */
+    public String getName() {
+        return Messages.getString(getClass().getName() + ".labelName");
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getImageName()
+     */
+    protected String getImageName() {
+        return "group.gif";
+    }
+
+    /**
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("queries".equals(event.getPropertyName())) {
+            firePropertyChange("queries", null, null);
+        }
+    }
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#dispose()
+     */
+    protected void dispose() {
+        getBookmark().removePropertyChangeListener(this);
+        super.dispose();
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryNode.java
new file mode 100644
index 0000000..4826003
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QueryNode.java
@@ -0,0 +1,64 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.sql.metadata.ObjectMetaData;
+
+public class QueryNode extends TreeNode {
+    
+    private String query;
+    private static final int MAX_SIZE = 30;
+	
+	public QueryNode(TreeNode parent, String query) {
+        super(parent);
+		this.query = query;
+	}
+
+	public ObjectMetaData getMetaData() {
+		 return null;	//no metadata implementation for now
+	 }
+
+	public String getQuery() {
+		return this.query;
+	}
+
+    public String getName() {
+        String name = this.query.trim();
+        boolean trimmed = false;
+        name = name.replace('\n', ' ');
+        
+        if (name.length() > MAX_SIZE) {
+            name = name.substring(0, MAX_SIZE);
+            trimmed = true;
+        }
+        if (trimmed) {
+            name += "...->"; //$NON-NLS-1$
+        }
+		return name;
+	}
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getChildren()
+     */
+    public Object[] getChildren() {
+        return BookmarkListNode.EMPTY_ARRAY;
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+     */
+    public boolean hasChildren() {
+        return false;
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getImageName()
+     */
+    protected String getImageName() {
+        return "script.gif";
+    }
+
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#initializeChildren()
+     */
+    protected void initializeChildren() {
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QuickListNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QuickListNode.java
new file mode 100644
index 0000000..9e74ef5
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/QuickListNode.java
@@ -0,0 +1,98 @@
+package com.quantum.view.bookmark;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+
+/**
+ * <p>A "quick list" is a set of favourite entities that a user may want 
+ * to work with without having to sift through the (somtimes lengthy) longer
+ * list of tables.</p>
+ * 
+ * @author bcholmes
+ */
+public class QuickListNode extends TreeNode implements PropertyChangeListener {
+    
+    private Map children = new Hashtable();
+
+    /**
+     * @param parent
+     */
+    public QuickListNode(BookmarkNode parent) {
+        super(parent);
+        
+        Bookmark bookmark = getBookmark();
+        bookmark.addPropertyChangeListener(this);
+    }
+    
+    /**
+     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        if ("quickList".equals(event.getPropertyName())) {
+            initializeChildren();
+            firePropertyChange("quickList", null, null);
+        }
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+     */
+    public boolean hasChildren() {
+        return getBookmark().hasQuickList();
+    }
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getImageName()
+     */
+    protected String getImageName() {
+        return "group.gif";
+    }
+    
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getChildren()
+     */
+    public Object[] getChildren() {
+        Bookmark bookmark = getBookmark();
+        if (children.isEmpty() && bookmark.hasQuickList()) {
+            initializeChildren();
+        }
+        List list = new ArrayList(this.children.values());
+        Collections.sort(list);
+        
+        return (TreeNode[]) list.toArray(new TreeNode[list.size()]);
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getName()
+     */
+    public String getName() {
+        return Messages.getString(QuickListNode.class.getName() + ".labelName");
+    }
+    
+    protected synchronized void initializeChildren() {
+        this.children.clear();
+        Entity[] entities = getBookmark().getQuickListEntries();
+        for (int i = 0, length = (entities == null) ? 0 : entities.length;
+            i < length;
+            i++) {
+                
+            this.children.put(entities[i].getCondQualifiedName(), 
+                new EntityNode(this, entities[i], true));
+        }
+    }
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#isInitialized()
+     */
+    protected boolean isInitialized() {
+        return true;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/RenameAction.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/RenameAction.java
new file mode 100644
index 0000000..175c68a
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/RenameAction.java
@@ -0,0 +1,52 @@
+package com.quantum.view.bookmark;
+
+import com.quantum.Messages;
+import com.quantum.model.Bookmark;
+
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+/**
+ * @author BC
+ */
+public class RenameAction extends SelectionListenerAction {
+
+    private IViewPart viewPart;
+
+    /**
+     * @param text
+     */
+    protected RenameAction(IViewPart viewPart) {
+        super(Messages.getString(RenameAction.class.getName() + ".text"));
+        this.viewPart = viewPart;
+    }
+    
+    
+
+    /**
+     * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    protected boolean updateSelection(IStructuredSelection selection) {
+        boolean enabled = super.updateSelection(selection);
+        return enabled & selection.size() == 1 & 
+            selection.getFirstElement() instanceof BookmarkNode;
+    }
+    
+    private Bookmark getBookmark() {
+        return ((BookmarkNode) getSelectedNonResources().get(0)).getBookmark();
+    }
+
+    /**
+     * @see org.eclipse.jface.action.IAction#run()
+     */
+    public void run() {
+        InputDialog dialog = new InputDialog(this.viewPart.getSite().getShell(), "Select a new name",
+            "Name: ", getBookmark().getName(), null);
+        int result = dialog.open();
+        if (result == InputDialog.OK) {
+            getBookmark().setName(dialog.getValue());
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/SchemaNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/SchemaNode.java
new file mode 100644
index 0000000..6b44cda
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/SchemaNode.java
@@ -0,0 +1,81 @@
+package com.quantum.view.bookmark;
+
+import java.sql.SQLException;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.NotConnectedException;
+import com.quantum.model.Schema;
+import com.quantum.model.SchemaHolder;
+
+/**
+ * @author BC
+ */
+public class SchemaNode extends TreeNode implements SchemaHolder {
+
+    private Schema schema;
+    /**
+     * @param parent
+     */
+    public SchemaNode(TreeNode parent, Schema schema) {
+        super(parent);
+        this.schema = schema;
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getChildren()
+     */
+    public Object[] getChildren() {
+        Bookmark bookmark = getBookmark();
+        if (!bookmark.isConnected()) {
+            return BookmarkListNode.EMPTY_ARRAY;
+        } else {
+            if (this.children.isEmpty()) {
+                initializeChildren();
+            }
+        }
+        return (TreeNode[]) this.children.toArray(new TreeNode[this.children.size()]);
+    }
+
+    protected void initializeChildren() {
+        this.children.clear();
+        Bookmark bookmark = getBookmark();
+        try {
+            String[] types = bookmark.getDatabase().getEntityTypes();
+            for (int i = 0, length = (types == null) ? 0 : types.length;
+                i < length;
+                i++) {
+                this.children.add(new GroupNode(this, this.schema, types[i]));
+            }
+        } catch (NotConnectedException e) {
+        } catch (SQLException e) {
+        }
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+     */
+    public boolean hasChildren() {
+        return getBookmark().isConnected();
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getName()
+     */
+    public String getName() {
+        return this.schema.getDisplayName();
+    }
+
+    /**
+     * @see com.quantum.view.bookmark.TreeNode#getImageName()
+     */
+    protected String getImageName() {
+        return this.schema.isDefault() ? "user.gif" : "schema.gif";
+    }
+
+    /**
+     * @see com.quantum.model.SchemaHolder#getSchema()
+     */
+    public Schema getSchema() {
+        return this.schema;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
new file mode 100644
index 0000000..1d18d38
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
@@ -0,0 +1,124 @@
+package com.quantum.view.bookmark;
+
+import java.beans.PropertyChangeEvent;
+import java.util.Iterator;
+import java.util.Vector;
+
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkHolder;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Base class for all nodes of the internal tree of data. Basically allows navigation.
+ * @author root
+ */
+public abstract class TreeNode 
+    implements BookmarkHolder, Comparable, IAdaptable {
+    
+    private TreeNode parent = null;
+    protected Vector children = new Vector();
+    private boolean disposed = false;
+
+    public TreeNode(TreeNode parent) {
+        this.parent = parent;
+    }
+    
+	public abstract Object[] getChildren();
+	public TreeNode getParent() {
+        return this.parent;
+	}
+	public abstract boolean hasChildren();
+	public abstract String getName();
+
+    public Bookmark getBookmark() {
+        return getParent().getBookmark();
+    }
+    
+    public String getLabelName() {
+        return getName();
+    }
+
+    /**
+	 * @return an Image object to appear in the view, null if not found
+	 */
+    public Image getImage() {
+    	return QuantumPlugin.getImage(getImageName());
+    }
+
+    /**
+     * @return
+     */
+    protected abstract String getImageName();
+    
+    
+    /**
+     * @see java.lang.Comparable#compareTo(java.lang.Object)
+     */
+    public int compareTo(Object object) {
+        TreeNode that = (TreeNode) object;
+        return this.getLabelName().compareTo(that.getLabelName());
+    }
+    
+    public String toString() {
+        return getLabelName();
+    }
+    
+    public String getLabelDecorations(LabelDecorationInstructions labelDecorationInstructions) {
+        return null;
+    }
+    /**
+     * @param propertyName
+     * @param oldValue
+     * @param newValue
+     */
+    protected void firePropertyChange(
+        String propertyName,
+        Object oldValue,
+        Object newValue) {
+            
+        firePropertyChange(new PropertyChangeEvent(this, propertyName, oldValue, newValue));
+    }
+
+    /**
+     * @param propertyName
+     * @param oldValue
+     * @param newValue
+     */
+    protected void firePropertyChange(PropertyChangeEvent event) {
+        TreeNode parent = getParent();
+        if (parent != null && !this.disposed) {
+            parent.firePropertyChange(event);
+        }
+    }
+    
+    protected void dispose() {
+        this.disposed = true;
+        removeAllChildren();
+    }
+    protected void removeAllChildren() {
+        for (Iterator i = this.children.iterator(); i.hasNext();) {
+            TreeNode element = (TreeNode) i.next();
+            element.dispose();
+        }
+    }
+    
+    protected boolean isInitialized() {
+        return !this.children.isEmpty();
+    }
+    
+    public Object getAdapter(Class adapter) {
+        return null;
+    }
+    protected abstract void initializeChildren();
+    public void reload() {
+        if (isInitialized()) {
+            initializeChildren();
+            for (Iterator i = this.children.iterator(); i.hasNext(); ) {
+                ((TreeNode) i.next()).reload();
+            }
+        }
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/EntitySubset.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/EntitySubset.java
new file mode 100644
index 0000000..0b70c9d
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/EntitySubset.java
@@ -0,0 +1,86 @@
+package com.quantum.view.subset;
+
+import java.sql.SQLException;
+
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.model.Column;
+import com.quantum.model.Entity;
+import com.quantum.model.Index;
+import com.quantum.model.Schema;
+
+/**
+ * @author BC
+ */
+public class EntitySubset implements Entity {
+    
+    private String name;
+    private String schema;
+    private String bookmarkName;
+    
+    public EntitySubset(String name, String schema, String bookmarkName) {
+        this.name = name;
+        this.schema = schema;
+        this.bookmarkName = bookmarkName;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public String getType() {
+        return null;
+    }
+
+    public Column[] getColumns() {
+        // TODO: limit the columns
+        Entity relatedEntity = getEntityFromBookmark();
+        if (relatedEntity != null) {
+            Column[] columns = relatedEntity.getColumns();
+            return columns;
+        } else {
+            return null;
+        }
+    }
+
+    public Index[] getIndexes() {
+        return new Index[0];
+    }
+
+    public Column getColumn(String columnName) {
+        Entity relatedEntity = getEntityFromBookmark();
+        return relatedEntity == null 
+            ? null : relatedEntity.getColumn(columnName);
+    }
+
+    public String getCondQualifiedName() {
+        return this.schema + "." + this.name;
+    }
+
+    public Boolean exists() {
+        return null;
+    }
+
+    public Bookmark getBookmark() {
+        return BookmarkCollection.getInstance().find(this.bookmarkName);
+    }
+    
+    private Entity getEntityFromBookmark() {
+        try {
+            return getBookmark().getEntity(
+                new Schema(schema), name);
+        } catch (SQLException e) {
+            return null;
+        }
+    }
+    /**
+     * @see com.quantum.model.Entity#getQuotedTableName()
+     */
+    public String getQuotedTableName() {
+        return getBookmark().getAdapter().filterTableName(getCondQualifiedName());
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
new file mode 100644
index 0000000..149135f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
@@ -0,0 +1,167 @@
+package com.quantum.view.subset;
+
+import com.quantum.IQuantumConstants;
+import com.quantum.Messages;
+import com.quantum.model.Entity;
+import com.quantum.model.EntityHolder;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+import com.quantum.sql.metadata.ObjectMetaData;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Defines a node for the Subset. It contains an editable ObjectMetaData 
+ * where you can erase columns you are not interested in. 
+ * @author jparrai
+ *
+ */
+public class ObjectNode implements Comparable, EntityHolder {
+	private SubsetNode parent = null;
+	private ObjectMetaData metadata = null;
+	private int order = 0;
+    private Entity entity;
+	
+	public ObjectNode(SubsetNode parent, ObjectMetaData metadata, String bookmark, String name, String schema) {
+		this.parent = parent;
+		this.metadata = metadata;
+        this.entity = new EntitySubset(name, schema, bookmark);
+	}
+	
+	public ObjectNode(){
+	}
+	public String getType(){
+		return IQuantumConstants.View;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.quantum.view.bookmark.TreeNode#getChildren()
+	 * We consider the columns of the metadata to be the children.
+	 */
+	public Object[] getChildren() {
+//		if (metadata != null && ColumnMetaData.getColumnsMetaDataNode(metadata, this) != null) {
+//			return ColumnMetaData.getColumnsMetaDataNode(metadata, this).toArray();
+//		} else {
+			return SubsetRoot.EMPTY_ARRAY;
+//		}
+	}
+
+	public Object getParent() {
+		return parent;
+	}
+
+	public boolean hasChildren() {
+//		if (metadata == null) return false;
+//		return (ColumnMetaData.getColumnsMetaDataNode(metadata, this) != null && 
+//				ColumnMetaData.getColumnsMetaDataNode(metadata, this).size() > 0);
+        return false;
+	}
+	
+	public String getName() {
+		return this.entity.getName();
+	}
+	
+	public String toString() {
+		return getName();
+	}
+
+	public int compareTo(Object o) {
+		if (o instanceof ObjectNode) {
+			ObjectNode node = (ObjectNode) o;
+			if (node.getOrder() > getOrder()) return -1;
+			if (node.getOrder() < getOrder()) return 1;
+			// If the order is the same, we use alphabetical order 
+			return getEntity().getCondQualifiedName().compareTo(
+                node.getEntity().getCondQualifiedName());
+		} else throw new ClassCastException();
+	}
+	
+	public void setObjectMetadata(ObjectMetaData metadata) {
+		this.metadata = metadata;
+	}
+	/**
+	 * @return
+	 */
+	public ObjectMetaData getMetaData() {
+		return metadata;
+	}
+
+	/**
+	 * @return The order of this ObjectNode inside the SubsetNode
+	 */
+	public int getOrder() {
+		return order;
+	}
+	/**
+	 * Sets an ordering (inside the SubsetNode) to the ObjectNode
+	 * @param i
+	 */
+	public void setOrder(int i) {
+		order = i;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof ObjectNode)) return false;
+		return (getEntity().getCondQualifiedName().equals(
+            ((ObjectNode) obj).getEntity().getCondQualifiedName()));
+	}
+	
+	/**
+	 * Imports one ObjectNode from an XMLDocument. There must be a tag for the Table Name, another for the Bookmark
+	 * name and other for the metadata. The complement function is exportXML()
+	 * @param root Document to get the data from
+	 * @param parent The SubsetNode to which to add the new ObjectNode
+	 * @return The newly created ObjectNode, or null if some error.
+	 */
+	public static ObjectNode importXML(Element root, SubsetNode parent){
+		// Get the name tag value into objName
+		String objName = MetaDataXMLInterface.getElementText(root, Messages.getString("ExportXMLAction.TableName")); //$NON-NLS-1$
+		String objSchema = MetaDataXMLInterface.getElementText(root, Messages.getString("ExportXMLAction.SchemaName")); //$NON-NLS-1$
+		if (objName == "") return null;	 //$NON-NLS-1$
+		// Get the bookmark tag value into objName
+		String bookmarkName = MetaDataXMLInterface.getElementText(root, Messages.getString("ExportXMLAction.BookmarkName")); //$NON-NLS-1$
+		if (bookmarkName == "") return null; //$NON-NLS-1$
+		ObjectMetaData metadata = new ObjectMetaData();
+		// The rest of the tags go to be the metadata
+		MetaDataXMLInterface.xmlToMetaData(metadata, root);
+		// We can finally create the new ObjectNode with the collected data
+		ObjectNode objectNode = new ObjectNode(parent, metadata, bookmarkName, objName, objSchema);
+		return objectNode;					
+	}
+	
+	/**
+	 * Exports an ObjectNode to an XMLDocument. The complement function is importXML()
+	 * @param root	Document to write the XML tags to
+	 */
+	public void exportXML(Element root){
+		Document doc = root.getOwnerDocument();
+		Element sub = (Element) root.appendChild(doc.createElement(Messages.getString("ExportXMLAction.Table"))); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(sub,Messages.getString("ExportXMLAction.TableName"), getEntity().getName()); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(sub,Messages.getString("ExportXMLAction.SchemaName"), getEntity().getSchema()); //$NON-NLS-1$
+		MetaDataXMLInterface.createElementText(sub,Messages.getString("ExportXMLAction.BookmarkName"), getEntity().getBookmark().getName()); //$NON-NLS-1$
+		if (this.metadata != null)
+			MetaDataXMLInterface.metaDataToXML(this.metadata, doc, sub);
+	}
+
+	/**
+	 * Generates a query with all the columns in the metadata of the ObjectNode.
+	 * "SELECT *" would not be valid because you can have less columns in the ObjectNode than in the table or view.
+	 * @return	String with the Query
+	 */
+	public String getQuery() {
+		String result = new String(""); //$NON-NLS-1$
+		result = "SELECT " + metadata.getColumnsString() + " FROM " + getEntity().getCondQualifiedName(); //$NON-NLS-1$ //$NON-NLS-2$
+		return result;
+	}
+
+    /**
+     * @see com.quantum.model.EntityHolder#getEntity()
+     */
+    public Entity getEntity() {
+        return this.entity;
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetContentProvider.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetContentProvider.java
new file mode 100644
index 0000000..dd8133b
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetContentProvider.java
@@ -0,0 +1,158 @@
+package com.quantum.view.subset;
+
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+import com.quantum.view.bookmark.ColumnNode;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+public class SubsetContentProvider implements ITreeContentProvider {
+	private Vector subsets = new Vector();
+	private static SubsetContentProvider instance = null;
+	private boolean hasChanged = false;
+
+   /**
+    * Singleton accessor
+    */
+	public static synchronized SubsetContentProvider getInstance() {
+		if (instance == null) {
+			instance = new SubsetContentProvider();
+		}
+		return instance;
+	}
+
+	private SubsetContentProvider() {
+	}
+
+	public void exportXML(Element root) {
+		System.out.println("Subsets: Saving to Element"); //$NON-NLS-1$
+		Element subsetRoot = MetaDataXMLInterface.createElementText(root,Messages.getString("ExportXMLAction.Subsets"), ""); //$NON-NLS-1$ //$NON-NLS-2$
+		for (int i = 0; i < subsets.size(); i++) {
+			SubsetNode current = (SubsetNode) subsets.get(i);
+			current.exportXML(subsetRoot);
+		}
+	}
+	
+	/**
+	 * Imports the data from an XML file to the tree. Does not set the tree to
+	 * changed because it's usually invoked from the initial import routine.
+	 * @param root
+	 */
+	public void importXML(Element root){
+		System.out.println("Bookmarks: Loading from Element"); //$NON-NLS-1$
+		Vector newSubsets = new Vector();
+		NodeList nodes = root.getElementsByTagName(Messages.getString("ExportXMLAction.Subset")); //$NON-NLS-1$
+		for (int i = 0; i < nodes.getLength(); i++) {
+			SubsetNode subset = new SubsetNode();
+			Element node = (Element) nodes.item(i);
+			subset.importXML(node,true);
+			newSubsets.add(subset);
+		}
+		subsets = newSubsets;
+	}
+	
+
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement.equals(SubsetRoot.ROOT)) {
+			return subsets.toArray();
+		} else if (parentElement instanceof TreeNode) {
+			TreeNode node = (TreeNode) parentElement;
+			return node.getChildren();
+		}
+		return SubsetRoot.EMPTY_ARRAY;
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return getChildren(inputElement);
+	}
+
+	public Object getParent(Object element) {
+		if (element.equals(SubsetRoot.ROOT)) {
+			return null;
+		} else if (element instanceof TreeNode) {
+			TreeNode node = (TreeNode) element;
+			return node.getParent();
+		}
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		if (element.equals(SubsetRoot.ROOT)) {
+			return true;
+		} else if (element instanceof TreeNode) {
+			TreeNode node = (TreeNode) element;
+			return node.hasChildren();
+		}
+		return false;
+	}
+
+    public void setChildren(SubsetNode b, Vector tables) {
+    	b.setChildren(tables);
+    }
+
+	public void addSubset(SubsetNode b) {
+		hasChanged = true;
+		if (!subsets.contains(b)) {
+			subsets.addElement(b);
+		}
+	}
+	public void removeSubset(SubsetNode b) {
+		hasChanged = true;
+		if (subsets.contains(b)) {
+			subsets.removeElement(b);
+		}
+	}
+	
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	}
+	
+	public void dispose() {
+	}
+	
+	public boolean hasChanged() {
+		return hasChanged;
+	}
+	
+	public int getSize() {
+		return subsets.size();
+	}
+	
+	/**
+	 * @param b
+	 */
+	public void setHasChanged(boolean b) {
+		hasChanged = b;
+	}
+
+	/**
+	 * @param column
+	 */
+	public void deleteColumn(ColumnNode column) {
+        // TODO: reinstate this
+//		TreeNode node = (TreeNode) column.getParent();
+//		if (!(node instanceof HasMetaData)) return;
+//		ObjectMetaData metadata = ((HasMetaData)node).getMetaData();
+//		if (metadata == null) return;
+//		metadata.dropColumn(column.getName());
+//		setHasChanged(true);
+//		
+	}
+
+	/**
+	 * @param object
+	 */
+	public void deleteObject(ObjectNode object) {
+		SubsetNode node = (SubsetNode) object.getParent();
+		if (!(node instanceof SubsetNode)) return;
+		node.remove(object);
+		setHasChanged(true);
+		
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetLabelProvider.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetLabelProvider.java
new file mode 100644
index 0000000..2f64f53
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetLabelProvider.java
@@ -0,0 +1,61 @@
+package com.quantum.view.subset;
+
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author root
+ *
+ * Implements the ILabelProvider for the Bookmarks.
+ */
+public class SubsetLabelProvider implements ILabelProvider {
+	/**
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
+	 */
+	public Image getImage(Object element) {
+	    if (element instanceof TreeNode) {
+            return ((TreeNode) element).getImage();
+		} else {
+    	   	return null;
+        }
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
+	 */
+	public String getText(Object element) {
+		if (element instanceof TreeNode) {
+			return ((TreeNode) element).getLabelName();
+		} else {
+            return element.toString();
+        }
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(ILabelProviderListener)
+	 */
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 */
+	public void dispose() {
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(Object, String)
+	 */
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(ILabelProviderListener)
+	 */
+	public void removeListener(ILabelProviderListener listener) {
+     }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetNode.java
new file mode 100644
index 0000000..8f6c5cf
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetNode.java
@@ -0,0 +1,162 @@
+package com.quantum.view.subset;
+
+import java.util.Collections;
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.sql.metadata.MetaDataXMLInterface;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+public class SubsetNode extends TreeNode {
+	private String name = null;
+    private Vector children = new Vector();
+
+	public SubsetNode(SubsetNode param) {
+        super(param.getParent());
+		name = param.name;		
+		children.addAll(param.children);
+	}
+	
+    public SubsetNode() {
+        super(SubsetRoot.ROOT);
+    }
+
+    public SubsetNode(String name) {
+        super(SubsetRoot.ROOT);
+    	this.name = name;
+    }
+    
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+    public String getName(){
+    	return name;
+    }
+
+	public Object[] getChildren() {
+		return children.toArray();
+	}
+
+	public boolean hasChildren() {
+		if (children != null && children.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public void setChildren(Vector children) {
+		for (int i = 0; i <  children.size(); i++) {
+			Object obj = children.elementAt(i);
+			isValid(obj);
+		}
+		Collections.sort(children);
+		this.children = children;
+	}
+	
+	public void isValid(Object child) {
+		boolean valid = false;
+		if (child instanceof ObjectNode ) {
+			valid = true;
+		}
+		if (!valid) {
+			throw new RuntimeException("Invalid SubsetNode child: " + child.getClass().getName()); //$NON-NLS-1$
+		}
+	}
+	
+	
+	/**
+	 * Finds a child of the SubsetNode with the said name 
+	 * @param name
+	 * @return the TreeNode found. null if none
+	 */
+	public TreeNode find(String name){
+		for (int i = 0; i <  children.size(); i++) {
+			Object obj = children.elementAt(i);
+			if (obj instanceof TreeNode){
+				TreeNode node = (TreeNode) obj;
+				if (name.equals(node.getName())) return node;			
+			}
+		}
+		return null;
+	}
+	
+	public boolean add(ObjectNode object){
+		if (children.indexOf(object) >= 0) return false;
+		children.add(object);
+		return true;
+	}
+
+	public boolean addReplace(ObjectNode object){
+		children.remove(object);
+		return add(object);
+	}
+	
+	public boolean remove(ObjectNode object){
+		return children.remove(object);
+	}
+	
+	public void exportXML(Element root) {
+		Element sub = MetaDataXMLInterface.createElementText(root,Messages.getString("ExportXMLAction.Subset"), ""); //$NON-NLS-1$ //$NON-NLS-2$
+		MetaDataXMLInterface.createElementText(sub,Messages.getString("ExportXMLAction.SubsetName"), getName()); //$NON-NLS-1$
+		for (int i = 0; i <  children.size(); i++) {
+			Object obj = children.elementAt(i);
+			if (obj instanceof ObjectNode){
+				((ObjectNode) obj).exportXML(sub);	
+			}
+		}
+		
+	}
+
+	/**
+	 * Imports a set of XML tags (parsed into a XMLDocument) into a Subset
+	 * @param root	Document to get the data from
+	 * @param replace	True if you want to replace already-existing elements with the same name, false if not
+	 */
+	public void importXML(Element root, boolean replace) {
+		if (replace) {
+			String name = MetaDataXMLInterface.getElementText(root, Messages.getString("ExportXMLAction.SubsetName")); //$NON-NLS-1$
+			if (name == "") return;	 //$NON-NLS-1$
+			setName(name);
+		}
+		importElementXML(root, replace, Messages.getString("ExportXMLAction.Table")); //$NON-NLS-1$
+		importElementXML(root, replace, Messages.getString("ExportXMLAction.View")); //$NON-NLS-1$
+
+	}
+
+
+	/**
+	 * 
+	 * Imports one type of element from a XMLDocument (possibly a part of one) into a Subset
+	 * @param root Document to get the data from
+	 * @param replace True if you want to replace already-existing elements with the same name, false if not
+	 * @param type The type of element to import, has to correspond with the XML tag
+	 */
+	private void importElementXML(Element root, boolean replace, String type) {
+		// We get all the tags named as the type
+		NodeList tables = root.getElementsByTagName(type); 
+		for (int i = 0; i < tables.getLength(); i++) {
+			Element table = (Element) tables.item(i);
+			ObjectNode objectNode = ObjectNode.importXML(table, this);
+			if (replace)addReplace(objectNode);
+			else add(objectNode);	
+		}
+	}
+
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#getImageName()
+     */
+    protected String getImageName() {
+        return "subset.gif";
+    }
+
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#initializeChildren()
+     */
+    protected void initializeChildren() {
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetRoot.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetRoot.java
new file mode 100644
index 0000000..3e893f6
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetRoot.java
@@ -0,0 +1,41 @@
+package com.quantum.view.subset;
+
+import com.quantum.view.bookmark.TreeNode;
+
+
+/**
+ * @author root
+ */
+public final class SubsetRoot extends TreeNode {
+    public final static SubsetRoot ROOT = new SubsetRoot();
+ 	public final static TreeNode[] EMPTY_ARRAY = new TreeNode[0];
+   
+    private SubsetRoot() {
+        super(null);
+    }
+	/**
+	 * @see com.quantum.view.bookmark.TreeNode#getChildren()
+	 */
+	public Object[] getChildren() {
+		return EMPTY_ARRAY;
+	}
+
+	/**
+	 * @see com.quantum.view.bookmark.TreeNode#hasChildren()
+	 */
+	public boolean hasChildren() {
+		return true;
+	}
+	
+	public String getName() {
+		return "ROOT"; //$NON-NLS-1$
+	}
+    protected String getImageName() {
+        return null;
+    }
+    /* (non-Javadoc)
+     * @see com.quantum.view.bookmark.TreeNode#initializeChildren()
+     */
+    protected void initializeChildren() {
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetView.java
new file mode 100644
index 0000000..448ff51
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/SubsetView.java
@@ -0,0 +1,354 @@
+package com.quantum.view.subset;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.actions.CustomCopyAction;
+import com.quantum.actions.DeleteColumnAction;
+import com.quantum.actions.DeleteObjectAction;
+import com.quantum.actions.DeleteSubsetAction;
+import com.quantum.actions.ExportXMLAction;
+import com.quantum.actions.NewSubsetAction;
+import com.quantum.actions.ViewTableAction;
+import com.quantum.view.bookmark.ColumnNode;
+import com.quantum.view.bookmark.TreeNode;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.part.ViewPart;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * @author panic
+ *
+ * View for subsets
+ * */
+public class SubsetView extends ViewPart {
+	
+	private SubsetContentProvider provider = SubsetContentProvider.getInstance();
+	private NewSubsetAction newSubsetAction;
+	private DeleteSubsetAction deleteSubsetAction;
+	private DeleteObjectAction deleteObjectAction;
+	private DeleteColumnAction deleteColumnAction;
+	private CustomCopyAction customCopyAction;
+
+	private ViewTableAction viewTableAction;
+	private ExportXMLAction exportXMLAction;
+	private static SubsetView instance = null;
+	private TreeViewer treeViewer;
+	private Label status;
+	public synchronized static SubsetView getInstance() {
+		return instance;
+	}
+	/**
+	 * Returns the current selected object in the tree. If it's a multiple selection, return the first.
+	 * @return
+	 */
+	public Object getCurrent() {
+		if (treeViewer == null) return null;
+		return ((StructuredSelection) treeViewer.getSelection())
+					.getFirstElement();
+	}
+	/**
+	 * Returns the current selected objects in the tree, in the form of a StructuredSelection.
+	 * @return
+	 */
+	public StructuredSelection getSelection() {
+		if (treeViewer == null) return null;
+		return ((StructuredSelection) treeViewer.getSelection());
+	}
+	
+	/** 
+	 * Navigates the tree to get the current subset (root) of the selected element.
+	 * If it's a multiple selection, it takes the first one.
+	 * @return
+	 */
+	public SubsetNode getCurrentSubset() {
+		TreeNode current = (TreeNode) getCurrent();
+		
+		return getRoot(current);
+	}
+
+	/**
+	 * Navigates a given TreeNode till finds a SubsetNode
+	 * @param node
+	 * @return
+	 */
+	private static SubsetNode getRoot(TreeNode node){
+		while (!( node instanceof SubsetNode))
+		{
+			node = (TreeNode) node.getParent();
+		}
+		return (SubsetNode) node;
+
+	}
+
+ 
+	/**
+	 * Deletes the current node (first selected) in the tree
+	 */
+	public void deleteCurrent() {
+		provider.removeSubset(getCurrentSubset());
+		treeViewer.refresh();
+	}
+	
+	public void refreshSubsetData(){
+		//if (treeViewer == null) return;
+		//SubsetContentProvider provider = (SubsetContentProvider) treeViewer.getContentProvider();
+		//Object[] objects = provider.getElements(Root.ROOT);
+		//for (int i = 0; i < objects.length; i++) {
+			//SubsetNode current = (SubsetNode) objects[i];
+			
+		//}
+	}
+	
+	public void expandCurrent(SubsetNode node) {
+		treeViewer.setExpandedState(node, true);
+		treeViewer.refresh(node, false);
+	}
+	public void refresh() {
+		treeViewer.refresh();
+	}
+	public void disconnect() {
+	}
+	
+	public void createPartControl(org.eclipse.swt.widgets.Composite parent) {
+		instance = this;
+		initActions();
+		Composite main = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout(1, false);
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
+		main.setLayout(layout);
+
+	
+		treeViewer = new TreeViewer(main);
+		treeViewer.setContentProvider(provider);
+		treeViewer.setLabelProvider(new SubsetLabelProvider());
+		treeViewer.setInput(SubsetRoot.ROOT);
+		MenuManager manager = new MenuManager();
+		manager.setRemoveAllWhenShown(true);
+		Menu fTextContextMenu =
+			manager.createContextMenu(treeViewer.getControl());
+		treeViewer.getControl().setMenu(fTextContextMenu);
+		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+			public void doubleClick(DoubleClickEvent event) {
+				Object sel = getCurrent();
+				if (sel instanceof ObjectNode) {
+					viewTableAction.run();
+				}
+			}
+		});
+
+		manager.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager mgr) {
+				Object sel = getCurrent();
+				if (sel instanceof SubsetNode) {
+					mgr.add(deleteSubsetAction);
+					deleteSubsetAction.setText(Messages.getString("SubsetView.Delete")); //$NON-NLS-1$
+					deleteSubsetAction.setImageDescriptor(
+						QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+					mgr.add(pasteAction);
+					pasteAction.setText(Messages.getString("SubsetView.Paste")); //$NON-NLS-1$
+					pasteAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("paste.gif")); //$NON-NLS-1$
+					mgr.add(exportXMLAction);
+					exportXMLAction.setText(Messages.getString("bookmarkview.exportXML")); //$NON-NLS-1$
+					exportXMLAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("xml.gif")); //$NON-NLS-1$
+                
+				} else 	if (sel instanceof ObjectNode) {
+					mgr.add(deleteObjectAction);
+					deleteObjectAction.setText(Messages.getString("SubsetView.Delete")); //$NON-NLS-1$
+					deleteObjectAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+					mgr.add(viewTableAction);
+					viewTableAction.setText(Messages.getString("bookmarkview.viewTable")); //$NON-NLS-1$
+					viewTableAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("table.gif")); //$NON-NLS-1$
+					mgr.add(exportXMLAction);
+					exportXMLAction.setText(Messages.getString("bookmarkview.exportXML")); //$NON-NLS-1$
+					exportXMLAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("xml.gif")); //$NON-NLS-1$
+                    customCopyAction.selectionChanged(
+                        (IStructuredSelection) treeViewer.getSelection());
+					mgr.add(customCopyAction);
+				} else if (sel instanceof ColumnNode){
+					mgr.add(deleteColumnAction);
+					deleteColumnAction.setText(Messages.getString("SubsetView.Delete")); //$NON-NLS-1$
+					deleteColumnAction.setImageDescriptor(QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+                    customCopyAction.selectionChanged(
+                        (IStructuredSelection) treeViewer.getSelection());
+					mgr.add(customCopyAction);
+                				
+				} else {
+					mgr.add(newSubsetAction);
+				}
+			}
+		});
+
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		treeViewer.getControl().setLayoutData(gridData);
+		status = new Label(main, SWT.NONE);
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		status.setLayoutData(gridData);
+		
+		IActionBars bars = getViewSite().getActionBars();
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.PASTE, pasteAction);
+		bars.setGlobalActionHandler(IWorkbenchActionConstants.DELETE, deleteSubsetAction);
+
+		IToolBarManager toolBar = getViewSite().getActionBars().getToolBarManager();
+		toolBar.add(newSubsetAction);
+		
+		status.setText(Messages.getString("bookmarkview.done")); //$NON-NLS-1$
+	}
+	public void initActions() {
+		newSubsetAction = new NewSubsetAction();
+		newSubsetAction.setText("New Subset"); //$NON-NLS-1$
+		newSubsetAction.setToolTipText(Messages.getString("SubsetView.CreatesANewEmptySubset")); //$NON-NLS-1$
+		newSubsetAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("subset.gif")); //$NON-NLS-1$
+		newSubsetAction.init(this);
+		deleteColumnAction = new DeleteColumnAction();
+		deleteColumnAction.setText("Delete Column"); //$NON-NLS-1$
+		deleteColumnAction.setToolTipText(Messages.getString("SubsetView.DeletesTheSelectedColumns")); //$NON-NLS-1$
+		deleteColumnAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+		deleteColumnAction.init(this);
+		deleteObjectAction = new DeleteObjectAction();
+		deleteObjectAction.setText("Delete Object"); //$NON-NLS-1$
+		deleteObjectAction.setToolTipText(Messages.getString("SubsetView.DeletesTheSelectedObject")); //$NON-NLS-1$
+		deleteObjectAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+		deleteObjectAction.init(this);
+		deleteSubsetAction = new DeleteSubsetAction();
+		deleteSubsetAction.setText("Delete Subset"); //$NON-NLS-1$
+		deleteSubsetAction.setToolTipText(Messages.getString("SubsetView.DeletesTheSelectedSubset")); //$NON-NLS-1$
+		deleteSubsetAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("delete.gif")); //$NON-NLS-1$
+		deleteSubsetAction.init(this);
+//		viewTableAction = new ViewTableAction();
+//		viewTableAction.setText(Messages.getString("bookmarkview.viewTable")); //$NON-NLS-1$
+//		viewTableAction.setImageDescriptor(
+//			QuantumPlugin.getImageDescriptor("table.gif")); //$NON-NLS-1$
+//		viewTableAction.init(this);
+		exportXMLAction = new ExportXMLAction();
+		exportXMLAction.setText(Messages.getString("bookmarkview.exportXML")); //$NON-NLS-1$
+		exportXMLAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("table.gif")); //$NON-NLS-1$
+		exportXMLAction.init(this);
+
+		this.customCopyAction = new CustomCopyAction(this,1); // 1 is unused, just in case more custom copies are defined        
+		this.customCopyAction.setText(Messages.getString("bookmarkview.customCopyAction")); //$NON-NLS-1$
+		this.customCopyAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+
+
+		
+	}
+	public void setFocus() {
+	}
+	
+	private Action pasteAction = new Action() {
+		public void run() {
+			Object sel = getCurrent();
+			if (sel == null) return;
+			if (!(sel instanceof SubsetNode)) return;
+			
+			SubsetNode subset = (SubsetNode) sel;
+			
+			TextTransfer transfer = TextTransfer.getInstance();
+			String xmlMetaData = (String) QuantumPlugin.getDefault().getSysClip().getContents(transfer);
+			StringReader text = new StringReader(xmlMetaData);
+			InputSource source = new InputSource(text);
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ 			DocumentBuilder parser;
+            Document doc; 
+			try {
+				parser = factory.newDocumentBuilder();
+				doc = parser.parse(source);
+ 			} catch (ParserConfigurationException e) {
+				e.printStackTrace();
+				return;
+			} catch (SAXException e) {
+				e.printStackTrace();
+				return;
+			} catch (IOException e) {
+				e.printStackTrace();
+				return;
+			}
+ 			Element root = doc.getDocumentElement();
+ 			subset.importXML(root, false);
+			treeViewer.refresh();
+			provider.setHasChanged(true);
+
+		}
+	};
+	
+	public void addNewSubset(SubsetNode subset) {
+		provider.addSubset(subset);
+		treeViewer.refresh();
+	}
+	public void setStatus(String text) {
+		status.setText(text);
+	}
+	public void dispose(){
+		super.dispose();
+	}
+
+	/**
+	 * Returs a Vector with all the elements of the treeViewer
+	 * @return
+	 */
+	public Vector getElements(){
+		Vector result = new Vector();
+		if (treeViewer == null) return result;
+		SubsetContentProvider provider = (SubsetContentProvider) treeViewer.getContentProvider();
+		Object[] objects = provider.getElements(SubsetRoot.ROOT);
+		for (int i = 0; i < objects.length; i++) {
+			SubsetNode current = (SubsetNode) objects[i];
+			result.add(current);
+		}
+		return result;
+	}
+	
+	public void deleteColumn (ColumnNode column){
+		provider.deleteColumn(column);
+		treeViewer.refresh();
+	}
+
+	public void deleteObject (ObjectNode object){
+		provider.deleteObject(object);
+		treeViewer.refresh();
+	}
+
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/DefaultSizes.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/DefaultSizes.java
new file mode 100644
index 0000000..aa53489
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/DefaultSizes.java
@@ -0,0 +1,6 @@
+package com.quantum.view.tableview;
+
+public class DefaultSizes {
+	public static int PAGE_SIZE = 200;
+	public static int MAX_COLUMN_SIZE = 1024 * 2;
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableAdapter.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableAdapter.java
new file mode 100644
index 0000000..17d7b29
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableAdapter.java
@@ -0,0 +1,269 @@
+package com.quantum.view.tableview;
+
+import java.sql.SQLException;
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+import com.quantum.model.NotConnectedException;
+import com.quantum.sql.FilterSort;
+import com.quantum.sql.SQLHelper;
+import com.quantum.sql.SQLResults;
+
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+
+public class TableAdapter {
+	
+	private Table table = null;
+	
+	public static final String DEFAULT = ""; //$NON-NLS-1$
+	public static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
+	public static final String UTF_16 = "UTF-16"; //$NON-NLS-1$
+	
+	private int pageSize = DefaultSizes.PAGE_SIZE;
+	private int maxColumnSize = DefaultSizes.MAX_COLUMN_SIZE;
+	private FilterSort extra = new FilterSort();
+	private int offset = 1;
+	private int totalSize = -1;
+	private Vector rows = new Vector();
+	private Vector columnNames = new Vector();
+	private boolean hasMore = false;
+	
+	private Bookmark bookmark = null;	
+    private Entity entity = null;
+	private String query;
+	
+	private String encoding = ""; //$NON-NLS-1$
+	
+    private TableAdapter(Entity entity) {
+        this.entity = entity;
+        this.bookmark = entity.getBookmark();
+    }
+	private TableAdapter(Bookmark bookmark) {
+		this.bookmark = bookmark;
+	}
+	public void fullMode() {
+		offset = 1;
+		pageSize = Integer.MAX_VALUE;
+	}
+	public void resetMode() {
+		offset = 1;
+		pageSize = DefaultSizes.PAGE_SIZE;
+	}
+	public static TableAdapter createFromQuery(Bookmark bookmark, SQLResults results) throws NotConnectedException {
+		TableAdapter retVal = new TableAdapter(bookmark);
+		retVal.setQuery(results.getQuery());
+		retVal.setData(results);
+		return retVal;
+	}
+	public static TableAdapter createFromTable(Entity entity) {
+		TableAdapter retVal = new TableAdapter(entity); 
+		return retVal;
+	}
+	private void loadSize() {
+        try {
+    		if (entity != null) {
+                totalSize = SQLHelper.getSize(
+                    bookmark.getConnection(), entity.getCondQualifiedName(), 
+                        AdapterFactory.getInstance().getAdapter(bookmark.getType()));
+    		}
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (NotConnectedException e) {
+            e.printStackTrace();
+        }
+	}
+	public int getStartIndex() {
+		if (totalSize == 0) {
+			return 0;
+		}
+		return offset;
+	}
+	public int getEndIndex() {
+		return offset + rows.size() - 1;
+	}
+	public int getTotalSize() {
+		return totalSize;
+	}
+	public void nextPage() {
+		loadSize();
+		offset = offset + pageSize;
+		if (totalSize >= 0 && offset > totalSize) {
+			offset = offset - pageSize;
+		}
+	}
+	public void previousPage() {
+		offset = offset - pageSize;
+		if (offset < 1) {
+			offset = 1;
+		}
+	}
+	public boolean hasNextPage() {
+		if (entity != null) {
+			if (offset + pageSize <= totalSize) {
+				return true;
+			}
+			return false;
+		}
+		return hasMore;
+	}
+	public boolean hasPreviousPage() {
+		if (offset > 1) {
+			return true;
+		}
+		return false;
+	}
+
+	public String getQuery() {
+		if (entity != null) {
+			DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+			if (adapter == null) throw new RuntimeException();
+			else return adapter.getTableQuery((entity).getCondQualifiedName()) + extra.toString();
+		}
+		return query;
+	}
+	public void loadData() throws NotConnectedException {
+		loadSize();
+		if (entity != null) {
+			if (offset > totalSize) {
+				offset = 1;
+			}
+		}
+		String query = getQuery();
+		System.out.println(offset + Messages.getString("TableAdapter.to") + (offset + pageSize - 1)); //$NON-NLS-1$
+		SQLResults results = SQLHelper.getResults(bookmark.getConnection(), query, offset, offset + pageSize - 1, maxColumnSize, encoding);
+		setData(results);
+	}
+	public void resetOffset() {
+		offset = 1;
+	}
+	public void setData(SQLResults results) throws NotConnectedException {
+        if (results.isError()) return;
+		int rowCount = results.getRowCount();
+		int columnCount = results.getColumnCount();
+		rows = new Vector();
+		columnNames = new Vector();
+		for (int col = 1; col <= columnCount; col++) {
+			columnNames.addElement(results.getColumnName(col));
+		}
+		for (int row = 1; row <= rowCount; row++) {
+			String rowData[] = new String[columnCount];
+			for (int col = 1; col <= columnCount; col++) {
+				rowData[col - 1] = results.getElement(col, row).toString();
+			}
+			rows.addElement(rowData);
+		}
+		hasMore = results.hasMore();
+		if (entity == null && results.getMaxSize() >= 0) {
+			if (offset > results.getMaxSize()) {
+				offset = 1;
+				loadData();
+			}
+		}
+	}
+	public void loadTable(Table table) {
+		this.table = table;
+		table.setHeaderVisible(true);
+		for (int i = 0; i < columnNames.size(); i++) {
+			TableColumn column = new TableColumn(table, SWT.NONE);
+			column.setText(columnNames.elementAt(i).toString());
+		}
+		for (int i = 0; i < columnNames.size(); i++) {
+			table.getColumn(i).pack();
+		}
+		for (int row = 0; row < rows.size(); row++) {
+			TableItem item = new TableItem(table, SWT.NONE);
+			String itemData[] = (String[]) rows.elementAt(row);
+			item.setText(itemData);
+		}
+		for (int i = 0; i < columnNames.size(); i++) {
+			table.getColumn(i).pack();
+		}
+	}
+	
+	public TableViewer addTableViewer(Table table) {
+		TableViewer tableViewer = new TableViewer(table);
+		tableViewer.setUseHashlookup(true);
+		String[] colNams = new String[columnNames.size()];
+		for (int i = 0; i < columnNames.size(); i++) {
+			colNams[i] = (String) columnNames.get(i);
+		}
+		tableViewer.setColumnProperties(colNams);
+
+		// Create the cell editors
+		CellEditor[] editors = new CellEditor[columnNames.size()];
+		for (int i = 0; i < columnNames.size(); i++) {
+			TextCellEditor textEditor = new TextCellEditor(table);
+			((Text) textEditor.getControl()).setTextLimit(60);
+			editors[i] = textEditor;
+		}
+		// Assign the cell editors to the viewer 
+		tableViewer.setCellEditors(editors);
+		// Set the cell modifier for the viewer
+		//tableViewer.setCellModifier(new MetaDataModifier(this));
+		// Set the default sorter for the viewer 
+		//tableViewer.setSorter(new ExampleTaskSorter(ExampleTaskSorter.DESCRIPTION));
+		
+		return tableViewer;
+	}
+	
+	public int getPageSize() {
+		return pageSize;
+	}
+	
+	public void setFilterSort(FilterSort extra) {
+		this.extra = extra;
+	}
+	public String getTable() {
+		return (entity != null) ? entity.getCondQualifiedName() : null;
+	}
+
+	public void setQuery(String query) {
+		this.query = query;
+	}
+	public String getEncoding() {
+		return encoding;
+	}
+
+	public void setEncoding(String encoding) {
+		this.encoding = encoding;
+	}
+	public String getStatusString() {
+		String status = getStartIndex() + Messages.getString("TableAdapter.to") + getEndIndex() + Messages.getString("TableAdapter.of") + //$NON-NLS-1$ //$NON-NLS-2$
+				getTotalSize();
+		if (!encoding.equals(DEFAULT)) {
+			status += " (" + encoding + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		String filterText = extra.toString();
+		if (!filterText.equals("")) { //$NON-NLS-1$
+			status += " (" + filterText + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (pageSize == Integer.MAX_VALUE) {
+			status += Messages.getString("TableAdapter.full"); //$NON-NLS-1$
+		}
+		return status;
+	}
+	/**
+	 * @return
+	 */
+	public Bookmark getBookmark() {
+		return this.bookmark;
+	}
+    /**
+     * @return
+     */
+    public Entity getEntity() {
+        return entity;
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableView.java
new file mode 100644
index 0000000..dc41455
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableView.java
@@ -0,0 +1,283 @@
+package com.quantum.view.tableview;
+
+import java.util.Vector;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.part.ViewPart;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.extensions.ProcessServiceMembers;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+import com.quantum.model.NotConnectedException;
+import com.quantum.sql.SQLResults;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.view.LogProxy;
+
+/**
+ * The Table View. Displays tables and Queries.
+ */
+public class TableView extends ViewPart implements ISelectionListener {
+
+	private class DefaultEncodingAction extends Action {
+        private final TableAdapter ta;
+        private DefaultEncodingAction(TableAdapter ta) {
+            super();
+            this.ta = ta;
+        }
+        public void run() {
+        	ta.setEncoding(TableAdapter.DEFAULT);
+        }
+    }
+    private static TableView instance = null;
+	private TabFolder tabs = null;
+	private Composite parent;
+	private Vector extensionVector;
+ 
+	/**
+	 * Generic contructor
+	 */
+	public TableView() {
+	}
+
+
+	public void setFocus() {
+		setQualifiedTitle();
+	}
+	
+    /**
+     * Gets the instance of the TableView.  This view can appear on multiple 
+     * perspectives, but tabs within the view are shared no matter which perspective
+     * is open.
+     * 
+     * @return the TableView instance.
+     */
+	public static TableView getInstance() {
+		return (TableView) QuantumPlugin.getDefault().getView("com.quantum.view.tableview.TableView");
+	}
+	
+	/**
+	 * Close the current tab, disposing of it
+	 */
+	public void closeCurrent() {
+		if (tabs == null) return;
+		
+		if (tabs.getSelectionIndex() >= 0) {
+			try {
+				TabItem item = tabs.getItem(tabs.getSelectionIndex());
+				item.dispose();
+			} catch (Throwable e) {
+				LogProxy.getInstance().addText(LogProxy.ERROR, "Error Closing Current: " + e.toString()); //$NON-NLS-1$
+				e.printStackTrace();
+			}
+		} 
+		if (tabs.getItemCount() == 0) {
+			setTitle(Messages.getString("tableview.QuantumTableViewName")); //$NON-NLS-1$
+		}
+	}
+	
+	/**
+	 * Reload table or query data into the selected tab
+	 */
+	public void refreshCurrent() {
+		TabItem item = tabs.getItem(tabs.getSelectionIndex());
+		TableAdapter adapter = (TableAdapter) item.getData();
+		Bookmark bookmark = adapter.getBookmark();
+		String table = adapter.getTable();
+		if (table == null) {
+			loadTable(bookmark, item, null, null, true, true);
+		} else {
+			loadTable(bookmark, item, null, null, true, true);
+		}
+		String title = Messages.getString("tableview.QuantumTableViewName"); //$NON-NLS-1$
+		if (bookmark != null)
+			title = bookmark.getName() + Messages.getString("tableview.ViewNameInitialDecoration") + title + Messages.getString("tableview.ViewNameFinalDecoration"); //$NON-NLS-1$ //$NON-NLS-2$
+		setTitle(title);
+	}
+	
+    public void loadQuery(Bookmark bookmark, SQLResults results) {
+        loadTable(bookmark, null, null, results, true, false);
+    }
+	public void loadTable(Entity entity) {
+		loadTable(entity.getBookmark(), null, entity, null, false, true);
+	}
+	public void loadTable(Bookmark bookmark, TabItem tabItem, Entity entity, SQLResults results, boolean query, boolean reload) {
+        try {
+    		TableAdapter adapter;
+    		// If no TabItem is given we have to create a new one, with the info of the table or view.
+    		if (tabItem == null) {
+    			tabItem = new TabItem(tabs, SWT.NONE);
+    			// Data is stored in a TableAdapter object
+    			if (query) {
+    				adapter = TableAdapter.createFromQuery(bookmark, results);
+    			} else {
+    				adapter = TableAdapter.createFromTable(entity);
+    			}
+    			// That is stored in the tabItem, so it won't get lost
+    			tabItem.setData(adapter);
+    			// This does not really belong here, but it'll fail if done before the creation of the
+    			// first TabItem, so it remains here till a better place found.
+    			// We set a function to change the Title of the window depending on the selected tab.
+    			tabs.addSelectionListener(new SelectionListener() {
+    				public void widgetDefaultSelected(SelectionEvent e) {
+    				}
+    				public void widgetSelected(SelectionEvent e) {
+    					setQualifiedTitle();
+    				}
+    			});
+    		} else {
+    			// If there is already a TabItem, we take its TableAdapter object
+    			adapter = (TableAdapter) tabItem.getData();
+    		}
+    		
+    		// We create a Composite widget (main) to display our data, with a GridLayout
+    		Composite main = new Composite(tabs, SWT.NONE);
+    		GridLayout layout = new GridLayout(1, false);
+    		layout.horizontalSpacing = 0;
+    		layout.verticalSpacing = 0;
+    		main.setLayout(layout);
+    
+    		
+    		// load widgets, the order of loading them determines the appearance in screen
+    		ToolBar widgetToolBar = new ToolBar(main, SWT.HORIZONTAL);
+    		// We fill up our Composite widget, the main table display, etc.
+    		final Table table = new Table(main, SWT.FULL_SELECTION | SWT.MULTI);
+    		final Label label = new Label(main, SWT.NULL);
+    		TableViewToolBar toolBar = new TableViewToolBar(this, widgetToolBar, table, adapter, label);
+    		
+    	
+    		// load table
+    		if (reload) {
+    			adapter.resetOffset();
+    			adapter.loadData();
+    		}
+    		// Load the table data from the adapter into the widget
+    		adapter.loadTable(table);
+    		// Experimental, won't make it into 2.2
+    		// final TableViewer viewer = adapter.addTableViewer(table);
+    		
+    		String tableName = adapter.getTable();
+    		if (tableName != null) {
+    			tabItem.setText(bookmark.getName() + ":" + tableName);
+    		} else {
+    			tabItem.setText(bookmark.getName() + ":" + adapter.getQuery());
+    		}
+    
+    		toolBar.getPrevious().setEnabled(adapter.hasPreviousPage());
+    		toolBar.getNext().setEnabled(adapter.hasNextPage());
+    		label.setText(adapter.getStatusString());
+    		
+    		GridData gridData = new GridData();
+    		gridData.horizontalAlignment = GridData.FILL;
+    		gridData.verticalAlignment = GridData.FILL;
+    		gridData.grabExcessHorizontalSpace = true;
+    		gridData.grabExcessVerticalSpace = true;
+    		table.setLayoutData(gridData);
+    
+    		gridData = new GridData();
+    		gridData.horizontalAlignment = GridData.FILL;
+    		label.setLayoutData(gridData);
+    
+    		
+    		toolBar.setColumns(this, adapter, table);
+    		final TableAdapter ta = adapter;
+    		final Action defaultEncodingAction = new DefaultEncodingAction(ta);
+    		defaultEncodingAction.setText(Messages.getString("tableview.defaultEncoding")); //$NON-NLS-1$
+    		final Action UTF8EncodingAction = new Action() {
+    			public void run() {
+    				ta.setEncoding(TableAdapter.UTF_8);
+    			}
+    		};
+    		UTF8EncodingAction.setText(Messages.getString("tableview.UTF8Encoding")); //$NON-NLS-1$
+    		final Action UTF16EncodingAction = new Action() {
+    			public void run() {
+    				ta.setEncoding(TableAdapter.UTF_16);
+    			}
+    		};
+    		UTF16EncodingAction.setText(Messages.getString("tableview.UTF16Encoding")); //$NON-NLS-1$
+    
+    		IMenuListener menuListener = new TableViewMenuListener(this, table, UTF16EncodingAction, ta, defaultEncodingAction, UTF8EncodingAction, extensionVector);
+    
+    		// final setup
+    		MenuManager manager = new MenuManager();
+    		manager.setRemoveAllWhenShown(true);
+    		Menu fTextContextMenu = manager.createContextMenu(table);
+    		table.setMenu(fTextContextMenu);
+    		table.setLinesVisible(true);
+    		manager.addMenuListener(menuListener);
+    		
+    		tabItem.setControl(main);
+    		tabs.setSelection(tabs.indexOf(tabItem));
+    
+    		setQualifiedTitle();		
+        } catch (NotConnectedException e) {
+            e.printStackTrace();
+            handleException(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+	}
+    
+    protected void handleException(Exception e) {
+        ExceptionDisplayDialog.openError(getSite().getShell(), null, null, e);
+    }
+
+	/**
+	 * @return
+	 */
+	/**
+	 * Sets the title of the window to the text of the selected tab
+	 */
+	private void setQualifiedTitle() {
+		if (tabs.getSelectionIndex() < 0) return;
+		TabItem item = tabs.getItem(tabs.getSelectionIndex());
+		String defTitle = Messages.getString("tableview.QuantumTableViewName"); //$NON-NLS-1$
+		String title = item.getText();
+		int ind = title.indexOf(Messages.getString("tableview.BookmarkSeparator")); //$NON-NLS-1$
+		if (ind > 0) defTitle = title.substring(0,ind) 
+								+ Messages.getString("tableview.ViewNameInitialDecoration")   //$NON-NLS-1$
+								+ defTitle 
+								+ Messages.getString("tableview.ViewNameFinalDecoration"); //$NON-NLS-1$
+		setTitle(defTitle);
+	}
+
+	public void createPartControl(Composite parent) {
+		instance = this;
+		this.parent = parent;
+		initActions();
+		tabs = new TabFolder(parent, SWT.NONE);
+	}
+	
+	public void initActions() {
+		extensionVector = new Vector();
+		try {
+			ProcessServiceMembers.process(this, extensionVector);
+		} catch (WorkbenchException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewMenuListener.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewMenuListener.java
new file mode 100644
index 0000000..09da28f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewMenuListener.java
@@ -0,0 +1,138 @@
+/*
+ * Created on 28-jul-2003
+ *
+ */
+package com.quantum.view.tableview;
+
+import java.util.Vector;
+
+import com.quantum.Messages;
+import com.quantum.extensions.ExtensionAction;
+import com.quantum.sql.TableRow;
+import com.quantum.util.StringMatrix;
+import com.quantum.wizards.DeleteRowPage;
+import com.quantum.wizards.InsertRowPage;
+import com.quantum.wizards.SQLRowWizard;
+import com.quantum.wizards.UpdateRowPage;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+
+
+public final class TableViewMenuListener implements IMenuListener {
+	private final TableView tableView;
+	private final Table table;
+	private final Action UTF16EncodingAction;
+	private final TableAdapter ta;
+	private final Action defaultEncodingAction;
+	private final Action UTF8EncodingAction;
+	private final Vector extensionVector;
+	
+	public TableViewMenuListener(
+		TableView view, 
+		Table table, 
+		Action UTF16EncodingAction, 
+		TableAdapter ta, 
+		Action defaultEncodingAction, 
+		Action UTF8EncodingAction,
+		Vector extensionVector ) {
+			
+		super();
+		this.tableView = view;
+		this.table = table;
+		this.UTF16EncodingAction = UTF16EncodingAction;
+		this.ta = ta;
+		this.defaultEncodingAction = defaultEncodingAction;
+		this.UTF8EncodingAction = UTF8EncodingAction;
+		this.extensionVector = extensionVector;
+	}
+	public void menuAboutToShow(IMenuManager mgr) {
+		if (ta.getTable() != null) {
+			TableItem[] selection = table.getSelection();
+			TableColumn[] columns = table.getColumns();
+			// Copy in columnNames the names of the columns of the selected rows
+			String columnNames[] = new String[columns.length];
+			for (int i = 0; i < columns.length; i++) {
+				columnNames[i] = columns[i].getText();
+			}
+			// Copy in data the values of the data columns of the selected rows
+			StringMatrix data = new StringMatrix();
+			data.addMatrixHeader(columnNames);
+			if (selection != null && selection.length > 0) {
+				for (int iRow = 0; iRow < selection.length; iRow++) {
+					TableItem sel = selection[iRow];
+					for (int i = 0; i < columns.length; i++) {
+						data.addAt(columnNames[i], sel.getText(i), iRow );
+					}
+				}
+			} else {
+				// Create dummy values in case nothing selected
+				for (int i = 0; i < columns.length; i++) {
+					data.addAt(columnNames[i], "", 0); //$NON-NLS-1$
+				}
+			}
+			final TableRow row =
+				new TableRow(ta.getEntity(), ta.getBookmark(), ta.getTable(), data);
+			Action updateAction = new Action() {
+				public void run() {
+					UpdateRowPage page = new UpdateRowPage(""); //$NON-NLS-1$
+					SQLRowWizard wizard = new SQLRowWizard();
+					wizard.init(Messages.getString("TableView.UpdateRow"), page, row, ta); //$NON-NLS-1$
+					WizardDialog dialog =
+						new WizardDialog(
+							tableView.getSite().getShell(),
+							wizard);
+					dialog.open();
+				}
+			};
+			updateAction.setText(Messages.getString("tableview.update")); //$NON-NLS-1$
+			Action insertAction = new Action() {
+				public void run() {
+					InsertRowPage page = new InsertRowPage(""); //$NON-NLS-1$
+					SQLRowWizard wizard = new SQLRowWizard();
+					wizard.init(Messages.getString("TableView.InsertRow"), page, row, ta); //$NON-NLS-1$
+					WizardDialog dialog =
+						new WizardDialog(
+							tableView.getSite().getShell(),
+							wizard);
+					dialog.open();
+				}
+			};
+			insertAction.setText(Messages.getString("tableview.insert")); //$NON-NLS-1$
+			Action deleteAction = new Action() {
+				public void run() {
+					DeleteRowPage page = new DeleteRowPage(""); //$NON-NLS-1$
+					SQLRowWizard wizard = new SQLRowWizard();
+					wizard.init(Messages.getString("TableView.DeleteRow"), page, row, ta); //$NON-NLS-1$
+					WizardDialog dialog =
+						new WizardDialog(
+					tableView.getSite().getShell(),
+							wizard);
+					dialog.open();
+				}
+			};
+			deleteAction.setText(Messages.getString("tableview.delete")); //$NON-NLS-1$
+			mgr.add(insertAction);
+			mgr.add(updateAction);
+			mgr.add(deleteAction);
+
+			MenuManager subMenuExtension = new MenuManager("Extensions"); 
+			for (int i = 0; i < extensionVector.size(); i++) {
+				ExtensionAction extensionAction = (ExtensionAction) extensionVector.get(i);
+				extensionAction.addRowData(row);
+				subMenuExtension.add(extensionAction);
+			}
+			if (extensionVector.size() > 0) mgr.add(subMenuExtension);
+
+		}
+		mgr.add(defaultEncodingAction);
+		mgr.add(UTF8EncodingAction);
+		mgr.add(UTF16EncodingAction);
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewToolBar.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewToolBar.java
new file mode 100644
index 0000000..cb06fbd
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/tableview/TableViewToolBar.java
@@ -0,0 +1,246 @@
+/*
+ * Created on 28-jul-2003
+ *
+ */
+package com.quantum.view.tableview;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.actions.CloseTableAction;
+import com.quantum.actions.RefreshTableAction;
+import com.quantum.model.NotConnectedException;
+import com.quantum.sql.TableRow;
+import com.quantum.util.StringMatrix;
+import com.quantum.view.CopyAction;
+import com.quantum.wizards.SQLRowWizard;
+import com.quantum.wizards.SortFilterPage;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+/**
+ * @author panic
+ *
+ */
+public class TableViewToolBar {
+
+	private ToolBar toolBar;
+	private RefreshTableAction refreshTableAction;
+	private CloseTableAction closeTableAction;
+	private ToolItem previous;
+	private ToolItem next;
+	
+	ToolItem filter;
+
+	public TableViewToolBar(
+		final TableView view,
+		final ToolBar toolBar, 
+		final Table table,
+		final TableAdapter ta,
+		final Label label) {
+
+		this.toolBar = toolBar;
+		
+		refreshTableAction = new RefreshTableAction();
+		refreshTableAction.setText(Messages.getString("tableview.refresh")); //$NON-NLS-1$
+		refreshTableAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("refresh.gif")); //$NON-NLS-1$
+		refreshTableAction.init(view);
+		closeTableAction = new CloseTableAction();
+		closeTableAction.setText(Messages.getString("tableview.close")); //$NON-NLS-1$
+		closeTableAction.setImageDescriptor(
+			QuantumPlugin.getImageDescriptor("close.gif")); //$NON-NLS-1$
+		closeTableAction.init(view);
+
+		ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH);
+		toolItem.setImage(QuantumPlugin.getImage("refresh.gif")); //$NON-NLS-1$
+		toolItem.setToolTipText(Messages.getString("tableview.refresh")); //$NON-NLS-1$
+		toolItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				refreshTableAction.run();
+			}
+		});
+
+		final Action copyAction = new CopyAction(view, table);
+		final Action selectAllAction = new Action() {
+			public void run() {
+				table.selectAll();
+			}
+		};
+		toolItem = new ToolItem(toolBar, SWT.PUSH);
+		toolItem.setImage(QuantumPlugin.getImage("copy.gif")); //$NON-NLS-1$
+		toolItem.setToolTipText(Messages.getString("tableview.copy")); //$NON-NLS-1$
+		toolItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				copyAction.run();
+			}
+		});
+		toolItem = new ToolItem(toolBar, SWT.PUSH);
+		toolItem.setImage(QuantumPlugin.getImage("table.gif")); //$NON-NLS-1$
+		toolItem.setToolTipText(Messages.getString("tableview.selectAll")); //$NON-NLS-1$
+		toolItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				selectAllAction.run();
+			}
+		});
+
+		filter = new ToolItem(toolBar, SWT.PUSH);
+		filter.setImage(QuantumPlugin.getImage("filter.gif")); //$NON-NLS-1$
+		filter.setToolTipText(Messages.getString("tableview.filterSort")); //$NON-NLS-1$
+
+		toolItem = new ToolItem(toolBar, SWT.SEPARATOR);
+
+		final ToolItem fullMode = new ToolItem(toolBar, SWT.PUSH | SWT.CHECK);
+
+		previous = new ToolItem(toolBar, SWT.PUSH);
+		next = new ToolItem(toolBar, SWT.PUSH);
+
+		fullMode.setImage(QuantumPlugin.getImage("fulldata.gif")); //$NON-NLS-1$
+		fullMode.setToolTipText(Messages.getString("tableview.showAll")); //$NON-NLS-1$
+		fullMode.setSelection(false);
+		fullMode.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+                try {
+    				if (ta.getPageSize() == Integer.MAX_VALUE) {
+    					ta.resetMode();
+    				} else {
+    					ta.fullMode();
+    				}
+    				ta.loadData();
+    				table.removeAll();
+    				for (int i = table.getColumnCount() - 1; i >= 0; i--) {
+    					table.getColumn(i).dispose();
+    				}
+    				ta.loadTable(table);
+    				label.setText(ta.getStatusString());
+    				previous.setEnabled(ta.hasPreviousPage());
+    				next.setEnabled(ta.hasNextPage());
+                } catch (NotConnectedException e) {
+                    view.handleException(e);
+                }
+			}
+		});
+		previous.setImage(QuantumPlugin.getImage("previous.gif")); //$NON-NLS-1$
+		previous.setToolTipText("Previous"); //$NON-NLS-1$
+		previous.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+                try {
+    				ta.previousPage();
+    				ta.loadData();
+    				table.removeAll();
+    				for (int i = table.getColumnCount() - 1; i >= 0; i--) {
+    					table.getColumn(i).dispose();
+    				}
+    				ta.loadTable(table);
+    				label.setText(ta.getStatusString());
+    				previous.setEnabled(ta.hasPreviousPage());
+    				next.setEnabled(ta.hasNextPage());
+                } catch (NotConnectedException e) {
+                    view.handleException(e);
+                }
+			}
+		});
+		next.setImage(QuantumPlugin.getImage("next.gif")); //$NON-NLS-1$
+		next.setToolTipText("Next"); //$NON-NLS-1$
+		next.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent event) {
+                try {
+    				ta.nextPage();
+    				ta.loadData();
+    				table.removeAll();
+    				for (int i = table.getColumnCount() - 1; i >= 0; i--) {
+    					table.getColumn(i).dispose();
+    				}
+    				ta.loadTable(table);
+    				label.setText(ta.getStatusString());
+    				previous.setEnabled(ta.hasPreviousPage());
+    				next.setEnabled(ta.hasNextPage());
+                } catch (NotConnectedException e) {
+                    view.handleException(e);
+                }
+			}
+		});
+
+		toolItem = new ToolItem(toolBar, SWT.SEPARATOR);
+
+		toolItem = new ToolItem(toolBar, SWT.PUSH);
+		toolItem.setImage(QuantumPlugin.getImage("close.gif")); //$NON-NLS-1$
+		toolItem.setToolTipText(Messages.getString("tableview.close")); //$NON-NLS-1$
+		toolItem.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				closeTableAction.run();
+			}
+		});
+
+	}
+
+	public void setColumns(	final TableView view,	final TableAdapter ta,	Table table) {
+
+		// We create a matrix of TableColumn (columns in the Table widget) with
+		// the columns in the table object
+		TableColumn[] columns = table.getColumns();
+		String columnNames[] = new String[columns.length];
+		for (int i = 0; i < columns.length; i++) {
+			columnNames[i] = columns[i].getText();
+		}
+		// Copy in data the values of the data columns of the selected rows
+		StringMatrix data = new StringMatrix();
+		data.addMatrixHeader(columnNames);
+			// Create dummy values in case nothing selected
+			for (int i = 0; i < columns.length; i++) {
+				data.addAt(columnNames[i], "", 0); //$NON-NLS-1$
+		}
+		final TableRow emptyRow = new TableRow(ta.getEntity(), ta.getBookmark(), ta.getTable(), data);
+
+		filter.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				SortFilterPage page = new SortFilterPage(""); //$NON-NLS-1$
+				SQLRowWizard wizard = new SQLRowWizard();
+				wizard.init(Messages.getString("TableView.FilterAndSort"), page, emptyRow, ta); //$NON-NLS-1$
+				WizardDialog dialog = new WizardDialog(view.getSite().getShell(), wizard);
+				dialog.open();
+			}
+		});
+	}
+	
+	
+
+	/**
+	 * @return
+	 */
+	public ToolItem getNext() {
+		return next;
+	}
+
+	/**
+	 * @return
+	 */
+	public ToolItem getPrevious() {
+		return previous;
+	}
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BaseSQLPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BaseSQLPage.java
new file mode 100644
index 0000000..459a949
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BaseSQLPage.java
@@ -0,0 +1,49 @@
+package com.quantum.wizards;
+
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Column;
+import com.quantum.model.ConnectionException;
+import com.quantum.model.Entity;
+import com.quantum.sql.TableRow;
+import com.quantum.view.ViewHelper;
+import com.quantum.view.tableview.TableAdapter;
+
+import org.eclipse.jface.wizard.WizardPage;
+
+/**
+ * @author BC
+ */
+public abstract class BaseSQLPage extends WizardPage implements SQLPage {
+
+    protected TableRow row;
+    protected TableAdapter adapter;
+
+    public BaseSQLPage(String pageName) {
+        super(pageName);
+    }
+    public boolean performFinish() {
+        try {
+            Bookmark bookmark = this.adapter.getBookmark();
+            bookmark.addQuery(getQueryText());
+            ViewHelper.tryGetResults(getShell(), bookmark.getConnection(), getQueryText());
+        } catch (ConnectionException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+    protected abstract String getQueryText();
+    protected void appendColumn(StringBuffer whereClause, Entity entity, String columnName, DatabaseAdapter adapter, String value) {
+            
+        if (adapter != null && entity != null && entity.getColumn(columnName) != null) {
+            Column column = entity.getColumn(columnName);
+        	whereClause.append(adapter.quote(value, column.getType(), column.getTypeName()));
+        } else {
+        	whereClause.append(value);
+        }
+    }
+    public void init(TableRow row, TableAdapter adapter) {
+    	this.row = row;
+        this.adapter = adapter;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BookmarkWizard.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BookmarkWizard.java
new file mode 100644
index 0000000..da768ff
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/BookmarkWizard.java
@@ -0,0 +1,297 @@
+package com.quantum.wizards;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DriverInfo;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.view.bookmark.BookmarkNode;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class BookmarkWizard extends Wizard {
+	BookmarkPage mainPage;
+
+	private Bookmark current;
+
+	public void init(BookmarkNode selection) {
+		System.out.println("Initing workbench"); //$NON-NLS-1$
+		this.current = selection.getBookmark();
+		setWindowTitle(Messages.getString("BookmarkWizard.NewBookmark")); //$NON-NLS-1$
+	}
+	public void init() {
+		System.out.println("Initing workbench"); //$NON-NLS-1$
+		current = null;
+		setWindowTitle(Messages.getString("BookmarkWizard.NewBookmark")); //$NON-NLS-1$
+	}
+	public boolean performFinish() {
+		System.out.println("perform finish workbench"); //$NON-NLS-1$
+		String bookmarkName = mainPage.name.getText();
+		if ( BookmarkCollection.getInstance().find(bookmarkName) != null){
+			MessageDialog.openInformation(
+				this.getShell(),Messages.getString("BookmarkWizard.Error"),Messages.getString("BookmarkWizard.bookmarkAlreadyExists"));	 //$NON-NLS-1$ //$NON-NLS-2$
+		  		return false;
+		}
+
+		mainPage.performFinish();
+		return true;
+	}
+	public void addPages() {
+		System.out.println("adding pages"); //$NON-NLS-1$
+		if (current != null) {
+			mainPage = new BookmarkPage(Messages.getString("BookmarkWizard.Testing"), current); //$NON-NLS-1$
+		} else {
+			mainPage = new BookmarkPage(Messages.getString("BookmarkWizard.Testing")); //$NON-NLS-1$
+		}
+		addPage(mainPage);
+		System.out.println("adding pages"); //$NON-NLS-1$
+	}
+}
+
+class BookmarkPage extends WizardPage {
+	public static final String ADD = "ADD"; //$NON-NLS-1$
+	String action = ADD;
+	Text name;
+	Text username;
+	Text password;
+	Text schema;
+	Text connect;
+	Text driver;
+	//List driverList;
+	Combo type;
+	Text driverFile;
+    Button prompt;
+
+	Bookmark initialData = null;
+
+	FileDialog dialog;
+
+	DriverInfo[] drivers = AdapterFactory.getInstance().getDriverList();
+	/**
+	 * Constructor for BookmarkPage.
+	 * @param pageName
+	 */
+	public BookmarkPage(String pageName) {
+		super(pageName);
+		initialData = null;
+	}
+	/**
+	 * Constructor for BookmarkPage.
+	 * @param pageName
+	 */
+	public BookmarkPage(String pageName, Bookmark bookmark) {
+		super(pageName);
+		this.initialData = bookmark;
+	}
+
+	public void createControl(Composite parent) {
+		System.out.println("page create control"); //$NON-NLS-1$
+		dialog = new FileDialog(getContainer().getShell(), SWT.OPEN);
+		dialog.setFilterExtensions(new String[]{"*.jar", "*.zip","*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		dialog.setFilterNames(new String[]{Messages.getString("BookmarkWizard.JarFiles"),Messages.getString("BookmarkWizard.ZipFiles"), Messages.getString("BookmarkWizard.AllFiles")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 2;
+		layout.verticalSpacing = 9;
+
+
+		Label label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.BookmarkNameAst")); //$NON-NLS-1$
+		name = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		GridData fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		name.setLayoutData(fullHorizontal);
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.UsernameAst")); //$NON-NLS-1$
+		username = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		username.setLayoutData(fullHorizontal);
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.PasswordAst")); //$NON-NLS-1$
+		password = new Text(container, SWT.BORDER | SWT.SINGLE);
+		password.setEchoChar('*');
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		password.setLayoutData(fullHorizontal);
+ 
+        this.prompt = new Button(container, SWT.CHECK);
+        this.prompt.setText(Messages.getString("BookmarkWizard.Prompt")); //$NON-NLS-1$
+        fullHorizontal = new GridData();
+        fullHorizontal.horizontalAlignment = GridData.FILL;
+        fullHorizontal.horizontalSpan = 2;
+        this.prompt.setLayoutData(fullHorizontal);
+ 
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.Schema")); //$NON-NLS-1$
+		schema = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		schema.setLayoutData(fullHorizontal);
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.ConnectAst")); //$NON-NLS-1$
+		connect = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		connect.setLayoutData(fullHorizontal);
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.DriverAst")); //$NON-NLS-1$
+		driver = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		driver.setLayoutData(fullHorizontal);
+
+		//label = new Label(container, SWT.NULL);
+ 		//fullHorizontal = new GridData();
+ 		//fullHorizontal.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+		//fullHorizontal.verticalSpan = 3;
+		//label.setLayoutData(fullHorizontal);
+		//label.setText("(Drivers Found in File)");
+		/*driverList = new List(container, SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		fullHorizontal.verticalAlignment = GridData.FILL;
+		fullHorizontal.verticalSpan = 3;
+		driverList.setLayoutData(fullHorizontal);
+		driverList.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				String[] selection = driverList.getSelection();
+				if (selection != null && selection.length > 0) {
+					driver.setText(selection[0]);
+				}
+			}
+		});*/
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.TypeAst")); //$NON-NLS-1$
+		type = new Combo(container, SWT.SIMPLE | SWT.DROP_DOWN | SWT.READ_ONLY);
+		String driverNames[] = new String[drivers.length];
+		for (int i = 0; i < drivers.length; i++) {
+			driverNames[i] = drivers[i].getDisplayName();
+		}
+		type.setItems(driverNames);
+		type.select(0);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		type.setLayoutData(fullHorizontal);
+
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.getString("BookmarkWizard.DriverFilenameAst")); //$NON-NLS-1$
+		driverFile = new Text(container, SWT.BORDER | SWT.SINGLE);
+ 		fullHorizontal = new GridData();
+		fullHorizontal.horizontalAlignment = GridData.FILL;
+		driverFile.setLayoutData(fullHorizontal);
+
+		Button button = new Button(container, SWT.PUSH);
+		button.setText(Messages.getString("BookmarkWizard.Browse")); //$NON-NLS-1$
+		
+		button.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			public void widgetSelected(SelectionEvent e) {
+				// We retrieve the last saved path
+				dialog.setFilterPath(QuantumPlugin.getDefault().getPreferenceStore().getString("quantum.dialogs.bookmarkwizard.path")); //$NON-NLS-1$
+				String filename = dialog.open();
+				if (filename != null) {
+					driverFile.setText(filename);
+				//	We save the used path
+					 QuantumPlugin.getDefault().getPreferenceStore().setValue("quantum.dialogs.bookmarkwizard.path", filename); //$NON-NLS-1$
+		
+				}
+			}
+		});
+
+//		if (initialData != null) {
+//			name.setText(initialData.getName());
+//			username.setText(initialData.getUsername());
+//            if (initialData.getPromptForPassword()) {
+//                this.password.setEditable(false);
+//            } else {
+//                password.setText(initialData.getPassword());
+//            }
+//			connect.setText(initialData.getConnect());
+//			driver.setText(initialData.getDriver());
+//			String typeData = initialData.getType();
+//            this.prompt.setSelection(initialData.getPromptForPassword());
+//			int selectedIndex = 0;
+//			for (int i = 0; i < drivers.length; i++) {
+//				if (typeData.equals(drivers[i].getDriverType())) {
+//					selectedIndex = i;
+//				}
+//			}
+//			type.select(selectedIndex);
+//			driverFile.setText(initialData.getDriverFile());
+//			updateDriverList();
+//		}
+
+        prompt.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                BookmarkPage.this.password.setEditable(!prompt.getSelection());
+            }
+        });
+
+		setControl(container);
+
+		setPageComplete(true);
+	}
+	public void updateDriverList() {
+			/*try {
+				JarFile file = new JarFile(driverFile.getText());
+				Enumeration enum = file.entries();
+				while (enum.hasMoreElements()) {
+					JarEntry entry = (JarEntry) enum.nextElement();
+					String className = entry.getName().replace('/', '.');
+					if (className.endsWith("Driver.class")) {
+						className = className.substring(0, className.lastIndexOf('.'));
+						//driverList.add(className);
+					}
+				}
+			} catch (IOException ex) {
+				//driverList.removeAll();
+			}*/
+	}
+	public void performFinish() {
+		if (initialData == null) {
+			initialData = new Bookmark();
+		}
+		initialData.setName(name.getText());
+		initialData.setUsername(username.getText());
+        initialData.setPromptForPassword(this.prompt.getSelection());
+        if (initialData.getPromptForPassword()) {
+            initialData.setPassword(""); //$NON-NLS-1$
+        } else {
+    		initialData.setPassword(password.getText());
+        }
+		initialData.addSchema(schema.getText());
+		initialData.setConnect(connect.getText());
+		initialData.setDriver(driver.getText());
+		int selection = type.getSelectionIndex();
+		if (selection >= 0) {
+			initialData.setType(drivers[selection].getDriverType());
+		}
+		initialData.setDriverFile(driverFile.getText());
+        BookmarkCollection.getInstance().addBookmark(initialData);
+	}
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/DeleteRowPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/DeleteRowPage.java
new file mode 100644
index 0000000..dc90a00
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/DeleteRowPage.java
@@ -0,0 +1,139 @@
+package com.quantum.wizards;
+
+import com.quantum.Messages;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class DeleteRowPage extends BaseSQLPage implements SQLPage {
+	String[] columnNames;
+	Text[] values;
+	Button[] whereValues;
+	Text query;
+
+	public DeleteRowPage(String pageName) {
+		super(pageName);
+	}
+	
+	public void createControl(Composite parent) {
+		System.out.println("page create control"); //$NON-NLS-1$
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 3;
+
+		if (row == null) {
+			System.out.println("Row is null"); //$NON-NLS-1$
+		}
+		if (row.getColumnNames() == null) {
+			System.out.println("Columns are null"); //$NON-NLS-1$
+		}
+		if (row.getTableData() == null) {
+			System.out.println("Data is null"); //$NON-NLS-1$
+		}
+		Entity entity = row.getEntity();
+		columnNames = row.getColumnNames();
+		String[] data = row.getTableData();
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			System.out.println("data = " + i + "=" + data[i]); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println("column = " + i + "=" + columnNames[i]); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		values = new Text[row.getColumnCount()];
+		whereValues = new Button[row.getColumnCount()];
+		new Label(container, SWT.NULL).setText(Messages.getString("DeleteRowPage.ColumnName")); //$NON-NLS-1$
+		new Label(container, SWT.NULL).setText(Messages.getString("DeleteRowPage.Value")); //$NON-NLS-1$
+		new Label(container, SWT.NULL).setText(Messages.getString("DeleteRowPage.IncludeIn")); //$NON-NLS-1$
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			Label label = new Label(container, SWT.NULL);
+			label.setText(columnNames[i]);
+			values[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
+			GridData fullHorizontal = new GridData();
+			fullHorizontal.horizontalAlignment = GridData.FILL;
+			values[i].setLayoutData(fullHorizontal);
+			values[i].setText(data[i]);
+
+			values[i].addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					updateQuery();
+				}				
+			});
+			
+			whereValues[i] = new Button(container, SWT.CHECK);
+			whereValues[i].setText(Messages.getString("DeleteRowPage.WhereClause")); //$NON-NLS-1$
+			// we check if it's a primary key to select it in the WHERE clause
+			if (entity != null && entity.getColumn(columnNames[i]).isPrimaryKey()) {
+                whereValues[i].setSelection(true);
+			} else {
+				whereValues[i].setSelection(false);
+            }
+			whereValues[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					updateQuery();
+				}
+			});
+		}
+		query = new Text(container, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP);
+ 		GridData gridData = new GridData();
+		gridData.horizontalSpan = layout.numColumns;
+		gridData.verticalSpan = 3;
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		query.setLayoutData(gridData);
+
+ 		setControl(container);
+        updateQuery();
+       
+		setPageComplete(true);
+	}
+	public void updateQuery() {
+		System.out.println(Messages.getString("DeleteRowPage.UpdatingQuery")); //$NON-NLS-1$
+		StringBuffer whereClause = new StringBuffer();
+		Bookmark bookmark = row.getBookmark();
+		Entity entity = row.getEntity();
+		DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+		
+		int numSelected = 0;
+		for (int i = 0; i < columnNames.length; i++) {
+			if (whereValues[i].getSelection()) {
+				if (numSelected > 0) whereClause.append(" AND "); //$NON-NLS-1$
+				numSelected++;
+				whereClause.append("("); //$NON-NLS-1$
+				whereClause.append(columnNames[i]);
+				whereClause.append(" = "); //$NON-NLS-1$
+                appendColumn(whereClause, entity, columnNames[i], adapter, values[i].getText());
+				whereClause.append(")"); //$NON-NLS-1$
+			}
+		}
+		String query = "DELETE FROM " + row.getTable(); //$NON-NLS-1$
+		if (numSelected > 0) {
+			query += " WHERE " + whereClause.toString(); //$NON-NLS-1$
+		}
+		if (numSelected > 0) {
+			setMessage(""); //$NON-NLS-1$
+		} else {
+			setMessage(Messages.getString("DeleteRowPage.WarningNoWhere")); //$NON-NLS-1$
+		}
+		this.query.setText(query);
+	}
+	
+    protected String getQueryText() {
+        return query.getText();
+    }
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizard.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizard.java
new file mode 100644
index 0000000..3689fd6
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizard.java
@@ -0,0 +1,34 @@
+package com.quantum.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IExportWizard;
+import org.eclipse.ui.IWorkbench;
+
+/**
+ * @author BC
+ */
+public class ExportBookmarkWizard extends Wizard implements IExportWizard {
+    
+    private ExportBookmarkWizardPage page = new ExportBookmarkWizardPage();
+
+    public ExportBookmarkWizard() {
+        setWindowTitle("Export Bookmarks");
+    }
+
+    public boolean performFinish() {
+        return this.page.finish();
+    }
+
+    public void init(IWorkbench workbench, IStructuredSelection selection) {
+    }
+
+    /**
+     * @see org.eclipse.jface.wizard.IWizard#addPages()
+     */
+    public void addPages() {
+        super.addPages();
+        addPage(this.page);
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizardPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizardPage.java
new file mode 100644
index 0000000..3feed8f
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportBookmarkWizardPage.java
@@ -0,0 +1,283 @@
+package com.quantum.wizards;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.quantum.Messages;
+import com.quantum.QuantumPlugin;
+import com.quantum.model.Bookmark;
+import com.quantum.model.BookmarkCollection;
+import com.quantum.model.xml.ModelToXMLConverter;
+import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.util.xml.XMLHelper;
+
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.w3c.dom.Document;
+
+/**
+ * @author BC
+ */
+public class ExportBookmarkWizardPage extends WizardPage {
+    
+    public class ContentProvider implements ITreeContentProvider {
+
+        public Object[] getChildren(Object parentElement) {
+            if (parentElement instanceof BookmarkCollection) {
+                return ((BookmarkCollection) parentElement).getBookmarks();
+            } else {
+                return new Object[0];
+            }
+        }
+        public Object getParent(Object element) {
+            if (element instanceof Bookmark) {
+                return BookmarkCollection.getInstance();
+            } else {
+                return null;
+            }
+        }
+        public boolean hasChildren(Object element) {
+            if (element instanceof BookmarkCollection) {
+                return ((BookmarkCollection) element).getBookmarks().length > 0;
+            } else {
+                return false;
+            }
+        }
+        public Object[] getElements(Object inputElement) {
+            return getChildren(inputElement);
+        }
+        public void dispose() {
+        }
+        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+        }
+    }
+    
+    public class LabelProvider implements ILabelProvider {
+
+        public Image getImage(Object element) {
+            if (element instanceof Bookmark) {
+                return QuantumPlugin.getImage("bookmarks.gif");
+            } else {
+                return null;
+            }
+        }
+
+        public String getText(Object element) {
+            
+            if (element instanceof Bookmark) {
+                return ((Bookmark) element).getName();
+            } else {
+                return element.toString();
+            }
+        }
+
+        public void addListener(ILabelProviderListener listener) {
+        }
+
+        public void dispose() {
+        }
+
+        public boolean isLabelProperty(Object element, String property) {
+            return false;
+        }
+
+        public void removeListener(ILabelProviderListener listener) {
+        }
+    }
+    
+    private CheckboxTreeViewer treeViewer;
+    private Text fileNameText;
+    
+    private boolean sourceIsSelected = false;
+    private boolean destinationIsSelected = false;
+
+    /**
+     * @param pageName
+     */
+    protected ExportBookmarkWizardPage() {
+        super("page1");
+        setTitle(Messages.getString(getClass(), "title"));
+    }
+
+    public void createControl(Composite pageContainer) {
+        this.sourceIsSelected = false;
+        this.destinationIsSelected = false;
+        
+        Composite composite = new Composite(pageContainer, SWT.NULL);
+        composite.setLayout(new GridLayout());
+        composite.setLayoutData(
+            new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
+
+        this.treeViewer = new CheckboxTreeViewer(composite, 
+            SWT.CHECK | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+        this.treeViewer.setContentProvider(new ContentProvider());
+        this.treeViewer.setLabelProvider(new LabelProvider());
+        this.treeViewer.setInput(BookmarkCollection.getInstance());
+        selectAll();
+        
+        this.treeViewer.addCheckStateListener(new ICheckStateListener() {
+            public void checkStateChanged(CheckStateChangedEvent event) {
+                setSourceIsSelected(
+                    ExportBookmarkWizardPage.this.treeViewer.getCheckedElements().length > 0);
+            }
+        });
+
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
+        data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
+        data.grabExcessHorizontalSpace = true;
+        data.heightHint = 200;
+        data.widthHint = 400;
+        this.treeViewer.getControl().setLayoutData(data);
+
+        Composite buttons = new Composite(composite, SWT.NULL);
+        buttons.setLayout(new GridLayout(2, false));
+        buttons.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
+        
+        Button selectAll = new Button(buttons, SWT.NONE);
+        selectAll.setText(Messages.getString(getClass(), "selectAll"));
+        selectAll.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                selectAll();
+            }
+        });
+
+        Button deselectAll = new Button(buttons, SWT.NONE);
+        deselectAll.setText(Messages.getString(getClass(), "deselectAll"));
+        deselectAll.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                deselectAll();
+            }
+        });
+        
+        createDestinationArea(composite);
+
+        setControl(composite);
+    }
+
+    private void createDestinationArea(Composite composite) {
+        GridData data;
+        Composite fileArea = new Composite(composite, SWT.NULL);
+        fileArea.setLayout(new GridLayout(3, false));
+        fileArea.setLayoutData(
+            new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
+        Label label = new Label(fileArea, SWT.NONE);
+        label.setText("File name:");
+        
+        this.fileNameText = new Text(fileArea, SWT.BORDER);
+        data = new GridData();
+        data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
+        data.widthHint = 300;
+        this.fileNameText.setLayoutData(data);
+        this.fileNameText.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent event) {
+                String text = ((Text) event.getSource()).getText();
+                setDestinationIsSelected(text != null && text.trim().length() > 0);
+            }
+        });
+        
+        Button button = new Button(fileArea, SWT.NONE);
+        button.setText("Browse");
+        button.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent event) {
+                promptForFile();
+            }
+        });
+    }
+    
+    private void setSourceIsSelected(boolean selected) {
+        this.sourceIsSelected = selected;
+        setPageComplete(selected & this.destinationIsSelected);
+    }
+    
+    private void setDestinationIsSelected(boolean selected) {
+        this.destinationIsSelected = selected;
+        setPageComplete(selected & this.sourceIsSelected);
+    }
+    
+    protected void promptForFile() {
+    
+        FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
+        dialog.setFilterExtensions(new String[] { "xml" });
+        dialog.setFilterNames(new String[] { "XML Files (*.xml)"});
+        String filename = dialog.open();
+        if (filename != null) {
+            this.fileNameText.setText(filename);
+        }
+    }
+    protected void deselectAll() {
+        this.treeViewer.setCheckedElements(new Object[0]);
+        setSourceIsSelected(false);
+    }
+
+    protected void selectAll() {
+        Bookmark[] bookmarks = BookmarkCollection.getInstance().getBookmarks();
+        this.treeViewer.setCheckedElements(bookmarks);
+        setSourceIsSelected(bookmarks.length > 0);
+    }
+    
+    public boolean finish() {
+        
+        String fileName = this.fileNameText.getText();
+        File file = new File(fileName);
+        if (file.exists()) {
+            // prompt for overwrite
+        } else if (!file.getParentFile().exists()) {
+            // do what?
+        }
+        
+        try {
+            Object[] bookmarks = this.treeViewer.getCheckedElements();
+            Document document = XMLHelper.createEmptyDocument();
+            ModelToXMLConverter.getInstance().createRoot(document);
+                
+            for (int i = 0, length = (bookmarks == null) ? 0 : bookmarks.length;
+                i < length;
+                i++) {
+                ModelToXMLConverter.getInstance().convert(
+                    document.getDocumentElement(), (Bookmark) bookmarks[i]);
+            }
+
+            FileWriter writer = new FileWriter(file);
+            try {
+                XMLHelper.write(writer, document);
+            } finally {
+                writer.close();
+            }
+        } catch (IOException e) {
+            ExceptionDisplayDialog.openError(getShell(), 
+                Messages.getString(getClass(), "error.IOException.title"), 
+                Messages.getString(getClass(), "error.IOException.message", 
+                    new Object[] { fileName }), e);
+        } catch (ParserConfigurationException e) {
+            ExceptionDisplayDialog.openError(getShell(), 
+                Messages.getString(getClass(), "error.IOException.title"), 
+                Messages.getString(getClass(), "error.IOException.message", 
+                    new Object[] { fileName }), e);
+        }
+        
+        return true;
+    }
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportTorqueWizard.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportTorqueWizard.java
new file mode 100644
index 0000000..7b05084
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/ExportTorqueWizard.java
@@ -0,0 +1,20 @@
+package com.quantum.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IExportWizard;
+import org.eclipse.ui.IWorkbench;
+
+/**
+ * @author BC
+ */
+public class ExportTorqueWizard extends Wizard implements IExportWizard {
+
+    public boolean performFinish() {
+        return false;
+    }
+
+    public void init(IWorkbench workbench, IStructuredSelection selection) {
+    }
+
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/InsertRowPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/InsertRowPage.java
new file mode 100644
index 0000000..cbf7ff1
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/InsertRowPage.java
@@ -0,0 +1,120 @@
+package com.quantum.wizards;
+
+import com.quantum.Messages;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class InsertRowPage extends BaseSQLPage implements SQLPage {
+	String[] columnNames;
+	Text[] values;
+	Label query;
+	int numColumns = 0;
+	
+	public InsertRowPage(String pageName) {
+		super(pageName);
+	}
+
+	public void createControl(Composite parent) {
+		System.out.println("page create control"); //$NON-NLS-1$
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 2;
+
+		if (row == null) {
+			System.out.println("Row is null"); //$NON-NLS-1$
+		}
+		if (row.getColumnNames() == null) {
+			System.out.println("Columns are null"); //$NON-NLS-1$
+		}
+		if (row.getTableData() == null) {
+			System.out.println("Data is null"); //$NON-NLS-1$
+		}
+		columnNames = row.getColumnNames();
+		String[] data = row.getTableData();
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			System.out.println("data = " + i + "=" + data[i]); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println("column = " + i + "=" + columnNames[i]); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		values = new Text[row.getColumnCount()];
+		new Label(container, SWT.NULL).setText(Messages.getString("InsertRowPage.ColumnName")); //$NON-NLS-1$
+		new Label(container, SWT.NULL).setText(Messages.getString("InsertRowPage.Value")); //$NON-NLS-1$
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			Label label = new Label(container, SWT.NULL);
+			label.setText(columnNames[i]);
+			values[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
+			GridData fullHorizontal = new GridData();
+			fullHorizontal.horizontalAlignment = GridData.FILL;
+			values[i].setLayoutData(fullHorizontal);
+
+			//values[i].setText(data[i]);
+			values[i].addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					updateQuery();
+				}				
+			});
+		}
+		query = new Label(container, SWT.WRAP);
+ 		GridData gridData = new GridData();
+ 		gridData.horizontalSpan = layout.numColumns;
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		query.setLayoutData(gridData);
+
+ 		setControl(container);
+        updateQuery();
+       
+		setPageComplete(true);
+	}
+	public void updateQuery() {
+		System.out.println("Updating query"); //$NON-NLS-1$
+		StringBuffer valuesClause = new StringBuffer();
+		StringBuffer namesClause = new StringBuffer();
+		Bookmark bookmark = row.getBookmark();
+		Entity entity = row.getEntity();
+		DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+		
+		numColumns = 0;
+		for (int i = 0; i < columnNames.length; i++) {
+			String name = columnNames[i];
+			String value = values[i].getText();
+			if (value.length() > 0) {
+				if (numColumns > 0) {
+					valuesClause.append(", "); //$NON-NLS-1$
+					namesClause.append(", ");
+				}
+                appendColumn(valuesClause, entity, name, adapter, value);
+				namesClause.append(name);	
+				numColumns++;
+			}
+		}
+		
+		String query = "INSERT INTO " + row.getTable(); //$NON-NLS-1$
+		if (numColumns > 0) {
+			query += " (" + namesClause + ")";
+			query += " VALUES " + "(" + valuesClause; //$NON-NLS-1$
+			query += " )"; //$NON-NLS-1$
+		}
+		this.query.setText(query);
+	}
+    /* (non-Javadoc)
+     * @see com.quantum.wizards.BaseSQLPage#getQueryText()
+     */
+    protected String getQueryText() {
+        return this.query.getText();
+    }
+
+}
\ No newline at end of file
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLPage.java
new file mode 100644
index 0000000..32b4322
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLPage.java
@@ -0,0 +1,11 @@
+package com.quantum.wizards;
+
+import com.quantum.sql.TableRow;
+import com.quantum.view.tableview.TableAdapter;
+
+import org.eclipse.jface.wizard.IWizardPage;
+
+public interface SQLPage extends IWizardPage {
+	public void init(TableRow row, TableAdapter adapter);
+	public boolean performFinish();
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLRowWizard.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLRowWizard.java
new file mode 100644
index 0000000..bc37001
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SQLRowWizard.java
@@ -0,0 +1,28 @@
+package com.quantum.wizards;
+
+import com.quantum.sql.TableRow;
+import com.quantum.view.tableview.TableAdapter;
+
+import org.eclipse.jface.wizard.Wizard;
+
+public class SQLRowWizard extends Wizard {
+	SQLPage page;
+	TableRow row;
+	TableAdapter adapter;
+	public void init(String title, SQLPage page, TableRow row, TableAdapter adapter) {
+		System.out.println("Init SQL row wizard"); //$NON-NLS-1$
+		this.row = row;
+		this.adapter = adapter;
+		this.page = page;
+		setWindowTitle(title);
+	}
+	public boolean performFinish() {
+		System.out.println("Perform SQL row wizard finish"); //$NON-NLS-1$
+		return page.performFinish();
+	}
+	public void addPages() {
+		System.out.println("QL row wizard adding pages"); //$NON-NLS-1$
+		page.init(row, adapter);
+		addPage(page);
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SortFilterPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SortFilterPage.java
new file mode 100644
index 0000000..c23d03e
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/SortFilterPage.java
@@ -0,0 +1,180 @@
+package com.quantum.wizards;
+
+import com.quantum.sql.FilterSort;
+import com.quantum.sql.TableRow;
+import com.quantum.view.tableview.TableAdapter;
+import com.quantum.view.tableview.TableView;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class SortFilterPage extends WizardPage implements SQLPage {
+	TableRow row;
+	TableAdapter adapter;
+	Button[] filter;
+	Combo[] operator;
+	Text[] filterValues;
+	Button[] stringFlags;
+	Button[] sort;
+	Combo[] ascDesc;
+	
+	String columnNames[];
+	Label query;
+	FilterSort filterSort = new FilterSort();
+	public SortFilterPage(String pageName) {
+		super(pageName);
+	}
+
+	public void init(TableRow row, TableAdapter adapter) {
+		this.row = row;
+		this.adapter = adapter;
+	}
+
+	public void createControl(Composite parent) {
+		System.out.println("page create control"); //$NON-NLS-1$
+		
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		int layoutColumns = 6;
+		layout.numColumns = layoutColumns;
+
+		if (row == null) {
+			System.out.println("Row is null"); //$NON-NLS-1$
+		}
+		if (row.getColumnNames() == null) {
+			System.out.println("Columns are null"); //$NON-NLS-1$
+		}
+		if (row.getTableData() == null) {
+			System.out.println("Data is null"); //$NON-NLS-1$
+		}
+		
+		columnNames = row.getColumnNames();
+		String[] data = row.getTableData();
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			System.out.println("data = " + i + "=" + data[i]); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println("column = " + i + "=" + columnNames[i]); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		int size = row.getColumnCount();
+		filter = new Button[size];
+		operator = new Combo[size];
+		filterValues = new Text[size];
+		stringFlags = new Button[size];
+		sort = new Button[size];
+		ascDesc = new Combo[size];
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			filter[i] = new Button(container, SWT.CHECK);
+			filter[i].setText(columnNames[i]);
+			filter[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					updateQuery();
+				}
+			});
+
+			operator[i] = new Combo(container, SWT.SINGLE | SWT.READ_ONLY);
+			operator[i].add("="); //$NON-NLS-1$
+			operator[i].add("<>"); //$NON-NLS-1$
+			operator[i].add("<"); //$NON-NLS-1$
+			operator[i].add(">"); //$NON-NLS-1$
+			operator[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					updateQuery();
+				}
+			});
+			
+			filterValues[i] = new Text(container, SWT.BORDER);
+			filterValues[i].setText(data[i]);
+			filterValues[i].addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					updateQuery();
+				}				
+			});
+			
+			stringFlags[i] = new Button(container, SWT.CHECK);
+			stringFlags[i].setText("String"); //$NON-NLS-1$
+			stringFlags[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					updateQuery();
+				}
+			});
+			
+			final int index = i;
+			sort[i] = new Button(container, SWT.CHECK);
+			sort[i].setText(columnNames[i]);
+			sort[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					if (sort[index].getSelection()) {
+						filterSort.addSort(columnNames[index], ascDesc[index].getText());
+					} else {
+						filterSort.removeSort(columnNames[index]);
+					}
+					updateQuery();
+				}
+			});
+
+			ascDesc[i] = new Combo(container, SWT.SINGLE | SWT.READ_ONLY);
+			ascDesc[i].add(""); //$NON-NLS-1$
+			ascDesc[i].add("ASC"); //$NON-NLS-1$
+			ascDesc[i].add("DESC"); //$NON-NLS-1$
+			ascDesc[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					if (sort[index].getSelection()) {
+						filterSort.addSort(columnNames[index], ascDesc[index].getText());
+					} else {
+						filterSort.removeSort(columnNames[index]);
+					}
+					updateQuery();
+				}
+			});
+		}
+		query = new Label(container, SWT.WRAP);
+ 		GridData gridData = new GridData();
+ 		gridData.horizontalSpan = layoutColumns;
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		query.setLayoutData(gridData);
+
+ 		setControl(container);
+       
+		setPageComplete(true);
+	}
+
+	public void updateQuery() {
+		filterSort.clearFilters();
+		for (int i = 0; i < filter.length; i++) {
+			if (filter[i].getSelection()) {
+				filterSort.addFilter(filter[i].getText(), operator[i].getText(), filterValues[i].getText(), stringFlags[i].getSelection());
+			}
+		}
+		query.setText(filterSort.toString());
+	}
+
+	public boolean performFinish() {
+		adapter.setFilterSort(filterSort);
+		TableView.getInstance().refreshCurrent();
+		return true;
+	}
+}
diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/UpdateRowPage.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/UpdateRowPage.java
new file mode 100644
index 0000000..b057d59
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/wizards/UpdateRowPage.java
@@ -0,0 +1,166 @@
+package com.quantum.wizards;
+
+import com.quantum.Messages;
+import com.quantum.adapters.AdapterFactory;
+import com.quantum.adapters.DatabaseAdapter;
+import com.quantum.model.Bookmark;
+import com.quantum.model.Entity;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class UpdateRowPage extends BaseSQLPage implements SQLPage {
+	String[] columnNames;
+	Text[] oldValues;
+	Text[] newValues;
+	Button[] primaryKeys;
+	Button[] setValues;
+	Label query;
+	public UpdateRowPage(String pageName) {
+		super(pageName);
+	}
+
+	public void createControl(Composite parent) {
+		System.out.println("page create control"); //$NON-NLS-1$
+		Composite container = new Composite(parent, SWT.V_SCROLL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		Entity entity = row.getEntity();
+		
+		int layoutColumns = 5;
+		layout.numColumns = layoutColumns;
+
+		if (row == null) {
+			System.out.println("Row is null"); //$NON-NLS-1$
+		}
+		if (row.getColumnNames() == null) {
+			System.out.println("Columns are null"); //$NON-NLS-1$
+		}
+		if (row.getTableData() == null) {
+			System.out.println("Data is null"); //$NON-NLS-1$
+		}
+		columnNames = row.getColumnNames();
+		String[] data = row.getTableData();
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			System.out.println("data = " + i + "=" + data[i]); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println("column = " + i + "=" + columnNames[i]); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		oldValues = new Text[row.getColumnCount()];
+		newValues = new Text[row.getColumnCount()];
+		primaryKeys = new Button[row.getColumnCount()];
+		setValues = new Button[row.getColumnCount()];
+		Label temp = new Label(container, SWT.NULL);
+		temp.setText(Messages.getString("UpdateRowPage.ColumnName")); //$NON-NLS-1$
+		temp = new Label(container, SWT.NULL);
+		temp.setText(Messages.getString("UpdateRowPage.OldValue")); //$NON-NLS-1$
+		temp = new Label(container, SWT.NULL);
+		temp.setText(""); //$NON-NLS-1$
+		temp = new Label(container, SWT.NULL);
+		temp.setText(Messages.getString("UpdateRowPage.NewValue")); //$NON-NLS-1$
+		temp = new Label(container, SWT.NULL);
+		temp.setText(Messages.getString("UpdateRowPage._13")); //$NON-NLS-1$
+		for (int i = 0; i < row.getColumnCount(); i++) {
+			Label label = new Label(container, SWT.NULL);
+			label.setText(columnNames[i]);
+			oldValues[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
+			oldValues[i].setText(data[i]);
+			oldValues[i].addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					updateQuery();
+				}				
+			});
+			primaryKeys[i] = new Button(container, SWT.CHECK);
+			primaryKeys[i].setText("Where"); //$NON-NLS-1$
+			if (entity != null && entity.getColumn(columnNames[i]).isPrimaryKey()) 
+				primaryKeys[i].setSelection(true);
+    			primaryKeys[i].addSelectionListener(new SelectionListener() {
+    				public void widgetDefaultSelected(SelectionEvent e) {
+    				}
+    				public void widgetSelected(SelectionEvent e) {
+    					updateQuery();
+    				}
+			});
+			newValues[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
+			newValues[i].setText(data[i]);
+			newValues[i].addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					updateQuery();
+				}				
+			});
+			setValues[i] = new Button(container, SWT.CHECK);
+			setValues[i].setText(Messages.getString("UpdateRowPage.SetValue")); //$NON-NLS-1$
+			setValues[i].addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					updateQuery();
+				}
+			});
+		}
+		query = new Label(container, SWT.WRAP | SWT.V_SCROLL);
+ 		GridData gridData = new GridData();
+ 		gridData.horizontalSpan = layoutColumns;
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		query.setLayoutData(gridData);
+
+ 		setControl(container);
+        updateQuery();
+       
+		setPageComplete(true);
+	}
+	public void updateQuery() {
+		System.out.println("Updating query"); //$NON-NLS-1$
+		StringBuffer setClause = new StringBuffer();
+		StringBuffer whereClause = new StringBuffer();
+		Bookmark bookmark = row.getBookmark();
+		Entity entity = row.getEntity();
+		DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+		
+		int numValuesSet = 0;
+		int numValuesWhere = 0;
+		for (int i = 0; i < columnNames.length; i++) {
+			if (primaryKeys[i].getSelection()) {
+				String value = oldValues[i].getText();
+				if (numValuesWhere > 0) whereClause.append(" AND "); //$NON-NLS-1$
+				whereClause.append("("); //$NON-NLS-1$
+				whereClause.append(columnNames[i]);
+				whereClause.append(" = "); //$NON-NLS-1$
+                appendColumn(whereClause, entity, columnNames[i], adapter, value);
+				whereClause.append(")"); //$NON-NLS-1$
+				numValuesWhere++;
+			} 
+			if (setValues[i].getSelection()) {
+				String value = newValues[i].getText();
+				if (numValuesSet > 0) setClause.append(", "); //$NON-NLS-1$
+				setClause.append(columnNames[i]);
+				setClause.append(" = "); //$NON-NLS-1$
+                appendColumn(setClause, entity, columnNames[i], adapter, value);
+				numValuesSet++;
+			}
+		}
+			String query = "UPDATE " + row.getTable(); //$NON-NLS-1$
+		query += " SET " + setClause.toString(); //$NON-NLS-1$
+		query += " WHERE " + whereClause.toString(); //$NON-NLS-1$
+		this.query.setText(query);
+	}
+
+    /* (non-Javadoc)
+     * @see com.quantum.wizards.BaseSQLPage#getQueryText()
+     */
+    protected String getQueryText() {
+        return query.getText();
+    }
+
+}
\ No newline at end of file
-- 
1.7.1