[jbosstools-commits] JBoss Tools SVN: r17246 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: graphical/editors/model and 1 other directory.

Author: DartPeng Date: 2009-08-25 02:23:25 -0400 (Tue, 25 Aug 2009) New Revision: 17246 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java Log: JBIDE-4648 Fix 2 bugs Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java 2009-08-25 03:32:21 UTC (rev 17245) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java 2009-08-25 06:23:25 UTC (rev 17246) @@ -281,12 +281,12 @@ this(beanClass, name, null, null, true); } - JavaBeanModel(Class beanClass, boolean lazyLoadProperties) { + JavaBeanModel(Class<?> beanClass, boolean lazyLoadProperties) { this(beanClass, null, null, null, lazyLoadProperties); } public boolean isPrimitive() { - Class beanType = getBeanClass(); + Class<?> beanType = getBeanClass(); if (beanType == null) return false; if (beanType.isPrimitive() || JavaBeanModelFactory.isPrimitiveObject(beanType)) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java 2009-08-25 03:32:21 UTC (rev 17245) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java 2009-08-25 06:23:25 UTC (rev 17246) @@ -60,6 +60,7 @@ } public static boolean isPrimitiveObject(Class<?> clazz) { + if(clazz.isEnum()) return true; return (PRIMITIVE_CLASSES.indexOf(clazz) != -1); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-08-25 03:32:21 UTC (rev 17245) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-08-25 06:23:25 UTC (rev 17246) @@ -57,6 +57,13 @@ return true; } } + + if(sourceModel instanceof IXMLStructuredObject && targetModel instanceof EObject){ + EStructuralFeature selectorFeature = SmooksUIUtils.getSelectorFeature((EObject)targetModel); + if(selectorFeature != null){ + return true; + } + } } return false; }