Author: Alex.Kolonitsky
Date: 2010-03-04 06:40:16 -0500 (Thu, 04 Mar 2010)
New Revision: 16525
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
Log:
https://jira.jboss.org/jira/browse/RF-8232
Tags support - fix checkstyle
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-03-04
00:52:13 UTC (rev 16524)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-03-04
11:40:16 UTC (rev 16525)
@@ -26,7 +26,6 @@
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.InvalidNameException;
-import org.richfaces.cdk.model.ClassName;
/**
* <p class="changed_added_4_0">
@@ -47,7 +46,7 @@
*
<li><code><prefix>.component.UI<Name></code>
=> <code><prefix>.<Name></code>
</li>
* </ul>
*
- * @param className
+ * @param componentClass
* @return JSF component type.
* @throws InvalidNameException if className does not match naming conventions.
*/
@@ -75,7 +74,7 @@
*/
public String inferUIComponentFamily(ComponentModel.Type componentType) throws
InvalidNameException;
- public ClassName inferTagHandlerClass(ComponentModel.Type componentType, String
markup) throws InvalidNameException;
+ public ClassName inferTagHandlerClass(ComponentModel.Type componentType, String
markup) throws InvalidNameException;
public String inferTagName(ComponentModel.Type componentType) throws
InvalidNameException;
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-03-04
00:52:13 UTC (rev 16524)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-03-04
11:40:16 UTC (rev 16525)
@@ -4,13 +4,9 @@
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.InvalidNameException;
import org.richfaces.cdk.model.Name;
-import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.Name.Classifier;
import org.richfaces.cdk.util.Strings;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
/**
* <p class="changed_added_4_0">
* </p>
@@ -28,53 +24,53 @@
// TODO - inject base name.
private String baseName;
- public RichFacesConventions() {}
+ public RichFacesConventions() { }
@Override
- public ComponentModel.Type inferComponentType( ClassName componentClass) throws
InvalidNameException {
+ public ComponentModel.Type inferComponentType(ClassName componentClass) throws
InvalidNameException {
// check parameters.
- if (null == componentClass) {
- throw new IllegalArgumentException();
- }
+ if (null == componentClass) {
+ throw new IllegalArgumentException();
+ }
- Name name = Name.create(componentClass.toString());
+ Name name = Name.create(componentClass.toString());
- // Use base library prefix.
- String baseName = this.getBaseName();
+ // Use base library prefix.
+ String baseName = this.getBaseName();
- if (null != baseName) {
- name.setPrefix(baseName);
- }
+ if (null != baseName) {
+ name.setPrefix(baseName);
+ }
- // Component type does not contain class or markup parts.
- name.setClassifier(null);
- name.setMarkup(null);
+ // Component type does not contain class or markup parts.
+ name.setClassifier(null);
+ name.setMarkup(null);
- String simpleName = name.getSimpleName();
+ String simpleName = name.getSimpleName();
- // Remove common prefixes.
- for (int i = 0; i < COMPONENT_PREFIXES.length; i++) {
- if (simpleName.startsWith(COMPONENT_PREFIXES[i])) {
- simpleName = simpleName.substring(COMPONENT_PREFIXES[i].length());
+ // Remove common prefixes.
+ for (int i = 0; i < COMPONENT_PREFIXES.length; i++) {
+ if (simpleName.startsWith(COMPONENT_PREFIXES[i])) {
+ simpleName = simpleName.substring(COMPONENT_PREFIXES[i].length());
- break;
- }
+ break;
}
+ }
- // Remove common suffixes.
- for (int i = 0; i < COMPONENT_SUFFIXES.length; i++) {
- if (simpleName.endsWith(COMPONENT_SUFFIXES[i])) {
- simpleName = simpleName.substring(0, simpleName.length() -
COMPONENT_SUFFIXES[i].length());
+ // Remove common suffixes.
+ for (int i = 0; i < COMPONENT_SUFFIXES.length; i++) {
+ if (simpleName.endsWith(COMPONENT_SUFFIXES[i])) {
+ simpleName = simpleName.substring(0, simpleName.length() -
COMPONENT_SUFFIXES[i].length());
- break;
- }
+ break;
}
+ }
- name.setSimpleName(simpleName);
+ name.setSimpleName(simpleName);
- return new ComponentModel.Type(name.toString());
+ return new ComponentModel.Type(name.toString());
}
@Override
@@ -82,13 +78,14 @@
if (null == componentType) {
throw new IllegalArgumentException();
}
- // Infer UI class name from component type.
- Name name = Name.create(componentType.toString());
- name.setClassifier(Classifier.component);
- name.setMarkup(null);
- name.setSimpleName(UI + name.getSimpleName());
+ // Infer UI class name from component type.
+ Name name = Name.create(componentType.toString());
+ name.setClassifier(Classifier.component);
+ name.setMarkup(null);
+ name.setSimpleName(UI + name.getSimpleName());
+
return new ClassName(name.toString());
}
@@ -108,20 +105,21 @@
/**
* @param generatedClass - component name in format
* <prefix>.component.Abstract<Name>
+ * <prefix>.component.UI<Name>
*
* @return tag handler name as
- * <prefix>.taglib.<Name>TagHandler
+ * <prefix>.taglib.html.<Name>TagHandler
*
* */
@Override
- public ClassName inferTagHandlerClass(ComponentModel.Type componentType,String
markup) {
+ public ClassName inferTagHandlerClass(ComponentModel.Type componentType, String
markup) {
if (null == componentType) {
throw new IllegalArgumentException();
}
Name name = Name.create(componentType.toString());
name.setClassifier(Classifier.taglib);
name.setMarkup(markup);
- name.setSimpleName(name.getSimpleName()+"Handler");
+ name.setSimpleName(name.getSimpleName() + "Handler");
return new ClassName(name.toString());
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-04
00:52:13 UTC (rev 16524)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-04
11:40:16 UTC (rev 16525)
@@ -73,7 +73,7 @@
setTagInfo(annotation.tag(), component);
}
Tag tag = componentElement.getAnnotation(Tag.class);
- if(null != tag){
+ if (null != tag) {
setTagInfo(tag, component);
}
library.getComponents().add(component);
@@ -84,7 +84,7 @@
Component componentAnnotation = componentElement.getAnnotation(Component.class);
String explicitType = componentAnnotation.value();
// if (!Strings.isEmpty(explicitType)) {
- return explicitType;
+ return explicitType;
// }
// Because component type is a primary key for components collection,
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-04
00:52:13 UTC (rev 16524)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-04
11:40:16 UTC (rev 16525)
@@ -96,7 +96,7 @@
return true;
}
- for (Map.Entry<String,Property> entry : model.getAttributes().entrySet())
{
+ for (Map.Entry<String, Property> entry : model.getAttributes().entrySet())
{
if (entry.getValue().isBingingAttribute()) {
return true;
}
@@ -198,15 +198,15 @@
String generatedClass, String baseClass) {
// if (generatedClass == null || generatedClass.isEmpty() ||
baseClass.equals(generatedClass)) {
- if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
- modelElement.setGenerate(true);
+ if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
+ modelElement.setGenerate(true);
// generatedClass =
namingConventions.inferUIComponentClass(modelElement.getId(), null, baseClass, true);
// modelElement.setClassNames(generatedClass, baseClass);
// } else {
// modelElement.setClassNames(baseClass, null);
- }
+ }
// } else {
- modelElement.setClassNames(generatedClass, baseClass);
+ modelElement.setClassNames(generatedClass, baseClass);
// }
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-03-04
00:52:13 UTC (rev 16524)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-03-04
11:40:16 UTC (rev 16525)
@@ -98,25 +98,25 @@
protected void verifyComponent(ComponentModel component) {
// Check Component type.
if (null == component.getType()) {
- if(null != component.getComponentClass()){
+ if (null != component.getComponentClass()) {
component.setType(namingConventions.inferComponentType(component.getComponentClass()));
- } else if(null != component.getBaseClass()){
+ } else if (null != component.getBaseClass()) {
component.setType(namingConventions.inferComponentType(component.getBaseClass()));
} else {
// No clue for component type, log error and return.
- log.error("No type information available for component:
"+component);
+ log.error("No type information available for component: " +
component);
return;
}
}
// Check classes.
- if(component.isGenerate()){
- if(null == component.getBaseClass()){
- log.error("Base class for generated component is not set
:"+component.getType());
+ if (component.isGenerate()) {
+ if (null == component.getBaseClass()) {
+ log.error("Base class for generated component is not set :" +
component.getType());
} else if (null == component.getComponentClass()) {
component.setGeneratedClass(namingConventions.inferUIComponentClass(component.getType()));
}
} else {
-
+ // TODO?
}