Changeset 770

Timestamp:

06/27/07 17:08:44 (2 years ago)

Author:

nozawa

Message:

Refactor wizard pages.

Files:

• trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/BeanEditorGeneratorUIActivator.java (modified) (1 diff)
• trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateAction.java (modified) (2 diffs)
• trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java (modified) (5 diffs)
• trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanInfoPage.java (moved) (moved from trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/PropertySelectionPage.java) (8 diffs)
• trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/TargetEnvironmentPage.java (moved) (moved from trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanSelectionPage.java) (11 diffs)

trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/BeanEditorGeneratorUIActivator.java

@@ -1 +1 @@
-/*******************************************************************************
-
+-2007
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0

trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateAction.java

@@ -66 +66 @@
-                    .getShell();
-            boolean question = MessageDialog.openQuestion(shell, "",
- 
+
-
-            if (question) {
@@ -101 +101 @@
-        IPackageFragment targetPackage = beanType.getPackageFragment();
-        String packageName = targetPackage.getElementName();
-
+.
-            IPackageFragmentRoot root = (IPackageFragmentRoot) targetPackage
-                    .getParent();
-            String newPackageName = packageName.substring(0, packageName
-                    .length() - 7);
-
+
+
+
+
-        }
-

trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java

@@ -52 +52 @@
- */
-public class BeanEditorGenerateWizard extends Wizard implements INewWizard {
-BeanSelectionPage beanSelection
+TargetEnvironmentPage targetEnvironment
-
-    // private IdSelectionPage idSelectionPage;
@@ -58 +58 @@
-    private IStructuredSelection selection;
-
-PropertySelectionPage propertySelection
+BeanInfoPage beanInfo
-
-    public BeanEditorGenerateWizard() {
@@ -86 +86 @@
-
-                    TargetBean targetBean = generatorPlugin.createTargetBean(
-Selection
-propertySelection
-propertySelection
+Info
+beanInfo
+beanInfo
-                    BeanEditorInfo beanEditorInfo = generatorPlugin
-beanSelection
+targetEnvironment
-                                    .getPackageFragment());
-
-                    SourceGenerator sourceGenerator = new SourceGenerator();
-
-beanSelection
+targetEnvironment
-                    IProject project = beanEditorInfo.getTargetSourceDir()
-                            .getJavaProject().getProject();
@@ -101 +101 @@
-                    ProjectConfiguration config = new ProjectConfiguration(
-                            project);
-beanSelection
+targetEnvironment
-                        config.addJalcedoLibraryDependency(monitor);
-                    }
-
-beanSelection
+targetEnvironment
-                        config
-                                .addBeanEditorToPluginXml(beanEditorInfo,
@@ -152 +152 @@
-    @Override
-    public void addPages() {
-beanSelectionPage = new BeanSelection
-beanSelection
-beanSelection
+targetEnvironmentPage = new TargetEnvironment
+targetEnvironment
+targetEnvironment
-
-
-
-
-
-
+
+
+
-    }
-}

trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanInfoPage.java

@@ -11 +11 @@
-package org.jalcedo.generator.client.beans.ui.internal.wizards;
-
+import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.IJavaElementSearchConstants;
+import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -24 +29 @@
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.SelectionDialog;
-import org.jalcedo.generator.client.beans.BeanEditorGeneratorActivator;
-import org.jalcedo.generator.client.beans.model.Property;
@@ -38 +52 @@
- * 
- */
-
+
+
+
-    private CheckboxTableViewer checkboxTableViewer;
-    private ComboViewer comboViewer;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -59 +90 @@
-        layout.numColumns = nColumns;
-        composite.setLayout(layout);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        Label label2 = new Label(composite, SWT.NULL);
-        label2.setText("&ID property:");
-
-        GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
-3
+nColumns - 1
-        comboViewer = new ComboViewer(composite, SWT.BORDER | SWT.SINGLE);
-        comboViewer.getCombo().setLayoutData(gd3);
@@ -71 +138 @@
-        comboViewer
-                .addSelectionChangedListener(new IdSelectionChangedListener());
-
+
+
+
+
+
+
+
+
+
-        Label label = new Label(composite, SWT.NULL);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    @Override
-    public void setVisible(boolean visible) {
-
-
+
+
+
+
+
-        TargetBean targetBean = null;
-
@@ -109 +198 @@
-            e.printStackTrace();
-        }
-super.setVisible(visible);
+
-        Property[] properties = targetBean.getProperties();
-
@@ -133 +222 @@
-
-    private void doValidate() {
-
+
+
+
+
+
-            setErrorMessage("select id property");
-            setPageComplete(false);
@@ -156 +249 @@
-    }
-
+    /**
+     * TargetBean 入力のテキストボックスの値が変更されたとき、そのクラスが 存在するか調べ、値のチェックを実行する。
+     * 
+     * @author nozawa
+     * 
+     */
+    class BeanTypeTextModifyListener implements ModifyListener {
+
+        public void modifyText(ModifyEvent event) {
+            try {
+                beanType = beanType.getJavaProject().findType(beanTypeText.getText());
+                
+                
+                if(beanType != null){
+                
+                TargetBean targetBean = null;
+
+                targetBean = BeanEditorGeneratorActivator.getDefault()
+                            .createTargetBean(beanType, null);
+                
+                Property[] properties = targetBean.getProperties();
+                
+                comboViewer.setInput(properties);
+                
+                
+                checkboxTableViewer.setInput(properties);
+                checkboxTableViewer.setAllChecked(true);
+                comboViewer.setSelection(new StructuredSelection(properties[0]));
+                }
+                doValidate();
+            } catch (JavaModelException e) {
+                setMessage(e.getMessage());
+            } catch (CoreException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * TargetBean 入力項目のボタンが押されたとき、bean選択ダイアログを表示し、 値をテキストボックスにセットする。
+     * 
+     * @author nozawa
+     * 
+     */
+    class ChooseBeanButtonSelectionAdapter extends SelectionAdapter {
+
+        public void widgetSelected(SelectionEvent e) {
+            IType choosedBean = chooseTargetBean(beanType.getJavaProject().getProject());
+            beanTypeText.setText(choosedBean.getFullyQualifiedName());
+        }
+
+        /**
+         * Open type selection dialog, and it returns IType of choosed bean.
+         * 
+         * @param project
+         * @return IType of choosed bean
+         */
+        private IType chooseTargetBean(IProject project) {
+            IWorkbenchWindow window = PlatformUI.getWorkbench()
+                    .getActiveWorkbenchWindow();
+
+            try {
+                SelectionDialog dialog = JavaUI.createTypeDialog(window
+                        .getShell(), window, project,
+                        IJavaElementSearchConstants.CONSIDER_CLASSES, false);
+                dialog.setTitle("select Bean");
+                dialog.setMessage("Select Bean:");
+
+                if (dialog.open() == SelectionDialog.OK) {
+                    Object[] selection = dialog.getResult();
+                    return (IType) selection[0];
+                }
+            } catch (JavaModelException e) {
+                setMessage(e.getMessage());
+            }
+            return null;
+        }
+
+    }
+    
-    class PropertyLabelProvider extends LabelProvider {
-        @Override

trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/TargetEnvironmentPage.java

@@ -1 +1 @@
-/*******************************************************************************
-
+-2007
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
@@ -15 +15 @@
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
@@ -46 +31 @@
- * <li>BeanEditorを出力するソースフォルダ。</li>
- * <li>BeanEditorを出力するルートとなるパッケージ名。</li>
- * <li>ターゲットとなるBean。</li>
- * <li>jalcedoのライブラリを追加するかどうか.</li>
- * <li>生成したView をプラグインに登録するかどうか.</li>
+ * <li>Overwrite files or not.</li>
- * </ul>
- * 
@@ -54 +39 @@
- * 
- */
-// TODO add contents assistant to beanTypeText.
-public class BeanSelectionPage extends NewTypeWizardPage {
-    private IJavaProject javaProject;
-
-
-
-
-
+
-    private Button libraryAddCheckBox;
-
-    private Button extensionAddCheckBox;
-
+
-    private Button fileOverWriteCheckBox;
-
-BeanSelection
-BeanSelection
-BeanSlectionPage
-select target bean
+TargetEnvironment
+TargetEnvironment
+Target Environment 
+Set the parameters which is used to generate the editor.  
-
-    }
@@ -85 +64 @@
-        initContainerPage(javaElement);
-        initTypePage(javaElement);
-        initBeanType(javaElement);
-        javaProject = javaElement.getJavaProject();
-    }
-
-    /**
-     * 
-     * ユーザの選択した要素が java クラスのモデルだったとき、 そのクラスを TargetBean の デフォルト値に設定する。
-     * 
-     * @param javaElement
-     */
-    private void initBeanType(IJavaElement javaElement) {
-        if (javaElement instanceof IType) {
-            beanType = (IType) javaElement;
-        } else if (javaElement instanceof ICompilationUnit) {
-            beanType = ((ICompilationUnit) javaElement).findPrimaryType();
-        }
-    }
-
@@ -123 +86 @@
-        createContainerControls(composite, nColumns);
-        createPackageControls(composite, nColumns);
-        
-
-        createSeparator(composite, nColumns);
-
-        createBeanSelectionControls(composite, nColumns);
-
-        createOptionCheckBoxes(composite, nColumns);
@@ -135 +95 @@
-
-    /**
-
-選択されたプロジェクトが 
+ 選択されたプロジェクトが
+
-     * 
-     */
@@ -142 +102 @@
-        IStatus[] status = new IStatus[] { fContainerStatus, fPackageStatus };
-        updateStatus(status);
-
-
-
-
-
+
-            setErrorMessage("Project is not a plug-in project. Select a plugin project or convert this to a plugin project. ");
-            setPageComplete(false);
-            return;
-
+ 
-            setErrorMessage("Root pacakge is not selected. ");
-            setPageComplete(false);
-            return;
-        }
-
-
-    }
@@ -187 +142 @@
-
-    /**
-     * TargetBean 選択の項目を作成する。
-     * 
-     * @param composite
-     * @param nColumns
-     */
-    private void createBeanSelectionControls(Composite composite, int nColumns) {
-        Label label = new Label(composite, SWT.NULL);
-        label.setText("&Target Bean:");
-
-        beanTypeText = new Text(composite, SWT.BORDER | SWT.SINGLE);
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.horizontalSpan = nColumns - 2;
-        beanTypeText.setLayoutData(gd);
-        beanTypeText.addModifyListener(new BeanTypeTextModifyListener());
-
-        Button button = new Button(composite, SWT.PUSH);
-        GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-        button.setText("Browse...");
-        button.setLayoutData(gd2);
-        button.addSelectionListener(new ChooseBeanButtonSelectionAdapter());
-    }
-
-    /**
-     * オプション選択のチェックボックスを作成する。
-     * 
@@ -229 +161 @@
-        extensionAddCheckBox.setText("register generated view extension.");
-        extensionAddCheckBox.setSelection(true);
-
+
-        fileOverWriteCheckBox = new Button(composite, SWT.CHECK);
-        GridData gd5 = new GridData(GridData.FILL_HORIZONTAL);
-        gd5.horizontalSpan = nColumns;
-        fileOverWriteCheckBox.setLayoutData(gd5);
-
+
+
-        fileOverWriteCheckBox.setSelection(false);
-    }
-
-    /**
-     * BeanTypeの入力テキストボックスを取得する
-     * 
-     * @return
-     */
-    public Text getBeanTypeText() {
-        return beanTypeText;
-    }
-
-    /**
-     * TargetBeanのモデルを取得する
-     * 
-     * @return TargetBeanのモデル
-     */
-    public IType getBeanType() {
-        return beanType;
-    }
-
@@ -273 +188 @@
-        return extensionAddCheckBox.getSelection();
-    }
-
-
+
+ 
-        return fileOverWriteCheckBox.getSelection();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jdt.ui.wizards.NewElementWizardPage#setVisible(boolean)
-     */
-    @Override
-    public void setVisible(boolean visible) {
-        super.setVisible(visible);
-        if (beanType != null) {
-            beanTypeText.setText(beanType.getFullyQualifiedName());
-        }
-        doStatusUpdate();
-    }
-
-    /**
-     * TargetBean 入力のテキストボックスの値が変更されたとき、そのクラスが 存在するか調べ、値のチェックを実行する。
-     * 
-     * @author nozawa
-     * 
-     */
-    class BeanTypeTextModifyListener implements ModifyListener {
-
-        public void modifyText(ModifyEvent event) {
-            try {
-                beanType = javaProject.findType(beanTypeText.getText());
-                doStatusUpdate();
-            } catch (JavaModelException e) {
-                setMessage(e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * TargetBean 入力項目のボタンが押されたとき、bean選択ダイアログを表示し、 値をテキストボックスにセットする。
-     * 
-     * @author nozawa
-     * 
-     */
-    class ChooseBeanButtonSelectionAdapter extends SelectionAdapter {
-
-        public void widgetSelected(SelectionEvent e) {
-            IType choosedBean = chooseTargetBean(javaProject.getProject());
-            beanTypeText.setText(choosedBean.getFullyQualifiedName());
-        }
-
-        /**
-         * Open type selection dialog, and it returns IType of choosed bean.
-         * 
-         * @param project
-         * @return IType of choosed bean
-         */
-        private IType chooseTargetBean(IProject project) {
-            IWorkbenchWindow window = PlatformUI.getWorkbench()
-                    .getActiveWorkbenchWindow();
-
-            try {
-                SelectionDialog dialog = JavaUI.createTypeDialog(window
-                        .getShell(), window, project,
-                        IJavaElementSearchConstants.CONSIDER_ALL_TYPES, false);
-                dialog.setTitle("select Bean");
-                dialog.setMessage("Select Bean:");
-
-                if (dialog.open() == SelectionDialog.OK) {
-                    Object[] selection = dialog.getResult();
-                    return (IType) selection[0];
-                }
-            } catch (JavaModelException e) {
-                setMessage(e.getMessage());
-            }
-            return null;
-        }
-
-    }
-
-}