X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java index ed690b0..bd235fd 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java @@ -26,6 +26,7 @@ public abstract class PHPParserSuperclass { public static final int WARNING = 1; public static final int INFO = 0; public static final int TASK = 3; + protected static IFile fileToParse; /** * Call the php parse command ( php -l -f <filename> ) @@ -38,7 +39,7 @@ public abstract class PHPParserSuperclass { final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); final String filename = file.getLocation().toString(); - final String[] arguments = { filename }; + final String[] arguments = {filename}; final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); final String command = form.format(arguments); @@ -149,26 +150,26 @@ public abstract class PHPParserSuperclass { * @throws CoreException an exception throwed by the MarkerUtilities */ public static void setMarker( - final IFile file, - final String message, - final int charStart, - final int charEnd, - final int errorLevel) - throws CoreException { + final IFile file, + final String message, + final int charStart, + final int charEnd, + final int errorLevel) + throws CoreException { if (file != null) { final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case INFO : + case INFO: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); break; - case TASK : + case TASK: attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK)); break; } @@ -187,23 +188,27 @@ public abstract class PHPParserSuperclass { * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}) * @throws CoreException an exception throwed by the MarkerUtilities */ - public static void setMarker(final IFile file, final String message, final int line, final int errorLevel, final String location) - throws CoreException { + public static void setMarker(final IFile file, + final String message, + final int line, + final int errorLevel, + final String location) + throws CoreException { if (file != null) { String markerKind = IMarker.PROBLEM; final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case INFO : + case INFO: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); break; - case TASK : + case TASK: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); markerKind = IMarker.TASK; break; @@ -216,6 +221,26 @@ public abstract class PHPParserSuperclass { /** * This will set a marker. + * @param message the message + * @param charStart the starting character + * @param charEnd the end character + * @param errorLevel the error level ({@link PHPParserSuperclass#ERROR}, + * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}) + * @throws CoreException an exception throwed by the MarkerUtilities + */ + public static void setMarker(final String message, + final int charStart, + final int charEnd, + final int errorLevel, + final String location) + throws CoreException { + if (fileToParse != null) { + setMarker(fileToParse, message, charStart, charEnd, errorLevel, location); + } + } + + /** + * This will set a marker. * @param file the file that generated the marker * @param message the message * @param charStart the starting character @@ -225,28 +250,27 @@ public abstract class PHPParserSuperclass { * @param location the location of the error * @throws CoreException an exception throwed by the MarkerUtilities */ - public static void setMarker( - final IFile file, - final String message, - final int charStart, - final int charEnd, - final int errorLevel, - final String location) - throws CoreException { + public static void setMarker(final IFile file, + final String message, + final int charStart, + final int charEnd, + final int errorLevel, + final String location) + throws CoreException { if (file != null) { final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case INFO : + case INFO: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); break; - case TASK : + case TASK: attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK)); break; }