Attachment #96201 for bug #226933

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 226933
Collapse All | Expand All

Lines 332-337 Link Here

(-)plugin.xml (+41 lines)
332	property="org.eclipse.wst.common.project.facet.core.projectFacet"	332	property="org.eclipse.wst.common.project.facet.core.projectFacet"
333	value="jst.appclient:[5.0" />	333	value="jst.appclient:[5.0" />
334	</adapt>	334	</adapt>
		335	<instanceof
		336	value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
		337	</instanceof>
		338	<instanceof
		339	value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
		340	</instanceof>
		341	<instanceof
		342	value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
		343	</instanceof>
335	</or>	344	</or>
336	</enablement>	345	</enablement>
337	</objectContribution>	346	</objectContribution>
Lines 349-354 Link Here
349	</objectContribution>	358	</objectContribution>
350	</extension>	359	</extension>
351		360
		361	<extension
		362	point="org.eclipse.ui.popupMenus">
		363	<objectContribution
		364	adaptable="true"
		365	id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction"
		366	objectClass="java.lang.Object">
		367	<action
		368	class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
		369	enablesFor="1"
		370	icon="icons/full/ctool16/dep_desc.gif"
		371	id="createDeploymentFiles"
		372	label="%create_deploy_files">
		373	</action>
		374	<enablement>
		375	<or>
		376	<instanceof
		377	value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
		378	</instanceof>
		379	<instanceof
		380	value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
		381	</instanceof>
		382	<instanceof
		383	value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
		384	</instanceof>
		385	<instanceof
		386	value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
		387	</instanceof>
		388	</or>
		389	</enablement>
		390	</objectContribution>
		391	</extension>
		392
352	<!--	393	<!--
353	<extension	394	<extension
354	point="org.eclipse.wst.common.frameworks.OperationExtension"	395	point="org.eclipse.wst.common.frameworks.OperationExtension"

Lines 114-117 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java (+4 lines)
114	ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();	114	ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
115	return ddFile;	115	return ddFile;
116	}	116	}
		117
		118	public IProject getProject() {
		119	return project;
		120	}
117	}	121	}

Lines 24-29 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java (-3 / +23 lines)
24	import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;	24	import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
25	import org.eclipse.jst.jee.project.facet.IEarCreateDeploymentFilesDataModelProperties;	25	import org.eclipse.jst.jee.project.facet.IEarCreateDeploymentFilesDataModelProperties;
26	import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;	26	import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;
		27	import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
		28	import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
		29	import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
		30	import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
27	import org.eclipse.swt.widgets.Shell;	31	import org.eclipse.swt.widgets.Shell;
28	import org.eclipse.wst.common.componentcore.ComponentCore;	32	import org.eclipse.wst.common.componentcore.ComponentCore;
29	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	33	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
Lines 43-54 Link Here
43	boolean isEnabled = false;	47	boolean isEnabled = false;
44	if (aSelection != null) {	48	if (aSelection != null) {
45	IStructuredSelection structuredSelection = (IStructuredSelection) aSelection;	49	IStructuredSelection structuredSelection = (IStructuredSelection) aSelection;
46	IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());	50	isEnabled = isValidSelection(getProjectFromSelection(structuredSelection), null);
47	isEnabled = isValidSelection(project, null);
48	}	51	}
49	setEnabled(isEnabled);	52	setEnabled(isEnabled);
50	action.setEnabled(isEnabled);	53	action.setEnabled(isEnabled);
51	}	54	}
		55
		56	private IProject getProjectFromSelection(IStructuredSelection structuredSelection){
		57	IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());
		58	if (project == null){
		59	Object firstElement = structuredSelection.getFirstElement();
		60	if (firstElement instanceof GroupEJBProvider){
		61	project = ProjectUtilities.getProject(((GroupEJBProvider)firstElement).getEjbJar());
		62	} else if (firstElement instanceof WebAppProvider){
		63	project = ((WebAppProvider)firstElement).getProject();
		64	} else if (firstElement instanceof GroupEARProvider){
		65	project = ((GroupEARProvider)firstElement).getProject();
		66	} else if (firstElement instanceof GroupAppClientProvider){
		67	project = ((GroupAppClientProvider)firstElement).getProject();
		68	}
		69	}
		70	return project;
		71	}
52		72
53	private boolean isValidSelection(IProject project, Shell shell) {	73	private boolean isValidSelection(IProject project, Shell shell) {
54	return (project != null	74	return (project != null
Lines 91-97 Link Here
91	/*	111	/*
92	*/	112	*/
93	protected void primRun(Shell shell) {	113	protected void primRun(Shell shell) {
94	IProject project = ProjectUtilities.getProject(selection.getFirstElement());	114	IProject project = getProjectFromSelection(selection);
95	if (!validateSelection(project, shell))	115	if (!validateSelection(project, shell))
96	return;	116	return;
97	try {	117	try {

Return to bug 226933