Author: rob.stryker(a)jboss.com Date: 2008-10-16 20:04:13 -0400 (Thu, 16 Oct 2008) New Revision: 10904 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/server_perspective.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/servers_view.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerContentProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerDecorator.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerLabelProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServersView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogContentProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogLabelProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/XPathProvider.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathFileResult.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: Pushing in newest changes before branch. This should give some beta view for the users to play with. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2008-10-16 18:17:33 UTC (rev 10903) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -22,6 +22,7 @@ package org.jboss.ide.eclipse.as.core.extensions.descriptors; import java.util.HashMap; +import java.util.Iterator; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; @@ -43,7 +44,8 @@ } public String getName() { return this.name; } - + public IServer getServer() { return this.server; } + public boolean queriesLoaded() { return children != null; } @@ -77,6 +79,10 @@ children.remove(query.getName()); } + public boolean isLoaded() { + return children == null ? false : true; + } + /* * Save these queries to its server object */ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathFileResult.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathFileResult.java 2008-10-16 18:17:33 UTC (rev 10903) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathFileResult.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -64,13 +64,17 @@ Iterator<Node> i = nodeList.iterator(); int z = 0; while(i.hasNext()) { - childList.add(new XPathResultNode(i.next(), query.getAttribute(), z++)); + childList.add(new XPathResultNode(i.next(), query.getAttribute(), z++, this)); } children = childList.toArray(new XPathResultNode[childList.size()]); } return children; } + public boolean isLoaded() { + return children == null ? false : true; + } + /* A class representing an actual result node / element in the document */ public class XPathResultNode { protected Node node; @@ -79,13 +83,19 @@ protected int index; protected Object val; protected boolean dirty; - public XPathResultNode(Node node, String attribute, int index) { + protected XPathFileResult file; + public XPathResultNode(Node node, String attribute, int index, XPathFileResult file) { this.node = node; this.attribute = attribute; this.index = index; this.hasAttribute = attribute == null || attribute.equals("") ? false : true; + this.file = file; } + public XPathFileResult getFile() { + return file; + } + public int getIndex() { return index; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-10-16 18:17:33 UTC (rev 10903) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -149,6 +149,7 @@ } }; FileUtil.touch(filter, deployPath.toFile(), true); + publishState = IServer.PUBLISH_STATE_NONE; return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2008-10-16 18:17:33 UTC (rev 10903) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2008-10-17 00:04:13 UTC (rev 10904) @@ -41,7 +41,8 @@ org.eclipse.core.variables, org.eclipse.search, org.apache.ant, - org.jboss.ide.eclipse.as.core + org.jboss.ide.eclipse.as.core, + org.eclipse.ui.navigator;bundle-version="3.3.100" Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.ui, org.jboss.ide.eclipse.as.ui.dialogs, Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/server_perspective.gif =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/server_perspective.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/servers_view.gif =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/cview16/servers_view.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerActionProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerActionProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,297 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional; + +import java.util.Iterator; + +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IContributionManager; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.bindings.TriggerSequence; +import org.eclipse.jface.viewers.IOpenListener; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.OpenEvent; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.keys.IBindingService; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.CommonViewer; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerPort; +import org.eclipse.wst.server.core.model.ServerDelegate; +import org.eclipse.wst.server.ui.internal.Messages; +import org.eclipse.wst.server.ui.internal.ServerUIPlugin; +import org.eclipse.wst.server.ui.internal.Trace; +import org.eclipse.wst.server.ui.internal.actions.NewServerWizardAction; +import org.eclipse.wst.server.ui.internal.view.servers.CopyAction; +import org.eclipse.wst.server.ui.internal.view.servers.DeleteAction; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleSloshAction; +import org.eclipse.wst.server.ui.internal.view.servers.MonitorServerPortAction; +import org.eclipse.wst.server.ui.internal.view.servers.OpenAction; +import org.eclipse.wst.server.ui.internal.view.servers.PasteAction; +import org.eclipse.wst.server.ui.internal.view.servers.PropertiesAction; +import org.eclipse.wst.server.ui.internal.view.servers.PublishAction; +import org.eclipse.wst.server.ui.internal.view.servers.PublishCleanAction; +import org.eclipse.wst.server.ui.internal.view.servers.RemoveModuleAction; +import org.eclipse.wst.server.ui.internal.view.servers.RenameAction; +import org.eclipse.wst.server.ui.internal.view.servers.RestartModuleAction; +import org.eclipse.wst.server.ui.internal.view.servers.ShowInConsoleAction; +import org.eclipse.wst.server.ui.internal.view.servers.ShowInDebugAction; +import org.eclipse.wst.server.ui.internal.view.servers.StartAction; +import org.eclipse.wst.server.ui.internal.view.servers.StartModuleAction; +import org.eclipse.wst.server.ui.internal.view.servers.StopAction; +import org.eclipse.wst.server.ui.internal.view.servers.StopModuleAction; + +public class ServerActionProvider extends CommonActionProvider { + private ICommonActionExtensionSite actionSite; + private Clipboard clipboard; + public ServerActionProvider() { + super(); + } + + public void init(ICommonActionExtensionSite aSite) { + super.init(aSite); + this.actionSite = aSite; + ICommonViewerSite site = aSite.getViewSite(); + if( site instanceof ICommonViewerWorkbenchSite ) { + StructuredViewer v = aSite.getStructuredViewer(); + if( v instanceof CommonViewer ) { + CommonViewer cv = (CommonViewer)v; + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; + addListeners(cv); + makeServerActions(cv, wsSite.getSelectionProvider()); + } + } + } + + + // actions on a server + protected Action[] actions; + protected Action actionModifyModules; + protected Action openAction, showInConsoleAction, showInDebugAction, propertiesAction, monitorPropertiesAction; + protected Action copyAction, pasteAction, deleteAction, renameAction; + protected Action noneAction = new Action(Messages.dialogMonitorNone) { + // dummy action + }; + + private void addListeners(CommonViewer tableViewer) { + tableViewer.addOpenListener(new IOpenListener() { + public void open(OpenEvent event) { + try { + IStructuredSelection sel = (IStructuredSelection) event.getSelection(); + Object data = sel.getFirstElement(); + if (!(data instanceof IServer)) + return; + IServer server = (IServer) data; + ServerUIPlugin.editServer(server); + } catch (Exception e) { + Trace.trace(Trace.SEVERE, "Could not open server", e); + } + } + }); + } + + private void makeServerActions(CommonViewer tableViewer, ISelectionProvider provider) { + clipboard = new Clipboard(tableViewer.getTree().getDisplay()); + Shell shell = tableViewer.getTree().getShell(); + + actions = new Action[6]; + // create the start actions + actions[0] = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE); + actions[1] = new StartAction(shell, provider, ILaunchManager.RUN_MODE); + actions[2] = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE); + + // create the stop action + actions[3] = new StopAction(shell, provider); + + // create the publish actions + actions[4] = new PublishAction(shell, provider); + actions[5] = new PublishCleanAction(shell, provider); + + // create the open action + openAction = new OpenAction(provider); + +// // create copy, paste, and delete actions + pasteAction = new PasteAction(shell, provider, clipboard); + copyAction = new CopyAction(provider, clipboard, pasteAction); + deleteAction = new DeleteAction(shell, provider); + renameAction = new RenameAction(shell, tableViewer, provider); + + // create the other actions + actionModifyModules = new ModuleSloshAction(shell, provider); + showInConsoleAction = new ShowInConsoleAction(provider); + showInDebugAction = new ShowInDebugAction(provider); + + // create the properties action + propertiesAction = new PropertiesAction(shell, provider); + monitorPropertiesAction = new PropertiesAction(shell, "org.eclipse.wst.server.ui.properties.monitor", provider); + } + + public void fillActionBars(IActionBars actionBars) { + actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug", actions[0]); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop", actions[3]); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish", actions[4]); + actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open", openAction); + actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertiesAction); + actionBars.updateActionBars(); + actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction); + actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction); + actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), deleteAction); + actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), renameAction); + + IContributionManager cm = actionBars.getToolBarManager(); + cm.removeAll(); + + for (int i = 0; i < actions.length - 1; i++) + cm.add(actions[i]); + } + + private static void fillNewContextMenu(Shell shell, ISelection selection, IMenuManager menu) { + IAction newServerAction = new NewServerWizardAction(); + newServerAction.setText(Messages.actionNewServer); + menu.add(newServerAction); + } + + public void fillContextMenu(IMenuManager menu) { + ICommonViewerSite site = actionSite.getViewSite(); + IStructuredSelection selection = null; + Shell shell = actionSite.getViewSite().getShell(); + if( site instanceof ICommonViewerWorkbenchSite ) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; + selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); + } + + IServer server = null; + IModule[] module = null; + if (selection != null && !selection.isEmpty()) { + Iterator iterator = selection.iterator(); + Object obj = iterator.next(); + if (obj instanceof IServer) + server = (IServer) obj; + if (obj instanceof ModuleServer) { + ModuleServer ms = (ModuleServer) obj; + server = ms.server; + module = ms.module; + } + if (iterator.hasNext()) { + server = null; + module = null; + } + } + + // new action + MenuManager newMenu = new MenuManager(Messages.actionNew); + fillNewContextMenu(null, selection, newMenu); + menu.add(newMenu); + + // open action + if (server != null && module == null) { + menu.add(openAction); + + String text = Messages.actionShowIn; + final IWorkbench workbench = PlatformUI.getWorkbench(); + final IBindingService bindingService = (IBindingService) workbench + .getAdapter(IBindingService.class); + final TriggerSequence[] activeBindings = bindingService + .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu"); + if (activeBindings.length > 0) { + text += "\t" + activeBindings[0].format(); + } + + MenuManager showInMenu = new MenuManager(text); + showInMenu.add(showInConsoleAction); + showInMenu.add(showInDebugAction); + //IActionBars actionBars = getViewSite().getActionBars(); + //actionBars.setGlobalActionHandler("group.show", showInMenu); + menu.add(showInMenu); + menu.add(new Separator()); + } else + menu.add(new Separator()); + + if (server != null) { + if (module == null) { + menu.add(copyAction); + menu.add(pasteAction); + menu.add(deleteAction); + menu.add(renameAction); + } else if (module.length == 1) + menu.add(new RemoveModuleAction(shell, server, module[0])); + menu.add(new Separator()); + } + + if (server != null && module == null) { + // server actions + for (int i = 0; i < actions.length; i++) + menu.add(actions[i]); + + menu.add(new Separator()); + menu.add(actionModifyModules); + + // monitor + if (server.getServerType() != null) { + final MenuManager menuManager = new MenuManager(Messages.actionMonitor); + + final IServer server2 = server; + final Shell shell2 = shell; + menuManager.addMenuListener(new IMenuListener() { + public void menuAboutToShow(IMenuManager manager) { + menuManager.removeAll(); + if (server2.getAdapter(ServerDelegate.class) != null) { + ServerPort[] ports = server2.getServerPorts(null); + if (ports != null) { + int size = ports.length; + for (int i = 0; i < size; i++) { + if (!ports[i].isAdvanced()) + menuManager.add(new MonitorServerPortAction(shell2, server2, ports[i])); + } + } + } + + if (menuManager.isEmpty()) + menuManager.add(noneAction); + + menuManager.add(new Separator()); + menuManager.add(monitorPropertiesAction); + } + }); + + // add an initial menu item so that the menu appears correctly + noneAction.setEnabled(false); + menuManager.add(noneAction); + menu.add(menuManager); + } + } + + if (server != null && module != null) { + menu.add(new Separator()); + menu.add(new StartModuleAction(server, module)); + menu.add(new StopModuleAction(server, module)); + menu.add(new RestartModuleAction(server, module)); + } + + menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end")); + + if (server != null) { + menu.add(new Separator()); + menu.add(propertiesAction); + } + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerContentProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerContentProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,331 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IPublishListener; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerLifecycleListener; +import org.eclipse.wst.server.core.IServerListener; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.core.ServerEvent; +import org.eclipse.wst.server.core.internal.Server; +import org.eclipse.wst.server.core.internal.UpdateServerJob; +import org.eclipse.wst.server.core.util.PublishAdapter; +import org.eclipse.wst.server.ui.internal.Messages; +import org.eclipse.wst.server.ui.internal.Trace; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; +import org.eclipse.wst.server.ui.internal.viewers.BaseContentProvider; + +public class ServerContentProvider extends BaseContentProvider implements ITreeContentProvider { + public static Object INITIALIZING = new Object(); + protected IServerLifecycleListener serverResourceListener; + protected IPublishListener publishListener; + protected IServerListener serverListener; + + // servers that are currently publishing and starting + protected static Set<String> publishing = new HashSet<String>(4); + protected static Set<String> starting = new HashSet<String>(4); + protected boolean animationActive = false; + protected boolean stopAnimation = false; + protected boolean initialized = false; + + + private StructuredViewer viewer; + + public ServerContentProvider() { + addListeners(); + } + + public Object[] getElements(Object element) { + if( !initialized ) { + deferInitialization(); + return new Object[] {INITIALIZING}; + } + + List<IServer> list = new ArrayList<IServer>(); + IServer[] servers = ServerCore.getServers(); + if (servers != null) { + int size = servers.length; + for (int i = 0; i < size; i++) { + if (!((Server)servers[i]).isPrivate()) + list.add(servers[i]); + } + } + return list.toArray(); + } + + public Object[] getChildren(Object element) { + if (element instanceof ModuleServer) { + ModuleServer ms = (ModuleServer) element; + try { + IModule[] children = ms.server.getChildModules(ms.module, null); + int size = children.length; + ModuleServer[] ms2 = new ModuleServer[size]; + for (int i = 0; i < size; i++) { + int size2 = ms.module.length; + IModule[] module = new IModule[size2 + 1]; + System.arraycopy(ms.module, 0, module, 0, size2); + module[size2] = children[i]; + ms2[i] = new ModuleServer(ms.server, module); + } + return ms2; + } catch (Exception e) { + return null; + } + } + + IServer server = (IServer) element; + IModule[] modules = server.getModules(); + int size = modules.length; + ModuleServer[] ms = new ModuleServer[size]; + for (int i = 0; i < size; i++) { + ms[i] = new ModuleServer(server, new IModule[] { modules[i] }); + } + return ms; + } + + public Object getParent(Object element) { + if (element instanceof ModuleServer) { + ModuleServer ms = (ModuleServer) element; + return ms.server; + } + return null; + } + + public boolean hasChildren(Object element) { + if (element instanceof ModuleServer) { + // Check if the module server has child modules. + ModuleServer curModuleServer = (ModuleServer)element; + IServer curServer = curModuleServer.server; + IModule[] curModule = curModuleServer.module; + if (curServer != null && curModule != null) { + IModule[] curChildModule = curServer.getChildModules(curModule, null); + if (curChildModule != null && curChildModule.length > 0) + return true; + + return false; + } + + return false; + } + if( element instanceof IServer ) { + return ((IServer) element).getModules().length > 0; + } + return false; + } + + public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) { + viewer = (StructuredViewer) aViewer; + } + + public void dispose() { + // do nothing + } + + + + // Listeners and refreshing the viewer + protected void addListeners() { + serverResourceListener = new IServerLifecycleListener() { + public void serverAdded(IServer server) { + refreshServer(null); + server.addServerListener(serverListener); + ((Server) server).addPublishListener(publishListener); + } + public void serverChanged(IServer server) { + refreshServer(server); + } + public void serverRemoved(IServer server) { + refreshServer(null); + server.removeServerListener(serverListener); + ((Server) server).removePublishListener(publishListener); + } + }; + ServerCore.addServerLifecycleListener(serverResourceListener); + + publishListener = new PublishAdapter() { + public void publishStarted(IServer server) { + handlePublishChange(server, true); + } + + public void publishFinished(IServer server, IStatus status) { + handlePublishChange(server, false); + } + }; + + serverListener = new IServerListener() { + public void serverChanged(ServerEvent event) { + if (event == null) + return; + + int eventKind = event.getKind(); + IServer server = event.getServer(); + if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { + // server change event + if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { + refreshServer(server, true); + int state = event.getState(); + String id = server.getId(); + if (state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING) { + boolean startThread = false; + synchronized (starting) { + if (!starting.contains(id)) { + if (starting.isEmpty()) + startThread = true; + starting.add(id); + } + } + if (startThread) + startThread(); + } else { + boolean stopThread = false; + synchronized (starting) { + if (starting.contains(id)) { + starting.remove(id); + if (starting.isEmpty()) + stopThread = true; + } + } + if (stopThread) + stopThread(); + } + } else + refreshServer(server); + } else if ((eventKind & ServerEvent.MODULE_CHANGE) != 0) { + // module change event + if ((eventKind & ServerEvent.STATE_CHANGE) != 0 || (eventKind & ServerEvent.PUBLISH_STATE_CHANGE) != 0) { + refreshServer(server); + } + } + } + }; + + // add listeners to servers + IServer[] servers = ServerCore.getServers(); + if (servers != null) { + int size = servers.length; + for (int i = 0; i < size; i++) { + servers[i].addServerListener(serverListener); + ((Server) servers[i]).addPublishListener(publishListener); + } + } + } + + protected void deferInitialization() { + Job job = new Job(Messages.jobInitializingServersView) { + public IStatus run(IProgressMonitor monitor) { + IServer[] servers = ServerCore.getServers(); + int size = servers.length; + for (int i = 0; i < size; i++) { + ((Server)servers[i]).getAllModules().iterator(); + } + + for (int i = 0; i < size; i++) { + IServer server = servers[i]; + if (server.getServerType() != null && server.getServerState() == IServer.STATE_UNKNOWN) { + UpdateServerJob job2 = new UpdateServerJob(server); + job2.schedule(); + } + } + initialized = true; + refreshServer(null); + return Status.OK_STATUS; + } + }; + + job.setSystem(true); + job.setPriority(Job.SHORT); + job.schedule(); + } + + protected void refreshServer(final IServer server) { + refreshServer(server, false); + } + protected void refreshServer(final IServer server, final boolean resetSelection) { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + try { + if( viewer != null && !viewer.getControl().isDisposed()) { + viewer.refresh(server); + if( resetSelection ) { + ISelection sel = viewer.getSelection(); + viewer.setSelection(sel); + } + ServerDecorator.getDefault().redecorate(server); + } + } catch (Exception e) { + // ignore + } + } + }); + } + + protected void handlePublishChange(IServer server, boolean isPublishing) { + String serverId = server.getId(); + if (isPublishing) + publishing.add(serverId); + else + publishing.remove(serverId); + + refreshServer(server); + } + + + protected void startThread() { + if (animationActive) + return; + + stopAnimation = false; + + final Display display = viewer == null ? Display.getDefault() : viewer.getControl().getDisplay(); + final int SLEEP = 200; + final Runnable[] animator = new Runnable[1]; + animator[0] = new Runnable() { + public void run() { + if (!stopAnimation) { + try { + int size = 0; + String[] servers; + synchronized (starting) { + size = starting.size(); + servers = new String[size]; + starting.toArray(servers); + } + + for (int i = 0; i < size; i++) { + IServer server = ServerCore.findServer(servers[i]); + if (server != null ) { + ServerDecorator.animate(); + refreshServer(server); + } + } + } catch (Exception e) { + Trace.trace(Trace.FINEST, "Error in Servers view animation", e); + } + display.timerExec(SLEEP, animator[0]); + } + } + }; + Display.getDefault().asyncExec(new Runnable() { + public void run() { + display.timerExec(SLEEP, animator[0]); + } + }); + } + + protected void stopThread() { + stopAnimation = true; + }} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerDecorator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerDecorator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerDecorator.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,196 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.viewers.IDecoration; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILightweightLabelDecorator; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.LabelProviderChangedEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.ISharedImages; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerType; +import org.eclipse.wst.server.core.internal.Server; +import org.eclipse.wst.server.ui.ServerUICore; +import org.eclipse.wst.server.ui.internal.ImageResource; +import org.eclipse.wst.server.ui.internal.Messages; +import org.eclipse.wst.server.ui.internal.ServerUIPlugin; +import org.eclipse.wst.server.ui.internal.provisional.UIDecoratorManager; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; + +public class ServerDecorator extends LabelProvider implements ILightweightLabelDecorator { + + public static final String[] syncState = new String[] { + Messages.viewSyncOkay, + Messages.viewSyncRestart, + Messages.viewSyncPublish, + Messages.viewSyncRestartPublish, + Messages.viewSyncPublishing}; + + public static final String[] syncStateUnmanaged = new String[] { + Messages.viewSyncOkay2, + Messages.viewSyncRestart2, + Messages.viewSyncPublish2, + Messages.viewSyncRestartPublish2, + Messages.viewSyncPublishing2}; + + public static final String[] modulePublishState = new String[] { + "", + Messages.viewSyncOkay, + Messages.viewSyncPublish, + Messages.viewSyncPublish}; + + private static ServerDecorator instance; + public static ServerDecorator getDefault() { + return instance; + } + + private static int count = 0; + public static void animate() { + count = (count + 1)%3; + } + public static int getCount() { + return count; + } + + public ServerDecorator() { + instance = this; + } + + public void decorate(Object element, IDecoration decoration) { + if( element instanceof IServer ) { + String state = getServerStateLabel((IServer)element); + String status = getServerStatusLabel((IServer)element); + decoration.addSuffix(combine(state, status)); + } else if( element instanceof ModuleServer ) { + String state = getModuleStateText((ModuleServer)element); + String status = getModuleStatusText((ModuleServer)element); + decoration.addSuffix(combine(state, status)); + } + } + + protected String combine(String state, String status) { + if(isEmpty(state) && isEmpty(status)) + return ""; + if( isEmpty(state)) + return " [" + status + "]"; + if( isEmpty(status)) + return " [" + state + "]"; + return " [" + state + ", " + status + "]"; + } + + protected boolean isEmpty(String s) { + return (s == null || "".equals(s)); + } + + public void redecorate(IServer server) { + fireLabelProviderChanged(new LabelProviderChangedEvent(this)); + } + + + + /* + * Utility methods + */ + public static Image getServerImage(IServer server) { + return server == null ? null : + server.getServerType() == null ? null : + ImageResource.getImage(server.getServerType().getId()); + } + + public static String getServerStateLabel(IServer server) { + return server == null ? null : + server.getServerType() == null ? null : + getStateLabel(server.getServerType(), server.getServerState(), server.getMode()); + } + + public static String getStateLabel(IServerType serverType, int state, String mode) { + return serverType == null ? null : + UIDecoratorManager.getUIDecorator(serverType).getStateLabel(state, mode, count); + } + + public static String getServerStatusLabel(IServer server) { + IStatus status = ((Server) server).getServerStatus(); + if (status != null) + return status.getMessage(); + + if (server.getServerType() == null) + return ""; + + if (server.getServerState() == IServer.STATE_UNKNOWN) + return ""; + + String serverId = server.getId(); + if (ServerContentProvider.publishing.contains(serverId)) + return ServerDecorator.syncState[4]; + + // republish + int i = 0; + if (server.shouldPublish()) { + if (((Server)server).isPublishUnknown()) + return ""; + i += 2; + } + + if (server.shouldRestart()) + i = 1; + + return syncState[i]; + } + + public static Image getServerStateImage(IServer server) { + return server == null ? null : + getStateImage(server.getServerType(), server.getServerState(), server.getMode()); + } + + public static Image getStateImage(IServerType serverType, int state, String mode) { + return serverType == null ? null : + UIDecoratorManager.getUIDecorator(serverType).getStateImage(state, mode, getCount()); + } + + public static String getModuleText(ModuleServer ms ) { + if (ms == null || ms.module == null) + return ""; + int size = ms.module.length; + return ms.module[size - 1].getName(); + } + + public static Image getModuleImage(ModuleServer ms) { + if( ms != null ) { + ILabelProvider labelProvider = ServerUICore.getLabelProvider(); + Image image = labelProvider.getImage(ms.module[ms.module.length - 1]); + labelProvider.dispose(); + return image; + } + return null; + } + + public static String getModuleStateText(ModuleServer ms) { + return ""; + } + + public static String getModuleStatusText(ModuleServer ms) { + if( ms != null && ms.server != null && ms.module != null ) { + IStatus status = ((Server) ms.server).getModuleStatus(ms.module); + if (status != null) + return status.getMessage(); + + return modulePublishState[ms.server.getModulePublishState(ms.module)]; + } + return ""; + } + + public static Image getModuleStatusImage(ModuleServer ms) { + IStatus status = ((Server) ms.server).getModuleStatus(ms.module); + if (status != null) { + ISharedImages sharedImages = ServerUIPlugin.getInstance().getWorkbench().getSharedImages(); + if (status.getSeverity() == IStatus.ERROR) + return sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + else if (status.getSeverity() == IStatus.WARNING) + return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK); + else if (status.getSeverity() == IStatus.INFO) + return sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK); + } + return null; + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerLabelProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServerLabelProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2003, 2007 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - Initial API and implementation + *******************************************************************************/ +package org.eclipse.wst.server.ui.internal.view.servers.provisional; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.ServerUICore; +import org.eclipse.wst.server.ui.internal.ImageResource; +import org.eclipse.wst.server.ui.internal.Messages; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; +/** + * Server table label provider. + */ +public class ServerLabelProvider extends LabelProvider { + + /** + * ServerTableLabelProvider constructor comment. + */ + public ServerLabelProvider() { + super(); + } + + public String getText(Object element) { + if (element instanceof ModuleServer) { + ModuleServer ms = (ModuleServer) element; + if (ms.module == null) + return ""; + int size = ms.module.length; + String name = ms.module[size - 1].getName(); + return name; + } + + if( element instanceof IServer ) { + IServer server = (IServer) element; + return notNull(server.getName()); + } + + if( element == ServerContentProvider.INITIALIZING) + return Messages.viewInitializing; + + return "-"; + } + public Image getImage(Object element) { + Image image = null; + if (element instanceof ModuleServer) { + ModuleServer ms = (ModuleServer) element; + ILabelProvider labelProvider = ServerUICore.getLabelProvider(); + image = labelProvider.getImage(ms.module[ms.module.length - 1]); + labelProvider.dispose(); + } else if( element instanceof IServer ) { + IServer server = (IServer) element; + if (server.getServerType() != null) { + image = ImageResource.getImage(server.getServerType().getId()); + } + } + return image; + } + + protected String notNull(String s) { + if (s == null) + return ""; + return s; + } + + public boolean isLabelProperty(Object element, String property) { + return false; + } +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServersView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServersView.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/ServersView.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2003, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - Initial API and implementation + *******************************************************************************/ +package org.eclipse.wst.server.ui.internal.view.servers.provisional; + +import org.eclipse.ui.navigator.CommonNavigator; +/** + * A view of servers, their modules, and status. + */ +public class ServersView extends CommonNavigator { + /** + * ServersView constructor comment. + */ + public ServersView() { + super(); + } +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogActionProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogActionProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,72 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.ServerEventModel; +import org.jboss.ide.eclipse.as.ui.dialogs.ShowStackTraceDialog; + +public class EventLogActionProvider extends CommonActionProvider { + private Action clearLogAction; + private Action showStackTraceAction; + private ICommonActionExtensionSite actionSite; + public EventLogActionProvider() { + super(); + } + + public void init(ICommonActionExtensionSite aSite) { + super.init(aSite); + this.actionSite = aSite; + createActions(); + } + public void fillContextMenu(IMenuManager menu) { + ICommonViewerSite site = actionSite.getViewSite(); + IStructuredSelection selection = null; + if( site instanceof ICommonViewerWorkbenchSite ) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; + selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); + Object first = selection.getFirstElement(); + if( first != null && first instanceof ServerEventModel) { + menu.add(clearLogAction); + } + if( first != null && first instanceof EventLogTreeItem && + (((EventLogTreeItem)first).getEventClass().equals(EventLogModel.EVENT_TYPE_EXCEPTION) || + ((EventLogTreeItem)first).getSpecificType().equals(EventLogModel.EVENT_TYPE_EXCEPTION))) { + menu.add(showStackTraceAction); + } + } + } + + + protected void createActions() { + clearLogAction = new Action() { + public void run() { + IStructuredSelection selection = (IStructuredSelection)actionSite.getStructuredViewer().getSelection(); + if(selection.getFirstElement() != null && selection.getFirstElement() instanceof ServerEventModel) { + ((ServerEventModel)selection.getFirstElement()).clearEvents(); + actionSite.getStructuredViewer().refresh(((ServerEventModel)selection.getFirstElement())); + } + } + }; + clearLogAction.setText("Clear Event Log"); + + showStackTraceAction = new Action() { + public void run() { + IStructuredSelection selection = (IStructuredSelection)actionSite.getStructuredViewer().getSelection(); + if( selection.getFirstElement() != null && selection.getFirstElement() instanceof EventLogTreeItem ) { + EventLogTreeItem item = (EventLogTreeItem)selection.getFirstElement(); + ShowStackTraceDialog dialog = new ShowStackTraceDialog(new Shell(), item); + dialog.open(); + } + } + }; + showStackTraceAction.setText("See Exception Details"); + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogContentProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogContentProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,165 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.core.runtime.Preferences; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogRoot; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.IEventLogListener; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.ServerEventModel; +import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; + +public class EventLogContentProvider implements ITreeContentProvider { + public static final String SHOW_TIMESTAMP = "org.jboss.ide.eclipse.as.ui.views.server.providers.EventLogViewProvider.showTimestamp"; + public static final String GROUP_BY_CATEGORY = "org.jboss.ide.eclipse.as.ui.views.server.providers.EventLogViewProvider.groupByCategory"; + public static final String EVENT_ON_TOP = "org.jboss.ide.eclipse.as.ui.views.server.providers.EventLogViewProvider.eventOnTop"; + public static final int NEWEST_ON_TOP = 1; + public static final int OLDEST_ON_TOP = 2; + public static final int _TRUE_ = 1; + public static final int _FALSE_ = 2; + + private Viewer viewer; + + public EventLogContentProvider() { + EventLogModel.enableLogging(); + EventLogModel.getDefault().addListener(new IEventLogListener() { + public void eventModelChanged(String serverId, + EventLogTreeItem changed) { + if( viewer instanceof StructuredViewer ) { + final Object o = changed.getEventRoot(); + if( o instanceof EventLogRoot) { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + ((StructuredViewer)viewer).refresh(((EventLogRoot)o).getModel()); + } + }); + } + } + } + }); + } + + public Object[] getChildren(Object parentElement) { + if( parentElement instanceof IServer && parentElement != null ) { + return new Object[] { EventLogModel.getModel((IServer)parentElement)}; + } + if( parentElement instanceof ServerEventModel) { + ServerEventModel s = ((ServerEventModel)parentElement); + boolean categorize = getCategorize(); + if( categorize ) + return getRootCategories(s); + Object[] ret = s.getRoot().getChildren(); + if( getSortOrder()) { + List<Object> l = Arrays.asList(ret); + Collections.reverse(l); + return l.toArray(); + } + return ret; + } + + if( parentElement instanceof MajorEventType ) { + // get children only of this type + String serverId = ((MajorEventType)parentElement).getServer(); + SimpleTreeItem[] children = EventLogModel.getModel(serverId).getRoot().getChildren(); + ArrayList<SimpleTreeItem> items = new ArrayList<SimpleTreeItem>(); + for( int i = 0; i < children.length; i++ ) { + if( children[i] instanceof EventLogTreeItem ) { + String type = ((EventLogTreeItem)children[i]).getEventClass(); + if( type != null && type.equals(((MajorEventType)parentElement).getId())) + items.add(children[i]); + } + } + + if( getSortOrder() ) Collections.reverse(items); + + return items.toArray(new Object[items.size()]); + } + + // just return the object's kids + if( parentElement instanceof EventLogTreeItem ) { + return ((EventLogTreeItem)parentElement).getChildren(); + } + return new Object[0]; + } + + public static class MajorEventType { + private String id; + private String serverId; + public MajorEventType(String serverId, String id) { + this.id = id; + this.serverId = serverId; + } + public String getId() { + return id; + } + public String getServer() { return serverId; } + public String toString() { return id; } + public boolean equals(Object o) { + return o instanceof MajorEventType && + ((MajorEventType)o).getId().equals(id) && + ((MajorEventType)o).getServer().equals(serverId); + } + } + + protected Object[] getRootCategories(ServerEventModel model) { + EventLogRoot root = model.getRoot(); + ArrayList<String> list = new ArrayList<String>(); + ArrayList<MajorEventType> majorTypes = new ArrayList<MajorEventType>(); + SimpleTreeItem[] children = root.getChildren(); + for( int i = 0; i < children.length; i++ ) { + if( children[i] instanceof EventLogTreeItem ) { + String type = ((EventLogTreeItem)children[i]).getEventClass(); + if( !list.contains(type)) { + list.add(type); + majorTypes.add(new MajorEventType(model.getId(), type)); + } + } + } + return majorTypes.toArray(new MajorEventType[majorTypes.size()]); + } + + + public Object getParent(Object element) { + return null; + } + + public boolean hasChildren(Object element) { + return getChildren(element).length > 0 ? true : false; + } + + public Object[] getElements(Object inputElement) { + return null; + } + + public void dispose() { + EventLogModel.disableLogging(); + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + this.viewer = viewer; + } + + protected boolean getSortOrder() { + Preferences store = JBossServerUIPlugin.getDefault().getPluginPreferences(); + int showTimestamp = store.getInt(EVENT_ON_TOP); + if( showTimestamp == OLDEST_ON_TOP) return false; + return true; + } + protected boolean getCategorize() { + Preferences store = JBossServerUIPlugin.getDefault().getPluginPreferences(); + int showTimestamp = store.getInt(GROUP_BY_CATEGORY); + if( showTimestamp == _TRUE_ ) return true; + if( showTimestamp == _FALSE_) return false; + return false; // default + } +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogLabelProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/EventLogLabelProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,147 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions; + +import java.util.Date; +import java.util.HashMap; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Preferences; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.EventLogContentProvider.MajorEventType; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem; +import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.ServerEventModel; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.IEventLogLabelProvider; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider; + +public class EventLogLabelProvider extends LabelProvider { + + public static final String SHOW_TIMESTAMP = "org.jboss.ide.eclipse.as.ui.views.server.providers.EventLogViewProvider.showTimestamp"; + public static final int _TRUE_ = 1; + public static final int _FALSE_ = 2; + private static HashMap<String, String> majorTypeToName = new HashMap<String, String>(); + + static { + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "EventLogMajorType"); + for( int i = 0; i < cf.length; i++ ) { + String type = cf[i].getAttribute("typeId"); + String name = cf[i].getAttribute("name"); + majorTypeToName.put(type, name); + } + } + + private Image rootImage; + public EventLogLabelProvider() { + super(); + ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/info_obj.gif")); + rootImage = des.createImage(); + } + public void dispose() { + super.dispose(); + rootImage.dispose(); + } + + private IEventLogLabelProvider[] labelProviderDelegates = null; + public Image getImage(Object element) { + if( labelProviderDelegates == null ) + loadLabelProviderDelegates(); + + if( element instanceof ServerEventModel ) { + return rootImage; + } + + if( !(element instanceof EventLogTreeItem)) + return null; + + EventLogTreeItem item = (EventLogTreeItem)element; + for( int i = 0; i < labelProviderDelegates.length; i++ ) { + if( labelProviderDelegates[i] != null + && labelProviderDelegates[i].supports(item.getSpecificType())) { + Image image = labelProviderDelegates[i].getImage((EventLogTreeItem)element); + if( image != null ) return image; + } + } + + return null; + } + + public String getText(Object element) { + if( element == null ) return "ERROR: Unknown String type"; + + if( element instanceof ServerEventModel ) { + return "Event Log"; + } + + + String suffix = getShowTimestamp() ? createTimestamp(element) : ""; + if( labelProviderDelegates == null ) + loadLabelProviderDelegates(); + + if( element instanceof ServerViewProvider ) { + return ((ServerViewProvider)element).getName(); + } + + if( !(element instanceof EventLogTreeItem)) { + if( element instanceof MajorEventType ) { + String val = majorTypeToName.get(((MajorEventType)element).getId()); + if( val != null ) return val; + } + return element.toString(); + } + EventLogTreeItem item = (EventLogTreeItem)element; + + for( int i = 0; i < labelProviderDelegates.length; i++ ) { + if( labelProviderDelegates[i] != null + && labelProviderDelegates[i].supports(item.getSpecificType())) { + String text = labelProviderDelegates[i].getText((EventLogTreeItem)element); + if( text != null ) return text + suffix; + } + } + + return element == null ? "" : element.toString() + suffix; + } + + public void loadLabelProviderDelegates() { + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] elements = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "EventLogLabelProvider"); + labelProviderDelegates = new IEventLogLabelProvider[elements.length]; + for( int i = 0; i < elements.length; i++ ) { + try { + labelProviderDelegates[i] = (IEventLogLabelProvider)elements[i].createExecutableExtension("class"); + } catch( CoreException ce ) { + JBossServerUIPlugin.log("Error loading Event Log Label Provider Delegate", ce); + } + } + } + protected boolean getShowTimestamp() { + Preferences store = JBossServerUIPlugin.getDefault().getPluginPreferences(); + int showTimestamp = store.getInt(SHOW_TIMESTAMP); + if( showTimestamp == _TRUE_ ) return true; + if( showTimestamp == _FALSE_) return false; + return false; // default + } + + protected String createTimestamp(Object element) { + if( element instanceof EventLogTreeItem ) { + Long v = (Long) ((EventLogTreeItem)element).getProperty(EventLogTreeItem.DATE); + if( v == null ) return ""; + + double date = v.doubleValue(); + double now = new Date().getTime(); + int seconds = (int) (( now - date) / 1000); + int minutes = seconds / 60; + int hours = minutes / 60; + minutes -= (hours * 60); + String minString = minutes + "m ago"; + if( hours == 0 ) + return " (" + minString + ")"; + return " (" + hours + "h " + minString + ")"; + } + return ""; + } +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/XPathProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/XPathProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/eclipse/wst/server/ui/internal/view/servers/provisional/extensions/XPathProvider.java 2008-10-17 00:04:13 UTC (rev 10904) @@ -0,0 +1,457 @@ +package org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions; + +import java.util.ArrayList; +import java.util.Arrays; + +import org.eclipse.core.filesystem.EFS; +import org.eclipse.core.filesystem.IFileStore; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IDecoration; +import org.eclipse.jface.viewers.ILightweightLabelDecorator; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider.XPathTreeContentProvider.ServerWrapper; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs; +import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathCategoryDialog; +import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathDialog; + +public class XPathProvider { + public static class XPathTreeContentProvider implements + ITreeContentProvider { + + public static class DelayProxy {} + public static final DelayProxy LOADING = new DelayProxy(); + + private Viewer viewer; + private ArrayList<XPathCategory> loading = new ArrayList<XPathCategory>(); + + public class ServerWrapper { + public IServer server; + + public ServerWrapper(IServer server) { + this.server = server; + } + public int hashCode() { + return server.getId().hashCode(); + } + public boolean equals(Object other) { + return other instanceof ServerWrapper && + ((ServerWrapper)other).server.getId().equals(server.getId()); + } + } + + public Object[] getChildren(Object parentElement) { + if (parentElement == null) + return new Object[] {}; + if (parentElement instanceof IServer) { + return new Object[] { new ServerWrapper((IServer) parentElement) }; + } + + if (parentElement instanceof ServerWrapper) { + return XPathModel.getDefault().getCategories( + ((ServerWrapper) parentElement).server); + } + + if( parentElement instanceof XPathCategory) { + if( ((XPathCategory)parentElement).isLoaded()) + return ((XPathCategory)parentElement).getQueries(); + + if( !loading.contains((XPathCategory)parentElement)) + launchLoad((XPathCategory)parentElement); + + return new Object[] { LOADING }; + } + + // we're the named element (JNDI) + if( parentElement instanceof XPathQuery) { + if( XPathProvider.getResultNodes((XPathQuery)parentElement).length == 1 ) { + return new Object[0]; + } else { + return ((XPathQuery)parentElement).getResults(); + } + } + + // we're a file node (blah.xml) + if( parentElement instanceof XPathFileResult ) { + if( ((XPathFileResult)parentElement).getChildren().length == 1 ) + return new Object[0]; + return ((XPathFileResult)parentElement).getChildren(); + } + + if( parentElement instanceof XPathResultNode ) { + return new Object[0]; + } + + + return new Object[0]; + } + + + protected void launchLoad(final XPathCategory cat) { + new Job("Loading XPaths") { + protected IStatus run(IProgressMonitor monitor) { + loading.add(cat); + XPathQuery[] queries = cat.getQueries(); + XPathFileResult[] results; + for( int i = 0; i < queries.length; i++ ) { + results = queries[i].getResults(); + for( int j = 0; j < results.length; j++ ) { + results[j].getChildren(); + } + } + Display.getDefault().asyncExec(new Runnable() { + public void run() { + loading.remove(cat); + ((StructuredViewer)viewer).refresh(cat.getServer()); + } + }); + return Status.OK_STATUS; + } + }.schedule(200); + } + + public Object getParent(Object element) { + return null; + } + + public boolean hasChildren(Object element) { + return getChildren(element).length > 0 ? true : false; + } + + public Object[] getElements(Object inputElement) { + return new Object[0]; + } + + public void dispose() { + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + this.viewer = viewer; + } + } + + public static class XPathTreeLabelProvider extends LabelProvider { + private Image rootImage; + public XPathTreeLabelProvider() { + super(); + ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif")); + rootImage = des.createImage(); + } + + public Image getImage(Object element) { + if( element instanceof ServerWrapper ) + return rootImage; + + if (element instanceof XPathCategory) + return PlatformUI.getWorkbench().getSharedImages().getImage( + ISharedImages.IMG_OBJ_FOLDER); + + return null; + } + + public String getText(Object element) { + if( element instanceof ServerWrapper ) + return "XML Configuration"; + if( element == XPathTreeContentProvider.LOADING ) + return "Loading..."; + + if (element instanceof XPathCategory) + return ((XPathCategory) element).getName(); + + if( element instanceof XPathQuery ) + return ((XPathQuery)element).getName(); + + if( element instanceof XPathFileResult ) + return ((XPathFileResult)element).getFileLocation(); + + return ""; + } + + public XPathResultNode[] getResultNodes(XPathQuery query) { + ArrayList<XPathResultNode> l = new ArrayList<XPathResultNode>(); + XPathFileResult[] files = query.getResults(); + for( int i = 0; i < files.length; i++ ) { + l.addAll(Arrays.asList(files[i].getChildren())); + } + return l.toArray(new XPathResultNode[l.size()]); + } + } + + public static class XMLActionProvider extends CommonActionProvider { + + private ICommonActionExtensionSite actionSite; + public Action newXPathCategoryAction, deleteXPathCategoryAction, + newXPathAction, editXPathAction, deleteXPathAction, + editFileAction; + private Object selectedNode; + + public void init(ICommonActionExtensionSite aSite) { + super.init(aSite); + this.actionSite = aSite; + createActions(); + } + + public void createActions() { + newXPathCategoryAction = new Action() { + public void run() { + XPathCategoryDialog d = new XPathCategoryDialog(Display + .getCurrent().getActiveShell(), getServer()); + if (d.open() == Window.OK) { + XPathModel.getDefault() + .addCategory(getServer(), d.getText()); + XPathModel.getDefault().save(getServer()); + refreshViewer(); + } + } + }; + newXPathCategoryAction.setText("New Category"); + + deleteXPathCategoryAction = new Action() { + public void run() { + int style = SWT.APPLICATION_MODAL | SWT.YES | SWT.NO; + MessageBox messageBox = new MessageBox(Display.getCurrent() + .getActiveShell(), style); + messageBox.setText(Messages.DescriptorXPathRemoveCategory + + "?"); + messageBox + .setMessage(Messages.DescriptorXPathRemoveCategoryDesc); + if (messageBox.open() == SWT.YES) { + XPathModel.getDefault().removeCategory(getServer(), + ((XPathCategory)selectedNode).getName()); + XPathModel.getDefault().save(getServer()); + refreshViewer(); + } + } + }; + deleteXPathCategoryAction + .setText(Messages.DescriptorXPathRemoveCategory); + + newXPathAction = new Action() { + public void run() { + XPathCategory category = (XPathCategory)selectedNode; + if (category != null) { + String categoryName = category.getName(); + XPathDialog d = new XPathDialog(Display.getCurrent() + .getActiveShell(), getServer(), categoryName); + if (d.open() == Window.OK) { + XPathCategory[] categoryList = XPathModel + .getDefault().getCategories(getServer()); + XPathCategory categoryItem = null; + for (int i = 0; i < categoryList.length; i++) { + if (categoryList[i].getName().equals( + category.getName())) + categoryItem = categoryList[i]; + } + if (categoryItem != null) { + XPathQuery query = new XPathQuery(d.getName(), + XPathDialogs.getConfigFolder(getServer()), + null, d.getXpath(), d.getAttribute()); + categoryItem.addQuery(query); + XPathModel.getDefault().save(getServer()); + refreshViewer(); + } + } + } + } + }; + newXPathAction.setText(Messages.DescriptorXPathNewXPath); + + editXPathAction = new Action() { + public void run() { + Object o = selectedNode; + if (o != null && o instanceof XPathQuery) { + XPathQuery original = (XPathQuery) o; + XPathCategory category = original.getCategory(); + + XPathDialog d = new XPathDialog(Display.getCurrent() + .getActiveShell(), getServer(), category.getName(), + original.getName()); + d.setAttribute(original.getAttribute()); + d.setXpath(original.getXpathPattern()); + + if (d.open() == Window.OK) { + original.setAttribute(d.getAttribute()); + original.setXpathPattern(d.getXpath()); + original.setName(d.getName()); + category.save(); + refreshViewer(); + } + } + } + }; + editXPathAction.setText(Messages.DescriptorXPathEditXPath); + + deleteXPathAction = new Action() { + public void run() { + Object o = selectedNode; + if (o instanceof XPathQuery) { + XPathCategory cat = ((XPathQuery) o).getCategory(); + cat.removeQuery((XPathQuery) o); + cat.save(); + refreshViewer(); + } + } + }; + deleteXPathAction.setText(Messages.DescriptorXPathDeleteXPath); + + editFileAction = new Action() { + public void run() { + try { + Object o = selectedNode; + Path p = null; + if (o instanceof XPathQuery + && ((XPathQuery) o).getResults().length == 1) { + o = (XPathFileResult) ((XPathQuery) o).getResults()[0]; + } + if (o instanceof XPathFileResult) { + p = new Path(((XPathFileResult) o) + .getFileLocation()); + } else if (o instanceof XPathResultNode) { + p = new Path(((XPathResultNode) o) + .getFileLocation()); + } + if (p != null) { + + IFileStore fileStore = EFS.getLocalFileSystem() + .getStore(p.removeLastSegments(1)); + fileStore = fileStore.getChild(p.lastSegment()); + IWorkbench wb = PlatformUI.getWorkbench(); + IWorkbenchWindow win = wb + .getActiveWorkbenchWindow(); + IWorkbenchPage page = win.getActivePage(); + + if (!fileStore.fetchInfo().isDirectory() + && fileStore.fetchInfo().exists()) { + try { + IDE.openEditorOnFileStore(page, fileStore); + } catch (PartInitException e) { + } + } + } + } catch (Exception exc) { + JBossServerUIPlugin.log( + "Error running edit file action", exc); + } + } + }; + editFileAction.setText("Edit File"); + } + + public void fillContextMenu(IMenuManager menu) { + ICommonViewerSite site = actionSite.getViewSite(); + IStructuredSelection selection = null; + if (site instanceof ICommonViewerWorkbenchSite) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; + selection = (IStructuredSelection) wsSite + .getSelectionProvider().getSelection(); + Object first = selection.getFirstElement(); + if( first == null ) + return; + + if (first instanceof ServerWrapper) { + menu.add(newXPathCategoryAction); + menu.add(new Separator()); + return; + } + + if (first instanceof XPathCategory) { + + menu.add(newXPathAction); + menu.add(deleteXPathCategoryAction); + menu.add(new Separator()); + return; + } + + if( first instanceof XPathQuery) { + selectedNode = first; + menu.add(newXPathAction); + menu.add(editXPathAction); + menu.add(deleteXPathAction); + } + if( (first instanceof XPathResultNode || first instanceof XPathFileResult ) || + (first instanceof XPathQuery && ((XPathQuery)first).getResults().length == 1)) { + menu.add(editFileAction); + } + } + } + + protected void refreshViewer() { + actionSite.getStructuredViewer().refresh(); + } + + protected IServer getServer() { + Object o = selectedNode; + if( o instanceof ServerWrapper) return ((ServerWrapper)o).server; + if( o instanceof XPathCategory) return ((XPathCategory)o).getServer(); + if( o instanceof XPathQuery) return ((XPathQuery)o).getCategory().getServer(); + if( o instanceof XPathFileResult) return ((XPathFileResult)o).getQuery().getCategory().getServer(); + if( o instanceof XPathResultNode) return ((XPathResultNode)o).getFile().getQuery().getCategory().getServer(); + return null; + } + } + + + public static class XMLDecorator extends LabelProvider implements ILightweightLabelDecorator { + public void decorate(Object element, IDecoration decoration) { + if( element instanceof XPathQuery) { + XPathResultNode[] nodes = getResultNodes((XPathQuery)element); + if(nodes.length == 1 ) { + decoration.addSuffix(" " + nodes[0].getText()); + } + return; + } + + // we're a file node (blah.xml) + if( element instanceof XPathFileResult ) { + XPathResultNode[] nodes = ((XPathFileResult)element).getChildren(); + if( nodes.length == 1 ) + decoration.addSuffix(" " + nodes[0].getText()); + } + } + } + + public static XPathResultNode[] getResultNodes(XPathQuery query) { + ArrayList<XPathResultNode> l = new ArrayList<XPathResultNode>(); + XPathFileResult[] files = query.getResults(); + for( int i = 0; i < files.length; i++ ) { + l.addAll(Arrays.asList(files[i].getChildren())); + } + return l.toArray(new XPathResultNode[l.size()]); + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-10-16 18:17:33 UTC (rev 10903) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-10-17 00:04:13 UTC (rev 10904) @@ -209,7 +209,7 @@ typeId="org.jboss.ide.eclipse.as.core.runtime.server.polling.MajorType"/> <MajorType name="Publish Events" - typeId="org.jboss.ide.eclipse.as.core.publishers.MajorType"/> + typeId="org.jboss.ide.eclipse.as.core.publishers.Events.MajorType"/> </extension> <extension point="org.eclipse.wst.server.ui.editorPageSections"> @@ -324,4 +324,199 @@ </extension> + +<!-- Provisional stuff to be contributed to Webtools --> + + <extension point="org.eclipse.ui.views"> + <view + id="org.eclipse.wst.server.ui.ServersViewProvisional" + name="JBoss Servers View 2 (beta)" + category="org.eclipse.wst.server.ui" + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServersView" + icon="icons/jboss.gif"/> + </extension> + + <extension point="org.eclipse.ui.decorators"> + <decorator + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerDecorator" + icon="icons/obj16/server.gif" + id="org.eclipse.wst.server.ui.navigatorDecorator" + label="Server State Decorator" + lightweight="true" + location="BOTTOM_RIGHT"> + <enablement> + <or> + <objectClass + name="org.eclipse.wst.server.core.IServer"> + </objectClass> + <objectClass + name="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer"> + </objectClass> + </or> + </enablement> + </decorator> + </extension> + + <extension + point="org.eclipse.ui.navigator.navigatorContent"> + <navigatorContent + activeByDefault="true" + contentProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerContentProvider" + icon="icons/cview16/servers_view.gif" + id="org.eclipse.wst.server.ui.ServersView.content.root" + labelProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerLabelProvider" + name="Servers View Default Content" + priority="highest"> + <triggerPoints> + <instanceof + value="org.eclipse.wst.server.core.internal.ServerPlugin"> + </instanceof> + </triggerPoints> + <possibleChildren> + <or> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + <instanceof + value="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer"> + </instanceof> + </or></possibleChildren> + <actionProvider + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerActionProvider" + id="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerActionProvider" + priority="highest"> + </actionProvider> + </navigatorContent> + </extension> + <extension + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.server.ui.ServersViewProvisional"> + <includes> + <contentExtension + isRoot="true" + pattern="org.eclipse.wst.server.ui.ServersView.content.root"> + </contentExtension> + </includes> + </viewerContentBinding> + </extension> + + + + <!-- Extensions to new Server View --> + + <extension + point="org.eclipse.ui.navigator.navigatorContent"> + <navigatorContent + id="org.jboss.ide.eclipse.as.ui.extensions.eventLog" + activeByDefault="true" + icon="icons/info_obj.gif" + contentProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.EventLogContentProvider" + labelProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.EventLogLabelProvider" + name="JBoss Server Event Log" + priority="normal"> + <triggerPoints> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </triggerPoints> + <possibleChildren> + <or> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel$EventLogTreeItem"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel$ServerEventModel"> + </instanceof> + </or></possibleChildren> + <actionProvider + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.EventLogActionProvider" + id="org.jboss.ide.eclipse.as.ui.extensions.eventLog.actions" + priority="highest"> + </actionProvider> + </navigatorContent> + <navigatorContent + activeByDefault="true" + contentProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XPathTreeContentProvider" + icon="icons/XMLFile.gif" + id="org.jboss.ide.eclipse.as.ui.extensions.xml" + labelProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XPathTreeLabelProvider" + name="XML Configuration" + priority="normal"> + <triggerPoints> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </triggerPoints> + <possibleChildren> + <or> + <instanceof + value="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XPathTreeContentProvider$ServerWrapper"> + </instanceof> + <instanceof + value="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XPathTreeContentProvider$DelayProxy"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult$XPathResultNode"> + </instanceof></or> + </possibleChildren> + <actionProvider + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XMLActionProvider" + id="org.jboss.ide.eclipse.as.ui.extensions.eventLog.actions" + priority="highest"> + </actionProvider> + </navigatorContent> + </extension> + <extension + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.server.ui.ServersViewProvisional"> + <includes> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.as.ui.extensions.eventLog"> + </contentExtension> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.as.ui.extensions.xml"> + </contentExtension> + </includes> + </viewerContentBinding> + </extension> + + + + <!-- Decorator for xpaths / xml--> + <extension point="org.eclipse.ui.decorators"> + <decorator + class="org.eclipse.wst.server.ui.internal.view.servers.provisional.extensions.XPathProvider$XMLDecorator" + id="org.jboss.ide.eclipse.as.ui.extensions.xml.decorator" + label="JBoss Server XML Configuration Decorator" + lightweight="true" + location="BOTTOM_RIGHT"> + <enablement> + <or> + <objectClass name="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery"/> + <objectClass + name="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult"> + </objectClass> + <objectClass + name="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult$XPathResultNode"> + </objectClass> + </or> + </enablement> + </decorator> + </extension> + + + </plugin>