Author: rob.stryker(a)jboss.com Date: 2007-07-05 14:03:51 -0400 (Thu, 05 Jul 2007) New Revision: 2333 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerExtensionFrame.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/TwiddlePollerListener.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java Log: View refactored. Removes confusing heirarchy. Renames classes to be more logical. Code cleanup. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -57,7 +57,6 @@ IWorkbenchPreferencePage { private static final String ENABLED = "_ENABLED_"; - private static final String WEIGHT = "_WEIGHT_"; private Table table; @@ -102,9 +101,6 @@ Boolean bigB = ((Boolean)items[i].getData(ENABLED)); if( bigB != null ) provider.setEnabled(bigB.booleanValue()); -// Integer weight = ((Integer)items[i].getData(WEIGHT)); -// if( weight != null ) -// provider.setWeight(weight.intValue()); provider.setWeight(i); } @@ -117,9 +113,7 @@ } // refresh the viewer - try { - JBossServerView.getDefault().getJBViewer().refresh(); - } catch( Exception e ) {}; + JBossServerView.getDefault().refreshAll(); return retval; } @@ -242,35 +236,10 @@ item.setData(ENABLED, new Boolean(b.getSelection())); } }); - -// TableEditor editor2 = new TableEditor(table); -// -// final Spinner s = new Spinner(table, SWT.NONE); -// s.setMaximum(50); -// s.setMinimum(0); -// s.setIncrement(1); -// s.setSelection(providers[i].getWeight()); -// Point size2 = s.computeSize(SWT.DEFAULT, SWT.DEFAULT); -// editor2.minimumWidth = size2.x; -// minWidth = Math.max(size2.x, minWidth); -// editor2.minimumHeight = size2.y; -// editor2.horizontalAlignment = SWT.RIGHT; -// editor2.verticalAlignment = SWT.CENTER; -// editor2.setEditor(s, item , 2); -// -// s.addModifyListener(new ModifyListener() { -// public void modifyText(ModifyEvent e) { -// item.setData(WEIGHT, new Integer(s.getSelection())); -// } -// }); - - } column0.pack(); column1.pack(); column1.setWidth(column1.getWidth() + minWidth); -// column2.pack(); -// column2.setWidth(column2.getWidth() + minWidth); column3.pack(); column3.setWidth(column3.getWidth() + minWidth); @@ -439,11 +408,7 @@ Button enabled = new Button(this, SWT.CHECK); enabled.setText(Messages.ViewPreferencePageEnabled); enabled.setSelection(provider.isEnabled()); - - - } - } public void init(IWorkbench workbench) { Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java (from rev 2202, trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -0,0 +1,437 @@ +package org.jboss.ide.eclipse.as.ui.views.server; + +import java.util.ArrayList; +import java.util.Properties; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.part.PageBook; +import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerLifecycleListener; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.ui.ServerUICore; +import org.jboss.ide.eclipse.as.core.server.JBossServer; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.ISimplePropertiesHolder; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.SimplePropertiesPropertySheetPage; + +public class ExtensionTableViewer extends TreeViewer { + + protected TableViewerPropertySheet propertySheet; + protected Action disableCategoryAction, refreshAction, refreshFullAction; + protected boolean suppressingRefresh = false; + public ExtensionTableViewer(Tree tree) { + super(tree); + setContentProvider(new ContentProviderDelegator()); + setLabelProvider(new LabelProviderDelegator()); + propertySheet = new TableViewerPropertySheet(); + createActions(); + ServerCore.addServerLifecycleListener(new IServerLifecycleListener() { + + public void serverAdded(IServer server) { + } + + public void serverChanged(IServer server) { + } + + public void serverRemoved(IServer server) { + final IServer server2 = server; + Display.getDefault().asyncExec(new Runnable() { + public void run() { + Object o = getInput(); + if( server2.equals(o)) { + setInput(null); + } + } + }); + } + }); + } + + protected void createActions() { + disableCategoryAction = new Action() { + public void run() { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + Object selected = getSelectedElement(); + if( selected instanceof ServerViewProvider) { + ((ServerViewProvider)selected).setEnabled(false); + refresh(); + } + } + } ); + } + }; + disableCategoryAction.setText(Messages.DisableCategoryAction); + refreshAction = new Action() { + public void run() { + Object el = getSelectedElement(); + if( el instanceof ServerViewProvider ) + refresh(el); + else + refresh(((IStructuredSelection)getSelection()).getFirstElement()); + } + }; + refreshAction.setText("Refresh Item"); + + refreshFullAction = new Action() { + public void run() { + refresh(null); + } + }; + refreshFullAction.setText("Refresh Full Tree"); + } + + public static class ContentWrapper { + private Object o; + private ServerViewProvider provider; + + public ContentWrapper(Object o, ServerViewProvider provider) { + this.o = o; + this.provider = provider; + } + + public Object getElement() { + return o; + } + + public ServerViewProvider getProvider() { + return provider; + } + + public boolean equals(Object other) { + if( other == null ) return false; + + if( other instanceof ContentWrapper ) { + if( ((ContentWrapper)other).getElement() == null ) + return o == null; + return ((ContentWrapper)other).getElement().equals(o); + } + return false; + } + + public int hashCode() { + if( o == null ) return super.hashCode(); + return o.hashCode(); + } + } + + protected class LabelProviderDelegator extends LabelProvider { + public String getText(Object obj) { + if( obj instanceof JBossServer) { + JBossServer server = (JBossServer)obj; + String ret = server.getServer().getName(); + return ret; + } + if( obj instanceof ServerViewProvider) { + return ((ServerViewProvider)obj).getName(); + } + + if( obj instanceof ContentWrapper ) { + ContentWrapper wrapper = (ContentWrapper)obj; + return wrapper.getProvider().getDelegate().getLabelProvider().getText(wrapper.getElement()); + } + return obj.toString(); + } + public Image getImage(Object obj) { + if( obj instanceof JBossServer ) { + return ServerUICore.getLabelProvider().getImage(((JBossServer)obj).getServer()); + } + if( obj instanceof ServerViewProvider ) { + return ((ServerViewProvider)obj).getImage(); + } + + if( obj instanceof ContentWrapper ) { + Object object2 = ((ContentWrapper)obj).getElement(); + return ((ContentWrapper)obj).getProvider().getDelegate().getLabelProvider().getImage(object2); + } + + return null; + } + } + protected class ContentProviderDelegator implements ITreeContentProvider { + + public ContentProviderDelegator() { + } + + public ContentWrapper[] wrap( Object[] elements, ServerViewProvider provider ) { + if( elements == null ) return new ContentWrapper[0]; + + ContentWrapper[] wrappers = new ContentWrapper[elements.length]; + for( int i = 0; i < wrappers.length; i++ ) { + wrappers[i] = new ContentWrapper(elements[i], provider); + } + return wrappers; + } + + public Object[] getElements(Object inputElement) { + if( inputElement == null ) return new Object[0]; + IServer tmp = (IServer)getInput(); + if( tmp == null ) + return new Object[0]; + return JBossServerUIPlugin.getDefault().getEnabledViewProviders(tmp); + } + + public Object[] getChildren(Object parentElement) { + try { + if( parentElement == null ) return new Object[0]; + + if( parentElement instanceof ServerViewProvider) { + Object[] ret = ((ServerViewProvider)parentElement).getDelegate().getContentProvider().getChildren(parentElement); + return wrap(ret, ((ServerViewProvider)parentElement)); + } + + if( parentElement instanceof ContentWrapper ) { + ContentWrapper parentWrapper = (ContentWrapper)parentElement; + Object[] o = null; + try { + o = parentWrapper.getProvider().getDelegate().getContentProvider().getChildren(parentWrapper.getElement()); + } catch( Exception e) { + } + if( o == null ) + return new Object[0]; + return wrap(o, parentWrapper.getProvider()); + } + } catch( Exception e ) { e.printStackTrace(); } + return new Object[0]; + } + + public Object getParent(Object element) { + return null; + } + + public boolean hasChildren(Object element) { + return getChildren(element).length > 0 ? true : false; + } + + public void dispose() { + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + ServerViewProvider[] providers = JBossServerUIPlugin.getDefault(). + getEnabledViewProviders(newInput instanceof IServer ? (IServer)newInput : null); + for( int i = 0; i < providers.length; i++ ) { + try { + providers[i].getDelegate().getContentProvider().inputChanged(viewer, oldInput, newInput); + } catch( Exception e) { + e.printStackTrace(); + } + } + } + + } + + public Object getRawElement(Object o) { + if( o instanceof ContentWrapper ) + return ((ContentWrapper)o).getElement(); + return o; + } + + public ServerViewProvider getParentViewProvider(Object o) { + if( o instanceof ContentWrapper ) + return ((ContentWrapper)o).getProvider(); + return null; + } + + public Object getSelectedElement() { + ISelection sel = getSelection(); + if( sel instanceof IStructuredSelection ) { + Object o = ((IStructuredSelection)sel).getFirstElement(); + if( o != null && o instanceof ContentWrapper ) { + o = ((ContentWrapper)o).getElement(); + } + return o; + } + return null; + } + + protected void fillSelectedContextMenu(Shell shell, IMenuManager mgr) { + ISelection sel = getSelection(); + if( sel instanceof IStructuredSelection ) { + Object selected = ((IStructuredSelection)sel).getFirstElement(); + if( selected != null ) { + ServerViewProvider provider; + if( selected instanceof ServerViewProvider ) { + provider = (ServerViewProvider)selected; + } else { + provider = getParentViewProvider(selected); + } + if( provider != null ) + provider.getDelegate().fillContextMenu(shell, mgr, getRawElement(selected)); + } + } + + } + + + protected void fillJBContextMenu(Shell shell, IMenuManager menu) { + Object selected = getSelectedElement(); + menu.add(refreshAction); + menu.add(refreshFullAction); + if( selected instanceof ServerViewProvider ) { + menu.add(disableCategoryAction); + } + menu.add(new Separator()); + } + + + + public IPropertySheetPage getPropertySheet() { + return propertySheet; + } + + public class TableViewerPropertySheet implements IPropertySheetPage { + + private PageBook book; + private ArrayList addedControls = new ArrayList(); + private SimplePropertiesPropertySheetPage topLevelPropertiesPage; + + public void createControl(Composite parent) { + topLevelPropertiesPage = PropertySheetFactory.createSimplePropertiesSheet(new TopLevelProperties()); + book = new PageBook(parent, SWT.NONE); + addedControls.clear(); + topLevelPropertiesPage.createControl(book); + book.showPage(topLevelPropertiesPage.getControl()); + } + + public void dispose() { + } + + public Control getControl() { + return book; + } + + public void setActionBars(IActionBars actionBars) { + } + + public void setFocus() { + } + + public void selectionChanged(IWorkbenchPart part, ISelection sel) { + Object selected = getSelectedObject(sel); + if( selected != null ) { + + IPropertySheetPage page = null; + if( selected instanceof ContentWrapper ) { + page = getDelegatePage((ContentWrapper)selected); + } + + if( page == null ) { + page = topLevelPropertiesPage; + } + page.selectionChanged(part, sel); + book.showPage(page.getControl()); + } + } + private IPropertySheetPage getDelegatePage(ContentWrapper wrapper) { + ServerViewProvider provider = wrapper.getProvider(); + IPropertySheetPage returnSheet = null; + returnSheet = provider.getDelegate().getPropertySheetPage(); + if( !addedControls.contains(provider) && returnSheet != null) { + returnSheet.createControl(book); + addedControls.add(provider); + } + return returnSheet; + } + + public Object getSelectedObject(ISelection sel) { + if( sel instanceof IStructuredSelection ) { + IStructuredSelection selection = (IStructuredSelection)sel; + Object selected = selection.getFirstElement(); + return selected; + } + return null; + } + + } + /** + * Properties for the top level elements + * (a server or a category / extension point + * @author rstryker + * + */ + class TopLevelProperties implements ISimplePropertiesHolder { + public Properties getProperties(Object selected) { + Properties ret = new Properties(); + if( selected instanceof ServerViewProvider ) { + ServerViewProvider provider = (ServerViewProvider)selected; + ret.setProperty(Messages.ExtensionID, provider.getId()); + ret.setProperty(Messages.ExtensionName, provider.getName()); + ret.setProperty(Messages.ExtensionDescription, provider.getDescription()); + ret.setProperty(Messages.ExtensionProviderClass, provider.getDelegateName()); + } + return ret; + } + + + public String[] getPropertyKeys(Object selected) { + if( selected instanceof ServerViewProvider) { + return new String[] { + Messages.ExtensionName, Messages.ExtensionDescription, + Messages.ExtensionID, Messages.ExtensionProviderClass + }; + + } + if( selected instanceof JBossServer ) { + return new String[] { + Messages.ServerRuntimeVersion, Messages.ServerHome, + Messages.ServerConfigurationName, Messages.ServerDeployDir, + }; + } + return new String[] {}; + } + } + + public void dispose() { + // The Loner + propertySheet.dispose(); + + ServerViewProvider[] providers = JBossServerUIPlugin.getDefault().getAllServerViewProviders(); + for( int i = 0; i < providers.length; i++ ) { + providers[i].dispose(); + } + } + + + public void suppressingRefresh(Runnable runnable) { + boolean currentVal = suppressingRefresh; + suppressingRefresh = true; + runnable.run(); + suppressingRefresh = currentVal; + } + + public void refresh() { + refresh(null); + } + public void refresh(final Object element) { + if(!suppressingRefresh) { + try { + super.refresh(element); + } catch( Exception e ) { + e.printStackTrace(); + } + } + } + + +} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -1,437 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server; - -import java.util.ArrayList; -import java.util.Properties; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.Separator; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.part.PageBook; -import org.eclipse.ui.views.properties.IPropertySheetPage; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerLifecycleListener; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.ui.ServerUICore; -import org.jboss.ide.eclipse.as.core.server.JBossServer; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.Messages; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.ISimplePropertiesHolder; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.SimplePropertiesPropertySheetPage; - -public class JBossServerTableViewer extends TreeViewer { - - protected TableViewerPropertySheet propertySheet; - protected Action disableCategoryAction, refreshAction, refreshFullAction; - protected boolean suppressingRefresh = false; - public JBossServerTableViewer(Tree tree) { - super(tree); - setContentProvider(new ContentProviderDelegator()); - setLabelProvider(new LabelProviderDelegator()); - propertySheet = new TableViewerPropertySheet(); - createActions(); - ServerCore.addServerLifecycleListener(new IServerLifecycleListener() { - - public void serverAdded(IServer server) { - } - - public void serverChanged(IServer server) { - } - - public void serverRemoved(IServer server) { - final IServer server2 = server; - Display.getDefault().asyncExec(new Runnable() { - public void run() { - Object o = getInput(); - if( server2.equals(o)) { - setInput(null); - } - } - }); - } - }); - } - - protected void createActions() { - disableCategoryAction = new Action() { - public void run() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - Object selected = getSelectedElement(); - if( selected instanceof ServerViewProvider) { - ((ServerViewProvider)selected).setEnabled(false); - refresh(); - } - } - } ); - } - }; - disableCategoryAction.setText(Messages.DisableCategoryAction); - refreshAction = new Action() { - public void run() { - Object el = getSelectedElement(); - if( el instanceof ServerViewProvider ) - refresh(el); - else - refresh(((IStructuredSelection)getSelection()).getFirstElement()); - } - }; - refreshAction.setText("Refresh Item"); - - refreshFullAction = new Action() { - public void run() { - refresh(null); - } - }; - refreshFullAction.setText("Refresh Full Tree"); - } - - public static class ContentWrapper { - private Object o; - private ServerViewProvider provider; - - public ContentWrapper(Object o, ServerViewProvider provider) { - this.o = o; - this.provider = provider; - } - - public Object getElement() { - return o; - } - - public ServerViewProvider getProvider() { - return provider; - } - - public boolean equals(Object other) { - if( other == null ) return false; - - if( other instanceof ContentWrapper ) { - if( ((ContentWrapper)other).getElement() == null ) - return o == null; - return ((ContentWrapper)other).getElement().equals(o); - } - return false; - } - - public int hashCode() { - if( o == null ) return super.hashCode(); - return o.hashCode(); - } - } - - protected class LabelProviderDelegator extends LabelProvider { - public String getText(Object obj) { - if( obj instanceof JBossServer) { - JBossServer server = (JBossServer)obj; - String ret = server.getServer().getName(); - return ret; - } - if( obj instanceof ServerViewProvider) { - return ((ServerViewProvider)obj).getName(); - } - - if( obj instanceof ContentWrapper ) { - ContentWrapper wrapper = (ContentWrapper)obj; - return wrapper.getProvider().getDelegate().getLabelProvider().getText(wrapper.getElement()); - } - return obj.toString(); - } - public Image getImage(Object obj) { - if( obj instanceof JBossServer ) { - return ServerUICore.getLabelProvider().getImage(((JBossServer)obj).getServer()); - } - if( obj instanceof ServerViewProvider ) { - return ((ServerViewProvider)obj).getImage(); - } - - if( obj instanceof ContentWrapper ) { - Object object2 = ((ContentWrapper)obj).getElement(); - return ((ContentWrapper)obj).getProvider().getDelegate().getLabelProvider().getImage(object2); - } - - return null; - } - } - protected class ContentProviderDelegator implements ITreeContentProvider { - - public ContentProviderDelegator() { - } - - public ContentWrapper[] wrap( Object[] elements, ServerViewProvider provider ) { - if( elements == null ) return new ContentWrapper[0]; - - ContentWrapper[] wrappers = new ContentWrapper[elements.length]; - for( int i = 0; i < wrappers.length; i++ ) { - wrappers[i] = new ContentWrapper(elements[i], provider); - } - return wrappers; - } - - public Object[] getElements(Object inputElement) { - if( inputElement == null ) return new Object[0]; - IServer tmp = (IServer)getInput(); - if( tmp == null ) - return new Object[0]; - return JBossServerUIPlugin.getDefault().getEnabledViewProviders(tmp); - } - - public Object[] getChildren(Object parentElement) { - try { - if( parentElement == null ) return new Object[0]; - - if( parentElement instanceof ServerViewProvider) { - Object[] ret = ((ServerViewProvider)parentElement).getDelegate().getContentProvider().getChildren(parentElement); - return wrap(ret, ((ServerViewProvider)parentElement)); - } - - if( parentElement instanceof ContentWrapper ) { - ContentWrapper parentWrapper = (ContentWrapper)parentElement; - Object[] o = null; - try { - o = parentWrapper.getProvider().getDelegate().getContentProvider().getChildren(parentWrapper.getElement()); - } catch( Exception e) { - } - if( o == null ) - return new Object[0]; - return wrap(o, parentWrapper.getProvider()); - } - } catch( Exception e ) { e.printStackTrace(); } - return new Object[0]; - } - - public Object getParent(Object element) { - return null; - } - - public boolean hasChildren(Object element) { - return getChildren(element).length > 0 ? true : false; - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - ServerViewProvider[] providers = JBossServerUIPlugin.getDefault(). - getEnabledViewProviders(newInput instanceof IServer ? (IServer)newInput : null); - for( int i = 0; i < providers.length; i++ ) { - try { - providers[i].getDelegate().getContentProvider().inputChanged(viewer, oldInput, newInput); - } catch( Exception e) { - e.printStackTrace(); - } - } - } - - } - - public Object getRawElement(Object o) { - if( o instanceof ContentWrapper ) - return ((ContentWrapper)o).getElement(); - return o; - } - - public ServerViewProvider getParentViewProvider(Object o) { - if( o instanceof ContentWrapper ) - return ((ContentWrapper)o).getProvider(); - return null; - } - - public Object getSelectedElement() { - ISelection sel = getSelection(); - if( sel instanceof IStructuredSelection ) { - Object o = ((IStructuredSelection)sel).getFirstElement(); - if( o != null && o instanceof ContentWrapper ) { - o = ((ContentWrapper)o).getElement(); - } - return o; - } - return null; - } - - protected void fillSelectedContextMenu(Shell shell, IMenuManager mgr) { - ISelection sel = getSelection(); - if( sel instanceof IStructuredSelection ) { - Object selected = ((IStructuredSelection)sel).getFirstElement(); - if( selected != null ) { - ServerViewProvider provider; - if( selected instanceof ServerViewProvider ) { - provider = (ServerViewProvider)selected; - } else { - provider = getParentViewProvider(selected); - } - if( provider != null ) - provider.getDelegate().fillContextMenu(shell, mgr, getRawElement(selected)); - } - } - - } - - - protected void fillJBContextMenu(Shell shell, IMenuManager menu) { - Object selected = getSelectedElement(); - menu.add(refreshAction); - menu.add(refreshFullAction); - if( selected instanceof ServerViewProvider ) { - menu.add(disableCategoryAction); - } - menu.add(new Separator()); - } - - - - public IPropertySheetPage getPropertySheet() { - return propertySheet; - } - - public class TableViewerPropertySheet implements IPropertySheetPage { - - private PageBook book; - private ArrayList addedControls = new ArrayList(); - private SimplePropertiesPropertySheetPage topLevelPropertiesPage; - - public void createControl(Composite parent) { - topLevelPropertiesPage = PropertySheetFactory.createSimplePropertiesSheet(new TopLevelProperties()); - book = new PageBook(parent, SWT.NONE); - addedControls.clear(); - topLevelPropertiesPage.createControl(book); - book.showPage(topLevelPropertiesPage.getControl()); - } - - public void dispose() { - } - - public Control getControl() { - return book; - } - - public void setActionBars(IActionBars actionBars) { - } - - public void setFocus() { - } - - public void selectionChanged(IWorkbenchPart part, ISelection sel) { - Object selected = getSelectedObject(sel); - if( selected != null ) { - - IPropertySheetPage page = null; - if( selected instanceof ContentWrapper ) { - page = getDelegatePage((ContentWrapper)selected); - } - - if( page == null ) { - page = topLevelPropertiesPage; - } - page.selectionChanged(part, sel); - book.showPage(page.getControl()); - } - } - private IPropertySheetPage getDelegatePage(ContentWrapper wrapper) { - ServerViewProvider provider = wrapper.getProvider(); - IPropertySheetPage returnSheet = null; - returnSheet = provider.getDelegate().getPropertySheetPage(); - if( !addedControls.contains(provider) && returnSheet != null) { - returnSheet.createControl(book); - addedControls.add(provider); - } - return returnSheet; - } - - public Object getSelectedObject(ISelection sel) { - if( sel instanceof IStructuredSelection ) { - IStructuredSelection selection = (IStructuredSelection)sel; - Object selected = selection.getFirstElement(); - return selected; - } - return null; - } - - } - /** - * Properties for the top level elements - * (a server or a category / extension point - * @author rstryker - * - */ - class TopLevelProperties implements ISimplePropertiesHolder { - public Properties getProperties(Object selected) { - Properties ret = new Properties(); - if( selected instanceof ServerViewProvider ) { - ServerViewProvider provider = (ServerViewProvider)selected; - ret.setProperty(Messages.ExtensionID, provider.getId()); - ret.setProperty(Messages.ExtensionName, provider.getName()); - ret.setProperty(Messages.ExtensionDescription, provider.getDescription()); - ret.setProperty(Messages.ExtensionProviderClass, provider.getDelegateName()); - } - return ret; - } - - - public String[] getPropertyKeys(Object selected) { - if( selected instanceof ServerViewProvider) { - return new String[] { - Messages.ExtensionName, Messages.ExtensionDescription, - Messages.ExtensionID, Messages.ExtensionProviderClass - }; - - } - if( selected instanceof JBossServer ) { - return new String[] { - Messages.ServerRuntimeVersion, Messages.ServerHome, - Messages.ServerConfigurationName, Messages.ServerDeployDir, - }; - } - return new String[] {}; - } - } - - public void dispose() { - // The Loner - propertySheet.dispose(); - - ServerViewProvider[] providers = JBossServerUIPlugin.getDefault().getAllServerViewProviders(); - for( int i = 0; i < providers.length; i++ ) { - providers[i].dispose(); - } - } - - - public void suppressingRefresh(Runnable runnable) { - boolean currentVal = suppressingRefresh; - suppressingRefresh = true; - runnable.run(); - suppressingRefresh = currentVal; - } - - public void refresh() { - refresh(null); - } - public void refresh(final Object element) { - if(!suppressingRefresh) { - try { - super.refresh(element); - } catch( Exception e ) { - e.printStackTrace(); - } - } - } - - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -1,274 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.ui.DebugUITools; -import org.eclipse.jface.action.Action; -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.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.SashForm; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.views.properties.IPropertySheetPage; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.internal.Server; -import org.eclipse.wst.server.core.internal.Trace; -import org.eclipse.wst.server.ui.internal.ServerUIPlugin; -import org.eclipse.wst.server.ui.internal.view.servers.DeleteAction; -import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; -import org.jboss.ide.eclipse.as.core.server.JBossServer; -import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; -import org.jboss.ide.eclipse.as.ui.Messages; -import org.jboss.ide.eclipse.as.ui.dialogs.TwiddleDialog; - -public class JBossServerView extends StrippedServerView { - - private static final String TAG_SASHFORM_HEIGHT = "sashformHeight"; - - protected int[] sashRows; // For the sashform sashRows - - protected SashForm form; - - protected JBossServerTableViewer jbViewer; - protected Tree jbTreeTable; - - - protected Action editLaunchConfigAction, twiddleAction, cloneServerAction; - - public static JBossServerView instance; - public static JBossServerView getDefault() { - return instance; - } - - - public JBossServerView() { - super(); - instance = this; - } - - public JBossServerTableViewer getJBViewer() { - return jbViewer; - } - - public void createPartControl(Composite parent) { - - form = new SashForm(parent, SWT.VERTICAL); - form.setBackground(new Color(parent.getDisplay(), 255, 255, 255)); - - form.setLayout(new FillLayout()); - - addServerViewer(form); - addSecondViewer(form); - form.setWeights(sashRows); - createActions(); - addListeners(); - doMenuStuff(parent); - } - - private void addServerViewer(Composite form) { - Composite child1 = new Composite(form,SWT.NONE); - child1.setLayout(new GridLayout()); - super.createPartControl(child1); - } - - private void addSecondViewer(Composite form) { - Composite child2 = new Composite(form,SWT.NONE); - child2.setLayout(new FillLayout()); - jbTreeTable = new Tree(child2, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - jbViewer = new JBossServerTableViewer(jbTreeTable); - getSite().setSelectionProvider(jbViewer); - } - - - public void createActions() { - editLaunchConfigAction = new Action() { - public void run() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - try { - final Object selected = getSelectedServer(); - IServer s = null; - if( selected instanceof JBossServer ) { - s = ((JBossServer)selected).getServer(); - } else if( selected instanceof IServer ) { - s = (IServer)selected; - } - - if( s != null ) { - ILaunchConfiguration launchConfig = ((Server) s).getLaunchConfiguration(true, null); - // TODO: use correct launch group - DebugUITools.openLaunchConfigurationPropertiesDialog(new Shell(), launchConfig, "org.eclipse.debug.ui.launchGroup.run"); - } - } catch (CoreException ce) { - Trace.trace(Trace.SEVERE, "Could not create launch configuration", ce); - } - - } - }); - } - }; - editLaunchConfigAction.setText(Messages.EditLaunchConfigurationAction); - editLaunchConfigAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.IMG_JBOSS_CONFIGURATION)); - - twiddleAction = new Action() { - public void run() { - final IStructuredSelection selected = ((IStructuredSelection)tableViewer.getSelection()); - Display.getDefault().asyncExec(new Runnable() { - public void run() { - TwiddleDialog dialog = new TwiddleDialog(tableViewer.getTree().getShell(), selected.getFirstElement()); - dialog.open(); - } - } ); - - } - }; - twiddleAction.setText(Messages.TwiddleServerAction); - twiddleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.TWIDDLE_IMAGE)); - - } - - - // for superclass, for the top viewer - protected void fillContextMenu(Shell shell, IMenuManager menu) { - menu.add(newServerAction); - menu.add(new Separator()); - if( getSelectedServer() != null ) { - menu.add(new DeleteAction(new Shell(), getSelectedServer())); - menu.add(new Separator()); - } - menu.add(actions[1]); - menu.add(actions[0]); - menu.add(actions[3]); - menu.add(actions[4]); - menu.add(actions[5]); - menu.add(new Separator()); - menu.add(twiddleAction); - menu.add(editLaunchConfigAction); - //menu.add(actions[6]); - menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - - if( getSelectedServer() != null ) { - boolean twiddleEnabled = getSelectedServer().getServerState() == IServer.STATE_STARTED - && ServerConverter.getJBossServer(getSelectedServer()) != null; - boolean editLaunchEnabled = (JBossServerBehavior)getSelectedServer().loadAdapter(JBossServerBehavior.class, new NullProgressMonitor()) != null; - twiddleAction.setEnabled(twiddleEnabled); - editLaunchConfigAction.setEnabled(true); - } else { - twiddleAction.setEnabled(false); - editLaunchConfigAction.setEnabled(false); - } - } - - - - public IServer getSelectedServer() { - return (IServer)jbViewer.getInput(); - } - - public void addListeners() { - - /* - * Handles the selection of the server viewer which is embedded in my sashform - */ - - tableViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - Object selection = ((TreeSelection)event.getSelection()).getFirstElement(); - Object server = selection; - if( selection instanceof ModuleServer ) { - server = ((ModuleServer)selection).server; - } - - if( selection == null ) return; - if( server != jbViewer.getInput()) { - jbViewer.setInput(server); - } else { - jbViewer.refresh(); -// Object[] expanded = jbViewer.getExpandedElements(); -// jbViewer.setInput(server); -// jbViewer.setExpandedElements(expanded); - } - } - - }); - } - protected void doMenuStuff(Composite parent) { - MenuManager menuManager = new MenuManager("#PopupMenu"); - menuManager.setRemoveAllWhenShown(true); - final Shell shell = jbTreeTable.getShell(); - menuManager.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { - jbViewer.fillSelectedContextMenu(shell, mgr); - mgr.add(new Separator()); - jbViewer.fillJBContextMenu(shell, mgr); - } - }); - Menu menu = menuManager.createContextMenu(parent); - jbTreeTable.setMenu(menu); - } - - /** - * Save / Load some state (width / height of boxes) - */ - public void init(IViewSite site, IMemento memento) throws PartInitException { - super.init(site, memento); - ServerUIPlugin.getPreferences().setShowOnActivity(false); - int sum = 0; - sashRows = new int[2]; - for (int i = 0; i < sashRows.length; i++) { - sashRows[i] = 50; - if (memento != null) { - Integer in = memento.getInteger(TAG_SASHFORM_HEIGHT + i); - if (in != null && in.intValue() > 5) - sashRows[i] = in.intValue(); - } - sum += sashRows[i]; - } - } - - public void saveState(IMemento memento) { - super.saveState(memento); - int[] weights = form.getWeights(); - for (int i = 0; i < weights.length; i++) { - if (weights[i] != 0) - memento.putInteger(TAG_SASHFORM_HEIGHT + i, weights[i]); - } - } - - - - public Object getAdapter(Class adaptor) { - if( adaptor == IPropertySheetPage.class) { - return jbViewer.getPropertySheet(); - } - return super.getAdapter(adaptor); - } - - public void dispose() { - super.dispose(); - jbViewer.dispose(); - } - - - -} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerExtensionFrame.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerExtensionFrame.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerExtensionFrame.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -0,0 +1,91 @@ +package org.jboss.ide.eclipse.as.ui.views.server; + +import org.eclipse.jface.action.IAction; +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.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; +import org.jboss.ide.eclipse.as.ui.views.server.JBossServerView.IServerViewFrame; + +public class ServerExtensionFrame extends Composite implements IServerViewFrame { + + private Tree jbTreeTable; + private ExtensionTableViewer jbViewer; + private JBossServerView view; + public ServerExtensionFrame(Composite parent, JBossServerView view) { + super(parent, SWT.NONE); + this.view = view; + setLayout(new FillLayout()); + jbTreeTable = new Tree(this, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + jbViewer = new ExtensionTableViewer(jbTreeTable); + view.getSite().setSelectionProvider(jbViewer); + addListeners(); + doMenuStuff(parent); + } + + protected void doMenuStuff(Composite parent) { + MenuManager menuManager = new MenuManager("#PopupMenu"); + menuManager.setRemoveAllWhenShown(true); + final Shell shell = jbTreeTable.getShell(); + menuManager.addMenuListener(new IMenuListener() { + public void menuAboutToShow(IMenuManager mgr) { + jbViewer.fillSelectedContextMenu(shell, mgr); + mgr.add(new Separator()); + jbViewer.fillJBContextMenu(shell, mgr); + } + }); + Menu menu = menuManager.createContextMenu(parent); + jbTreeTable.setMenu(menu); + } + + public ExtensionTableViewer getViewer() { + return jbViewer; + } + + public void refresh() { + jbViewer.refresh(); + } + + public void addListeners() { + + /* + * Handles the selection of the server viewer which is embedded in my sashform + */ + view.getServerFrame().getViewer().addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + Object selection = ((TreeSelection)event.getSelection()).getFirstElement(); + Object server = selection; + if( selection instanceof ModuleServer ) { + server = ((ModuleServer)selection).server; + } + + if( selection == null ) return; + if( server != jbViewer.getInput()) { + jbViewer.setInput(server); + } else { + jbViewer.refresh(); + } + } + + }); + } + + + public IAction[] getActionBarActions() { + return new IAction[] {}; // none + } + + public int getDefaultSize() { + return 0; + } + } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -0,0 +1,232 @@ +package org.jboss.ide.eclipse.as.ui.views.server; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.ui.DebugUITools; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +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.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeColumn; +import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.internal.Server; +import org.eclipse.wst.server.core.internal.Trace; +import org.eclipse.wst.server.ui.internal.ContextIds; +import org.eclipse.wst.server.ui.internal.Messages; +import org.eclipse.wst.server.ui.internal.ServerUIPlugin; +import org.eclipse.wst.server.ui.internal.actions.NewServerWizardAction; +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.StartAction; +import org.eclipse.wst.server.ui.internal.view.servers.StopAction; +import org.jboss.ide.eclipse.as.core.server.JBossServer; +import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; +import org.jboss.ide.eclipse.as.ui.dialogs.TwiddleDialog; +import org.jboss.ide.eclipse.as.ui.views.server.JBossServerView.IServerViewFrame; + +public class ServerFrame extends Composite implements IServerViewFrame { + + protected Action[] actions; + protected IWorkbenchPartSite site; + protected IViewSite viewSite; + protected Tree treeTable; + protected ServerTableViewer tableViewer; + protected Action editLaunchConfigAction; + protected Action twiddleAction; + protected Action newServerAction; + + public ServerFrame(Composite parent, JBossServerView view) { + super(parent, SWT.BORDER); + setLayout(new FillLayout()); + this.site = view.getSite(); + this.viewSite = view.getViewSite(); + + + int cols[] = new int[] {150, 30}; + + treeTable = new Tree(this, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.NONE); + treeTable.setHeaderVisible(true); + treeTable.setLinesVisible(false); + treeTable.setFont(parent.getFont()); + PlatformUI.getWorkbench().getHelpSystem().setHelp(treeTable, ContextIds.VIEW_SERVERS); + + // add columns + TreeColumn column = new TreeColumn(treeTable, SWT.SINGLE); + column.setText(Messages.viewServer); + column.setWidth(cols[0]); + + TreeColumn column2 = new TreeColumn(treeTable, SWT.SINGLE); + column2.setText(Messages.viewStatus); + column2.setWidth(cols[1]); + + tableViewer = new ServerTableViewer(viewSite, treeTable); + initializeActions(tableViewer); + + treeTable.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + try { + } catch (Exception e) { + viewSite.getActionBars().getStatusLineManager().setMessage(null, ""); + } + } + public void widgetDefaultSelected(SelectionEvent event) { + try { + TreeItem item = treeTable.getSelection()[0]; + Object data = item.getData(); + if (!(data instanceof IServer)) + return; + IServer server = (IServer) data; + ServerUIPlugin.editServer(server); + } catch (Exception e) { + Trace.trace(Trace.SEVERE, "Could not open server", e); + } + } + }); + + MenuManager menuManager = new MenuManager("#PopupMenu"); + menuManager.setRemoveAllWhenShown(true); + final Shell shell = treeTable.getShell(); + menuManager.addMenuListener(new IMenuListener() { + public void menuAboutToShow(IMenuManager mgr) { + fillContextMenu(shell, mgr); + } + }); + Menu menu = menuManager.createContextMenu(parent); + treeTable.setMenu(menu); + site.registerContextMenu(menuManager, tableViewer); + site.setSelectionProvider(tableViewer); + } + + protected void fillContextMenu(Shell shell, IMenuManager menu) { + menu.add(newServerAction); + menu.add(new Separator()); + //menu.add(new DeleteAction(new Shell(), getSelectedServer())); + menu.add(new Separator()); + menu.add(actions[1]); + menu.add(actions[0]); + menu.add(actions[3]); + menu.add(actions[4]); + menu.add(actions[5]); + menu.add(new Separator()); + menu.add(twiddleAction); + menu.add(editLaunchConfigAction); + menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + twiddleAction.setEnabled(true); + editLaunchConfigAction.setEnabled(true); + } + + public IServer getSelectedServer() { + Object o = ((IStructuredSelection)tableViewer.getSelection()).getFirstElement(); + return (IServer)o; + } + + public void initializeActions(ISelectionProvider provider) { + Shell shell = site.getShell(); + + createActions(); + + actions = new Action[8]; + // 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); + actions[6] = editLaunchConfigAction; + actions[7] = twiddleAction; + } + + protected void createActions() { + newServerAction = new Action() { + public void run() { + IAction newServerAction = new NewServerWizardAction(); + newServerAction.run(); + } + }; + newServerAction.setText("New Server"); + newServerAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.GENERIC_SERVER_IMAGE)); + + editLaunchConfigAction = new Action() { + public void run() { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + try { + final Object selected = getSelectedServer(); + IServer s = null; + if( selected instanceof JBossServer ) { + s = ((JBossServer)selected).getServer(); + } else if( selected instanceof IServer ) { + s = (IServer)selected; + } + + if( s != null ) { + ILaunchConfiguration launchConfig = ((Server) s).getLaunchConfiguration(true, null); + // TODO: use correct launch group + DebugUITools.openLaunchConfigurationPropertiesDialog(new Shell(), launchConfig, "org.eclipse.debug.ui.launchGroup.run"); + } + } catch (CoreException ce) { + } + } + }); + } + }; + editLaunchConfigAction.setText(org.jboss.ide.eclipse.as.ui.Messages.EditLaunchConfigurationAction); + editLaunchConfigAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.IMG_JBOSS_CONFIGURATION)); + + twiddleAction = new Action() { + public void run() { + final IStructuredSelection selected = ((IStructuredSelection)tableViewer.getSelection()); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + TwiddleDialog dialog = new TwiddleDialog(tableViewer.getTree().getShell(), selected.getFirstElement()); + dialog.open(); + } + } ); + + } + }; + twiddleAction.setText( org.jboss.ide.eclipse.as.ui.Messages.TwiddleServerAction); + twiddleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.TWIDDLE_IMAGE)); + + } + + public ServerTableViewer getViewer() { + return tableViewer; + } + + public void refresh() { + tableViewer.refresh(); + } + + public IAction[] getActionBarActions() { + return new IAction[] { actions[0], actions[1], actions[2], actions[3], actions[4], actions[5] }; + } + + public int getDefaultSize() { + return 0; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IViewSite; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.wst.server.core.IPublishListener; import org.eclipse.wst.server.core.IServer; @@ -43,7 +44,6 @@ import org.eclipse.wst.server.ui.internal.view.servers.ServerAction; import org.eclipse.wst.server.ui.internal.view.servers.ServerActionHelper; import org.eclipse.wst.server.ui.internal.view.servers.ServerTableLabelProvider; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; /** * Tree view showing servers and their associations. * This is for the TOP window @@ -64,7 +64,7 @@ protected ServerTableLabelProvider2 labelProvider; //protected ISelectionListener dsListener; - protected StrippedServerView view; + protected IViewSite viewSite; protected class ServerTableLabelProvider2 extends ServerTableLabelProvider { private int myCount = 0; @@ -152,9 +152,9 @@ * @param view the view * @param tree the tree */ - public ServerTableViewer(final StrippedServerView view, final Tree tree) { + public ServerTableViewer(final IViewSite site, final Tree tree) { super(tree); - this.view = view; + this.viewSite = site; setContentProvider(new TrimmedServerContentProvider()); labelProvider = new ServerTableLabelProvider2(); @@ -179,7 +179,7 @@ addListeners(); - IActionBars actionBars = view.getViewSite().getActionBars(); + IActionBars actionBars = viewSite.getActionBars(); actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), new ServerAction(getControl().getShell(), this, "Delete it!", ServerActionHelper.ACTION_DELETE)); } @@ -352,7 +352,7 @@ String serverId = server.getId(); publishing.remove(serverId); - view.getViewSite().getActionBars().getStatusLineManager().setMessage(null, null); + viewSite.getActionBars().getStatusLineManager().setMessage(null, null); } protected void addServer(final IServer server) { Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -1,315 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server; - -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.debug.ui.IDebugView; -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.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.swt.widgets.TreeColumn; -import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.internal.Trace; -import org.eclipse.wst.server.ui.internal.ContextIds; -import org.eclipse.wst.server.ui.internal.Messages; -import org.eclipse.wst.server.ui.internal.ServerUIPlugin; -import org.eclipse.wst.server.ui.internal.actions.NewServerWizardAction; -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.StartAction; -import org.eclipse.wst.server.ui.internal.view.servers.StopAction; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; - -public class StrippedServerView extends ViewPart { - private static final String TAG_COLUMN_WIDTH = "columnWidth"; - - protected int[] cols; - - protected Tree treeTable; - protected ServerTableViewer tableViewer; - - // actions on a server - protected Action[] actions; - protected MenuManager restartMenu; - - protected Action newServerAction; - - /** - * ServersView constructor comment. - */ - public StrippedServerView() { - super(); - } - - /** - * createPartControl method comment. - * - * @param parent a parent composite - */ - public void createPartControl(Composite parent) { - treeTable = new Tree(parent, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.NONE); - treeTable.setHeaderVisible(true); - treeTable.setLinesVisible(false); - treeTable.setLayoutData(new GridData(GridData.FILL_BOTH)); - treeTable.setFont(parent.getFont()); - PlatformUI.getWorkbench().getHelpSystem().setHelp(treeTable, ContextIds.VIEW_SERVERS); - - // add columns - TreeColumn column = new TreeColumn(treeTable, SWT.SINGLE); - column.setText(Messages.viewServer); - column.setWidth(cols[0]); - - TreeColumn column2 = new TreeColumn(treeTable, SWT.SINGLE); - column2.setText(Messages.viewStatus); - column2.setWidth(cols[1]); - -// TreeColumn column3 = new TreeColumn(treeTable, SWT.SINGLE); -// column3.setText(Messages.viewSync); -// column3.setWidth(cols[2]); - - tableViewer = new ServerTableViewer(this, treeTable); - initializeActions(tableViewer); - - treeTable.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - try { - } catch (Exception e) { - getViewSite().getActionBars().getStatusLineManager().setMessage(null, ""); - } - } - public void widgetDefaultSelected(SelectionEvent event) { - try { - TreeItem item = treeTable.getSelection()[0]; - Object data = item.getData(); - if (!(data instanceof IServer)) - return; - IServer server = (IServer) data; - ServerUIPlugin.editServer(server); - } catch (Exception e) { - Trace.trace(Trace.SEVERE, "Could not open server", e); - } - } - }); - - MenuManager menuManager = new MenuManager("#PopupMenu"); - menuManager.setRemoveAllWhenShown(true); - final Shell shell = treeTable.getShell(); - menuManager.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { - fillContextMenu(shell, mgr); - } - }); - Menu menu = menuManager.createContextMenu(parent); - treeTable.setMenu(menu); - getSite().registerContextMenu(menuManager, tableViewer); - getSite().setSelectionProvider(tableViewer); - } - - public void init(IViewSite site, IMemento memento) throws PartInitException { - super.init(site, memento); - cols = new int[2]; - for (int i = 0; i < 2; i++) { - cols[i] = 100; - if (memento != null) { - Integer in = memento.getInteger(TAG_COLUMN_WIDTH + i); - if (in != null && in.intValue() > 5) - cols[i] = in.intValue(); - } - } - } - - public void saveState(IMemento memento) { - TreeColumn[] tc = treeTable.getColumns(); - for (int i = 0; i < 2; i++) { - int width = tc[i].getWidth(); - if (width != 0) - memento.putInteger(TAG_COLUMN_WIDTH + i, width); - } - } - - protected void selectServerProcess(Object process) { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ; - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IWorkbenchPart part = page.findView(IDebugUIConstants.ID_DEBUG_VIEW); - if (part != null) { - IDebugView view = (IDebugView)part.getAdapter(IDebugView.class); - if (view != null) { - Viewer viewer = view.getViewer(); - if (viewer != null) { - viewer.setSelection(new StructuredSelection(process)); - } - } - } - } - } - } - - /** - * Initialize actions - * - * @param provider a selection provider - */ - public void initializeActions(ISelectionProvider provider) { - Shell shell = getSite().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); - - // add toolbar buttons - IContributionManager cm = getViewSite().getActionBars().getToolBarManager(); - for (int i = 0; i < actions.length - 1; i++) - cm.add(actions[i]); - -// // create the debug action -// Action debugAction = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE); -// debugAction.setToolTipText(Messages.actionDebugToolTip); -// debugAction.setText(Messages.actionDebug); -// debugAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); -// debugAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); -// debugAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); -// -// // create the start action -// Action runAction = new StartAction(shell, provider, ILaunchManager.RUN_MODE); -// runAction.setToolTipText(Messages.actionStartToolTip); -// runAction.setText(Messages.actionStart); -// runAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); -// runAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); -// runAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); -// -// // create the profile action -// Action profileAction = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE); -// profileAction.setToolTipText(Messages.actionProfileToolTip); -// profileAction.setText(Messages.actionProfile); -// profileAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); -// profileAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); -// profileAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); -// -// // create the restart menu -// restartMenu = new MenuManager(Messages.actionRestart); -// -// Action restartAction = new RestartAction(shell, provider, ILaunchManager.DEBUG_MODE); -// restartAction.setToolTipText(Messages.actionDebugToolTip); -// restartAction.setText(Messages.actionDebug); -// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); -// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); -// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); -// restartMenu.add(restartAction); -// -// restartAction = new RestartAction(shell, provider, ILaunchManager.RUN_MODE); -// restartAction.setToolTipText(Messages.actionRestartToolTip); -// restartAction.setText(Messages.actionStart); -// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); -// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); -// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); -// restartMenu.add(restartAction); -// -// restartAction = new RestartAction(shell, provider, "restartProfile", ILaunchManager.PROFILE_MODE); -// restartAction.setToolTipText(Messages.actionRestartToolTip); -// restartAction.setText(Messages.actionProfile); -// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); -// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); -// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); -// restartMenu.add(restartAction); -// -// // create the restart action -// restartAction = new RestartAction(shell, provider, "restart"); -// restartAction.setToolTipText(Messages.actionRestartToolTip); -// restartAction.setText(Messages.actionRestart); -// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_RESTART)); -// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_RESTART)); -// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_RESTART)); -// -// // create the stop action -// Action stopAction = new StopAction(shell, provider, "stop"); -// stopAction.setToolTipText(Messages.actionStopToolTip); -// stopAction.setText(Messages.actionStop); -// stopAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_STOP)); -// stopAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_STOP)); -// stopAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_STOP)); -// -// // create the publish action -// Action publishAction = new PublishAction(shell, provider, "publish"); -// publishAction.setToolTipText(Messages.actionPublishToolTip); -// publishAction.setText(Messages.actionPublish); -// publishAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_PUBLISH)); -// publishAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_PUBLISH)); -// publishAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_PUBLISH)); -// -// // create the module slosh dialog action -// Action addModuleAction = new ModuleSloshAction(shell, provider, "modules"); -// addModuleAction.setToolTipText(Messages.actionModifyModulesToolTip); -// addModuleAction.setText(Messages.actionModifyModules); -// addModuleAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ETOOL_MODIFY_MODULES)); -// addModuleAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CTOOL_MODIFY_MODULES)); -// addModuleAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DTOOL_MODIFY_MODULES)); -// -// actions = new Action[7]; -// actions[0] = debugAction; -// actions[1] = runAction; -// actions[2] = profileAction; -// actions[3] = restartAction; -// actions[4] = stopAction; -// actions[5] = publishAction; -// actions[6] = addModuleAction; -// -// // add toolbar buttons -// IContributionManager cm = getViewSite().getActionBars().getToolBarManager(); -// for (int i = 0; i < actions.length - 1; i++) { -// cm.add(actions[i]); -// } - - newServerAction = new Action() { - public void run() { - IAction newServerAction = new NewServerWizardAction(); - newServerAction.run(); - } - }; - newServerAction.setText("New Server"); - newServerAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.GENERIC_SERVER_IMAGE)); - } - - protected void fillContextMenu(Shell shell, IMenuManager menu) { - } - - /** - * - */ - public void setFocus() { - if (treeTable != null) - treeTable.setFocus(); - } -} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/TwiddlePollerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/TwiddlePollerListener.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/TwiddlePollerListener.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -1,37 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerPollerTimeoutListener; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; - -public class TwiddlePollerListener implements IServerPollerTimeoutListener { - public static final String key = "org.jboss.ide.eclipse.as.ui.preferencepages.TwiddlePollerListener"; - public void serverTimedOut(IServer server, boolean expectedState) { - if( expectedState && firstEverTimeout()) { - IPreferenceStore store = JBossServerUIPlugin.getDefault().getPreferenceStore(); - store.setValue(key, 2); - - Display.getDefault().asyncExec(new Runnable() { - public void run() { - MessageBox box = new MessageBox(new Shell()); - box.setMessage("The Poller has timed out"); - box.setText("Twiddle Poller Timed Out"); - box.open(); - } - }); - } - } - - protected boolean firstEverTimeout() { - return true; -// IPreferenceStore store = JBossServerUIPlugin.getDefault().getPreferenceStore(); -// int val = store.getInt(key); -// if( val == 2 ) return false; -// return true; - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -14,7 +14,7 @@ import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer; import org.jboss.ide.eclipse.as.ui.preferencepages.ViewProviderPreferenceComposite; import org.jboss.ide.eclipse.as.ui.views.server.JBossServerView; -import org.jboss.ide.eclipse.as.ui.views.server.JBossServerTableViewer.ContentWrapper; +import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer.ContentWrapper; public abstract class JBossServerViewExtension { protected ServerViewProvider provider; @@ -72,7 +72,7 @@ } protected void suppressingRefresh(Runnable runnable) { - JBossServerView.getDefault().getJBViewer().suppressingRefresh(runnable); + JBossServerView.getDefault().getExtensionFrame().getViewer().suppressingRefresh(runnable); } protected void refreshViewer() { @@ -84,9 +84,9 @@ if( isEnabled() ) { try { if( o == null ) - JBossServerView.getDefault().getJBViewer().refresh(provider); + JBossServerView.getDefault().getServerFrame().getViewer().refresh(provider); else - JBossServerView.getDefault().getJBViewer().refresh(new ContentWrapper(o, provider)); + JBossServerView.getDefault().getServerFrame().getViewer().refresh(new ContentWrapper(o, provider)); } catch(Exception e) { } } @@ -98,10 +98,10 @@ r.run(); } protected void removeElement(Object o) { - JBossServerView.getDefault().getJBViewer().remove(new ContentWrapper(o, provider)); + JBossServerView.getDefault().getServerFrame().getViewer().remove(new ContentWrapper(o, provider)); } protected void addElement(Object parent, Object child) { - JBossServerView.getDefault().getJBViewer().add(new ContentWrapper(parent, provider), new ContentWrapper(child, provider)); + JBossServerView.getDefault().getServerFrame().getViewer().add(new ContentWrapper(parent, provider), new ContentWrapper(child, provider)); } // what servers should i show for? Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -26,8 +26,8 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.jboss.ide.eclipse.as.ui.Messages; -import org.jboss.ide.eclipse.as.ui.views.server.JBossServerTableViewer; -import org.jboss.ide.eclipse.as.ui.views.server.JBossServerTableViewer.ContentWrapper; +import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer; +import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer.ContentWrapper; public class PropertySheetFactory { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -102,7 +102,7 @@ import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathCategoryDialog; import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathDialog; import org.jboss.ide.eclipse.as.ui.preferencepages.ViewProviderPreferenceComposite; -import org.jboss.ide.eclipse.as.ui.views.server.JBossServerTableViewer.ContentWrapper; +import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer.ContentWrapper; import org.jboss.ide.eclipse.as.ui.views.server.extensions.JBossServerViewExtension; import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java 2007-07-05 17:43:10 UTC (rev 2332) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java 2007-07-05 18:03:51 UTC (rev 2333) @@ -116,10 +116,10 @@ if( selected instanceof ServerViewProvider) { ((ServerViewProvider)selected).setEnabled(true); ((ServerViewProvider)selected).getDelegate().getContentProvider(). - inputChanged(JBossServerView.getDefault().getJBViewer(), null, JBossServerView.getDefault().getSelectedServer()); + inputChanged(JBossServerView.getDefault().getServerFrame().getViewer(), null, JBossServerView.getDefault().getSelectedServer()); try { - JBossServerView.getDefault().getJBViewer().refresh(); + JBossServerView.getDefault().getServerFrame().getViewer().refresh(); } catch(Exception e) { } }