Attachment 105853 Details for Bug 237290 – remove internal class dependency

[patch] remove internal class dependency

NewMidletWizardPage.java.patch (text/plain), 16.65 KB, created by Feng(Marvin) Wang

on 2008-06-25 21:42:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Feng(Marvin) Wang

Created: 2008-06-25 21:42:15 EDT

Size: 16.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mtj.ui
>Index: src/org/eclipse/mtj/ui/MTJUIPluginResources.properties
>===================================================================
>--- src/org/eclipse/mtj/ui/MTJUIPluginResources.properties	(revision 239)
>+++ src/org/eclipse/mtj/ui/MTJUIPluginResources.properties	(working copy)
>@@ -105,6 +105,8 @@
> wiz.newmidlet.which_methods=Which methods should be created?
> wiz.newmidlet.super_const=Superclass constructors
> wiz.newmidlet.unimplemented=Unimplemented abstract methods
>+wiz.newmidlet.warning.NotAMidletProject=Source folder is not a Midlet project
>+wiz.newmidlet.warning.NotInAMidletProject=Source folder is not in a Midlet project
> 
> #
> # Dialogs
>Index: src/org/eclipse/mtj/ui/internal/wizards/NewMidletWizardPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/wizards/NewMidletWizardPage.java	(revision 239)
>+++ src/org/eclipse/mtj/ui/internal/wizards/NewMidletWizardPage.java	(working copy)
>@@ -10,11 +10,19 @@
>  *     Craig Setera (EclipseME) - Initial implementation
>  *     Diego Sandin (Motorola)  - Refactoring package name to follow eclipse
>  *                                standards
>+ *     Feng(Marvin) Wang (Sybase) - Add validations. Ensure that user cannot
>+ *     							   create a Midlet in a non-midlet project.
>  */
> package org.eclipse.mtj.ui.internal.wizards;
> 
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IType;
>@@ -23,6 +31,8 @@
> import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.mtj.core.IMTJCoreConstants;
>+import org.eclipse.mtj.core.internal.MTJCorePlugin;
>+import org.eclipse.mtj.ui.IMTJUIConstants;
> import org.eclipse.mtj.ui.MTJUIStrings;
> import org.eclipse.mtj.ui.internal.MTJUIPlugin;
> import org.eclipse.swt.SWT;
>@@ -38,184 +48,253 @@
>  * @author Craig Setera
>  */
> public class NewMidletWizardPage extends NewTypeWizardPage {
>-    /** The name this page is registered as within the wizard */
>-    public static final String PAGE_NAME = "NewMidletClass";
>+	/** The name this page is registered as within the wizard */
>+	public static final String PAGE_NAME = "NewMidletClass";
>+
>+	// Dialog settings constants
>+	private static final String SETTINGS_ADD_TO_JAD = "addToJad";
>+	private static final String SETTINGS_CONSTRUCTORS = "constructors";
>+	private static final String SETTINGS_UNIMPLEMENTED = "unimplemented";
> 
>-    // Dialog settings constants
>-    private static final String SETTINGS_ADD_TO_JAD = "addToJad";
>-    private static final String SETTINGS_CONSTRUCTORS = "constructors";
>-    private static final String SETTINGS_UNIMPLEMENTED = "unimplemented";
>+	// Controls
>+	private Button addToJadButton;
>+	private Button constructorsButton;
>+	private Button unimplementedButton;
> 
>-    // Controls
>-    private Button addToJadButton;
>-    private Button constructorsButton;
>-    private Button unimplementedButton;
>+	/**
>+	 * @param isClass
>+	 * @param pageName
>+	 */
>+	public NewMidletWizardPage() {
>+		super(true, PAGE_NAME);
> 
>-    /**
>-     * @param isClass
>-     * @param pageName
>-     */
>-    public NewMidletWizardPage() {
>-        super(true, PAGE_NAME);
>+		setTitle(MTJUIStrings.getString("wiz.newmidlet.title"));
>+		setDescription(MTJUIStrings.getString("wiz.newmidlet.description"));
>+	}
> 
>-        setTitle(MTJUIStrings.getString("wiz.newmidlet.title"));
>-        setDescription(MTJUIStrings.getString("wiz.newmidlet.description"));
>-    }
>+	/**
>+	 * The wizard owning this page is responsible for calling this method with
>+	 * the current selection. The selection is used to initialize the fields of
>+	 * the wizard page.
>+	 * 
>+	 * @param selection
>+	 *            used to initialize the fields
>+	 */
>+	public void init(IStructuredSelection selection) {
>+		IJavaElement jelem = getInitialJavaElement(selection);
>+		initContainerPage(jelem);
>+		initTypePage(jelem);
>+		setSuperClass(IMTJCoreConstants.MIDLET_SUPERCLASS, true);
>+	}
> 
>-    /**
>-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
>-     */
>-    public void createControl(Composite parent) {
>-        initializeDialogUnits(parent);
>+	// ------ validation --------
>+	/*
>+	 * @see org.eclipse.jdt.ui.wizards.NewClassWizardPage#doStatusUpdate
>+	 */
>+	private void doStatusUpdate() {
>+		// status of all used components
>+		IStatus[] status = new IStatus[] {
>+				fContainerStatus,
>+				isEnclosingTypeSelected() ? fEnclosingTypeStatus
>+						: fPackageStatus, fTypeNameStatus, fModifierStatus,
>+				fSuperClassStatus, fSuperInterfacesStatus };
>+		// the mode severe status will be displayed and the OK button
>+		// enabled/disabled.
>+		updateStatus(status);
>+	}
> 
>-        Composite composite = new Composite(parent, SWT.NONE);
>+	/*
>+	 * @see org.eclipse.jdt.ui.wizards.NewContainerWizardPage#handleFieldChanged
>+	 */
>+	protected void handleFieldChanged(String fieldName) {
>+		super.handleFieldChanged(fieldName);
>+		doStatusUpdate();
>+	}
> 
>-        int nColumns = 4;
>+	/*
>+	 * @see org.eclipse.jdt.ui.wizards.NewTypeWizardPage#containerChanged()
>+	 */
>+	@Override
>+	protected IStatus containerChanged() {
>+		IStatus containerStatus = super.containerChanged();
>+		String str = getPackageFragmentRootText();
>+		IPath path = new Path(str);
>+		IResource res = getWorkspaceRoot().findMember(path);
>+		if (res != null) {
>+			int resType = res.getType();
>+			if (resType == IResource.PROJECT || resType == IResource.FOLDER) {
>+				IProject proj = res.getProject();
>+				try {
>+					if (!proj.hasNature(MTJCorePlugin.J2ME_NATURE_ID)) {
>+						if (res.exists()) {
>+							if (resType == IResource.PROJECT) {
>+								return new Status(
>+										IStatus.ERROR,
>+										IMTJUIConstants.PLUGIN_ID,
>+										MTJUIStrings
>+												.getString("wiz.newmidlet.warning.NotAMidletProject"));
>+							} else {
>+								return new Status(
>+										IStatus.ERROR,
>+										IMTJUIConstants.PLUGIN_ID,
>+										MTJUIStrings
>+												.getString("wiz.newmidlet.warning.NotInAMidletProject"));
>+							}
>+						}
>+					}
>+				} catch (CoreException e) {
>+					return new Status(
>+							IStatus.ERROR,
>+							IMTJUIConstants.PLUGIN_ID,
>+							MTJUIStrings
>+									.getString("wiz.newmidlet.warning.NotAMidletProject"));
>+				}
>+			}
>+		}
>+		return containerStatus;
>+	}
> 
>-        GridLayout layout = new GridLayout();
>-        layout.numColumns = nColumns;
>-        composite.setLayout(layout);
>+	// ------ UI --------
>+	/**
>+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
>+	 */
>+	public void createControl(Composite parent) {
>+		initializeDialogUnits(parent);
> 
>-        // pick & choose the wanted UI components
>+		Composite composite = new Composite(parent, SWT.NONE);
> 
>-        createContainerControls(composite, nColumns);
>-        createPackageControls(composite, nColumns);
>-        createEnclosingTypeControls(composite, nColumns);
>+		int nColumns = 4;
> 
>-        createSeparator(composite, nColumns);
>+		GridLayout layout = new GridLayout();
>+		layout.numColumns = nColumns;
>+		composite.setLayout(layout);
> 
>-        createTypeNameControls(composite, nColumns);
>-        createModifierControls(composite, nColumns);
>+		// pick & choose the wanted UI components
> 
>-        createSuperClassControls(composite, nColumns);
>-        createSuperInterfacesControls(composite, nColumns);
>-        createMethodStubSelectionControls(composite, nColumns);
>-        createAddToJADSelectionControl(composite, nColumns);
>+		createContainerControls(composite, nColumns);
>+		createPackageControls(composite, nColumns);
>+		createEnclosingTypeControls(composite, nColumns);
> 
>-        boolean addToJad = true;
>-        boolean constructors = true;
>-        boolean unimplemented = true;
>+		createSeparator(composite, nColumns);
> 
>-        IDialogSettings section = getDialogSettings().getSection(PAGE_NAME);
>-        if (section != null) {
>-            addToJad = section.getBoolean(SETTINGS_ADD_TO_JAD);
>-            constructors = section.getBoolean(SETTINGS_CONSTRUCTORS);
>-            unimplemented = section.getBoolean(SETTINGS_UNIMPLEMENTED);
>-        }
>+		createTypeNameControls(composite, nColumns);
>+		createModifierControls(composite, nColumns);
> 
>-        addToJadButton.setSelection(addToJad);
>-        constructorsButton.setSelection(constructors);
>-        unimplementedButton.setSelection(unimplemented);
>+		createSuperClassControls(composite, nColumns);
>+		createSuperInterfacesControls(composite, nColumns);
>+		createMethodStubSelectionControls(composite, nColumns);
>+		createAddToJADSelectionControl(composite, nColumns);
> 
>-        setControl(composite);
>+		boolean addToJad = true;
>+		boolean constructors = true;
>+		boolean unimplemented = true;
> 
>-        Dialog.applyDialogFont(composite);
>-    }
>+		IDialogSettings section = getDialogSettings().getSection(PAGE_NAME);
>+		if (section != null) {
>+			addToJad = section.getBoolean(SETTINGS_ADD_TO_JAD);
>+			constructors = section.getBoolean(SETTINGS_CONSTRUCTORS);
>+			unimplemented = section.getBoolean(SETTINGS_UNIMPLEMENTED);
>+		}
> 
>-    /**
>-     * The wizard owning this page is responsible for calling this method with
>-     * the current selection. The selection is used to initialize the fields of
>-     * the wizard page.
>-     * 
>-     * @param selection used to initialize the fields
>-     */
>-    public void init(IStructuredSelection selection) {
>-        IJavaElement jelem = getInitialJavaElement(selection);
>-        initContainerPage(jelem);
>-        initTypePage(jelem);
>-        setSuperClass(IMTJCoreConstants.MIDLET_SUPERCLASS, true);
>-    }
>+		addToJadButton.setSelection(addToJad);
>+		constructorsButton.setSelection(constructors);
>+		unimplementedButton.setSelection(unimplemented);
> 
>-    /**
>-     * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
>-     */
>-    public void setVisible(boolean visible) {
>-        super.setVisible(visible);
>-        if (visible) {
>-            setFocus();
>-        }
>-    }
>+		setControl(composite);
> 
>-    /**
>-     * Return a boolean indicating whether the "add to jad" button was selected.
>-     * 
>-     * @return
>-     */
>-    boolean isAddToJadSelected() {
>-        return addToJadButton.getSelection();
>-    }
>+		Dialog.applyDialogFont(composite);
>+	}
> 
>-    /**
>-     * @see org.eclipse.jdt.ui.wizards.NewTypeWizardPage#createTypeMembers(org.eclipse.jdt.core.IType,
>-     *      org.eclipse.jdt.ui.wizards.NewTypeWizardPage.ImportsManager,
>-     *      org.eclipse.core.runtime.IProgressMonitor)
>-     */
>-    protected void createTypeMembers(IType newType, ImportsManager imports,
>-            IProgressMonitor monitor) throws CoreException {
>-        createInheritedMethods(newType, constructorsButton.getSelection(),
>-                unimplementedButton.getSelection(), imports,
>-                new SubProgressMonitor(monitor, 1));
>+	/**
>+	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
>+	 */
>+	public void setVisible(boolean visible) {
>+		super.setVisible(visible);
>+		if (visible) {
>+			setFocus();
>+		}
>+	}
> 
>-        IDialogSettings section = MTJUIPlugin.getDialogSettings(
>-                getDialogSettings(), PAGE_NAME);
>-        section.put(SETTINGS_ADD_TO_JAD, addToJadButton.getSelection());
>-        section.put(SETTINGS_CONSTRUCTORS, constructorsButton.getSelection());
>-        section.put(SETTINGS_UNIMPLEMENTED, unimplementedButton.getSelection());
>-    }
>+	/**
>+	 * Return a boolean indicating whether the "add to jad" button was selected.
>+	 * 
>+	 * @return
>+	 */
>+	boolean isAddToJadSelected() {
>+		return addToJadButton.getSelection();
>+	}
> 
>-    /**
>-     * Create the "Add to JAD" selection control.
>-     * 
>-     * @param parent
>-     * @param numColumns
>-     */
>-    private void createAddToJADSelectionControl(Composite parent, int numColumns) {
>-        new Label(parent, SWT.NONE);
>-        Composite composite = new Composite(parent, SWT.NONE);
>+	/**
>+	 * @see org.eclipse.jdt.ui.wizards.NewTypeWizardPage#createTypeMembers(org.eclipse.jdt.core.IType,
>+	 *      org.eclipse.jdt.ui.wizards.NewTypeWizardPage.ImportsManager,
>+	 *      org.eclipse.core.runtime.IProgressMonitor)
>+	 */
>+	protected void createTypeMembers(IType newType, ImportsManager imports,
>+			IProgressMonitor monitor) throws CoreException {
>+		createInheritedMethods(newType, constructorsButton.getSelection(),
>+				unimplementedButton.getSelection(), imports,
>+				new SubProgressMonitor(monitor, 1));
> 
>-        GridLayout layout = new GridLayout();
>-        layout.numColumns = 1;
>-        composite.setLayout(layout);
>+		IDialogSettings section = MTJUIPlugin.getDialogSettings(
>+				getDialogSettings(), PAGE_NAME);
>+		section.put(SETTINGS_ADD_TO_JAD, addToJadButton.getSelection());
>+		section.put(SETTINGS_CONSTRUCTORS, constructorsButton.getSelection());
>+		section.put(SETTINGS_UNIMPLEMENTED, unimplementedButton.getSelection());
>+	}
> 
>-        GridData gridData = new GridData();
>-        gridData.grabExcessHorizontalSpace = true;
>-        gridData.horizontalSpan = numColumns - 1;
>-        composite.setLayoutData(gridData);
>+	/**
>+	 * Create the "Add to JAD" selection control.
>+	 * 
>+	 * @param parent
>+	 * @param numColumns
>+	 */
>+	private void createAddToJADSelectionControl(Composite parent, int numColumns) {
>+		new Label(parent, SWT.NONE);
>+		Composite composite = new Composite(parent, SWT.NONE);
> 
>-        addToJadButton = new Button(composite, SWT.CHECK);
>-        addToJadButton.setText("Add To Application Descriptor?");
>-    }
>+		GridLayout layout = new GridLayout();
>+		layout.numColumns = 1;
>+		composite.setLayout(layout);
> 
>-    /**
>-     * Create the controls for method stub selection.
>-     * 
>-     * @param composite
>-     */
>-    private void createMethodStubSelectionControls(Composite parent,
>-            int numColumns) {
>-        new Label(parent, SWT.NONE);
>-        Composite composite = new Composite(parent, SWT.NONE);
>+		GridData gridData = new GridData();
>+		gridData.grabExcessHorizontalSpace = true;
>+		gridData.horizontalSpan = numColumns - 1;
>+		composite.setLayoutData(gridData);
> 
>-        GridLayout layout = new GridLayout();
>-        layout.numColumns = 1;
>-        composite.setLayout(layout);
>+		addToJadButton = new Button(composite, SWT.CHECK);
>+		addToJadButton.setText("Add To Application Descriptor?");
>+	}
> 
>-        GridData gridData = new GridData();
>-        gridData.grabExcessHorizontalSpace = true;
>-        gridData.horizontalSpan = numColumns - 1;
>-        composite.setLayoutData(gridData);
>+	/**
>+	 * Create the controls for method stub selection.
>+	 * 
>+	 * @param composite
>+	 */
>+	private void createMethodStubSelectionControls(Composite parent,
>+			int numColumns) {
>+		new Label(parent, SWT.NONE);
>+		Composite composite = new Composite(parent, SWT.NONE);
> 
>-        Label l = new Label(composite, SWT.NONE);
>-        l.setText(MTJUIStrings.getString("wiz.newmidlet.which_methods"));
>+		GridLayout layout = new GridLayout();
>+		layout.numColumns = 1;
>+		composite.setLayout(layout);
> 
>-        constructorsButton = new Button(composite, SWT.CHECK);
>-        constructorsButton.setText(MTJUIStrings
>-                .getString("wiz.newmidlet.super_const"));
>-        constructorsButton.setSelection(true);
>+		GridData gridData = new GridData();
>+		gridData.grabExcessHorizontalSpace = true;
>+		gridData.horizontalSpan = numColumns - 1;
>+		composite.setLayoutData(gridData);
> 
>-        unimplementedButton = new Button(composite, SWT.CHECK);
>-        unimplementedButton.setText(MTJUIStrings
>-                .getString("wiz.newmidlet.unimplemented"));
>-        unimplementedButton.setSelection(true);
>-    }
>+		Label l = new Label(composite, SWT.NONE);
>+		l.setText(MTJUIStrings.getString("wiz.newmidlet.which_methods"));
>+
>+		constructorsButton = new Button(composite, SWT.CHECK);
>+		constructorsButton.setText(MTJUIStrings
>+				.getString("wiz.newmidlet.super_const"));
>+		constructorsButton.setSelection(true);
>+
>+		unimplementedButton = new Button(composite, SWT.CHECK);
>+		unimplementedButton.setText(MTJUIStrings
>+				.getString("wiz.newmidlet.unimplemented"));
>+		unimplementedButton.setSelection(true);
>+	}
> }

Flags:

wds057: iplog+
armstrong.wang2000: review?

Actions: View | Diff

Attachments on bug 237290: 105608 | 105853