1) Fixed issue #347: Syntax highlight doesn't like apostrophe in heredoc.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / lookup / ImportBinding.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ImportBinding.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ImportBinding.java
index 1727234..2ad87a5 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ImportBinding.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ImportBinding.java
@@ -1,45 +1,52 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
+ * 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 v0.5 
+ * 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-v05.html
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- ******************************************************************************/
+ *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
+import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpdt.internal.compiler.util.CharOperation;
 
 public class ImportBinding extends Binding {
        public char[][] compoundName;
+
        public boolean onDemand;
+
        public ImportReference reference;
 
        Binding resolvedImport; // must ensure the import is resolved
-       
-public ImportBinding(char[][] compoundName, boolean isOnDemand, Binding binding, ImportReference reference) {
-       this.compoundName = compoundName;
-       this.onDemand = isOnDemand;
-       this.resolvedImport = binding;
-       this.reference = reference;
-}
-/* API
-* Answer the receiver's binding type from Binding.BindingID.
-*/
 
-public final int bindingType() {
-       return IMPORT;
-}
-public char[] readableName() {
-       if (onDemand)
-               return CharOperation.concat(CharOperation.concatWith(compoundName, '.'), ".*".toCharArray()); //$NON-NLS-1$
-       else
-               return CharOperation.concatWith(compoundName, '.');
-}
-public String toString() {
-       return "import : " + new String(readableName()); //$NON-NLS-1$
-}
+       public ImportBinding(char[][] compoundName, boolean isOnDemand,
+                       Binding binding, ImportReference reference) {
+               this.compoundName = compoundName;
+               this.onDemand = isOnDemand;
+               this.resolvedImport = binding;
+               this.reference = reference;
+       }
+
+       /*
+        * API Answer the receiver's binding type from Binding.BindingID.
+        */
+
+       public final int bindingType() {
+               return IMPORT;
+       }
+
+       public char[] readableName() {
+               if (onDemand)
+                       return CharOperation.concat(CharOperation.concatWith(compoundName,
+                                       '.'), ".*".toCharArray()); //$NON-NLS-1$
+               else
+                       return CharOperation.concatWith(compoundName, '.');
+       }
+
+       public String toString() {
+               return "include : " + new String(readableName()); //$NON-NLS-1$
+       }
 }