View | Details | Raw Unified | Return to bug 277482 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java (-10 / +3 lines)
Lines 14-25 Link Here
14
import java.util.Arrays;
14
import java.util.Arrays;
15
import java.util.Iterator;
15
import java.util.Iterator;
16
16
17
import org.eclipse.core.commands.ExecutionException;
18
import org.eclipse.core.resources.IProject;
17
import org.eclipse.core.resources.IProject;
19
import org.eclipse.core.resources.ResourcesPlugin;
18
import org.eclipse.core.resources.ResourcesPlugin;
20
import org.eclipse.core.runtime.CoreException;
19
import org.eclipse.core.runtime.CoreException;
21
import org.eclipse.core.runtime.IProgressMonitor;
20
import org.eclipse.core.runtime.IProgressMonitor;
22
import org.eclipse.core.runtime.NullProgressMonitor;
23
import org.eclipse.jface.viewers.ISelectionChangedListener;
21
import org.eclipse.jface.viewers.ISelectionChangedListener;
24
import org.eclipse.jface.viewers.IStructuredSelection;
22
import org.eclipse.jface.viewers.IStructuredSelection;
25
import org.eclipse.jface.viewers.ITreeContentProvider;
23
import org.eclipse.jface.viewers.ITreeContentProvider;
Lines 27-34 Link Here
27
import org.eclipse.jface.viewers.SelectionChangedEvent;
25
import org.eclipse.jface.viewers.SelectionChangedEvent;
28
import org.eclipse.jface.viewers.TreeViewer;
26
import org.eclipse.jface.viewers.TreeViewer;
29
import org.eclipse.jface.viewers.Viewer;
27
import org.eclipse.jface.viewers.Viewer;
30
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
31
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
32
import org.eclipse.swt.SWT;
28
import org.eclipse.swt.SWT;
33
import org.eclipse.swt.graphics.Image;
29
import org.eclipse.swt.graphics.Image;
34
import org.eclipse.swt.layout.FillLayout;
30
import org.eclipse.swt.layout.FillLayout;
Lines 39-46 Link Here
39
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
35
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
40
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
36
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
41
import org.eclipse.wst.common.componentcore.ui.Messages;
37
import org.eclipse.wst.common.componentcore.ui.Messages;
42
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
38
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
43
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
44
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
39
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
45
import org.eclipse.wst.server.ui.wizard.WizardFragment;
40
import org.eclipse.wst.server.ui.wizard.WizardFragment;
46
41
Lines 83-92 Link Here
83
	public void performFinish(IProgressMonitor monitor) throws CoreException {
78
	public void performFinish(IProgressMonitor monitor) throws CoreException {
84
		if( !ModuleCoreNature.isFlexibleProject(selected)) {
79
		if( !ModuleCoreNature.isFlexibleProject(selected)) {
85
			try {
80
			try {
86
				IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
81
				ProjectFacetsManager.create(selected.getProject(), true, monitor);
87
				migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, selected.getName());
82
			} catch( CoreException ee) {
88
				migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null);
89
			} catch( ExecutionException ee) {
90
				// TODO something
83
				// TODO something
91
			}
84
			}
92
		}
85
		}
(-)META-INF/MANIFEST.MF (-1 lines)
Lines 15-21 Link Here
15
 org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.300,2.0.0)",
15
 org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.300,2.0.0)",
16
 org.eclipse.jst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
16
 org.eclipse.jst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
17
 org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
17
 org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
18
 org.eclipse.jst.j2ee;bundle-version="[1.1.300,2.0.0)",
19
 org.eclipse.wst.server.ui;bundle-version="[1.1.102,2.0.0)",
18
 org.eclipse.wst.server.ui;bundle-version="[1.1.102,2.0.0)",
20
 org.eclipse.wst.server.core;bundle-version="[1.1.101,2.0.0)",
19
 org.eclipse.wst.server.core;bundle-version="[1.1.101,2.0.0)",
21
 org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.300,2.0.0)",
20
 org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.300,2.0.0)",

Return to bug 277482