Attachment 120164 Details for Bug 226933 – fixed wih chucks recomendations

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

fixed wih chucks recomendations

226933.txt (text/plain), 10.18 KB, created by Dimitar Giormov

on 2008-12-11 03:44:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitar Giormov

Created: 2008-12-11 03:44:47 EST

Size: 10.18 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jee.ui
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 GroupEJBProvider.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java	21 Oct 2008 06:24:32 -0000	1.2
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java	11 Dec 2008 08:44:08 -0000
>@@ -12,6 +12,9 @@
> 
> import java.util.List;
> 
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> import org.eclipse.jst.javaee.ejb.EJBJar;
> import org.eclipse.jst.jee.ui.internal.Messages;
>@@ -23,7 +26,7 @@
>  * @author Dimitar Giormov
>  *
>  */
>-public class GroupEJBProvider extends AbstractGroupProvider {
>+public class GroupEJBProvider extends AbstractGroupProvider implements IAdaptable {
> 
> 	private GroupEjbSession groupEjbSession;
> 	private GroupEjbMessageDriven groupEjbMessageDriven;
>@@ -76,4 +79,11 @@
> 		groupEjbMessageDriven.reinit(modelObject);
> 		groupEjbEntity.reinit(modelObject);
> 	}
>+
>+	public Object getAdapter(Class adapter) {
>+		if (IProject.class == adapter){
>+			return ResourcesPlugin.getWorkspace().getRoot().getProject(getProjectName());
>+		}
>+		return null;
>+	}
> }
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/plugin.xml,v
>retrieving revision 1.23
>diff -u -r1.23 plugin.xml
>--- plugin.xml	21 Oct 2008 06:24:32 -0000	1.23
>+++ plugin.xml	11 Dec 2008 08:44:07 -0000
>@@ -383,6 +383,15 @@
> 							property="org.eclipse.wst.common.project.facet.core.projectFacet"
> 							value="jst.appclient:[5.0" />
> 				  </adapt>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
>+      </instanceof>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
>+      </instanceof>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
>+      </instanceof>
> 		    </or>
>          </enablement>         		   		
>       </objectContribution>
>@@ -400,6 +409,38 @@
>       </objectContribution>
>    </extension>
>    
>+   <extension
>+         point="org.eclipse.ui.popupMenus">
>+      <objectContribution
>+            adaptable="true"
>+            id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction"
>+            objectClass="java.lang.Object">
>+         <action
>+               class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
>+               enablesFor="1"
>+               icon="icons/full/ctool16/dep_desc.gif"
>+               id="createDeploymentFiles"
>+               label="%create_deploy_files">
>+		</action>
>+        <enablement>
>+            <or>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
>+      </instanceof>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
>+      </instanceof>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
>+      </instanceof>
>+      <instanceof
>+            value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
>+      </instanceof>
>+		    </or>
>+         </enablement>         		   		
>+      </objectContribution>
>+   </extension>
>+   
>    <!--
>      <extension
>          point="org.eclipse.wst.common.frameworks.OperationExtension"
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 GroupAppClientProvider.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java	21 Oct 2008 06:24:31 -0000	1.2
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java	11 Dec 2008 08:44:07 -0000
>@@ -15,6 +15,7 @@
> 
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jst.j2ee.model.IModelProvider;
> import org.eclipse.jst.j2ee.model.ModelProviderManager;
>@@ -33,7 +34,7 @@
>  * @author Dimitar Giormov
>  * 
>  */
>-public class GroupAppClientProvider extends AbstractGroupProvider {
>+public class GroupAppClientProvider extends AbstractGroupProvider implements IAdaptable {
> 
> 	
> 	private final IProject project;
>@@ -111,4 +112,15 @@
> 		ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
> 		return ddFile;
> 	}
>+
>+	public IProject getProject() {
>+		return project;
>+	}
>+	
>+	public Object getAdapter(Class adapter) {
>+		if (IProject.class == adapter){
>+			return getProject();
>+		}
>+		return null;
>+	}
> }
>Index: src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java,v
>retrieving revision 1.4
>diff -u -r1.4 CreateDeploymentFilesActionDelegate.java
>--- src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java	7 Aug 2008 19:14:18 -0000	1.4
>+++ src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java	11 Dec 2008 08:44:07 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.core.commands.ExecutionException;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Path;
>@@ -47,12 +48,22 @@
> 		boolean isEnabled = false;
> 		if (aSelection != null) {
> 			IStructuredSelection structuredSelection = (IStructuredSelection) aSelection;
>-			IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());
>-			isEnabled = isValidSelection(project, null);
>+			isEnabled = isValidSelection(getProjectFromSelection(structuredSelection), null);
> 		}
> 		setEnabled(isEnabled);
> 		action.setEnabled(isEnabled);
> 	}
>+	
>+	private IProject getProjectFromSelection(IStructuredSelection structuredSelection){
>+		IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());
>+		if (project == null){
>+			Object firstElement = structuredSelection.getFirstElement();
>+			if (IAdaptable.class.isInstance(firstElement)){
>+				return (IProject) ((IAdaptable) firstElement).getAdapter(IProject.class);
>+			}
>+		}
>+		return project;
>+	}
> 
> 	private boolean isValidSelection(IProject project, Shell shell) {
> 		return (project != null
>@@ -95,7 +106,7 @@
> 	/*
> 	 */
> 	protected void primRun(Shell shell) {
>-		IProject project = ProjectUtilities.getProject(selection.getFirstElement());
>+		IProject project = getProjectFromSelection(selection);
> 		if (!validateSelection(project, shell))
> 			return;
> 		try {
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 GroupEARProvider.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java	21 Oct 2008 06:24:30 -0000	1.2
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java	11 Dec 2008 08:44:08 -0000
>@@ -16,6 +16,7 @@
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
> import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
>@@ -38,7 +39,7 @@
>  * @author Dimitar Giormov
>  *
>  */
>-public class GroupEARProvider extends AbstractGroupProvider {
>+public class GroupEARProvider extends AbstractGroupProvider implements IAdaptable {
> 
> 	private static final String PROJECT_RELATIVE_PATH = "META-INF/application.xml"; //$NON-NLS-1$
> 	public final static String EAR_DEFAULT_LIB = "lib"; //$NON-NLS-1$
>@@ -121,5 +122,12 @@
> 		ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
> 		return ddFile;
> 	}
>+	
>+	public Object getAdapter(Class adapter) {
>+		if (IProject.class == adapter){
>+			return getProject();
>+		}
>+		return null;
>+	}
> 
> }
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java,v
>retrieving revision 1.3
>diff -u -r1.3 WebAppProvider.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java	21 Oct 2008 06:24:31 -0000	1.3
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java	11 Dec 2008 08:44:08 -0000
>@@ -15,6 +15,7 @@
> 
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> import org.eclipse.jst.javaee.web.WebApp;
>@@ -32,7 +33,7 @@
>  * @author Dimitar Giormov
>  *
>  */
>-public class WebAppProvider extends AbstractGroupProvider {
>+public class WebAppProvider extends AbstractGroupProvider implements IAdaptable {
>   
>   
> 	private static final String PROJECT_RELATIVE_PATH = "WEB-INF/web.xml"; //$NON-NLS-1$
>@@ -118,4 +119,12 @@
> 			((AbstractGroupProvider)child).reinit(modelObject);
> 		}
> 	}
>+	
>+
>+	public Object getAdapter(Class adapter) {
>+		if (IProject.class == adapter){
>+			return getProject();
>+		}
>+		return null;
>+	}
> }

Actions: View

Attachments on bug 226933: 96201 | 120164