diff options
author | canderson | 2010-04-07 15:35:56 +0000 |
---|---|---|
committer | canderson | 2010-04-07 15:35:56 +0000 |
commit | 758b85cec78af1cdcc5d051a710bdd133e90278a (patch) | |
tree | 09ab80988c251ac44207da3eb40239ccef244ee5 /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet | |
parent | b4ff4cb9d8b80da26c7d1b1df19bf8217d51841c (diff) | |
download | webtools.javaee-758b85cec78af1cdcc5d051a710bdd133e90278a.tar.gz webtools.javaee-758b85cec78af1cdcc5d051a710bdd133e90278a.tar.xz webtools.javaee-758b85cec78af1cdcc5d051a710bdd133e90278a.zip |
[308282] [UI]Additional changes to Module assembly
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet')
3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java index c91a2c8a2..a68d2ab4a 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java @@ -78,6 +78,7 @@ public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWiz button = new Button(parent, SWT.CHECK); button.setText(Messages.getString("CustomWebProjectReferenceWizardFragment.0")); //$NON-NLS-1$ + button.setToolTipText(Messages.getString("CustomWebProjectReferenceWizardFragment.1")); //$NON-NLS-1$ button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); button.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { @@ -87,6 +88,7 @@ public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWiz handleEdit(); } }); + button.setSelection(true); } // public Composite createButtonColumnComposite(Composite parent) { // Composite aButtonColumn = new Composite(parent, SWT.NONE); @@ -143,11 +145,12 @@ public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWiz public void performFinish(IProgressMonitor monitor) throws CoreException { for (int i = 0; i < selected.length; i++) { IProject proj = selected[i]; - if(!JavaEEProjectUtilities.isUtilityProject(proj)) + if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$ { J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null); } } super.performFinish(monitor); } + } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java index 53ed574ba..fe1abfc6b 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java @@ -50,8 +50,8 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider new WebDependencyPropertyPage(project.getProject(), parent)}; return new IModuleDependenciesControl[] { - new ManifestModuleDependencyControl(project.getProject(), parent), - new WebDependencyPropertyPage(project.getProject(), parent) + new WebDependencyPropertyPage(project.getProject(), parent), + new ManifestModuleDependencyControl(project.getProject(), parent) }; } @@ -72,10 +72,10 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider TabItem tab = new TabItem(folder, SWT.NONE); tab.setControl(controls[0].createContents(folder)); - tab.setText(Messages.ManifestEntries); + tab.setText(Messages.DeploymentAssembly); tab = new TabItem(folder, SWT.NONE); tab.setControl(controls[1].createContents(folder)); - tab.setText(Messages.DeploymentAssembly); + tab.setText(Messages.ManifestEntries); folder.setSelection(0); return folder; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties index fed5f7c9e..e2d263a81 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties @@ -1,4 +1,5 @@ CustomWebProjectReferenceWizardFragment.0=Web Library Reference +CustomWebProjectReferenceWizardFragment.1=Select this to assemble project reference in "WEB-INF/lib" folder of archive WebProjectReferenceDescription=Here you can make a project into a reference.\nIf the project is not already a flexible project, it will be converted into one. References are added to the MANIFEST.MF DeploymentAssembly=Deployment Assembly WebDeploymentAssembly=Web Deployment Assembly |