Author: DartPeng Date: 2008-09-02 02:58:44 -0400 (Tue, 02 Sep 2008) New Revision: 10013 Modified: workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java Log: remove the checkbox treeviewer Modified: workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java =================================================================== --- workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-09-02 06:58:19 UTC (rev 10012) +++ workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-09-02 06:58:44 UTC (rev 10013) @@ -10,13 +10,10 @@ ******************************************************************************/ package org.jboss.tools.smooks.javabean.ui; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.search.IJavaSearchScope; @@ -25,7 +22,6 @@ import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; @@ -33,8 +29,6 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.events.TreeEvent; -import org.eclipse.swt.events.TreeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -43,10 +37,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.dialogs.SelectionDialog; -import org.jboss.tools.smooks.javabean.model.BeanContentProvider; -import org.jboss.tools.smooks.javabean.model.BeanlabelProvider; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory; import org.jboss.tools.smooks.ui.SmooksUIActivator; @@ -64,7 +55,6 @@ private Button classBrowseButton; protected String classFullName; protected boolean loadAtomic; - private CheckboxTreeViewer treeViewer; protected IJavaProject javaProject; protected IRunnableContext runnableContext; protected JavaBeanModel currentRootJavaBeanModel = null; @@ -136,8 +126,6 @@ */ public void modifyText(ModifyEvent arg0) { classFullName = classText.getText(); - if (loadAtomic) - loadModelPropertiesAndRefreshViewer(runnableContext); } }); @@ -146,88 +134,6 @@ classBrowseButton.addSelectionListener(this); classBrowseButton.setText("Browse..."); } - - // final Button atomicLoadButton = new Button(com, SWT.RADIO); - // - // atomicLoadButton.setText("Atomicly load"); - // atomicLoadButton.setSelection(true); - // - // Button loadButton = new Button(com, SWT.RADIO); - // loadButton.setText("Load by hand"); - // - // final Button loadClassButton = new Button(com, SWT.NONE); - // loadClassButton.setText("Load Class"); - // loadClassButton.addSelectionListener(new SelectionAdapter() { - // - // /* - // * (non-Javadoc) - // * - // * @see - // * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse - // * .swt.events.SelectionEvent) - // */ - // @Override - // public void widgetSelected(SelectionEvent e) { - // super.widgetSelected(e); - // if (!loadAtomic) - // loadModelPropertiesAndRefreshViewer(runnableContext); - // } - // }); - // loadClassButton.setEnabled(false); - // - // SelectionAdapter radioButtonSelectionAdp = new SelectionAdapter() { - // /* - // * (non-Javadoc) - // * - // * @see - // * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse - // * .swt.events.SelectionEvent) - // */ - // @Override - // public void widgetSelected(SelectionEvent e) { - // super.widgetSelected(e); - // loadAtomic = atomicLoadButton.getSelection(); - // loadClassButton.setEnabled(!loadAtomic); - // } - // - // }; - // atomicLoadButton.addSelectionListener(radioButtonSelectionAdp); - // loadButton.addSelectionListener(radioButtonSelectionAdp); - - Label spliter = new Label(com, SWT.SEPARATOR | SWT.HORIZONTAL); - spliter.setVisible(false); - treeViewer = new CheckboxTreeViewer(com, SWT.BORDER); - treeViewer.setContentProvider(new BeanContentProvider()); - treeViewer.setLabelProvider(new BeanlabelProvider()); - treeViewer.getTree().addTreeListener(new TreeListener(){ - - /* (non-Javadoc) - * @see org.eclipse.swt.events.TreeListener#treeCollapsed(org.eclipse.swt.events.TreeEvent) - */ - public void treeCollapsed(TreeEvent e) { - - } - - /* (non-Javadoc) - * @see org.eclipse.swt.events.TreeListener#treeExpanded(org.eclipse.swt.events.TreeEvent) - */ - public void treeExpanded(TreeEvent e) { - TreeItem item = (TreeItem)e.item; - if(item.getChecked()){ - TreeItem[] items = item.getItems(); - for (int i = 0; i < items.length; i++) { - TreeItem ci = items[i]; - ci.setChecked(true); - } - } - } - - }); - gd = new GridData(GridData.FILL_BOTH); - gd.horizontalSpan = 2; - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = true; - treeViewer.getTree().setLayoutData(gd); return com; } @@ -267,12 +173,20 @@ */ public JavaBeanModel fillCheckStateModel(JavaBeanModel rootJavaBean) { if (rootJavaBean == null) { - List list = (List) treeViewer.getInput(); - if (list != null) - rootJavaBean = (JavaBeanModel) list.get(0); + // List list = (List) treeViewer.getInput(); + // if (list != null) + // rootJavaBean = (JavaBeanModel) list.get(0); + try { + ProjectClassLoader loader = new ProjectClassLoader(javaProject); + Class clazz = loader.loadClass(this.classText.getText()); + rootJavaBean = JavaBeanModelFactory + .getJavaBeanModelWithLazyLoad(clazz); + }catch(Exception e){ + + } } - if (rootJavaBean != null) - this.fillTheModelWithCheckStatus(rootJavaBean, treeViewer); + // if (rootJavaBean != null) + // this.fillTheModelWithCheckStatus(rootJavaBean, treeViewer); return rootJavaBean; } @@ -307,40 +221,6 @@ } } + - protected void loadModelPropertiesAndRefreshViewer( - IRunnableContext runnableContext) { - Exception exp = null; - try { - runnableContext.run(false, false, new IRunnableWithProgress() { - - public void run(IProgressMonitor arg0) - throws InvocationTargetException, InterruptedException { - try { - Class clazz = loader.loadClass(classFullName); - currentRootJavaBeanModel = JavaBeanModelFactory - .getJavaBeanModelWithLazyLoad(clazz); - } catch (ClassNotFoundException e) { - throw new InvocationTargetException(e); - } - } - - }); - } catch (InvocationTargetException e1) { - exp = e1; - } catch (InterruptedException e1) { - exp = e1; - } - if (exp != null) { - // TODO ignor???? - treeViewer.setInput(Collections.EMPTY_LIST); - } else { - if (currentRootJavaBeanModel != null) { - treeViewer.setInput(currentRootJavaBeanModel.getProperties()); - treeViewer.setAllChecked(true); - } else - treeViewer.setInput(Collections.EMPTY_LIST); - } - } - }