Author: DartPeng Date: 2008-09-10 22:42:35 -0400 (Wed, 10 Sep 2008) New Revision: 10187 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java Log: change the name of a method Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 02:40:28 UTC (rev 10186) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 02:42:35 UTC (rev 10187) @@ -13,7 +13,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -38,6 +37,7 @@ import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer; import org.jboss.tools.smooks.analyzer.MappingModel; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; import org.jboss.tools.smooks.graphical.GraphInformations; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; @@ -90,7 +90,6 @@ adapterFactory = new ComposedAdapterFactory( ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - adapterFactory .addAdapterFactory(new ResourceItemProviderAdapterFactory()); adapterFactory @@ -360,14 +359,14 @@ this.analyzeGraphicalModel(root, listType); } - public List<MappingModel> analyzeMappingSmooksModel( + public MappingResourceConfigList analyzeMappingSmooksModel( SmooksResourceListType listType, Object sourceObject, Object targetObject) { if (!(sourceObject instanceof JavaBeanModel) || !(targetObject instanceof JavaBeanModel)) { - return Collections.EMPTY_LIST; + return MappingResourceConfigList.createEmptyList(); } - + MappingResourceConfigList resourceConfigList = new MappingResourceConfigList(); JavaBeanModel source = (JavaBeanModel) sourceObject; JavaBeanModel target = (JavaBeanModel) targetObject; List<MappingModel> mappingModelList = new ArrayList<MappingModel>(); @@ -395,14 +394,16 @@ setSelectorIsUsed(sourceName); // create the first connection mappingModelList.add(new MappingModel(source, target)); + resourceConfigList.addResourceConfig(rc); analyzeMappingModelFromResourceConfig(mappingModelList, - listType, rc, source, target); + resourceConfigList, listType, rc, source, + target); } } } } - - return mappingModelList; + resourceConfigList.setMappingModelList(mappingModelList); + return resourceConfigList; } protected boolean isReferenceSelector(String selector) { @@ -416,6 +417,7 @@ protected void analyzeMappingModelFromResourceConfig( List<MappingModel> mappingModelList, + MappingResourceConfigList mappingResourceConfigList, SmooksResourceListType resourceList, ResourceConfigType resourceConfig, JavaBeanModel source, JavaBeanModel target) { @@ -443,8 +445,10 @@ sourceModel = findTheChildJavaBeanModel(newSelector, source); if (sourceModel != null) { setSelectorIsUsed(newSelector); + mappingResourceConfigList.addResourceConfig(rc); analyzeMappingModelFromResourceConfig(mappingModelList, - resourceList, rc, sourceModel, targetModel); + mappingResourceConfigList, resourceList, rc, + sourceModel, targetModel); } } } else { @@ -453,14 +457,15 @@ if (sourceModel != null) { MappingModel model = new MappingModel(sourceModel, targetModel); FeatureMap it = binding.getAnyAttribute(); - for(int i = 0 ; i < it.size() ; i++){ + for (int i = 0; i < it.size(); i++) { EStructuralFeature feature = it.getEStructuralFeature(i); - if(feature.equals(SmooksModelUtils.ATTRIBUTE_PROPERTY) || - feature.equals(SmooksModelUtils.ATTRIBUTE_SELECTOR)) + if (feature.equals(SmooksModelUtils.ATTRIBUTE_PROPERTY) + || feature + .equals(SmooksModelUtils.ATTRIBUTE_SELECTOR)) continue; String pname = feature.getName(); String pvalue = it.get(feature, false).toString(); - PropertyModel pmodel =new PropertyModel(); + PropertyModel pmodel = new PropertyModel(); pmodel.setName(pname); pmodel.setValue(pvalue); model.getProperties().add(pmodel);