Eclipse Indigo support

Updated required plug-ins

Author: skiera

META-INF/MANIFEST.MF

@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PHP Tool Codesniffer
 Bundle-SymbolicName: org.phpsrc.eclipse.pti.tools.codesniffer;singleton:=true
-Bundle-Version: 1.3.0.I20110319000000
+Bundle-Version: 1.3.0.R20110619000000
 Bundle-Activator: org.phpsrc.eclipse.pti.tools.codesniffer.PHPCodeSnifferPlugin
 Bundle-Vendor: Sven Kiera
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.phpsrc.eclipse.pti.core;bundle-version="1.3.0",
+ org.phpsrc.eclipse.pti.core;bundle-version="1.6.0",
  org.phpsrc.eclipse.pti.library.pear;bundle-version="1.2.0",
- org.eclipse.php.ui;bundle-version="2.1.0",
- org.eclipse.php.debug.core;bundle-version="2.1.0",
- org.eclipse.php.debug.ui;bundle-version="2.1.0",
+ org.eclipse.php.ui;bundle-version="3.0.0",
+ org.eclipse.php.debug.core;bundle-version="3.0.0",
+ org.eclipse.php.debug.ui;bundle-version="3.0.0",
  org.eclipse.core.resources;bundle-version="3.4.1",
  org.eclipse.dltk.core,
  org.eclipse.wst.validation,

src/org/phpsrc/eclipse/pti/tools/codesniffer/core/PHPCodeSniffer.java

@@ -20,8 +20,10 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.dltk.compiler.problem.DefaultProblemIdentifier;
 import org.eclipse.dltk.compiler.problem.IProblem;
 import org.eclipse.dltk.compiler.problem.ProblemSeverities;
+import org.eclipse.dltk.compiler.problem.ProblemSeverity;
 import org.phpsrc.eclipse.pti.core.launching.OperatingSystem;
 import org.phpsrc.eclipse.pti.core.launching.PHPToolLauncher;
 import org.phpsrc.eclipse.pti.core.php.inifile.INIFileEntry;
@@ -146,9 +148,9 @@ protected IProblem[] parseOutput(ISourceFile file, String output, PHPCodeSniffer
 
 					Document doc = parser.getDocument();
 					problems.addAll(createProblemMarker(file, doc.getElementsByTagName("error"),
-							ProblemSeverities.Error, tabWidth, prefs.getIgnoreSniffs()));
+							ProblemSeverity.ERROR, tabWidth, prefs.getIgnoreSniffs()));
 					problems.addAll(createProblemMarker(file, doc.getElementsByTagName("warning"),
-							ProblemSeverities.Warning, tabWidth, prefs.getIgnoreSniffs()));
+							ProblemSeverity.WARNING, tabWidth, prefs.getIgnoreSniffs()));
 				}
 			}
 		} catch (Exception e) {
@@ -158,7 +160,7 @@ protected IProblem[] parseOutput(ISourceFile file, String output, PHPCodeSniffer
 		return problems.toArray(new IProblem[0]);
 	}
 
-	protected ArrayList<IProblem> createProblemMarker(ISourceFile file, NodeList list, int type, int tabWidth,
+	protected ArrayList<IProblem> createProblemMarker(ISourceFile file, NodeList list, ProblemSeverity type, int tabWidth,
 			String[] ignoreSniffs) {
 		if (tabWidth <= 0)
 			tabWidth = 2;
@@ -192,8 +194,10 @@ protected ArrayList<IProblem> createProblemMarker(ISourceFile file, NodeList lis
 			if (column > 1)
 				lineStart += (column - 1 - (file.lineStartTabCount(lineNr) * (tabWidth - 1)));
 
+			System.out.println(IProblem.Syntax);
+			System.out.println(DefaultProblemIdentifier.decode(IProblem.Syntax));
 			problems.add(new CodeSnifferProblem(file.getFile().getFullPath().toOSString(), item.getTextContent(),
-					IProblem.Syntax, new String[0], type, lineStart, file.lineEnd(lineNr), lineNr, column, source));
+					DefaultProblemIdentifier.decode(IProblem.Syntax), new String[0], type, lineStart, file.lineEnd(lineNr), lineNr, column, source));
 		}
 
 		return problems;

src/org/phpsrc/eclipse/pti/tools/codesniffer/core/problem/CodeSnifferProblem.java

@@ -9,13 +9,15 @@
 package org.phpsrc.eclipse.pti.tools.codesniffer.core.problem;
 
 import org.eclipse.dltk.compiler.problem.DefaultProblem;
+import org.eclipse.dltk.compiler.problem.IProblemIdentifier;
+import org.eclipse.dltk.compiler.problem.ProblemSeverity;
 
 public class CodeSnifferProblem extends DefaultProblem {
 
 	protected String source;
 
-	public CodeSnifferProblem(String originatingFileName, String message, int id, String[] stringArguments,
-			int severity, int startPosition, int endPosition, int line, int column, String source) {
+	public CodeSnifferProblem(String originatingFileName, String message, IProblemIdentifier id, String[] stringArguments,
+			ProblemSeverity severity, int startPosition, int endPosition, int line, int column, String source) {
 		super(originatingFileName, message, id, stringArguments, severity, startPosition, endPosition, line, column);
 		this.source = source;
 	}