Author: DartPeng Date: 2009-02-27 01:18:13 -0500 (Fri, 27 Feb 2009) New Revision: 13862 Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/plugin.xml workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceLabelProvider.java workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceModel.java workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/TestProjectsView.java workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java Log: Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/plugin.xml =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/plugin.xml 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/plugin.xml 2009-02-27 06:18:13 UTC (rev 13862) @@ -17,30 +17,11 @@ </view> </extension> <extension - point="org.eclipse.ui.perspectiveExtensions"> - <perspectiveExtension - targetID="org.eclipse.jdt.ui.JavaPerspective"> - <view - ratio="0.5" - relative="org.eclipse.ui.views.TaskList" - relationship="right" - id="org.smooks.tools.testui.views.SampleView"> - </view> - </perspectiveExtension> - </extension> - <extension - point="org.eclipse.help.contexts"> - <contexts - file="contexts.xml"> - </contexts> - </extension> - <extension point="org.eclipse.ui.editors"> <editor class="org.smooks.tools.testui.editors.SmooksTestMultiPageEditor" - contributorClass="org.smooks.tools.testui.editors.MultiPageEditorContributor" icon="icons/sample.gif" - id="org.smooks.tools.testui.editors.MultiPageEditor" + id="org.smooks.tools.testui.editors.SmooksTestEditor" name="Smooks Test Editor"> </editor> </extension> Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceContentProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceContentProvider.java 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceContentProvider.java 2009-02-27 06:18:13 UTC (rev 13862) @@ -17,7 +17,12 @@ if(!has) return has; if(bean instanceof JavaBeanInstanceModel){ Object value = ((JavaBeanInstanceModel)bean).getValue(); - if(value == null) return false; + if(value == null){ + if(((JavaBeanInstanceModel)bean).isArray() || ((JavaBeanInstanceModel)bean).isList()) { + return true; + } + return false; + } } return true; } Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceLabelProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceLabelProvider.java 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceLabelProvider.java 2009-02-27 06:18:13 UTC (rev 13862) @@ -27,10 +27,14 @@ case 0: return getText(element); case 1: - if(element instanceof JavaBeanInstanceModel){ - Object value = ((JavaBeanInstanceModel)element).getValue(); - if(value != null){ - return value.toString(); + if (element instanceof JavaBeanInstanceModel) { + Object value = ((JavaBeanInstanceModel) element).getValue(); + if (((JavaBeanInstanceModel) element).isPrimitive()) { + if (value != null) { + return value.toString(); + } else { + return "null"; + } } } } Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceModel.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceModel.java 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/java/JavaBeanInstanceModel.java 2009-02-27 06:18:13 UTC (rev 13862) @@ -3,43 +3,30 @@ */ package org.smooks.tools.testui.java; +import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Iterator; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; /** * @author Dart - * + * */ public class JavaBeanInstanceModel extends JavaBeanModel { - + private Object instanceModel = null; - + public Object getValue(Object args) { - if(instanceModel == null){ - return null; - } - Method readMethod = this.getPropertyDescriptor().getReadMethod(); - if(readMethod != null){ - try { - readMethod.invoke(instanceModel, args); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - return null; + return instanceModel; } - - public Object getValue(){ + + public Object getValue() { return getValue(null); } - public Object getInstanceModel() { return instanceModel; } @@ -47,17 +34,75 @@ public void setInstanceModel(Object instanceModel) { this.instanceModel = instanceModel; } - - public JavaBeanInstanceModel(Object instance , String beanId){ + + public JavaBeanInstanceModel(Object instance, String beanId) { this(instance.getClass()); this.setInstanceModel(instance); String name = getName(); - if(beanId != null){ + if (beanId != null) { name += " (" + beanId + ")"; setName(name); } } + @Override + protected JavaBeanModel newChildJavaBean(Class clazz, String name, + PropertyDescriptor pd, Class parentClass, boolean lazyLoading) { + JavaBeanInstanceModel instance = new JavaBeanInstanceModel(clazz, name); + Object obj = null; + if (instanceModel != null) { + Method method = pd.getReadMethod(); + if (method != null) { + try { + obj = method.invoke(instanceModel, null); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + } + instance.setInstanceModel(obj); + return instance; + } + + @Override + protected void createArrayChildren(Class<Object> clazz, String name, + PropertyDescriptor pd, Class<? extends Object> parentClass, + boolean lazyLoad) { + if(instanceModel.getClass().isArray()){ + Object[] objs = (Object[])instanceModel; + for (int i = 0; i < objs.length; i++) { + Object obj = objs[i]; + String simpleName = obj.getClass().getSimpleName(); + simpleName += String.valueOf(i+1); + JavaBeanInstanceModel instance = new JavaBeanInstanceModel(obj.getClass(), simpleName); + instance.setInstanceModel(obj); + addProperty(instance); + } + } + } + + @Override + protected void createListChildren(Class<Object> clazz, String name, + PropertyDescriptor pd, Class<? extends Object> parentClass, + boolean lazyLoad) { + int index = 1; + if(Collection.class.isAssignableFrom(instanceModel.getClass())){ + Collection objs = (Collection)instanceModel; + for (Iterator iterator = objs.iterator(); iterator.hasNext();index++) { + Object obj = iterator.next(); + String simpleName = obj.getClass().getSimpleName(); + simpleName += String.valueOf(index); + JavaBeanInstanceModel instance = new JavaBeanInstanceModel(obj.getClass(), simpleName); + instance.setInstanceModel(obj); + addProperty(instance); + } + } + } + public JavaBeanInstanceModel(Class beanClass, String name) { super(beanClass, name); } @@ -65,5 +110,5 @@ public JavaBeanInstanceModel(Class beanClass) { super(beanClass); } - + } Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/TestProjectsView.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/TestProjectsView.java 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/TestProjectsView.java 2009-02-27 06:18:13 UTC (rev 13862) @@ -197,12 +197,7 @@ drillDownAdapter = new DrillDownAdapter(viewer); viewer.setContentProvider(new ViewContentProvider()); viewer.setLabelProvider(new ViewLabelProvider()); - viewer.setSorter(new NameSorter()); - - // Create the help context id for the viewer's control - PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), - "org.smooks.tools.testui.viewer"); makeActions(); hookContextMenu(); hookDoubleClickAction(); @@ -314,7 +309,7 @@ .getWorkbenchWindow() .getActivePage() .openEditor(input, - "org.smooks.tools.testui.editors.MultiPageEditor"); + "org.smooks.tools.testui.editors.SmooksTestEditor"); } catch (PartInitException e) { e.printStackTrace(); } Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java 2009-02-27 05:56:36 UTC (rev 13861) +++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java 2009-02-27 06:18:13 UTC (rev 13862) @@ -140,7 +140,7 @@ String beanID = (String) iterator.next(); Object obj = result.getBean(beanID); if(obj != null){ - JavaBeanInstanceModel instanceModel = new JavaBeanInstanceModel(obj.getClass(),beanID); + JavaBeanInstanceModel instanceModel = new JavaBeanInstanceModel(obj,beanID); resultList.addJavaBean(instanceModel); } }