From: toshihiro <toshihiro>
Date: Mon, 28 May 2007 06:58:30 +0000 (+0000)
Subject: Fix #1726724 - "build" causes parser error
X-Git-Url: http://git.phpeclipse.com

Fix #1726724 - "build" causes parser error
---

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 6669d85..8e1fd60 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
@@ -88,7 +88,7 @@ public class BatchImageBuilder extends AbstractImageBuilder {
 							if (resource == null)
 								resource = proxy.requestResource();
 							sourceFiles.add(new SourceFile((IFile) resource,
-									sourceLocation, encoding));
+									sourceLocation, ((IFile) resource).getCharset()));
 						}
 						return false;
 					case IResource.FOLDER:
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 260c29f..1d382fb 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
@@ -494,7 +494,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
 						System.out
 								.println("Compile this added source file " + typeLocator); //$NON-NLS-1$
 					sourceFiles.add(new SourceFile((IFile) resource, md,
-							encoding));
+							((IFile) resource).getCharset()));
 					String typeName = typePath.toString();
 					// if (!newState.isDuplicateLocator(typeName, typeLocator))
 					// { // adding
@@ -560,7 +560,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
 						System.out
 								.println("Compile this changed source file " + typeLocator); //$NON-NLS-1$
 					sourceFiles.add(new SourceFile((IFile) resource, md,
-							encoding));
+							((IFile) resource).getCharset()));
 				}
 				return;
 				// } else if (ProjectPrefUtil.isClassFileName(resourceName)) {