From: axelcl <axelcl>
Date: Mon, 13 Mar 2006 23:52:15 +0000 (+0000)
Subject: Fixed bug: ArrayIndexOutOfBoundsException
X-Git-Url: http://secure.phpeclipse.com

Fixed bug: ArrayIndexOutOfBoundsException
See: http://phpeclipse.pastebin.com/599491
---

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/SourceFile.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/SourceFile.java
index 07aaa8d..cac68c2 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/SourceFile.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/SourceFile.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * 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
  *******************************************************************************/
@@ -22,87 +22,99 @@ import org.eclipse.core.runtime.IPath;
 
 public class SourceFile implements ICompilationUnit {
 
-IFile resource;
-ClasspathMultiDirectory sourceLocation;
-String initialTypeName;
-String encoding;
+	IFile resource;
 
-public SourceFile(IFile resource, ClasspathMultiDirectory sourceLocation, String encoding) {
-	this.resource = resource;
-	this.sourceLocation = sourceLocation;
-	this.initialTypeName = extractTypeName();
-	this.encoding = encoding;
-}
+	ClasspathMultiDirectory sourceLocation;
+
+	String initialTypeName;
+
+	String encoding;
+
+	public SourceFile(IFile resource, ClasspathMultiDirectory sourceLocation, String encoding) {
+		this.resource = resource;
+		this.sourceLocation = sourceLocation;
+		this.initialTypeName = extractTypeName();
+		this.encoding = encoding;
+	}
+
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (!(o instanceof SourceFile))
+			return false;
 
-public boolean equals(Object o) {
-	if (this == o) return true;
-	if (!(o instanceof SourceFile)) return false;
-
-	SourceFile f = (SourceFile) o;
-	return sourceLocation == f.sourceLocation && resource.getFullPath().equals(f.resource.getFullPath());
-} 
-
-String extractTypeName() {
-	// answer a String with the qualified type name for the source file in the form: 'p1/p2/A'
-	IPath fullPath = resource.getFullPath();
-	int resourceSegmentCount = fullPath.segmentCount();
-	int sourceFolderSegmentCount = sourceLocation.sourceFolder.getFullPath().segmentCount();
-	int charCount = (resourceSegmentCount - sourceFolderSegmentCount - 1) - 5; // length of ".java"
-	for (int i = sourceFolderSegmentCount; i < resourceSegmentCount; i++)
-		charCount += fullPath.segment(i).length();
-
-	char[] result = new char[charCount];
-	int offset = 0;
-	resourceSegmentCount--; // deal with the last segment separately
-	for (int i = sourceFolderSegmentCount; i < resourceSegmentCount; i++) {
-		String segment = fullPath.segment(i);
-		int size = segment.length();
+		SourceFile f = (SourceFile) o;
+		return sourceLocation == f.sourceLocation && resource.getFullPath().equals(f.resource.getFullPath());
+	}
+
+	String extractTypeName() {
+		// answer a String with the qualified type name for the source file in the
+		// form: 'p1/p2/A'
+		IPath fullPath = resource.getFullPath();
+		int resourceSegmentCount = fullPath.segmentCount();
+		int sourceFolderSegmentCount = sourceLocation.sourceFolder.getFullPath().segmentCount();
+		String extension = fullPath.getFileExtension();
+		int ext_length = extension == null ? 0 : extension.length() + 1;
+		int charCount = (resourceSegmentCount - sourceFolderSegmentCount - 1) - ext_length; // length
+																																								// of
+																																								// ".php"
+		for (int i = sourceFolderSegmentCount; i < resourceSegmentCount; i++)
+			charCount += fullPath.segment(i).length();
+
+		char[] result = new char[charCount];
+		int offset = 0;
+		resourceSegmentCount--; // deal with the last segment separately
+		for (int i = sourceFolderSegmentCount; i < resourceSegmentCount; i++) {
+			String segment = fullPath.segment(i);
+			int size = segment.length();
+			segment.getChars(0, size, result, offset);
+			offset += size;
+			result[offset++] = '/';
+		}
+		String segment = fullPath.segment(resourceSegmentCount);
+		int size = segment.length() - ext_length; // length of ".php"
 		segment.getChars(0, size, result, offset);
-		offset += size;
-		result[offset++] = '/';
+		return new String(result);
 	}
-	String segment = fullPath.segment(resourceSegmentCount);
-	int size = segment.length() - 5; // length of ".java"
-	segment.getChars(0, size, result, offset);
-	return new String(result);
-}
 
-public char[] getContents() {
+	public char[] getContents() {
 
-	try {	
-		return Util.getResourceContentsAsCharArray(resource, this.encoding);
-	} catch (CoreException e) {
-		throw new AbortCompilation(true, new MissingSourceFileException(resource.getFullPath().toString()));
+		try {
+			return Util.getResourceContentsAsCharArray(resource, this.encoding);
+		} catch (CoreException e) {
+			throw new AbortCompilation(true, new MissingSourceFileException(resource.getFullPath().toString()));
+		}
 	}
-}
 
-public char[] getFileName() {
-	return resource.getFullPath().toString().toCharArray(); // do not know what you want to return here
-}
+	public char[] getFileName() {
+		return resource.getFullPath().toString().toCharArray(); // do not know what
+																														// you want to
+																														// return here
+	}
 
-public char[] getMainTypeName() {
-	char[] typeName = initialTypeName.toCharArray();
-	int lastIndex = CharOperation.lastIndexOf('/', typeName);
-	return CharOperation.subarray(typeName, lastIndex + 1, -1);
-}
+	public char[] getMainTypeName() {
+		char[] typeName = initialTypeName.toCharArray();
+		int lastIndex = CharOperation.lastIndexOf('/', typeName);
+		return CharOperation.subarray(typeName, lastIndex + 1, -1);
+	}
 
-public char[][] getPackageName() {
-	char[] typeName = initialTypeName.toCharArray();
-	int lastIndex = CharOperation.lastIndexOf('/', typeName);
-	return CharOperation.splitOn('/', typeName, 0, lastIndex);
-}
+	public char[][] getPackageName() {
+		char[] typeName = initialTypeName.toCharArray();
+		int lastIndex = CharOperation.lastIndexOf('/', typeName);
+		return CharOperation.splitOn('/', typeName, 0, lastIndex);
+	}
 
-String typeLocator() {
-	return resource.getProjectRelativePath().toString();
-}
+	String typeLocator() {
+		return resource.getProjectRelativePath().toString();
+	}
 
-public String toString() {
-	return "SourceFile[" //$NON-NLS-1$
-		+ resource.getFullPath() + "]";  //$NON-NLS-1$
-}
+	public String toString() {
+		return "SourceFile[" //$NON-NLS-1$
+				+ resource.getFullPath() + "]"; //$NON-NLS-1$
+	}
 
-public IResource getResource() {
-	return resource; 
-}
+	public IResource getResource() {
+		return resource;
+	}
 
 }