Author: Alex.Kolonitsky
Date: 2010-03-18 10:50:38 -0400 (Thu, 18 Mar 2010)
New Revision: 16603
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-03-18
14:49:32 UTC (rev 16602)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-03-18
14:50:38 UTC (rev 16603)
@@ -27,6 +27,7 @@
import com.google.inject.Inject;
import freemarker.template.Configuration;
+import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWriter;
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
@@ -34,31 +35,29 @@
import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
-import org.richfaces.cdk.model.Visitable;
+import java.util.Collection;
+
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
*
*/
-public class ComponentClassGenerator extends FreeMarkerRenderer<ComponentModel,
ComponentLibrary> implements CdkWriter {
+public class ComponentClassGenerator extends FreeMarkerRenderer<ComponentModel>
implements CdkWriter {
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext)
- */
@Inject
public ComponentClassGenerator(Configuration configuration, ComponentLibrary library,
@Output(Outputs.JAVA_CLASSES) FileManager output) {
super(configuration, library, output);
}
@Override
- protected boolean isMyComponent(Visitable c) {
- if (c instanceof ComponentModel) {
- return ((ComponentModel) c).isGenerate();
+ public void render() throws CdkException {
+ Collection<ComponentModel> models = library.getComponents();
+ for (ComponentModel model : models) {
+ if (model.isGenerate()) {
+ this.generate(model);
+ }
}
-
- return false;
}
@Override
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-18
14:49:32 UTC (rev 16602)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-18
14:50:38 UTC (rev 16603)
@@ -24,6 +24,7 @@
import com.google.inject.Inject;
import freemarker.template.Configuration;
+import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWriter;
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
@@ -31,13 +32,14 @@
import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConverterModel;
-import org.richfaces.cdk.model.Visitable;
+import java.util.Collection;
+
/**
* @author akolonitsky
* @since Jan 20, 2010
*/
-public class ConverterClassGenerator extends FreeMarkerRenderer<ConverterModel,
ComponentLibrary> implements CdkWriter {
+public class ConverterClassGenerator extends FreeMarkerRenderer<ConverterModel>
implements CdkWriter {
@Inject
public ConverterClassGenerator(Configuration configuration, ComponentLibrary
library,
@@ -46,12 +48,13 @@
}
@Override
- protected boolean isMyComponent(Visitable visitable) {
- if (visitable instanceof ConverterModel) {
- return ((ConverterModel) visitable).isGenerate();
+ public void render() throws CdkException {
+ Collection<ConverterModel> models = library.getConverters();
+ for (ConverterModel model : models) {
+ if (model.isGenerate()) {
+ this.generate(model);
+ }
}
-
- return false;
}
@Override
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-18
14:49:32 UTC (rev 16602)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-18
14:50:38 UTC (rev 16603)
@@ -24,6 +24,7 @@
import com.google.inject.Inject;
import freemarker.template.Configuration;
+import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWriter;
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
@@ -31,13 +32,14 @@
import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ValidatorModel;
-import org.richfaces.cdk.model.Visitable;
+import java.util.Collection;
+
/**
* @author akolonitsky
* @since Jan 15, 2010
*/
-public class ValidatorClassGenerator extends FreeMarkerRenderer<ValidatorModel,
ComponentLibrary> implements CdkWriter {
+public class ValidatorClassGenerator extends FreeMarkerRenderer<ValidatorModel>
implements CdkWriter {
@Inject
public ValidatorClassGenerator(Configuration configuration, ComponentLibrary library,
@Output(Outputs.JAVA_CLASSES) FileManager output) {
@@ -45,12 +47,13 @@
}
@Override
- protected boolean isMyComponent(Visitable visitable) {
- if (visitable instanceof ValidatorModel) {
- return ((ValidatorModel) visitable).isGenerate();
+ public void render() throws CdkException {
+ Collection<ValidatorModel> models = library.getValidators();
+ for (ValidatorModel model : models) {
+ if (model.isGenerate()) {
+ this.generate(model);
+ }
}
-
- return false;
}
@Override