[jbosstools-commits] JBoss Tools SVN: r42434 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 6 04:08:20 EDT 2012
Author: rob.stryker at jboss.com
Date: 2012-07-06 04:08:20 -0400 (Fri, 06 Jul 2012)
New Revision: 42434
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
Log:
/JBIDE-11858 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -18,8 +18,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
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.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class FilesetContentProvider implements ITreeContentProvider {
private static final String FILESET_KEY = "org.jboss.ide.eclipse.as.ui.views.server.providers.FilesetViewProvider.PropertyKey"; //$NON-NLS-1$
@@ -199,7 +205,25 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly access files matching a given pattern in your server installation."); //$NON-NLS-1$
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
private IPath[] findPaths(Fileset fs) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -8,15 +8,20 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredViewer;
+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.swt.widgets.Display;
import org.eclipse.wst.server.core.IServer;
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.XPathFileResult.XPathResultNode;
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.Messages;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class XPathTreeContentProvider implements ITreeContentProvider {
@@ -130,7 +135,26 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+
this.viewer = viewer;
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly modify xpath values in your server installation.");
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -5,14 +5,15 @@
import java.util.Arrays;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
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.XPathFileResult.XPathResultNode;
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.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -25,7 +26,13 @@
ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif")); //$NON-NLS-1$
rootImage = des.createImage();
}
-
+// public boolean useNativeToolTip(Object object) {
+// return true;
+// }
+// public String getToolTipText(Object element) {
+// return "BLAAAAAAAH";
+// }
+
public Image getImage(Object element) {
if( element instanceof ServerWrapper )
return rootImage;
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -0,0 +1,245 @@
+/**********************************************************************
+ * Copyright (c) 2007, 2011 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.jboss.tools.as.wst.server.ui.xpl;
+
+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;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+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 Label hintLabel;
+ protected Tree tree;
+ protected int x;
+ protected int y;
+
+ public ServerToolTip(final Tree tree) {
+ super(tree);
+
+ this.tree = tree;
+
+ tree.addMouseMoveListener(new MouseMoveListener() {
+ public void mouseMove(MouseEvent e) {
+ x = e.x;
+ 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();
+ }
+ if (e.keyCode == SWT.F6) {
+ if (CURRENT_TOOLTIP == null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
+ }
+ }
+ }
+ public void keyReleased(KeyEvent e){
+ // nothing to do
+ }
+ });
+ }
+
+ 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));
+
+ control.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ Event event = new Event();
+ event.x = x;
+ event.y = y;
+ event.widget = tree;
+
+ createToolTipContentArea(event, stickyTooltip);
+ stickyTooltip.pack();
+
+ stickyTooltip.setLocation(stickyTooltip.getDisplay().getCursorLocation());
+ hintLabel.setText("Press 'ESC' to Hide.");
+ stickyTooltip.setVisible(true);
+// Eventually we want to add a listener that checks if
+// the mouseDown event is occurring outside of the bounds of the tooltip
+// if it is, then hide the tooltip
+// addListener(stickyTooltip);
+ }
+ });
+ CURRENT_TOOLTIP = stickyTooltip;
+ }
+
+ @Override
+ protected Object getToolTipArea(Event event) {
+ Object o = tree.getItem(new Point(event.x,event.y));
+ return o;
+ }
+
+ protected boolean shouldCreateToolTip(Event event) {
+ if (tree.getItem(new Point(event.x, event.y)) == null)
+ return false;
+ /* JBT: Added this check */
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData()))
+ return false;
+ return super.shouldCreateToolTip(event);
+ }
+
+ /*
+ * JBT: Added a method
+ */
+ protected abstract boolean isMyType(Object selected);
+
+ protected Composite createToolTipContentArea(Event event, Composite parent) {
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if (o == null)
+ return null;
+
+ FillLayout layout = (FillLayout)parent.getLayout();
+ layout.type = SWT.VERTICAL;
+ parent.setLayout(layout);
+ parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ // set the default text for the tooltip
+ StyledText sText = new StyledText(parent, SWT.NONE);
+ sText.setEditable(false);
+ sText.setBackground(parent.getBackground());
+
+ fillStyledText(parent, sText, o);
+
+ // add the F3 text
+ hintLabel = new Label(parent,SWT.BORDER);
+ hintLabel.setAlignment(SWT.RIGHT);
+ hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ hintLabel.setText("Press 'F6' for Focus.");
+ hintLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+
+ final Font font;
+ Display display = parent.getDisplay();
+ FontData[] fd = parent.getFont().getFontData();
+ int size2 = fd.length;
+ for (int i = 0; i < size2; i++)
+ fd[i].setHeight(7);
+ font = new Font(display, fd);
+ parent.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ font.dispose();
+ }
+ });
+ hintLabel.setFont(font);
+
+ parseText(sText.getText(),sText);
+
+ 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);
+ String text;
+
+ try {
+ text = reader.getString();
+ } catch (IOException e) {
+ text= ""; //$NON-NLS-1$
+ }
+
+ sText.setText(text);
+ Iterator iter = presentation.getAllStyleRangeIterator();
+ while (iter.hasNext()) {
+ StyleRange sr = (StyleRange)iter.next();
+ sText.setStyleRange(sr);
+ }
+ }
+}
\ No newline at end of file
More information about the jbosstools-commits
mailing list