5:07 p.m.
Author: alexsmirnov
Date: 2010-08-20 18:07:02 -0400 (Fri, 20 Aug 2010)
New Revision: 18893
Added:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/DiagnosticListenerImplementation.java
Modified:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
Log:
fix Guice injection error
Added:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/DiagnosticListenerImplementation.java
===================================================================
---
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/DiagnosticListenerImplementation.java
(rev 0)
+++
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/DiagnosticListenerImplementation.java 2010-08-20
22:07:02 UTC (rev 18893)
@@ -0,0 +1,71 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.apt;
+
+import java.util.Locale;
+
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaFileObject;
+import javax.tools.Diagnostic.Kind;
+
+import org.richfaces.cdk.Logger;
+
+final class DiagnosticListenerImplementation implements
DiagnosticListener<JavaFileObject> {
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ */
+ private final Logger log;
+ private Locale locale;
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param locale TODO
+ * @param taskFactoryImpl
+ */
+ DiagnosticListenerImplementation(Logger log, Locale locale) {
+ this.log = log;
+ }
+
+ @Override
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ StringBuilder message = new StringBuilder(diagnostic.getMessage(this.locale));
+ JavaFileObject source = diagnostic.getSource();
+ if (null != source) {
+ message.append(", in the
file:").append(source.getName()).append(" at line ").append(
+ diagnostic.getLineNumber()).append(" in column
").append(diagnostic.getColumnNumber());
+ }
+ Kind kind = diagnostic.getKind();
+ if (Kind.ERROR.equals(kind)) {
+ this.log.error(message);
+ } else if (Kind.MANDATORY_WARNING.equals(kind) || Kind.WARNING.equals(kind)) {
+ this.log.warn(message);
+ } else if (Kind.NOTE.equals(kind)) {
+ this.log.info(message);
+ } else {
+ this.log.debug(message);
+ }
+ }
+}
\ No newline at end of file
Property changes on:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/DiagnosticListenerImplementation.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
===================================================================
---
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-08-20
21:58:50 UTC (rev 18892)
+++
trunk/cdk/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-08-20
22:07:02 UTC (rev 18893)
@@ -33,14 +33,11 @@
import java.util.Locale;
import javax.annotation.processing.Processor;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticListener;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
-import javax.tools.Diagnostic.Kind;
import javax.tools.JavaCompiler.CompilationTask;
import org.richfaces.cdk.CdkClassLoader;
@@ -65,36 +62,11 @@
*/
public class TaskFactoryImpl implements CompilationTaskFactory {
- private final class DiagnosticListenerImplementation implements
DiagnosticListener<JavaFileObject> {
-
- @Override
- public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
- StringBuilder message = new StringBuilder(diagnostic.getMessage(locale));
- JavaFileObject source = diagnostic.getSource();
- if (null != source) {
- message.append(", in the
file:").append(source.getName()).append(" at line ").append(
- diagnostic.getLineNumber()).append(" in column
").append(diagnostic.getColumnNumber());
- }
- Kind kind = diagnostic.getKind();
- if (Kind.ERROR.equals(kind)) {
- log.error(message);
- } else if (Kind.MANDATORY_WARNING.equals(kind) || Kind.WARNING.equals(kind))
{
- log.warn(message);
- } else if (Kind.NOTE.equals(kind)) {
- log.info(message);
- } else {
- log.debug(message);
- }
- }
- }
-
private static List<String> compilerOptions = new
ArrayList<String>(Arrays.asList("-proc:only",
"-implicit:class"));
- @Inject
- private Logger log;
+ @Inject Logger log;
- @Inject
- private Locale locale;
+ @Inject Locale locale;
@Inject
private Charset charset;
@@ -117,8 +89,6 @@
private StandardJavaFileManager fileManager;
- private final DiagnosticListener<JavaFileObject> diagnosticListener = new
DiagnosticListenerImplementation();
-
/*
* (non-Javadoc)
*
@@ -135,7 +105,7 @@
}
CompilationTask task =
- getJavaCompiler().getTask(null, getFileManager(), diagnosticListener,
compilerOptions, null,
+ getJavaCompiler().getTask(null, getFileManager(), new
DiagnosticListenerImplementation(log, locale), compilerOptions, null,
sourceObjects);
task.setLocale(locale);
task.setProcessors(Collections.singleton(cdkProcessor));
@@ -165,7 +135,7 @@
private StandardJavaFileManager getFileManager() {
if (fileManager == null) {
- fileManager = getJavaCompiler().getStandardFileManager(diagnosticListener,
locale, charset);
+ fileManager = getJavaCompiler().getStandardFileManager(new
DiagnosticListenerImplementation(log, locale), locale, charset);
try {
fileManager.setLocation(StandardLocation.CLASS_PATH,
classPathLoader.getFiles());
Iterable<File> outputFolders = outputFolder.getFolders();