Attachment 146711 Details for Bug 277482 – Remove the j2ee plugin dependency

[patch] Remove the j2ee plugin dependency

bug277482.patch2 (text/plain), 3.78 KB, created by Carl Anderson

on 2009-09-08 17:33:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2009-09-08 17:33:10 EDT

Size: 3.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.common.modulecore.ui
>Index: src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java,v
>retrieving revision 1.1
>diff -u -r1.1 ProjectReferenceWizardFragment.java
>--- src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java	7 Aug 2009 15:34:47 -0000	1.1
>+++ src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java	8 Sep 2009 21:34:59 -0000
>@@ -14,12 +14,10 @@
> import java.util.Arrays;
> import java.util.Iterator;
> 
>-import org.eclipse.core.commands.ExecutionException;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.ITreeContentProvider;
>@@ -27,8 +25,6 @@
> import org.eclipse.jface.viewers.SelectionChangedEvent;
> import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.jface.viewers.Viewer;
>-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
>-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.FillLayout;
>@@ -39,8 +35,7 @@
> import org.eclipse.wst.common.componentcore.ModuleCoreNature;
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
> import org.eclipse.wst.common.componentcore.ui.Messages;
>-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
>-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
>+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> import org.eclipse.wst.server.ui.wizard.IWizardHandle;
> import org.eclipse.wst.server.ui.wizard.WizardFragment;
> 
>@@ -83,10 +78,8 @@
> 	public void performFinish(IProgressMonitor monitor) throws CoreException {
> 		if( !ModuleCoreNature.isFlexibleProject(selected)) {
> 			try {
>-				IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
>-				migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, selected.getName());
>-				migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null);
>-			} catch( ExecutionException ee) {
>+				ProjectFacetsManager.create(selected.getProject(), true, monitor);
>+			} catch( CoreException ee) {
> 				// TODO something
> 			}
> 		}
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.3
>diff -u -r1.3 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Aug 2009 15:11:57 -0000	1.3
>+++ META-INF/MANIFEST.MF	8 Sep 2009 21:34:59 -0000
>@@ -15,7 +15,6 @@
>  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.300,2.0.0)",
>  org.eclipse.jst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
>  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
>- org.eclipse.jst.j2ee;bundle-version="[1.1.300,2.0.0)",
>  org.eclipse.wst.server.ui;bundle-version="[1.1.102,2.0.0)",
>  org.eclipse.wst.server.core;bundle-version="[1.1.101,2.0.0)",
>  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.300,2.0.0)",

Actions: View | Diff

Attachments on bug 277482: 142710 | 143083 | 146711