Attachment 95608 Details for Bug 226592 – v1

[patch] v1

patch.txt (text/plain), 3.57 KB, created by Angel Vera

on 2008-04-10 19:03:59 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Angel Vera

Created: 2008-04-10 19:03:59 EDT

Size: 3.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.ui
>Index: serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java,v
>retrieving revision 1.13
>diff -u -r1.13 ServerLabelProvider.java
>--- serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java	29 Aug 2007 15:02:42 -0000	1.13
>+++ serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java	10 Apr 2008 23:01:12 -0000
>@@ -33,7 +33,7 @@
> /**
>  * A label provider for all server related objects.
>  */
>-public class ServerLabelProvider implements ILabelProvider, IColorProvider {
>+public class ServerLabelProvider implements ILabelProvider, IColorProvider, IWorkbenchAdapter {
> 	private ILabelDecorator decorator;
> 	protected transient List<ILabelProviderListener> listeners;
> 	protected ILabelProviderListener providerListener;
>@@ -284,4 +284,24 @@
> 		}
> 		return null;
> 	}
>+
>+	public Object[] getChildren(Object o) { 
>+		if (o instanceof IServer){
>+			IServer server = (IServer)o;
>+			return server.getModules();
>+		}
>+		return new Object[0];
>+	}
>+
>+	public String getLabel(Object o) {
>+		return getText(o);
>+	}
>+
>+	public Object getParent(Object o) {
>+		if (o instanceof IServer){
>+			IServer server = (IServer)o;
>+			return server.getRuntime();
>+		}
>+		return null;
>+	}
> }
>\ No newline at end of file
>Index: serverui/org/eclipse/wst/server/ui/internal/ServerAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerAdapterFactory.java,v
>retrieving revision 1.6
>diff -u -r1.6 ServerAdapterFactory.java
>--- serverui/org/eclipse/wst/server/ui/internal/ServerAdapterFactory.java	10 Jul 2007 18:57:38 -0000	1.6
>+++ serverui/org/eclipse/wst/server/ui/internal/ServerAdapterFactory.java	10 Apr 2008 23:01:12 -0000
>@@ -12,6 +12,8 @@
> 
> import org.eclipse.core.runtime.IAdapterFactory;
> import org.eclipse.ui.IActionFilter;
>+import org.eclipse.ui.model.IWorkbenchAdapter;
>+import org.eclipse.wst.server.ui.ServerUICore;
> /**
>  * Adapter factory to adapt servers to IActionFilter.
>  */
>@@ -28,6 +30,9 @@
> 	public Object getAdapter(Object adaptableObject, Class adapterType) {
> 		if (adapterType == IActionFilter.class)
> 			return actionFilter;
>+		
>+		if (adapterType == IWorkbenchAdapter.class)
>+			return ServerUICore.getLabelProvider();
> 			
> 		return null;
> 	}
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/plugin.xml,v
>retrieving revision 1.46
>diff -u -r1.46 plugin.xml
>--- plugin.xml	2 Apr 2008 03:04:35 -0000	1.46
>+++ plugin.xml	10 Apr 2008 23:01:12 -0000
>@@ -259,6 +259,13 @@
>       adaptableType="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer">
>       <adapter type="org.eclipse.ui.IActionFilter"/>
>     </factory>
>+    <factory
>+          adaptableType="org.eclipse.wst.server.core.IServer"
>+          class="org.eclipse.wst.server.ui.internal.ServerAdapterFactory">
>+       <adapter
>+             type="org.eclipse.ui.model.IWorkbenchAdapter">
>+       </adapter>
>+    </factory>
>   </extension>
> 
> <extension point="org.eclipse.wst.server.core.clients">
>@@ -499,4 +506,4 @@
>         priority="-999999"/>
> </extension>
> 
>-</plugin>
>\ No newline at end of file
>+</plugin>

Actions: View | Diff

Attachments on bug 226592: 95584 | 95608