Author: DartPeng Date: 2009-07-07 03:46:36 -0400 (Tue, 07 Jul 2009) New Revision: 16457 Modified: branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanContentProvider.java branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/ValueWiringBindingSelectionDialog.java Log: JBIDE-4578 Done Modified: branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java =================================================================== --- branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-07 06:06:34 UTC (rev 16456) +++ branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-07 07:46:36 UTC (rev 16457) @@ -141,7 +141,7 @@ gd.horizontalSpan = 2; separator.setLayoutData(gd); - Hyperlink link = toolkit.createHyperlink(parent, "Add Value binding and Wiring binidng", SWT.NONE); + Hyperlink link = toolkit.createHyperlink(parent, "Add Value binding and Bean binding automatically", SWT.NONE); final Composite fp = parent; final BindingsType fb = (BindingsType)model; final SmooksMultiFormEditor ff = formEditor; Modified: branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanContentProvider.java =================================================================== --- branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanContentProvider.java 2009-07-07 06:06:34 UTC (rev 16456) +++ branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanContentProvider.java 2009-07-07 07:46:36 UTC (rev 16457) @@ -1,5 +1,7 @@ package org.jboss.tools.smooks.configuration.editors.javabean; +import java.util.Collection; + import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -37,6 +39,9 @@ if (arg0 instanceof JavaBeanList) { return ((JavaBeanList) arg0).getChildren().toArray(); } + if(arg0 instanceof Collection){ + return ((Collection<?>)arg0).toArray(); + } return new Object[]{}; } Modified: branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/ValueWiringBindingSelectionDialog.java =================================================================== --- branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/ValueWiringBindingSelectionDialog.java 2009-07-07 06:06:34 UTC (rev 16456) +++ branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/ValueWiringBindingSelectionDialog.java 2009-07-07 07:46:36 UTC (rev 16457) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.javabean; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.CheckboxTableViewer; @@ -86,11 +88,11 @@ // TableColumn nameColumn = new TableColumn(viewer.getTable(),SWT.NONE); viewer.setContentProvider(new JavabeanContentProvider()); viewer.setLabelProvider(new JavaBeanTableLabelProvider()); - JavaBeanList list = new JavaBeanList(); + List<JavaBeanModel> list = new ArrayList<JavaBeanModel>(); for (Iterator<?> iterator = beanModel.getChildren().iterator(); iterator.hasNext();) { Object child = (Object) iterator.next(); if (child instanceof JavaBeanModel && !ignoreProperty((JavaBeanModel) child)) { - list.addJavaBean((JavaBeanModel) child); + list.add((JavaBeanModel) child); } } viewer.setInput(list);