Author: Alex.Kolonitsky Date: 2010-02-04 11:14:47 -0500 (Thu, 04 Feb 2010) New Revision: 16414 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 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/AdapterBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-02-04 15:29:22 UTC (rev 16413) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-02-04 16:14:47 UTC (rev 16414) @@ -23,29 +23,27 @@ package org.richfaces.cdk.xmlconfig.model; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.ModelElement; import org.richfaces.cdk.xmlconfig.JAXBBinding; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import javax.xml.bind.annotation.adapters.XmlAdapter; +import java.util.List; +import java.util.Map; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public abstract class AdapterBase<K,V> extends XmlAdapter<K, V> { +public abstract class AdapterBase<K, V> extends XmlAdapter<K, V> { @Override public K marshal(V model) throws CdkException { K bean = JAXBBinding.createAdapter(getBeanClass(model), model); - postMarshal(model,bean); + postMarshal(model, bean); return bean; } @@ -58,7 +56,7 @@ @Override public V unmarshal(K bean) throws CdkException { V model = JAXBBinding.createModelElement(getModelClass(bean), bean); - postUnmarshal(bean,model); + postUnmarshal(bean, model); return model; } @@ -68,10 +66,11 @@ protected abstract Class<? extends V> getModelClass(K bean); - protected <K, B extends MapEntry<K>, M extends ModelElement<? super M>> List<B> marshalMap(Map<K,M> map, + protected <K, B extends MapEntry<K>, M extends ModelElement<? super M>> List<B> marshalMap(Map<K, M> map, AdapterBase<B, M> adapter) throws CdkException { + List<B> result = Lists.newArrayList(); - if(null != map && map.size()>0){ + if (null != map && map.size() > 0) { for (Map.Entry<K, M> entry : map.entrySet()) { B bean = adapter.marshal(entry.getValue()); bean.setKey(entry.getKey()); @@ -81,10 +80,11 @@ return result; } - protected <K,B extends MapEntry<K>, M extends ModelElement<? super M>> Map<K,M> unmarshalMap(List<B> list, - AdapterBase<B, M> adapter) throws CdkException { - Map<K,M> map = Maps.newHashMap(); - if(null != list && list.size()>0){ + protected <K, B extends MapEntry<K>, M extends ModelElement<? super M>> Map<K, M> unmarshalMap( + List<B> list, AdapterBase<B, M> adapter) throws CdkException { + + Map<K, M> map = Maps.newHashMap(); + if (null != list && list.size() > 0) { for (B bean : list) { M model = adapter.unmarshal(bean); map.put(bean.getKey(), model); 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 15:29:22 UTC (rev 16413) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-02-04 16:14:47 UTC (rev 16414) @@ -25,9 +25,13 @@ 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 java.util.Map; + /** * <p class="changed_added_4_0"></p> * @@ -64,7 +68,8 @@ model.setType(new Type(type.trim())); } // Copy properties/attributes - model.getAttributes().putAll(unmarshalMap(bean.getAttributes(), ATTRIBUTE_ADAPTER)); - model.getFacets().putAll(unmarshalMap(bean.getFacets(), FACET_ADAPTER)); + model.getAttributes().putAll((Map<String,Property>) unmarshalMap(bean.getAttributes(), ATTRIBUTE_ADAPTER)); + model.getFacets().putAll((Map<String, 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 15:29:22 UTC (rev 16413) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2010-02-04 16:14:47 UTC (rev 16414) @@ -24,7 +24,10 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.RenderKitModel; +import java.util.Map; + /** * <p class="changed_added_4_0"></p> * @@ -51,6 +54,6 @@ @Override protected void postUnmarshal(FacesConfigBean bean, ComponentLibrary model) { - model.getRenderKits().putAll(unmarshalMap(bean.getRenderKits(), ADAPTER)); + model.getRenderKits().putAll((Map<RenderKitModel.Id, RenderKitModel>)unmarshalMap(bean.getRenderKits(), ADAPTER)); } }