3:03 a.m.
Author: nbelaevski
Date: 2009-12-22 21:03:22 -0500 (Tue, 22 Dec 2009)
New Revision: 16195
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java
Log:
Fixed AptBuilder lost during refactoring:
http://fisheye.jboss.org/browse/RichFaces/root/cdk/trunk/plugins/generato...
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-23
01:25:02 UTC (rev 16194)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-23
02:03:22 UTC (rev 16195)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk;
import java.io.File;
@@ -31,6 +29,7 @@
import java.util.List;
import java.util.Map;
+import org.richfaces.cdk.apt.AptBuilder;
import org.richfaces.cdk.generate.java.ComponentClassGenerator;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.templatecompiler.RendererClassGenerator;
@@ -48,10 +47,10 @@
* <p class="changed_added_4_0">Base CDK context class. Particular build
tool ( Ant, Maven ) should extend that class with
* tool-specific methods.</p>
* @author asmirnov(a)exadel.com
- *
+ *
*/
public class CdkContextBase implements CdkContext {
-
+
/* Map contains writer classes for standard outputs.
*/
static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS
=
@@ -62,10 +61,10 @@
/**
* map contain library model builder classes for each source type.
*/
- static final ImmutableMap<SourceType, Class<? extends ModelBuilder>>
BUILDERS =
- ImmutableMap.<SourceType, Class<? extends
ModelBuilder>>builder().put(StandardSources.FACES_CONFIGS,
- FacesConfigParser.class).put(StandardSources.RENDERER_TEMPLATES,
- RendererTemplateParser.class).build();
+ static final ImmutableMap<SourceType, Class<? extends ModelBuilder>>
BUILDERS =
+ ImmutableMap.<SourceType, Class<? extends ModelBuilder>>
builder().put(StandardSources.FACES_CONFIGS,
+ FacesConfigParser.class).put(StandardSources.JAVA_SOURCES,
AptBuilder.class).put(
+ StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class).build();
private Map<String, String> options = Maps.newHashMap();
private Map<SourceType, Iterable<File>> sources = Maps.newHashMap();
@@ -81,7 +80,7 @@
}
/*
- * (non-Javadoc)
+ * (non-Javadoc)
* @see org.richfaces.cdk.CdkContext#getLoader()
*/
public CdkClassLoader getLoader() {
@@ -226,7 +225,7 @@
public String getOption(String name) {
return options.get(name);
}
-
+
/**
* This method returns instance of {@link CdkWriter} for given output type.
* @param type
@@ -237,18 +236,18 @@
public CdkWriter getGeneratorFor(OutputType type) throws CdkException {
CdkWriter generator = null;
Class<? extends CdkWriter> writerClass = CdkContextBase.WRITERS.get(type);
-
+
if (null != writerClass) {
generator = getWorker(writerClass);
} else {
generator = new DummyGenerator();
generator.init(this);
-
+
// TODO - make service method for new source types.
// throw new CdkException("No generator for type " +
// type.getName());
}
-
+
return generator;
}
@@ -262,18 +261,18 @@
public ModelBuilder getBuilderFor(SourceType type) throws CdkException {
ModelBuilder builder;
Class<? extends ModelBuilder> builderClass =
CdkContextBase.BUILDERS.get(type);
-
+
if (null != builderClass) {
builder = getWorker(builderClass);
} else {
builder = new DummyBuilder();
builder.init(this);
-
+
// TODO - make service method for new source types.
// throw new CdkException("No model builder for source type " +
// type.getName());
}
-
+
return builder;
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-23
01:25:02 UTC (rev 16194)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-23
02:03:22 UTC (rev 16195)
@@ -47,9 +47,9 @@
import org.richfaces.cdk.CdkClassLoader;
import org.richfaces.cdk.CdkContext;
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.CdkWorker;
import org.richfaces.cdk.Logger;
import org.richfaces.cdk.LoggerFactory;
+import org.richfaces.cdk.ModelBuilder;
import org.richfaces.cdk.StandardOutputs;
import org.richfaces.cdk.StandardSources;
@@ -63,7 +63,7 @@
* @author asmirnov(a)exadel.com
*
*/
-public class AptBuilder implements CdkWorker {
+public class AptBuilder implements ModelBuilder {
private static final Logger LOG = LoggerFactory.getLogger();
private boolean initialized = false;
private CdkContext context;