X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java index cf6b24b..32a8b41 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java @@ -14,11 +14,11 @@ import java.util.ArrayList; import java.util.Locale; import net.sourceforge.phpdt.core.IJavaModelMarker; -import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.JavaCore; +import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.compiler.IProblem; -import net.sourceforge.phpdt.internal.compiler.Compiler; import net.sourceforge.phpdt.internal.compiler.CompilationResult; +import net.sourceforge.phpdt.internal.compiler.Compiler; import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies; import net.sourceforge.phpdt.internal.compiler.ICompilerRequestor; import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation; @@ -109,7 +109,7 @@ public void acceptResult(CompilationResult result) { // if (duplicateTypeNames == null) // duplicateTypeNames = new ArrayList(); // duplicateTypeNames.add(compoundName); -// createErrorFor(compilationUnit.resource, Util.bind("build.duplicateClassFile", new String(typeName))); //$NON-NLS-1$ +// createErrorFor(compilationUnit.resource, ProjectPrefUtil.bind("build.duplicateClassFile", new String(typeName))); //$NON-NLS-1$ // continue; // } // newState.recordLocatorForType(qualifiedTypeName, typeLocator); @@ -247,16 +247,16 @@ protected void createErrorFor(IResource resource, String message) { // newState.record(sourceLocator, qualifiedRefs, simpleRefs, mainTypeName, definedTypeNames); //} -protected IContainer createFolder(IPath packagePath, IContainer outputFolder) throws CoreException { - if (packagePath.isEmpty()) return outputFolder; - IFolder folder = outputFolder.getFolder(packagePath); - if (!folder.exists()) { - createFolder(packagePath.removeLastSegments(1), outputFolder); - folder.create(true, true, null); - folder.setDerived(true); - } - return folder; -} +//protected IContainer createFolder(IPath packagePath, IContainer outputFolder) throws CoreException { +// if (packagePath.isEmpty()) return outputFolder; +// IFolder folder = outputFolder.getFolder(packagePath); +// if (!folder.exists()) { +// createFolder(packagePath.removeLastSegments(1), outputFolder); +// folder.create(true, true, null); +// folder.setDerived(true); +// } +// return folder; +//} protected RuntimeException internalException(CoreException t) { ImageBuilderInternalException imageBuilderException = new ImageBuilderInternalException(t); @@ -360,8 +360,8 @@ protected void storeProblemsFor(SourceFile sourceFile, IProblem[] problems) thro // compute a user-friendly location IJavaElement element = JavaCore.create(resource); - if (element instanceof org.eclipse.jdt.core.ICompilationUnit) { // try to find a finer grain element - org.eclipse.jdt.core.ICompilationUnit unit = (org.eclipse.jdt.core.ICompilationUnit) element; + if (element instanceof net.sourceforge.phpdt.core.ICompilationUnit) { // try to find a finer grain element + net.sourceforge.phpdt.core.ICompilationUnit unit = (net.sourceforge.phpdt.core.ICompilationUnit) element; IJavaElement fragment = unit.getElementAt(problem.getSourceStart()); if (fragment != null) element = fragment; }