[jbosstools-commits] JBoss Tools SVN: r42876 - in branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui/xpl and 1 other directory.

Author: rob.stryker(a)jboss.com Date: 2012-08-07 06:43:18 -0400 (Tue, 07 Aug 2012) New Revision: 42876 Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java Log: JBIDE-11858 try 3 to maintenance Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 10:42:56 UTC (rev 42875) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 10:43:18 UTC (rev 42876) @@ -22,8 +22,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Composite; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip; /** * ServerContentTreeContentProvider @@ -92,13 +96,28 @@ loadElementJob.cancel(); pendingUpdates.clear(); } - + + private ServerToolTip tooltip = null; public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (viewer instanceof TreeViewer) { this.viewer = (TreeViewer) viewer; } else { viewer = null; } + if( tooltip != null ) + tooltip.deactivate(); + tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) { + protected boolean isMyType(Object selected) { + return selected instanceof ResourceNode; + } + protected void fillStyledText(Composite parent, StyledText sText, Object o) { + sText.setText("View JBoss-7 management details."); //$NON-NLS-1$ + } + }; + tooltip.setShift(new Point(15, 8)); + tooltip.setPopupDelay(500); // in ms + tooltip.setHideOnMouseDown(true); + tooltip.activate(); } public Object[] getElements(Object inputElement) { Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:42:56 UTC (rev 42875) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:43:18 UTC (rev 42876) @@ -12,8 +12,6 @@ import java.io.IOException; import java.io.StringReader; -import java.util.ArrayList; -import java.util.Hashtable; import java.util.Iterator; import org.eclipse.jface.internal.text.html.HTML2TextReader; @@ -40,14 +38,10 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.ui.IServerModule; -import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip; public abstract class ServerToolTip extends ToolTip { - protected Hashtable<String,ArrayList<IServerToolTip>> toolTipProviders = new Hashtable<String,ArrayList<IServerToolTip>>(); - protected static Shell CURRENT_TOOLTIP; + protected Shell FOCUSSED_TOOLTIP; + protected Object tooltipSelection; protected Label hintLabel; protected Tree tree; protected int x; @@ -64,39 +58,54 @@ y = e.y; } }); - - tree.addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent e) { - if (e == null) - return; - - if (e.keyCode == SWT.ESC) { - if (CURRENT_TOOLTIP != null) { - CURRENT_TOOLTIP.dispose(); - CURRENT_TOOLTIP = null; - } - activate(); + tree.addKeyListener( new CustomKeyListener(true, true)); + } + + // Created a key listener to add it to both the shell and the styledText of the focussed tooltip + private class CustomKeyListener implements KeyListener { + private boolean handleEscape, handlef6; + public CustomKeyListener( boolean handlesEscape, boolean handlesf6) { + this.handleEscape = handlesEscape; + this.handlef6 = handlesf6; + } + public void keyPressed(KeyEvent e) { + if (e == null) + return; + if( handleEscape ) + handleEscape(e); + if( handlef6) + handlef6(e); + } + protected void handleEscape(KeyEvent e) { + if (e.keyCode == SWT.ESC) { + if (FOCUSSED_TOOLTIP != null) { + FOCUSSED_TOOLTIP.dispose(); + FOCUSSED_TOOLTIP = null; + tooltipSelection = null; } - if (e.keyCode == SWT.F6) { - if (CURRENT_TOOLTIP == null) { - deactivate(); - hide(); - createFocusedTooltip(tree); - } + activate(); + } + } + protected void handlef6(KeyEvent e) { + if (e.keyCode == SWT.F6) { + // We have no focussed window, and we DO have a selection to show in focus + if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) { + deactivate(); + hide(); + createFocusedTooltip(tree); } } - public void keyReleased(KeyEvent e){ - // nothing to do - } - }); - } + } + public void keyReleased(KeyEvent e) { + } + }; public void createFocusedTooltip(final Control control) { final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL | SWT.NO_FOCUS); stickyTooltip.setLayout(new FillLayout()); stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); - + stickyTooltip.addKeyListener(new CustomKeyListener(true, false)); control.getDisplay().asyncExec(new Runnable() { public void run() { Event event = new Event(); @@ -116,7 +125,7 @@ // addListener(stickyTooltip); } }); - CURRENT_TOOLTIP = stickyTooltip; + FOCUSSED_TOOLTIP = stickyTooltip; } @Override @@ -130,20 +139,27 @@ return false; /* JBT: Added this check */ Object o = tree.getItem(new Point(event.x, event.y)); + boolean ret; if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData())) - return false; - return super.shouldCreateToolTip(event); + ret = false; + else + ret = super.shouldCreateToolTip(event); + if( !ret ) + tooltipSelection = null; + return ret; } /* * JBT: Added a method */ protected abstract boolean isMyType(Object selected); + protected abstract void fillStyledText(Composite parent, StyledText sText, Object o); protected Composite createToolTipContentArea(Event event, Composite parent) { Object o = tree.getItem(new Point(event.x, event.y)); if (o == null) return null; + tooltipSelection = o; FillLayout layout = (FillLayout)parent.getLayout(); layout.type = SWT.VERTICAL; @@ -154,10 +170,11 @@ StyledText sText = new StyledText(parent, SWT.NONE); sText.setEditable(false); sText.setBackground(parent.getBackground()); + sText.addKeyListener(new CustomKeyListener(true, false)); fillStyledText(parent, sText, o); - // add the F3 text + // add the F6 text hintLabel = new Label(parent,SWT.BORDER); hintLabel.setAlignment(SWT.RIGHT); hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); @@ -183,47 +200,6 @@ return parent; } - protected void fillStyledText(Composite parent, StyledText sText, Object o) { - - IServer server = null; - IServerModule module = null; - if (o instanceof TreeItem) { - Object obj = ((TreeItem)o).getData(); - if (obj instanceof IServer) - server = (IServer) obj; - if (obj instanceof IServerModule) - module = (IServerModule) obj; - } - - if (module != null) { - IModule[] modules = module.getModule(); - IModule m = modules[modules.length - 1]; - sText.setText("<b>" + m.getName() + "</b>"); - //sText.setText("<b>" + m.getName() + "</b></p>" + m.getModuleType().getName()); - - StyledText sText2 = new StyledText(parent, SWT.NONE); - sText2.setEditable(false); - sText2.setBackground(parent.getBackground()); - sText2.setText(m.getModuleType().getName()); - } - - if (server != null) { - sText.setText("<b>" + server.getName() + "</b>"); - - // add adopters content - if (server.getServerType() != null) { - ArrayList<IServerToolTip> listOfProviders = toolTipProviders.get(server.getServerType().getId()); - - if (listOfProviders != null) { - for (IServerToolTip tipProvider : listOfProviders) { - tipProvider.createContent(parent,server); - } - } - } - } - } - - protected void parseText(String htmlText,StyledText sText) { TextPresentation presentation = new TextPresentation(); HTML2TextReader reader = new HTML2TextReader(new StringReader(htmlText), presentation);