You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/05 18:03:22 UTC
svn commit: r674207 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin:
builder/model/ builder/qdox/ builder/unpack/ builder/utils/ tagdoc/
Author: skitching
Date: Sat Jul 5 09:03:21 2008
New Revision: 674207
URL: http://svn.apache.org/viewvc?rev=674207&view=rev
Log:
Code style changes only
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/TagMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ViewEntityMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractDependencyMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractFromConfigurationMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/ArtifactItem.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/UnpackMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/BuildException.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/ConsoleLogSystem.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocContentMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocIndexReport.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocUtils.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java Sat Jul 5 09:03:21 2008
@@ -349,7 +349,9 @@
public String getFieldName()
{
if (_fieldName == null)
+ {
return "_"+getName();
+ }
return _fieldName;
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java Sat Jul 5 09:03:21 2008
@@ -46,7 +46,8 @@
out.writeElement("renderKitId", rkm._renderKitId);
out.writeElement("className", rkm._className);
- for (Iterator it = rkm._renderers.values().iterator();it.hasNext();){
+ for (Iterator it = rkm._renderers.values().iterator();it.hasNext();)
+ {
RendererMeta rm = (RendererMeta) it.next();
rm.writeXml(out);
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/TagMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/TagMeta.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/TagMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/TagMeta.java Sat Jul 5 09:03:21 2008
@@ -246,7 +246,8 @@
//THIS METHODS ARE USED FOR VELOCITY TO GET DATA AND GENERATE CLASSES
- public Collection getAttributeList(){
+ public Collection getAttributeList()
+ {
return _attributes.values();
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java Sat Jul 5 09:03:21 2008
@@ -294,13 +294,17 @@
// of the generated tag already supports.
private List _propertyTagList = null;
- public Collection getPropertyTagList(){
- if (_propertyTagList == null){
+ public Collection getPropertyTagList()
+ {
+ if (_propertyTagList == null)
+ {
_propertyTagList = new ArrayList();
- for (Iterator it = getPropertyList().iterator(); it.hasNext();){
+ for (Iterator it = getPropertyList().iterator(); it.hasNext();)
+ {
PropertyMeta prop = (PropertyMeta) it.next();
if (!prop.isTagExcluded().booleanValue() &&
- !prop.isInheritedTag().booleanValue()){
+ !prop.isInheritedTag().booleanValue())
+ {
_propertyTagList.add(prop);
}
}
@@ -311,12 +315,16 @@
private List _propertyValidatorList = null;
- public Collection getPropertyValidatorList(){
- if (_propertyValidatorList == null){
+ public Collection getPropertyValidatorList()
+ {
+ if (_propertyValidatorList == null)
+ {
_propertyValidatorList = new ArrayList();
- for (Iterator it = getPropertyList().iterator(); it.hasNext();){
+ for (Iterator it = getPropertyList().iterator(); it.hasNext();)
+ {
PropertyMeta prop = (PropertyMeta) it.next();
- if (!prop.isInherited().booleanValue() && prop.isGenerated().booleanValue()){
+ if (!prop.isInherited().booleanValue() && prop.isGenerated().booleanValue())
+ {
_propertyValidatorList.add(prop);
}
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ViewEntityMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ViewEntityMeta.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ViewEntityMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ViewEntityMeta.java Sat Jul 5 09:03:21 2008
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -182,7 +182,8 @@
return _properties;
}
- public Collection getPropertyList(){
+ public Collection getPropertyList()
+ {
return _properties.values();
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Sat Jul 5 09:03:21 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.myfaces.buildtools.maven2.plugin.builder.qdox;
import java.io.File;
@@ -195,7 +213,8 @@
//Check if the validator class file exists
if (!IOUtils.existsSourceFile(StringUtils.replace(
- validator.getClassName(),".","/")+".java", sourceDirs)){
+ validator.getClassName(),".","/")+".java", sourceDirs))
+ {
validator.setGeneratedComponentClass(Boolean.TRUE);
}
@@ -408,10 +427,14 @@
int end = src.length();
if (end == 0)
+ {
return src;
+ }
if (src.equals("\"\""))
+ {
return "\"\"";
+ }
while (start <= end)
{
@@ -1069,15 +1092,19 @@
Annotation jspAnno = getAnnotation(clazz, "JSFJspProperties");
- if (jspAnno != null){
+ if (jspAnno != null)
+ {
Object jspProps = jspAnno.getNamedParameter("properties");
- if (jspProps instanceof AnnoDef){
+ if (jspProps instanceof AnnoDef)
+ {
AnnoDef jspPropertiesAnno = (AnnoDef) jspProps;
Map props = new NonParentesisMap(jspPropertiesAnno.args);
processComponentJspProperty(props, jspAnno.getContext(), clazz,
component);
- }else{
+ }
+ else
+ {
List jspPropsList = (List) jspProps;
for (int i = 0; i < jspPropsList.size();i++)
{
@@ -1100,10 +1127,12 @@
* TODO: change this on a future version of qdox!
*
*/
- public class NonParentesisMap implements Map{
+ public class NonParentesisMap implements Map
+ {
Map _delegate = null;
- public NonParentesisMap(Map delegate){
+ public NonParentesisMap(Map delegate)
+ {
_delegate = delegate;
}
public void clear()
@@ -1130,7 +1159,9 @@
{
Object value = _delegate.get(key);
if (value == null)
+ {
return null;
+ }
if (value instanceof List)
{
return ((List) value).get(0);
@@ -1238,7 +1269,8 @@
}
private void processInterfaceComponentProperty(Map props, AbstractJavaEntity ctx,
- JavaClass clazz, JavaMethod method, PropertyHolder component){
+ JavaClass clazz, JavaMethod method, PropertyHolder component)
+ {
this.processComponentProperty(props, ctx, clazz, method, component);
PropertyMeta property = component.getProperty(methodToPropName(method.getName()));
@@ -1255,21 +1287,22 @@
}
private void processInterfaceComponentFacet(Map props, AbstractJavaEntity ctx,
- JavaClass clazz, JavaMethod method, FacetHolder component){
- this.processComponentFacet(props, ctx, clazz, method, component);
+ JavaClass clazz, JavaMethod method, FacetHolder component)
+ {
+ this.processComponentFacet(props, ctx, clazz, method, component);
- FacetMeta facet = component.getFacet(methodToPropName(method.getName()));
+ FacetMeta facet = component.getFacet(methodToPropName(method.getName()));
- //Try to get the method from the component clazz to see if this
- //has an implementation
- JavaMethod clazzMethod = clazz.getMethodBySignature(method.getName(), null , false);
+ //Try to get the method from the component clazz to see if this
+ //has an implementation
+ JavaMethod clazzMethod = clazz.getMethodBySignature(method.getName(), null , false);
- if (clazzMethod == null)
- {
- //The method should be generated!
- facet.setGenerated(Boolean.TRUE);
- }
- }
+ if (clazzMethod == null)
+ {
+ //The method should be generated!
+ facet.setGenerated(Boolean.TRUE);
+ }
+ }
private void processComponentProperty(Map props, AbstractJavaEntity ctx,
JavaClass clazz, JavaMethod method, PropertyHolder component)
@@ -1351,7 +1384,8 @@
}
//If the method is abstract this should be generated
- if (method.isAbstract()){
+ if (method.isAbstract())
+ {
p.setGenerated(Boolean.TRUE);
}
@@ -1378,7 +1412,8 @@
p.setLongDescription(longDescription);
//If the method is abstract this should be generated
- if (method.isAbstract()){
+ if (method.isAbstract())
+ {
p.setGenerated(Boolean.TRUE);
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractDependencyMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractDependencyMojo.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractDependencyMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractDependencyMojo.java Sat Jul 5 09:03:21 2008
@@ -1,24 +1,24 @@
-package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
+
import java.io.File;
import java.lang.reflect.Field;
import java.util.List;
@@ -244,7 +244,10 @@
// Create the selectors that will filter
// based on include/exclude parameters
// MDEP-47
- IncludeExcludeFileSelector[] selectors = new IncludeExcludeFileSelector[] { new IncludeExcludeFileSelector() };
+ IncludeExcludeFileSelector[] selectors = new IncludeExcludeFileSelector[]
+ {
+ new IncludeExcludeFileSelector()
+ };
if ( StringUtils.isNotEmpty( excludes ) )
{
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractFromConfigurationMojo.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractFromConfigurationMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/AbstractFromConfigurationMojo.java Sat Jul 5 09:03:21 2008
@@ -1,24 +1,24 @@
-package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/ArtifactItem.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/ArtifactItem.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/ArtifactItem.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/ArtifactItem.java Sat Jul 5 09:03:21 2008
@@ -1,24 +1,24 @@
-package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
+
import java.io.File;
import org.apache.maven.artifact.Artifact;
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/UnpackMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/UnpackMojo.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/UnpackMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/unpack/UnpackMojo.java Sat Jul 5 09:03:21 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.myfaces.buildtools.maven2.plugin.builder.unpack;
import java.io.File;
@@ -5,19 +24,15 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.plugin.dependency.utils.filters.ArtifactItemFilter;
import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter;
import org.apache.maven.plugin.dependency.utils.markers.MarkerHandler;
import org.apache.maven.plugin.dependency.utils.markers.UnpackFileMarkerHandler;
-import org.apache.maven.plugin.logging.Log;
import org.apache.myfaces.buildtools.maven2.plugin.builder.IOUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.util.StringUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
@@ -204,9 +219,12 @@
{
MarkerHandler handler = new UnpackFileMarkerHandler( artifactItem, this.markersDirectory );
- unpack( artifactItem.getArtifact().getFile(), artifactItem.getOutputDirectory(), artifactItem.getIncludes(), artifactItem.getExcludes() );
+ unpack(
+ artifactItem.getArtifact().getFile(),
+ artifactItem.getOutputDirectory(),
+ artifactItem.getIncludes(),
+ artifactItem.getExcludes());
handler.setMarker();
-
}
ArtifactItemFilter getMarkedArtifactFilter( ArtifactItem item )
@@ -238,7 +256,8 @@
}
protected String scanModelAndAddGeneratedFiles(ArtifactItem artifactItem)
- throws MojoExecutionException{
+ throws MojoExecutionException
+ {
ArrayList exclusions = new ArrayList();
@@ -250,8 +269,8 @@
{
ComponentMeta component = (ComponentMeta) it.next();
- if (component.getModelId().equals(model.getModelId())){
-
+ if (component.getModelId().equals(model.getModelId()))
+ {
if (component.isGeneratedComponentClass().booleanValue())
{
getLog().info("Adding Generated: "+ component.getClassName());
@@ -272,8 +291,8 @@
{
ConverterMeta converter = (ConverterMeta) it.next();
- if (converter.getModelId().equals(model.getModelId())){
-
+ if (converter.getModelId().equals(model.getModelId()))
+ {
if (converter.isGeneratedTagClass().booleanValue())
{
getLog().info("Adding Generated: "+ converter.getTagClass());
@@ -287,8 +306,8 @@
{
ValidatorMeta validator = (ValidatorMeta) it.next();
- if (validator.getModelId().equals(model.getModelId())){
-
+ if (validator.getModelId().equals(model.getModelId()))
+ {
if (validator.isGeneratedComponentClass().booleanValue())
{
getLog().info("Adding Generated: "+ validator.getClassName());
@@ -317,7 +336,9 @@
{
existingFiles.append(exclusions.get(i));
if (i != exclusions.size() - 1)
+ {
existingFiles.append(',');
+ }
}
return existingFiles.toString();
@@ -351,7 +372,9 @@
{
existingFiles.append(exclusions.get(i));
if (i != exclusions.size() - 1)
+ {
existingFiles.append(',');
+ }
}
return existingFiles.toString();
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/BuildException.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/BuildException.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/BuildException.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/BuildException.java Sat Jul 5 09:03:21 2008
@@ -29,11 +29,13 @@
*/
public class BuildException extends RuntimeException
{
- public BuildException(String msg) {
+ public BuildException(String msg)
+ {
super(msg);
}
- public BuildException(String msg, Exception cause) {
+ public BuildException(String msg, Exception cause)
+ {
super(msg, cause);
}
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/ConsoleLogSystem.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/ConsoleLogSystem.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/ConsoleLogSystem.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/ConsoleLogSystem.java Sat Jul 5 09:03:21 2008
@@ -29,7 +29,8 @@
final Logger log = Logger.getLogger(ConsoleLogSystem.class.getName());
- public Logger getLogger(){
+ public Logger getLogger()
+ {
return log;
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java Sat Jul 5 09:03:21 2008
@@ -82,10 +82,14 @@
public static String getFullJspPropertyType11(PropertyMeta property)
{
if (property.isMethodExpression())
+ {
return "javax.faces.el.MethodBinding";
+ }
if (property.isMethodBinding())
+ {
return "javax.faces.el.MethodBinding";
+ }
return "java.lang.String";
}
@@ -107,24 +111,36 @@
}
if (property.isMethodExpression())
+ {
return "MethodExpression";
+ }
if (property.isMethodBinding())
+ {
return "MethodBinding";
+ }
if (!property.isLiteralOnly().booleanValue())
+ {
return "ValueExpression";
+ }
else
+ {
return property.getClassName();
+ }
}
public static String getVariableFromName(String name)
{
if (name == null)
+ {
return null;
+ }
if (RESERVED_WORDS.contains(name))
+ {
name = name + "Param";
+ }
return name;
}
@@ -177,13 +193,16 @@
imports.add(property.getClassName());
}
}
- if (property.getJspName().equals("actionListener")){
+ if (property.getJspName().equals("actionListener"))
+ {
imports.add("javax.faces.event.MethodExpressionActionListener");
}
- if (property.getJspName().equals("valueChangeListener")){
+ if (property.getJspName().equals("valueChangeListener"))
+ {
imports.add("javax.faces.event.MethodExpressionValueChangeListener");
}
- if (property.getJspName().equals("validator")){
+ if (property.getJspName().equals("validator"))
+ {
imports.add("javax.faces.validator.MethodExpressionValidator");
}
}
@@ -210,7 +229,8 @@
public static boolean isList(String propClass)
{
- if (propClass == null){
+ if (propClass == null)
+ {
return false;
}
else if(propClass.contains("List"))
@@ -241,26 +261,45 @@
public static String getBoxedClass(String className)
{
if ("boolean".equals(className))
+ {
return "Boolean";
+ }
else if ("byte".equals(className))
+ {
return "Byte";
+ }
else if ("char".equals(className))
+ {
return "Character";
+ }
else if ("double".equals(className))
+ {
return "Double";
+ }
else if ("float".equals(className))
+ {
return "Float";
+ }
else if ("int".equals(className))
+ {
return "Integer";
+ }
else if ("long".equals(className))
+ {
return "Long";
+ }
else if ("short".equals(className))
+ {
return "Short";
+ }
else
+ {
return className;
+ }
}
- public static String getSignatureParams(MethodSignatureMeta signature){
+ public static String getSignatureParams(MethodSignatureMeta signature)
+ {
String[] paramTypes = (signature != null) ? signature.getParameterTypes() : null;
String classArray;
@@ -276,7 +315,9 @@
for (int i = 0; i < paramTypes.length; i++)
{
if (i > 0)
+ {
sb.append(',');
+ }
sb.append(paramTypes[i]);
sb.append(".class");
}
@@ -355,7 +396,8 @@
return Collections.unmodifiableSet(reserved);
}
- static private final String[] _PRIMITIVE_TYPES = new String[] {// TODO: Shouldn't java.lang.* be specified in that list as well?
+ static private final String[] _PRIMITIVE_TYPES = new String[] {
+ // TODO: Shouldn't java.lang.* be specified in that list as well?
"boolean", "byte", "char", "float", "double", "int", "short", "long", };
static private final String[] _RESERVED_WORDS = new String[] { "abstract",
@@ -409,7 +451,9 @@
static public String getClassFromFullClass(String fullClass)
{
if (fullClass == null)
+ {
return null;
+ }
int lastSep = fullClass.lastIndexOf('.');
// Note: this code also works for the empty package
@@ -419,13 +463,17 @@
static public String getPackageFromFullClass(String fullClass)
{
if (fullClass == null)
+ {
return null;
+ }
int lastSep = fullClass.lastIndexOf('.');
// detect the empty package
if (lastSep == -1)
+ {
return "";
+ }
return (fullClass.substring(0, lastSep));
}
@@ -453,7 +501,9 @@
}
if (constantSuffix != null)
+ {
constantName.append(constantSuffix);
+ }
return constantName.toString();
}
@@ -514,29 +564,49 @@
static public String primitiveDefaultValue(String className)
{
if ("boolean".equals(className))
+ {
return "false";
+ }
else if ("byte".equals(className))
+ {
return "0";
+ }
else if ("char".equals(className))
+ {
return "''";
+ }
else if ("double".equals(className))
+ {
return "0.0d";
+ }
else if ("float".equals(className))
+ {
return "0.0f";
+ }
else if ("int".equals(className))
+ {
return "0";
+ }
else if ("long".equals(className))
+ {
return "0L";
+ }
else if ("short".equals(className))
+ {
return "0";
+ }
else
+ {
return className;
+ }
}
static public String fill(String base, int length)
{
if (base == null || base.length() > length)
+ {
return base;
+ }
StringBuffer filled = new StringBuffer(base);
for (int i = base.length(); i < length; i++)
@@ -549,7 +619,9 @@
static public String getVariableFromClass(String className)
{
if (className == null)
+ {
return null;
+ }
for (int i = 0; i < className.length(); i++)
{
@@ -636,7 +708,8 @@
{
String def = getDefaultValue(property);
- if (property.getClassName().endsWith("Boolean") && def != null){
+ if (property.getClassName().endsWith("Boolean") && def != null)
+ {
def = "Boolean.valueOf("+def+")";
}
return def;
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocContentMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocContentMojo.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocContentMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocContentMojo.java Sat Jul 5 09:03:21 2008
@@ -170,7 +170,8 @@
public void execute() throws MojoExecutionException, MojoFailureException
{
- if (modelIds == null){
+ if (modelIds == null)
+ {
modelIds = new ArrayList();
modelIds.add(project.getArtifactId());
}
@@ -206,22 +207,23 @@
}
}
- public class CustomResourceManagerImpl extends ResourceManagerImpl{
-
+ public class CustomResourceManagerImpl extends ResourceManagerImpl
+ {
public CustomResourceManagerImpl()
{
super();
}
-
}
private VelocityEngine initVelocity() throws MojoExecutionException
{
Properties p = new Properties();
p.setProperty( "resource.loader", "file, class" );
- p.setProperty( "file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
+ p.setProperty( "file.resource.loader.class",
+ "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
p.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
- p.setProperty( "class.resource.loader.class", "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
+ p.setProperty( "class.resource.loader.class",
+ "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
p.setProperty( "class.resource.loader.path", "META-INF");
p.setProperty( "velocimacro.library", "componentClassMacros11.vm");
p.setProperty( "velocimacro.permissions.allow.inline","true");
@@ -278,7 +280,8 @@
while (components.hasNext())
{
ComponentMeta component = (ComponentMeta) components.next();
- if (canGenerate(component)){
+ if (canGenerate(component))
+ {
String pageName = _generateComponentDoc(velocityEngine,baseContext,component);
if (pageName != null)
{
@@ -290,7 +293,8 @@
while (converters.hasNext())
{
ConverterMeta converter = (ConverterMeta) converters.next();
- if (canGenerate(converter)){
+ if (canGenerate(converter))
+ {
String pageName = _generateConverterDoc(velocityEngine,baseContext,converter);
if (pageName != null)
{
@@ -303,7 +307,8 @@
{
ValidatorMeta validator = (ValidatorMeta) validators.next();
- if (canGenerate(validator)){
+ if (canGenerate(validator))
+ {
String pageName = _generateValidatorDoc(velocityEngine,baseContext,validator);
if (pageName != null)
{
@@ -316,7 +321,8 @@
{
TagMeta tag = (TagMeta) tags.next();
- if (canGenerate(tag)){
+ if (canGenerate(tag))
+ {
String pageName = _generateTagDoc(velocityEngine,baseContext,tag);
if (pageName != null)
{
@@ -847,7 +853,9 @@
{
String href = attributes.getValue("href");
if (href == null)
+ {
throw new IllegalStateException("Missing href attribute");
+ }
URL master = (URL) digester.getRoot();
return new URL(master, href);
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocIndexReport.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocIndexReport.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocIndexReport.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocIndexReport.java Sat Jul 5 09:03:21 2008
@@ -251,7 +251,8 @@
{
TagMeta tag = (TagMeta) tags.next();
- if (canGenerate(tag)){
+ if (canGenerate(tag))
+ {
String pageName = _generateTagDoc(tag);
if (pageName != null)
{
@@ -336,7 +337,9 @@
private void _writeIndexSection(Sink sink, Set pages, String title)
{
if (pages.isEmpty())
+ {
return;
+ }
sink.sectionTitle1();
sink.text(title);
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocUtils.java?rev=674207&r1=674206&r2=674207&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocUtils.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocUtils.java Sat Jul 5 09:03:21 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.myfaces.buildtools.maven2.plugin.tagdoc;
import java.io.File;
@@ -45,7 +63,9 @@
out = out + token;
// Give ourselves an opportunity for a line break after "component.";
if (out.endsWith("component."))
+ {
out = out + "<wbr/>";
+ }
}
return out;
@@ -62,7 +82,8 @@
while (attrs.hasNext())
{
PropertyMeta property = (PropertyMeta) attrs.next();
- if (!property.isTagExcluded().booleanValue()){
+ if (!property.isTagExcluded().booleanValue())
+ {
attributes.add(property.getName());
}
}
@@ -124,13 +145,16 @@
{
Map componentRenderers = new HashMap();
List renderKits = model.getRenderKits();
- if (renderKits != null){
+ if (renderKits != null)
+ {
for (Iterator it = renderKits.iterator();it.hasNext();)
{
RenderKitMeta renderkit = (RenderKitMeta) it.next();
RendererMeta renderer = renderkit.findRenderer(component.getFamily(), component.getRendererType());
if (renderer != null)
+ {
componentRenderers.put(renderkit.getRenderKitId(), renderer.getClassName());
+ }
}
}
return componentRenderers;