You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/10/29 09:46:59 UTC
svn commit: r708831 - in
/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler:
CompilerRequestor.java FileCompilationUnit.java JavaCompiler.java
Author: jsdelfino
Date: Wed Oct 29 01:46:58 2008
New Revision: 708831
URL: http://svn.apache.org/viewvc?rev=708831&view=rev
Log:
Improved error reporting in compiler plugin.
Modified:
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
Modified: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java?rev=708831&r1=708830&r2=708831&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java (original)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java Wed Oct 29 01:46:58 2008
@@ -33,10 +33,12 @@
class CompilerRequestor implements ICompilerRequestor {
private String outputDirectory;
+ private boolean showWarnings;
private List<CompilerError> compilerErrors;
- public CompilerRequestor(String outputDirectory, List<CompilerError> compilerErrors) {
+ public CompilerRequestor(String outputDirectory, boolean showWarnings, List<CompilerError> compilerErrors) {
this.outputDirectory = outputDirectory;
+ this.showWarnings = showWarnings;
this.compilerErrors = compilerErrors;
}
@@ -47,13 +49,15 @@
// Convert JDT IProblems into plexus CompilerErrors
for (IProblem problem: result.getProblems()) {
if (problem.isWarning()) {
- compilerErrors.add(new CompilerError(new String(problem.getOriginatingFileName()),
- false,
- problem.getSourceLineNumber(),
- problem.getSourceStart(),
- problem.getSourceLineNumber(),
- problem.getSourceEnd(),
- problem.getMessage()));
+ if (showWarnings) {
+ compilerErrors.add(new CompilerError(new String(problem.getOriginatingFileName()),
+ false,
+ problem.getSourceLineNumber(),
+ problem.getSourceStart(),
+ problem.getSourceLineNumber(),
+ problem.getSourceEnd(),
+ problem.getMessage()));
+ }
} else if (problem.isError()) {
hasErrors = true;
Modified: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java?rev=708831&r1=708830&r2=708831&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java (original)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java Wed Oct 29 01:46:58 2008
@@ -34,6 +34,7 @@
* @version $Rev: $ $Date: $
*/
class FileCompilationUnit implements ICompilationUnit {
+ private final static char fileSeparator = System.getProperty("file.separator").charAt(0);
private String className;
private String sourceFile;
@@ -64,7 +65,7 @@
}
public char[] getFileName() {
- return sourceFile.toCharArray();
+ return (className.replace('.', fileSeparator) + ".java").toCharArray();
}
public char[] getMainTypeName() {
Modified: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java?rev=708831&r1=708830&r2=708831&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java (original)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java Wed Oct 29 01:46:58 2008
@@ -22,6 +22,7 @@
import static org.codehaus.plexus.compiler.CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE;
import static org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies.proceedWithAllProblems;
import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.DISABLED;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.ENABLED;
import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.GENERATE;
import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.IGNORE;
import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_Encoding;
@@ -53,6 +54,7 @@
import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
/**
@@ -101,9 +103,6 @@
if (configuration.getSourceEncoding() != null && !(configuration.getSourceEncoding().length() == 0)) {
settings.put(OPTION_Encoding, configuration.getSourceEncoding());
}
- if (!configuration.isShowWarnings()) {
- settings.put(OPTION_SuppressWarnings, DISABLED);
- }
if (configuration.isShowDeprecation()) {
settings.put(OPTION_ReportDeprecation, WARNING);
} else {
@@ -113,7 +112,7 @@
// Create a compiler
List<CompilerError> compilerErrors = new ArrayList<CompilerError>();
INameEnvironment nameEnvironment = new ClassLoaderNameEnvironment(classLoader, configuration.getSourceLocations());
- ICompilerRequestor requestor = new CompilerRequestor(configuration.getOutputLocation(), compilerErrors);
+ ICompilerRequestor requestor = new CompilerRequestor(configuration.getOutputLocation(), configuration.isShowWarnings(), compilerErrors);
Compiler compiler = new Compiler(nameEnvironment,
proceedWithAllProblems(),
settings,