X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java index d82a30c..603da89 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java @@ -12,19 +12,20 @@ package net.sourceforge.phpdt.core; import java.util.StringTokenizer; +import net.sourceforge.phpdt.core.compiler.CharOperation; +import net.sourceforge.phpdt.core.compiler.ITerminalSymbols; +import net.sourceforge.phpdt.core.compiler.InvalidInputException; +import net.sourceforge.phpdt.internal.compiler.parser.Scanner; +import net.sourceforge.phpdt.internal.core.ClasspathEntry; +import net.sourceforge.phpdt.internal.core.JavaModelStatus; +import net.sourceforge.phpdt.internal.core.util.Util; + import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import net.sourceforge.phpdt.core.compiler.*; -import net.sourceforge.phpdt.core.compiler.InvalidInputException; -import net.sourceforge.phpdt.internal.compiler.parser.Scanner; -import net.sourceforge.phpdt.internal.compiler.util.SuffixConstants; -import net.sourceforge.phpdt.internal.core.*; -import net.sourceforge.phpdt.internal.core.JavaModelStatus; -import net.sourceforge.phpdt.internal.core.util.Util; /** * Provides methods for checking Java-specific conventions such as name syntax. @@ -169,30 +170,30 @@ public final class JavaConventions { * object indicating what is wrong with the name * @since 2.0 */ - public static IStatus validateClassFileName(String name) { - if (name == null) { - return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.nullName"), null); //$NON-NLS-1$ - } - if (!net.sourceforge.phpdt.internal.compiler.util.Util.isClassFileName(name)) { - return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.notClassFileName"), null); //$NON-NLS-1$ - } - String identifier; - int index; - index = name.lastIndexOf('.'); - if (index == -1) { - return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.notClassFileName"), null); //$NON-NLS-1$ - } - identifier = name.substring(0, index); - IStatus status = validateIdentifier(identifier); - if (!status.isOK()) { - return status; - } - status = ResourcesPlugin.getWorkspace().validateName(name, IResource.FILE); - if (!status.isOK()) { - return status; - } - return JavaModelStatus.VERIFIED_OK; - } +// public static IStatus validateClassFileName(String name) { +// if (name == null) { +// return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.nullName"), null); //$NON-NLS-1$ +// } +// if (!net.sourceforge.phpdt.internal.compiler.util.Util.isClassFileName(name)) { +// return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.notClassFileName"), null); //$NON-NLS-1$ +// } +// String identifier; +// int index; +// index = name.lastIndexOf('.'); +// if (index == -1) { +// return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.classFile.notClassFileName"), null); //$NON-NLS-1$ +// } +// identifier = name.substring(0, index); +// IStatus status = validateIdentifier(identifier); +// if (!status.isOK()) { +// return status; +// } +// status = ResourcesPlugin.getWorkspace().validateName(name, IResource.FILE); +// if (!status.isOK()) { +// return status; +// } +// return JavaModelStatus.VERIFIED_OK; +// } /** * Validate the given field name.