X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/BasicCompilationUnit.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/BasicCompilationUnit.java
index f0176e0..cf5d8d5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/BasicCompilationUnit.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/BasicCompilationUnit.java
@@ -13,25 +13,52 @@ package net.sourceforge.phpdt.internal.core;
 import java.io.File;
 import java.io.IOException;
 
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 
 /**
- * A basic implementation of <code>ICompilationUnit</code>
- * for use in the <code>SourceMapper</code>.
+ * A basic implementation of <code>ICompilationUnit</code> for use in the <code>SourceMapper</code>.
+ * 
  * @see ICompilationUnit
  */
 public class BasicCompilationUnit implements ICompilationUnit {
   protected char[] contents;
+
   protected char[] fileName;
+
   protected char[][] packageName;
+
   protected char[] mainTypeName;
+
   protected String encoding;
 
-  public BasicCompilationUnit(char[] contents, char[][] packageName, String fileName, String encoding) {
+  protected IResource resource;
+
+  //  public BasicCompilationUnit(char[] contents, char[][] packageName, String fileName, String encoding) {
+  //    this.contents = contents;
+  //    this.fileName = fileName.toCharArray();
+  //    this.packageName = packageName;
+  //
+  //    int start = fileName.lastIndexOf("/") + 1; //$NON-NLS-1$
+  //    if (start == 0 || start < fileName.lastIndexOf("\\")) //$NON-NLS-1$
+  //      start = fileName.lastIndexOf("\\") + 1; //$NON-NLS-1$
+  //
+  //    int end = fileName.lastIndexOf("."); //$NON-NLS-1$
+  //    if (end == -1)
+  //      end = fileName.length();
+  //
+  //    this.mainTypeName = fileName.substring(start, end).toCharArray();
+  //    this.encoding = encoding;
+  //  }
+  public BasicCompilationUnit(char[] contents, char[][] packageName, String fileName) {
     this.contents = contents;
     this.fileName = fileName.toCharArray();
     this.packageName = packageName;
@@ -45,8 +72,56 @@ public class BasicCompilationUnit implements ICompilationUnit {
       end = fileName.length();
 
     this.mainTypeName = fileName.substring(start, end).toCharArray();
+    this.encoding = null;
+    this.resource = null;
+  }
+
+  public BasicCompilationUnit(char[] contents, char[][] packageName, String fileName, String encoding) {
+    this(contents, packageName, fileName);
     this.encoding = encoding;
+    this.resource = null;
+  }
+
+  public BasicCompilationUnit(char[] contents, char[][] packageName, String fileName, IJavaElement javaElement) {
+    this(contents, packageName, fileName);
+    initEncoding(javaElement);
+  }
+
+  /*
+   * Initialize compilation unit encoding. If we have a project, then get file name corresponding IFile and retrieve its encoding
+   * using new API for encoding. In case of a class file, then go through project in order to let the possibility to retrieve a
+   * corresponding source file resource. If we have a compilation unit, then get encoding from its resource directly...
+   */
+  private void initEncoding(IJavaElement javaElement) {
+    if (javaElement != null) {
+      try {
+        IJavaProject javaProject = javaElement.getJavaProject();
+        switch (javaElement.getElementType()) {
+        case IJavaElement.COMPILATION_UNIT:
+          IFile file = (IFile) javaElement.getResource();
+
+          if (file != null) {
+            resource = file;
+            this.encoding = file.getCharset();
+            break;
+          }
+        // if no file, then get project encoding
+        default:
+          IProject project = (IProject) javaProject.getResource();
+          if (project != null) {
+            resource = project;
+            this.encoding = project.getDefaultCharset();
+          }
+          break;
+        }
+      } catch (CoreException e1) {
+        this.encoding = null;
+      }
+    } else {
+      this.encoding = null;
+    }
   }
+
   public char[] getContents() {
     if (this.contents != null)
       return this.contents; // answer the cached source
@@ -58,18 +133,27 @@ public class BasicCompilationUnit implements ICompilationUnit {
     }
     return CharOperation.NO_CHAR;
   }
+
   public char[] getFileName() {
     return this.fileName;
   }
+
   public char[] getMainTypeName() {
     return this.mainTypeName;
   }
+
   public char[][] getPackageName() {
     return this.packageName;
   }
+
   public String toString() {
     return "CompilationUnit: " + new String(fileName); //$NON-NLS-1$
   }
-  
 
-}
+  /* (non-Javadoc)
+   * @see net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit#getResource()
+   */
+  public IResource getResource() {
+    return resource;
+  }
+}
\ No newline at end of file