Author: Alex.Kolonitsky Date: 2010-02-04 11:57:43 -0500 (Thu, 04 Feb 2010) New Revision: 16415 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java Log: https://jira.jboss.org/jira/browse/RF-8232 Tags support - fix compilation error for sonar Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-02-04 16:14:47 UTC (rev 16414) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-02-04 16:57:43 UTC (rev 16415) @@ -25,13 +25,11 @@ import org.richfaces.cdk.model.ComponentModel; -import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.model.FacetModel; import org.richfaces.cdk.model.ComponentModel.Type; +import org.richfaces.cdk.model.FacetModel; +import org.richfaces.cdk.model.Property; -import java.util.Map; - /** * <p class="changed_added_4_0"></p> * @@ -68,8 +66,8 @@ model.setType(new Type(type.trim())); } // Copy properties/attributes - model.getAttributes().putAll((Map<String,Property>) unmarshalMap(bean.getAttributes(), ATTRIBUTE_ADAPTER)); - model.getFacets().putAll((Map<String, FacetModel>) unmarshalMap(bean.getFacets(), FACET_ADAPTER)); + model.getAttributes().putAll(this.<String, PropertyBase, Property>unmarshalMap(bean.getAttributes(), ATTRIBUTE_ADAPTER)); + model.getFacets().putAll(this.<String, FacetBean, FacetModel>unmarshalMap(bean.getFacets(), FACET_ADAPTER)); // model.getFacets().putAll(unmarshalMap(bean.getExtension().getRendererTypes(), FACET_ADAPTER)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2010-02-04 16:14:47 UTC (rev 16414) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2010-02-04 16:57:43 UTC (rev 16415) @@ -26,8 +26,6 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.RenderKitModel; -import java.util.Map; - /** * <p class="changed_added_4_0"></p> * @@ -54,6 +52,6 @@ @Override protected void postUnmarshal(FacesConfigBean bean, ComponentLibrary model) { - model.getRenderKits().putAll((Map<RenderKitModel.Id, RenderKitModel>)unmarshalMap(bean.getRenderKits(), ADAPTER)); + model.getRenderKits().putAll(this.<RenderKitModel.Id, RenderKitBean, RenderKitModel>unmarshalMap(bean.getRenderKits(), ADAPTER)); } }