Attachment 119049 Details for Bug 255542 – Patch with bug fix

[patch] Patch with bug fix

mtjbug-255542.patch (text/plain), 29.58 KB, created by David Marques

on 2008-11-28 15:15:57 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David Marques

Created: 2008-11-28 15:15:57 EST

Size: 29.58 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mtj.core
>Index: src/org/eclipse/mtj/core/internal/preverification/builder/BuildInfo.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/preverification/builder/BuildInfo.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/preverification/builder/BuildInfo.java	(working copy)
>@@ -95,7 +95,7 @@
>         this.buildKind = kind;
>         this.buildArgs = args;
>         this.baseJavaProject = baseJavaProject;
>-        this.midletSuite = MidletSuiteFactory
>+        this.midletSuite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(baseJavaProject);
> 
>         classpathChanged = false;
>@@ -259,7 +259,7 @@
>                 IProject project = ResourcesPlugin.getWorkspace().getRoot()
>                         .getProject(targetProjectName);
>                 IJavaProject javaProject = JavaCore.create(project);
>-                targetMidletSuite = MidletSuiteFactory
>+                targetMidletSuite = MidletSuiteFactory.getInstance()
>                         .getMidletSuiteProject(javaProject);
>             }
>         }
>Index: src/org/eclipse/mtj/core/internal/preverification/builder/PreverificationBuilder.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/preverification/builder/PreverificationBuilder.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/preverification/builder/PreverificationBuilder.java	(working copy)
>@@ -251,7 +251,7 @@
>             createFolders(runtimeFolder, monitor);
> 
>             IJavaProject javaProject = JavaCore.create(project);
>-            IMidletSuiteProject midletSuite = MidletSuiteFactory
>+            IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance()
>                     .getMidletSuiteProject(javaProject);
> 
>             runtimeJar = new File(runtimeFolder.getLocation().toFile(),
>@@ -347,7 +347,7 @@
>     private static IFolder getDeploymentFolder(IProject project,
>             IProgressMonitor monitor) throws CoreException {
>         IJavaProject javaProject = JavaCore.create(project);
>-        IMidletSuiteProject suite = MidletSuiteFactory
>+        IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
>         String deploymentDirectoryName = MTJCorePlugin
>                 .getDeploymentDirectoryName();
>@@ -1269,7 +1269,7 @@
>         cleanProject(project, false, monitor);
> 
>         // Regenerate the manifest
>-        IMidletSuiteProject suite = MidletSuiteFactory
>+        IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(JavaCore.create(getProject()));
>         generateDeployedManifest(suite, monitor);
> 
>Index: src/org/eclipse/mtj/core/internal/MTJCorePlugin.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/MTJCorePlugin.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/MTJCorePlugin.java	(working copy)
>@@ -12,6 +12,7 @@
>  *                                standards
>  *     Hugo Raniere (Motorola)  - Removing Preprocessor code
>  *     Diego Sandin (Motorola)  - Re-enabling Preprocessor code
>+ *     David Marques (Motorola) - Adding a workspace ResourceChangeListener.
>  */
> package org.eclipse.mtj.core.internal;
> 
>@@ -46,6 +47,7 @@
> import org.eclipse.mtj.core.internal.preprocessor.PreprocessedSourceMapper;
> import org.eclipse.mtj.core.model.Version;
> import org.eclipse.mtj.core.model.library.LibrarySpecification;
>+import org.eclipse.mtj.core.model.project.MidletSuiteFactory;
> import org.osgi.framework.Bundle;
> import org.osgi.framework.BundleContext;
> import org.osgi.framework.Constants;
>@@ -489,6 +491,8 @@
>             plugin = this;
>         }
> 
>+        // Setting MidletSuiteFactory as the workspace ResourceChangeListener.
>+        ResourcesPlugin.getWorkspace().addResourceChangeListener(MidletSuiteFactory.getInstance());
>         try {
>             resourceBundle = ResourceBundle
>                     .getBundle("org.eclipse.mtj.core.MTJPluginResources");
>Index: src/org/eclipse/mtj/core/internal/preprocessor/PreprocessorBuilder.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/preprocessor/PreprocessorBuilder.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/preprocessor/PreprocessorBuilder.java	(working copy)
>@@ -546,7 +546,7 @@
> 
>     private IMidletSuiteProject getMidletSuiteProject() {
>         IJavaProject javaProject = JavaCore.create(getProject());
>-        IMidletSuiteProject midletSuite = MidletSuiteFactory
>+        IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
>         return midletSuite;
>     }
>Index: src/org/eclipse/mtj/core/internal/refactoring/MidletJadFileChangesCollector.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/refactoring/MidletJadFileChangesCollector.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/refactoring/MidletJadFileChangesCollector.java	(working copy)
>@@ -143,7 +143,7 @@
>                 + javaProject.getElementName());
> 
>         if (isMidletSuite(javaProject)) {
>-            IMidletSuiteProject midletSuite = MidletSuiteFactory
>+            IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance()
>                     .getMidletSuiteProject(javaProject);
> 
>             if (midletSuite != null) {
>@@ -158,8 +158,8 @@
>     }
> 
>     /**
>-     * Return a boolean describing whether the specified java project is
>-     * a midlet suite project.
>+     * Return a boolean describing whether the specified java project is a
>+     * midlet suite project.
>      * 
>      * @param javaProject
>      * @return
>Index: src/org/eclipse/mtj/core/internal/launching/EmulatorLaunchConfigDelegate.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/launching/EmulatorLaunchConfigDelegate.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/launching/EmulatorLaunchConfigDelegate.java	(working copy)
>@@ -229,7 +229,7 @@
>     private IMidletSuiteProject getMidletSuite(ILaunchConfiguration launchConfig)
>             throws CoreException {
>         IJavaProject javaProject = getJavaProject(launchConfig);
>-        return MidletSuiteFactory.getMidletSuiteProject(javaProject);
>+        return MidletSuiteFactory.getInstance().getMidletSuiteProject(javaProject);
>     }
> 
>     /**
>@@ -259,7 +259,7 @@
>         if (doOTA) {
>             IJavaProject javaProject = getJavaProject(configuration);
>             if (javaProject != null) {
>-                IMidletSuiteProject suite = MidletSuiteFactory
>+                IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                         .getMidletSuiteProject(javaProject);
>                 ApplicationDescriptor desc = suite.getApplicationDescriptor();
>                 if (desc != null) {
>Index: src/org/eclipse/mtj/core/internal/PreferenceAccessor.java
>===================================================================
>--- src/org/eclipse/mtj/core/internal/PreferenceAccessor.java	(revision 681)
>+++ src/org/eclipse/mtj/core/internal/PreferenceAccessor.java	(working copy)
>@@ -136,7 +136,7 @@
> 		Version version = null;
> 
> 		IJavaProject javaProject = JavaCore.create(project);
>-		IMidletSuiteProject suite = MidletSuiteFactory
>+		IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
> 				.getMidletSuiteProject(javaProject);
> 
> 		// Figure out which preference store to use
>Index: src/org/eclipse/mtj/core/model/project/MidletSuiteFactory.java
>===================================================================
>--- src/org/eclipse/mtj/core/model/project/MidletSuiteFactory.java	(revision 681)
>+++ src/org/eclipse/mtj/core/model/project/MidletSuiteFactory.java	(working copy)
>@@ -16,6 +16,7 @@
>  *     Diego Sandin (Motorola)  - Re-enabling Preprocessor code 
>  *     Diego Sandin (Motorola)  - Changed the way to set the project compliance 
>  *                                options
>+ *     David Marques (Motorola) - Converting class into a Singleton. 
>  */
> package org.eclipse.mtj.core.model.project;
> 
>@@ -26,6 +27,7 @@
> import java.lang.reflect.InvocationTargetException;
> import java.util.ArrayList;
> import java.util.Arrays;
>+import java.util.Collection;
> import java.util.HashMap;
> import java.util.Map;
> 
>@@ -33,6 +35,9 @@
> import org.eclipse.core.resources.IFolder;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IProjectDescription;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IResourceChangeEvent;
>+import org.eclipse.core.resources.IResourceChangeListener;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Preferences;
>@@ -50,10 +55,13 @@
> 
> /**
>  * A factory for accessing MIDlet suite instances based on projects.
>+ * This class implements the IResourceChangeListener interface because
>+ * it needs to remove IMidletSuiteProject instances from the cache upon
>+ * deletion from the workspace.
>  * 
>  * @author Craig Setera
>  */
>-public class MidletSuiteFactory {
>+public class MidletSuiteFactory implements IResourceChangeListener {
> 
>     /**
>      * Workspace runnable for creating a MIDlet Suite within a project.
>@@ -126,7 +134,7 @@
>                 throws InvocationTargetException, InterruptedException {
>             try {
>                 // Configure the project
>-                IMidletSuiteProject suite = getMidletSuiteProject(javaProject);
>+                IMidletSuiteProject suite = MidletSuiteFactory.getInstance().getMidletSuiteProject(javaProject);
> 
>                 suite.setDevice(device, monitor);
>                 suite.setJadFileName(jadFileName);
>@@ -213,7 +221,7 @@
>                 IProgressMonitor monitor) throws CoreException, IOException {
> 
>             // Get the project references
>-            IMidletSuiteProject midletSuite = getMidletSuiteProject(javaProject);
>+            IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance().getMidletSuiteProject(javaProject);
> 
>             // Check the JAD file for existence
>             IFile jadFile = midletSuite.getApplicationDescriptorFile();
>@@ -356,7 +364,7 @@
>          * platform definition.
>          */
>         private void setProjectMetadata() throws CoreException {
>-            IMidletSuiteProject midletprj = getMidletSuiteProject(javaProject);
>+            IMidletSuiteProject midletprj = MidletSuiteFactory.getInstance().getMidletSuiteProject(javaProject);
>             midletprj.saveMetaData();
>         }
>     }
>@@ -364,6 +372,9 @@
>     // Storage of the previously created MIDlet suite projects
>     private static final Map<IJavaProject, IMidletSuiteProject> midletSuiteMap = new HashMap<IJavaProject, IMidletSuiteProject>();
> 
>+    // Class Singleton
>+    private static MidletSuiteFactory instance; 
>+    
>     /**
>      * Return a runnable capable of setting up the J2ME nature on the project.
>      * 
>@@ -382,7 +393,7 @@
>      * @param javaProject the Java project to retrieve the MIDlet suite wrapper
>      * @return the MIDlet suite wrapper
>      */
>-    public static IMidletSuiteProject getMidletSuiteProject(
>+    public IMidletSuiteProject getMidletSuiteProject(
>             IJavaProject javaProject) {
>         IMidletSuiteProject suite = null;
> 
>@@ -398,6 +409,27 @@
>     }
> 
>     /**
>+     * Return the MIDlet suite project instance with the specified project name.
>+     * 
>+     * @param name the name of the project to retrieve the MIDlet suite wrapper
>+     * @return the MIDlet suite wrapper or null if suite is not a MIDlet Suite.
>+     */
>+    public IMidletSuiteProject getMidletSuiteProject(String name) {
>+        IMidletSuiteProject suite = null;
>+
>+        synchronized (midletSuiteMap) {
>+            Collection<IMidletSuiteProject> projects = MidletSuiteFactory.midletSuiteMap.values();
>+            for (IMidletSuiteProject project : projects) {
>+                if (project.getProject().getName().equals(name)) {
>+                    suite = project;
>+                    break;
>+                }
>+            }
>+        }
>+        return suite;
>+    }
>+    
>+    /**
>      * Remove the MIDlet suite project from the cache hash-map.
>      * 
>      * @param javaProject - the Java project wrapped by the MIDlet suite which
>@@ -403,7 +435,7 @@
>      * @param javaProject - the Java project wrapped by the MIDlet suite which
>      *            will be removed.
>      */
>-    public static void removeMidletSuiteProject(IJavaProject javaProject) {
>+    public void removeMidletSuiteProject(IJavaProject javaProject) {
>         synchronized (midletSuiteMap) {
>             midletSuiteMap.remove(javaProject);
>         }
>@@ -410,6 +442,18 @@
>     }
> 
>     /**
>+     * Gets the singleton for the MidletSuiteFactory class.
>+     * 
>+     * @return single instance.
>+     */
>+    public static synchronized MidletSuiteFactory getInstance() {
>+        if (MidletSuiteFactory.instance == null) {
>+            MidletSuiteFactory.instance = new MidletSuiteFactory();
>+        }
>+        return MidletSuiteFactory.instance;
>+    }
>+    
>+    /**
>      * Static-only access
>      */
>     private MidletSuiteFactory() {
>@@ -415,4 +459,25 @@
>     private MidletSuiteFactory() {
>         super();
>     }
>+    
>+    
>+    /* (non-Javadoc)
>+     * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
>+     */
>+    public void resourceChanged(IResourceChangeEvent event) {
>+        switch (event.getType()) {
>+            case IResourceChangeEvent.PRE_DELETE :
>+                IResource resource = event.getResource();
>+                if (resource instanceof IProject) {
>+                    MidletSuiteFactory factory = MidletSuiteFactory.getInstance();
>+                    IProject           project = (IProject) resource;
>+                    /*Removes IMidletSuiteProject instances from cache upon project deletion.*/
>+                    IMidletSuiteProject meProject = factory.getMidletSuiteProject(project.getName());
>+                    if (meProject != null) {
>+                        factory.removeMidletSuiteProject(meProject.getJavaProject());
>+                    }
>+                }
>+            break;
>+        }
>+    }
> }
>#P org.eclipse.mtj.ui
>Index: src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/OverviewEditorPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/OverviewEditorPage.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/editors/jad/form/pages/OverviewEditorPage.java	(working copy)
>@@ -105,7 +105,7 @@
>         this.project = JavaCore.create(((JADFormEditor) getEditor())
>                 .getJadFile().getProject());
> 
>-        this.midletProject = MidletSuiteFactory
>+        this.midletProject = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(this.project);
>     }
> 
>Index: src/org/eclipse/mtj/ui/internal/properties/J2MESigningPropertiesPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/properties/J2MESigningPropertiesPage.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/properties/J2MESigningPropertiesPage.java	(working copy)
>@@ -389,7 +389,7 @@
>      */
>     private IMidletSuiteProject getMidletSuiteProject() {
>         IJavaProject javaProject = JavaCore.create(getProject());
>-        IMidletSuiteProject midletProject = MidletSuiteFactory
>+        IMidletSuiteProject midletProject = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
> 
>         return midletProject;
>@@ -541,30 +541,32 @@
>         aliasText.setText(convertNullToEmpty(sigProps.getKeyAlias()));
> 
>         switch (sigProps.getPasswordStorageMethod()) {
>-        case ISignatureProperties.PASSMETHOD_IN_PROJECT:
>-            promptForPasswordRadio.setSelection(false);
>-            savePasswordsInKeyringRadio.setSelection(false);
>-            savePasswordsInProjectRadio.setSelection(true);
>-            keystorePassText.setText(convertNullToEmpty(sigProps
>-                    .getKeyStorePassword()));
>-            keyPassText.setText(convertNullToEmpty(sigProps.getKeyPassword()));
>-            break;
>+            case ISignatureProperties.PASSMETHOD_IN_PROJECT:
>+                promptForPasswordRadio.setSelection(false);
>+                savePasswordsInKeyringRadio.setSelection(false);
>+                savePasswordsInProjectRadio.setSelection(true);
>+                keystorePassText.setText(convertNullToEmpty(sigProps
>+                        .getKeyStorePassword()));
>+                keyPassText.setText(convertNullToEmpty(sigProps
>+                        .getKeyPassword()));
>+                break;
> 
>-        case ISignatureProperties.PASSMETHOD_IN_KEYRING:
>-            promptForPasswordRadio.setSelection(false);
>-            savePasswordsInKeyringRadio.setSelection(true);
>-            savePasswordsInProjectRadio.setSelection(false);
>-            keystorePassText.setText(convertNullToEmpty(sigProps
>-                    .getKeyStorePassword()));
>-            keyPassText.setText(convertNullToEmpty(sigProps.getKeyPassword()));
>-            break;
>+            case ISignatureProperties.PASSMETHOD_IN_KEYRING:
>+                promptForPasswordRadio.setSelection(false);
>+                savePasswordsInKeyringRadio.setSelection(true);
>+                savePasswordsInProjectRadio.setSelection(false);
>+                keystorePassText.setText(convertNullToEmpty(sigProps
>+                        .getKeyStorePassword()));
>+                keyPassText.setText(convertNullToEmpty(sigProps
>+                        .getKeyPassword()));
>+                break;
> 
>-        case ISignatureProperties.PASSMETHOD_PROMPT:
>-        default:
>-            promptForPasswordRadio.setSelection(true);
>-            savePasswordsInKeyringRadio.setSelection(false);
>-            savePasswordsInProjectRadio.setSelection(false);
>-            break;
>+            case ISignatureProperties.PASSMETHOD_PROMPT:
>+            default:
>+                promptForPasswordRadio.setSelection(true);
>+                savePasswordsInKeyringRadio.setSelection(false);
>+                savePasswordsInProjectRadio.setSelection(false);
>+                break;
>         }
> 
>         providerText
>@@ -816,7 +818,7 @@
>             keyPassText.setEnabled(false);
>             sigProps.clear();
>             testButton.setEnabled(false);
>-            //if signProjectCheckButton unchecked, clear the error message
>+            // if signProjectCheckButton unchecked, clear the error message
>             setErrorMessage(null);
>             return (true);
>         }
>Index: src/org/eclipse/mtj/ui/internal/properties/J2MEProjectPropertiesPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/properties/J2MEProjectPropertiesPage.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/properties/J2MEProjectPropertiesPage.java	(working copy)
>@@ -181,7 +181,7 @@
>      */
>     private IMidletSuiteProject getMidletSuiteProject() {
>         IJavaProject javaProject = JavaCore.create(getProject());
>-        IMidletSuiteProject midletProject = MidletSuiteFactory
>+        IMidletSuiteProject midletProject = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
> 
>         return midletProject;
>Index: src/org/eclipse/mtj/ui/internal/wizards/importer/eclipseme/ImportEclipseMEProjectWizardPage.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/wizards/importer/eclipseme/ImportEclipseMEProjectWizardPage.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/wizards/importer/eclipseme/ImportEclipseMEProjectWizardPage.java	(working copy)
>@@ -893,10 +893,10 @@
> 				IJavaProject javaProject = JavaCore.create(project);
> 				// must remove the cached MIDlet suite project, or class path
> 				// container will not be added.
>-				MidletSuiteFactory.removeMidletSuiteProject(javaProject);
>+				MidletSuiteFactory.getInstance().removeMidletSuiteProject(javaProject);
> 				String jadFileName = MidletSuiteProject
> 						.getDefaultJadFileName(project);
>-				MidletSuiteFactory.getMidletSuiteCreationRunnable(project,
>+				MidletSuiteFactory.getInstance().getMidletSuiteCreationRunnable(project,
> 						javaProject, device, jadFileName).run(monitor);
> 				// Now, remove the Java SE and EclipseME libraries
> 				removeJ2SEAndEclipseMELibraries(javaProject, monitor);
>@@ -1492,8 +1492,8 @@
> 	 */
> 	private IMidletSuiteProject getMidletSuiteProject(IProject project) {
> 		IJavaProject javaProject = JavaCore.create(project);
>-		IMidletSuiteProject midletProject = MidletSuiteFactory
>-				.getMidletSuiteProject(javaProject);
>+		IMidletSuiteProject midletProject = MidletSuiteFactory.getInstance().
>+				getMidletSuiteProject(javaProject);
> 		return midletProject;
> 	}
> 
>Index: src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizard.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizard.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizard.java	(working copy)
>@@ -103,7 +103,8 @@
>         }
> 
>         if (secondPage == null) {
>-            secondPage = new NewMidletProjectWizardPageTwo(firstPage, libraryPage);
>+            secondPage = new NewMidletProjectWizardPageTwo(firstPage,
>+                    libraryPage);
>         }
>         addPage(secondPage);
> 
>@@ -162,7 +163,8 @@
>             /* Open the Application Descriptor file */
>             try {
>                 IMidletSuiteProject midletSuiteProject = MidletSuiteFactory
>-                        .getMidletSuiteProject(secondPage.getJavaProject());
>+                        .getInstance().getMidletSuiteProject(
>+                                secondPage.getJavaProject());
> 
>                 IFile jadfile = midletSuiteProject
>                         .getApplicationDescriptorFile();
>Index: src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizardPageTwo.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizardPageTwo.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/wizards/projects/NewMidletProjectWizardPageTwo.java	(working copy)
>@@ -336,7 +336,7 @@
>                 currProject.delete(removeContent, false,
>                         new SubProgressMonitor(monitor, 2));
> 
>-                MidletSuiteFactory.removeMidletSuiteProject(getJavaProject());
>+                MidletSuiteFactory.getInstance().removeMidletSuiteProject(getJavaProject());
> 
>                 restoreExistingFiles(projLoc,
>                         new SubProgressMonitor(monitor, 1));
>@@ -803,7 +803,7 @@
> 
>                 IJavaProject javaProject = super.getJavaProject();
> 
>-                MidletSuiteFactory.MidletSuiteCreationRunnable runnable = MidletSuiteFactory
>+                MidletSuiteFactory.MidletSuiteCreationRunnable runnable = MidletSuiteFactory.getInstance()
>                         .getMidletSuiteCreationRunnable(currProject,
>                                 javaProject, device, jadFileName);
> 
>Index: src/org/eclipse/mtj/ui/internal/wizards/midlet/NewMidletWizard.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/wizards/midlet/NewMidletWizard.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/wizards/midlet/NewMidletWizard.java	(working copy)
>@@ -116,7 +116,7 @@
>         // Pull out the midlet suite that the type was created in
>         IJavaProject javaProject = (IJavaProject) type
>                 .getAncestor(IJavaElement.JAVA_PROJECT);
>-        IMidletSuiteProject midletSuite = MidletSuiteFactory
>+        IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
> 
>         ApplicationDescriptor desc = midletSuite.getApplicationDescriptor();
>Index: src/org/eclipse/mtj/ui/internal/actions/packaging/AbstractCreatePackageAction.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/actions/packaging/AbstractCreatePackageAction.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/actions/packaging/AbstractCreatePackageAction.java	(working copy)
>@@ -113,7 +113,7 @@
>      */
>     private void createPackageForProject(IProgressMonitor monitor,
>             IJavaProject javaProject) {
>-        IMidletSuiteProject suite = MidletSuiteFactory
>+        IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
> 
>         if (configurationsIsDirty(suite)) {
>@@ -182,7 +182,7 @@
>     private boolean doesProjectHaveValidDevice(IJavaProject javaProject) {
>         boolean hasValidDevice = false;
> 
>-        IMidletSuiteProject suite = MidletSuiteFactory
>+        IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(javaProject);
>         if (suite != null) {
>             IDevice device = suite.getDevice();
>Index: src/org/eclipse/mtj/ui/internal/actions/exporting/AntennaBuildExportAction.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/actions/exporting/AntennaBuildExportAction.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/actions/exporting/AntennaBuildExportAction.java	(working copy)
>@@ -43,7 +43,7 @@
> public class AntennaBuildExportAction extends AbstractJavaProjectAction {
> 
>     public void run(IJavaProject project, IWorkbenchPart workbenchPart) {
>-        
>+
>         if (configurationIsValid()) {
>             // Setup the progress monitoring
>             ProgressMonitorDialog dialog = new ProgressMonitorDialog(
>@@ -143,7 +143,8 @@
> 
>         IJavaProject project = getJavaProject(selected);
>         if (project != null) {
>-            suite = MidletSuiteFactory.getMidletSuiteProject(project);
>+            suite = MidletSuiteFactory.getInstance().getMidletSuiteProject(
>+                    project);
>         }
> 
>         return suite;
>Index: src/org/eclipse/mtj/ui/internal/launching/JadLaunchShortcut.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/launching/JadLaunchShortcut.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/launching/JadLaunchShortcut.java	(working copy)
>@@ -233,7 +233,7 @@
>     private IMidletSuiteProject getMidletSuiteProject(IFile selectedFile) {
>         IJavaProject javaProject = getJavaProject(selectedFile);
>         IMidletSuiteProject midletSuiteProject = MidletSuiteFactory
>-                .getMidletSuiteProject(javaProject);
>+                .getInstance().getMidletSuiteProject(javaProject);
>         return midletSuiteProject;
>     }
> 
>@@ -329,7 +329,7 @@
>             launch(selectedFile, mode);
>         } else if (selected instanceof IProject) {
>             IJavaProject javaProject = JavaCore.create((IProject) selected);
>-            IMidletSuiteProject suite = MidletSuiteFactory
>+            IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                     .getMidletSuiteProject(javaProject);
>             IFile jadFile = getRuntimeJadFile(suite);
>             launch(jadFile, mode);
>@@ -334,7 +334,7 @@
>             IFile jadFile = getRuntimeJadFile(suite);
>             launch(jadFile, mode);
>         } else if (selected instanceof IJavaProject) {
>-            IMidletSuiteProject suite = MidletSuiteFactory
>+            IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                     .getMidletSuiteProject((IJavaProject) selected);
>             IFile jadFile = getRuntimeJadFile(suite);
>             launch(jadFile, mode);
>Index: src/org/eclipse/mtj/ui/internal/launching/DeviceTab.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/launching/DeviceTab.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/launching/DeviceTab.java	(working copy)
>@@ -379,7 +379,7 @@
>         IDevice device = null;
> 
>         if (javaProject != null) {
>-            IMidletSuiteProject suite = MidletSuiteFactory
>+            IMidletSuiteProject suite = MidletSuiteFactory.getInstance()
>                     .getMidletSuiteProject(javaProject);
>             device = suite.getDevice();
>         }
>Index: src/org/eclipse/mtj/ui/internal/preprocess/contentAssistant/PreprocessSymbolManager.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/preprocess/contentAssistant/PreprocessSymbolManager.java	(revision 681)
>+++ src/org/eclipse/mtj/ui/internal/preprocess/contentAssistant/PreprocessSymbolManager.java	(working copy)
>@@ -65,7 +65,7 @@
>     public static List<PreprocessSymbol> getSymbols(IProject project) {
>         HashSet<PreprocessSymbol> symbolmap = new HashSet<PreprocessSymbol>();
> 
>-        IMidletSuiteProject midletSuite = MidletSuiteFactory
>+        IMidletSuiteProject midletSuite = MidletSuiteFactory.getInstance()
>                 .getMidletSuiteProject(JavaCore.create(project));
>         // add the symbols provided by configurations associated to the project
>         Configurations configurations = midletSuite.getConfigurations();

Actions: View | Diff

Attachments on bug 255542: 119048 | 119049 | 119178