Author: DartPeng Date: 2010-09-21 06:01:48 -0400 (Tue, 21 Sep 2010) New Revision: 25047 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java Log: JBIDE-6901 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-09-21 08:56:03 UTC (rev 25046) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-09-21 10:01:48 UTC (rev 25047) @@ -79,6 +79,8 @@ private Button collectionClassBrowseButton; private Text colllectionClassText; + + private ICheckStateListener checkStateListener = null; public JavaBeanCreationWizardPage(String pageName, String title, ImageDescriptor titleImage, IJavaProject project, @@ -126,7 +128,7 @@ createBeanClassControls(mainComposite); - //createBeanTypeControls(mainComposite); + // createBeanTypeControls(mainComposite); Label seperator = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); @@ -198,7 +200,7 @@ } }); - viewer.addCheckStateListener(new ICheckStateListener() { + checkStateListener = new ICheckStateListener() { public void checkStateChanged(CheckStateChangedEvent event) { modelClassStringList.clear(); @@ -232,13 +234,14 @@ } private void checkChildren(JavaBeanModel model, boolean flag) { + ((JavaBeanModel) model).getChildren(); if (((JavaBeanModel) model).isExpaned()) { for (Iterator<?> iterator = ((JavaBeanModel) model) .getChildren().iterator(); iterator.hasNext();) { JavaBeanModel child = (JavaBeanModel) iterator.next(); - if(containts(child)){ + if (containts(child)) { continue; - }else{ + } else { record(child); } viewer.setChecked(child, flag); @@ -252,9 +255,9 @@ ITreeContentProvider provider = (ITreeContentProvider) viewer .getContentProvider(); Object parent = provider.getParent(element); - if(containts(parent)){ + if (containts(parent)) { return; - }else{ + } else { record(parent); } if (parent != null && !viewer.getChecked(parent)) { @@ -262,24 +265,26 @@ checkParents(parent, viewer); } } - + private List<Class> modelClassStringList = new ArrayList<Class>(); - - private boolean containts(Object model){ - if(model instanceof JavaBeanModel){ - Class clazz = ((JavaBeanModel)model).getBeanClass(); + + private boolean containts(Object model) { + if (model instanceof JavaBeanModel) { + Class clazz = ((JavaBeanModel) model).getBeanClass(); return modelClassStringList.contains(clazz); } return false; } - - private void record(Object model){ - if(model instanceof JavaBeanModel){ - Class clazz = ((JavaBeanModel)model).getBeanClass(); + + private void record(Object model) { + if (model instanceof JavaBeanModel) { + Class clazz = ((JavaBeanModel) model).getBeanClass(); modelClassStringList.add(clazz); } } - }); + }; + + viewer.addCheckStateListener(checkStateListener); } public Object[] getSelectionProperties() { @@ -439,14 +444,21 @@ isCollection = isCollectionClass(beanClass); Class<?> clazz = loader.loadClass(beanClass); - javaBeanModel = JavaBeanModelFactory.getJavaBeanModelWithLazyLoad(clazz); + javaBeanModel = JavaBeanModelFactory + .getJavaBeanModelWithLazyLoad(clazz); if (javaBeanModel != null) { if (beanID != null) { javaBeanModel.setName(beanID); } - if(!isCollection) { + if (!isCollection) { viewer.setInput(javaBeanModel.getChildren()); } + Object[] nodes = javaBeanModel.getChildren().toArray(); + for (int i = 0; i < nodes.length; i++) { + Object node = nodes[i]; + viewer.setChecked(node, true); + checkStateListener.checkStateChanged(new CheckStateChangedEvent(viewer, node, true)); + } // viewer.setCheckedElements(javaBeanModel.getChildren().toArray()); } else { viewer.setInput(""); //$NON-NLS-1$ @@ -508,7 +520,8 @@ String classString = JavaTypeFieldDialog.openJavaTypeDialog( getShell(), project, IJavaElementSearchConstants.CONSIDER_CLASSES); - beanClassText.setText(classString); + if (classString != null) + beanClassText.setText(classString); } }); @@ -542,7 +555,7 @@ Text t = (Text) e.getSource(); beanID = t.getText(); updateWizardPageStatus(); - if(javaBeanModel != null){ + if (javaBeanModel != null) { javaBeanModel.setName(beanID); } }