misc changes

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java
index d151393..bb41fa3 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java
@@ -5,7 +5,7 @@ import java.io.File;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 import net.sourceforge.phpdt.internal.launching.PHPInterpreter;
-import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditPathMapDialog.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditPathMapDialog.java
index afffa87..7fe69d4 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditPathMapDialog.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditPathMapDialog.java
@@ -6,7 +6,7 @@
  */
 package net.sourceforge.phpdt.internal.debug.ui.preferences;
 
-import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
 
 import org.eclipse.swt.SWT;

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPPartitionScannerTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPPartitionScannerTest.java
index c94f098..535b473 100644 (file)
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPPartitionScannerTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPPartitionScannerTest.java
@@ -5,6 +5,7 @@
 package net.sourceforge.phpeclipse.phpeditor.php.test;
 
 import junit.framework.*;
+import net.sourceforge.phpdt.internal.ui.text.*;
 import net.sourceforge.phpeclipse.phpeditor.php.*;
 
 import org.eclipse.jface.text.*;
@@ -13,7 +14,7 @@ import org.eclipse.jface.text.rules.*;
 /**
  * Testcase for the PHPPartitionScanner
  * @author Stefan Langer
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class PHPPartitionScannerTest extends TestCase
 {
@@ -41,7 +42,7 @@ public class PHPPartitionScannerTest extends TestCase
         fScanner.setRange(fDocument, 0, fDocument.getLength());
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             fDocument.getLength(),
@@ -60,7 +61,7 @@ public class PHPPartitionScannerTest extends TestCase
         fScanner.setRange(fDocument, 0, fDocument.getLength());
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             fDocument.getLength(),
@@ -99,7 +100,7 @@ public class PHPPartitionScannerTest extends TestCase
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 1 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 1 not correct!",
@@ -113,7 +114,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHPComment Partition 1 not recognized!",
-            IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+            IPHPPartitions.PHP_MULTILINE_COMMENT,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHPComment Partition 1 not correct!",
@@ -128,7 +129,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 2 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 2 not correct!",
@@ -143,7 +144,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 1 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 1 not correct!",
@@ -158,7 +159,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 3 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 3 not correct!",
@@ -176,7 +177,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 2 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 2 not correct!",
@@ -195,7 +196,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 4 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 4 not correct!",
@@ -215,7 +216,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Multilinecomment 2 not recognized!",
-            IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+            IPHPPartitions.PHP_MULTILINE_COMMENT,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Multilinecomment 2  not correct!",
@@ -236,7 +237,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 5 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 5 not correct!",
@@ -257,7 +258,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 3 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 3 not correct!",
@@ -294,7 +295,7 @@ public class PHPPartitionScannerTest extends TestCase
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 1 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 1 not correct!",
@@ -308,7 +309,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 1 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 1 not correct!",
@@ -322,7 +323,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 2 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 2 not correct!",
@@ -336,7 +337,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 2 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 2 not correct!",
@@ -350,7 +351,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition 3 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition 3 not correct!",
@@ -364,7 +365,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "HTML 3 not recognized!",
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of HTML 3 not correct!",
@@ -389,7 +390,7 @@ public class PHPPartitionScannerTest extends TestCase
         fScanner.setRange(fDocument, 0, fDocument.getLength());
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
-            IPHPPartitionScannerConstants.HTML,
+            IPHPPartitions.HTML,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             fDocument.getLength(),
@@ -415,7 +416,7 @@ public class PHPPartitionScannerTest extends TestCase
         IToken token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition part 1 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition part 1 not correct!",
@@ -429,7 +430,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Multiline not recognized!",
-            IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+            IPHPPartitions.PHP_MULTILINE_COMMENT,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Multinline not correct!",
@@ -443,7 +444,7 @@ public class PHPPartitionScannerTest extends TestCase
         token = fScanner.nextToken();
         junit.framework.Assert.assertEquals(
             "PHP Partition part 2 not recognized!",
-            IPHPPartitionScannerConstants.PHP,
+            IPHPPartitions.PHP_PARTITIONING,
             (String) token.getData());
         junit.framework.Assert.assertEquals(
             "Length of PHP Partition part 2 not correct!",