null
- * if none.
- *
- * @return the stack frame in which to search for variables, or null
- * if none
+ * Returns the stack frame in which to search for variables, or
+ * null if none.
+ *
+ * @return the stack frame in which to search for variables, or
+ * null if none
*/
protected PHPStackFrame getFrame() {
if (fSelection instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection)fSelection;
+ IStructuredSelection selection = (IStructuredSelection) fSelection;
if (selection.size() == 1) {
Object el = selection.getFirstElement();
if (el instanceof IAdaptable) {
- return (PHPStackFrame)((IAdaptable)el).getAdapter(PHPStackFrame.class);
+ return (PHPStackFrame) ((IAdaptable) el)
+ .getAdapter(PHPStackFrame.class);
}
}
}
return null;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+
+ protected XDebugStackFrame getXDebugFrame() {
+ if (fSelection instanceof IStructuredSelection) {
+ IStructuredSelection selection = (IStructuredSelection) fSelection;
+ if (selection.size() == 1) {
+ Object el = selection.getFirstElement();
+ if (el instanceof IAdaptable) {
+ return (XDebugStackFrame) ((IAdaptable) el)
+ .getAdapter(XDebugStackFrame.class);
+ }
+ }
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
+ * org.eclipse.jface.text.IRegion)
*/
public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
- PHPStackFrame frame = getFrame();
- if (frame != null) {
+ IVariable variable = null;
+ PHPStackFrame frameDBG = null;
+ XDebugStackFrame frameXD = null;
+
+ TreePath paths[] = ((ITreeSelection) fSelection).getPaths ();
+ Object target = paths[0].getSegment (1);
+
+ if (target.getClass().getName ().equals ("net.sourceforge.phpeclipse.xdebug.php.model.XDebugTarget") ) {
+ frameXD = getXDebugFrame ();
+ }
+ else {
+ frameDBG = getFrame();
+ }
+
+ if ((frameDBG != null) || (frameXD != null)) {
try {
-
- IDocument document= textViewer.getDocument();
+ IDocument document = textViewer.getDocument();
+
if (document == null)
return null;
-
- String variableName= document.get(hoverRegion.getOffset(), hoverRegion.getLength());
-
- StringBuffer buffer= new StringBuffer();
+
+ String variableName = document.get (hoverRegion.getOffset(), hoverRegion.getLength());
+
+ StringBuffer buffer = new StringBuffer();
try {
- IVariable variable= frame.findVariable(variableName);
+ if (frameDBG != null) {
+ variable = frameDBG.findVariable (variableName);
+ }
+ else if (frameXD != null) {
+ variable = frameXD.findVariable (variableName);
+ }
+
if (variable != null) {
appendVariable(buffer, variable);
}
} catch (DebugException x) {
-// if (x.getStatus().getCode() != IJavaThread.ERR_THREAD_NOT_SUSPENDED) {
- PHPDebugUiPlugin.log(x);
-// }
+ // if (x.getStatus().getCode() !=
+ // IJavaThread.ERR_THREAD_NOT_SUSPENDED) {
+ PHPDebugUiPlugin.log(x);
+ // }
}
-
+
if (buffer.length() > 0) {
return buffer.toString();
}
-
+
} catch (BadLocationException x) {
PHPDebugUiPlugin.log(x);
}
@@ -188,53 +245,89 @@ public class PHPDebugHover implements IJavaEditorTextHover, ITextHoverExtension,
/**
* Append HTML for the given variable to the given buffer
*/
- private static void appendVariable(StringBuffer buffer, IVariable variable) throws DebugException {
+ private static void appendVariable(StringBuffer buffer, IVariable variable)
+ throws DebugException {
buffer.append(""); //$NON-NLS-1$ buffer.append("
").append(variable.getName()).append(""); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(" ="); //$NON-NLS-1$
-
- String type= getTypeName(variable);
- String value= "" + variable.getValue().getValueString() + ""; //$NON-NLS-1$ //$NON-NLS-2$ - + + String type = getTypeName(variable); + String value = "
" + variable.getValue().getValueString() + ""; //$NON-NLS-1$ //$NON-NLS-2$ + if (type == null) { buffer.append(" null"); //$NON-NLS-1$ } else if (type.equals("java.lang.String")) { //$NON-NLS-1$ buffer.append(" \""); //$NON-NLS-1$ buffer.append(value); buffer.append('"'); - } else if (type.equals("boolean")) { //$NON-NLS-1$ + } else if (type.equals("boolean") || // in dbg it's boolean + type.equals("bool")) { // in XDebug it's bool $NON-NLS-1$ buffer.append(' '); buffer.append(value); } else { buffer.append(" ("); //$NON-NLS-1$ buffer.append("
").append(type).append(""); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(") "); //$NON-NLS-1$
- buffer.append(value);
- }
+ buffer.append(value);
+ }
buffer.append(""); //$NON-NLS-1$
}
private static String getTypeName(IVariable variable) throws DebugException {
- IValue value= variable.getValue();
- if (value instanceof PHPValue)
- return((PHPValue) value).getReferenceTypeName();
+ IValue value = variable.getValue();
+
+ if (value instanceof PHPValue)
+ return ((PHPValue) value).getReferenceTypeName();
+
+ if (value instanceof XDebugAbstractValue)
+ return ((XDebugAbstractValue) value).getReferenceTypeName ();
+
return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jface.text.ITextHoverExtension#getInformationControlCreator()
*/
- public IInformationControlCreator getInformationControlCreator() {
-// if (Platform.getPlugin("org.eclipse.jdt.ui").getPluginPreferences().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)) { //$NON-NLS-1$
+// public IInformationControlCreator getInformationControlCreator() {
+// // if
+// // (Platform.getPlugin("org.eclipse.jdt.ui").getPluginPreferences().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE))
+// // { //$NON-NLS-1$
+// return new IInformationControlCreator() {
+// public IInformationControl createInformationControl(Shell parent) {
+////incastrix
+// // return new DefaultInformationControl(parent, SWT.NONE,
+//// new HTMLTextPresenter(true), PHPDebugUiMessages
+//// .getString("JavaDebugHover.16")); //$NON-NLS-1$
+// return new DefaultInformationControl(parent, PHPDebugUiMessages.getString("JavaDebugHover.16"),
+// new HTMLTextPresenter(true));
+// }
+// };
+// // }
+// // return null;
+// }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
+ */
+ public IInformationControlCreator getHoverControlCreator() {
+ if (PreferenceConstants.getPreferenceStore().getBoolean(
+ PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)) { //$NON-NLS-1$
return new IInformationControlCreator() {
public IInformationControl createInformationControl(Shell parent) {
- return new DefaultInformationControl(parent, SWT.NONE,
- new HTMLTextPresenter(true),
- PHPDebugUiMessages.getString("JavaDebugHover.16")); //$NON-NLS-1$
- }
- };
-// }
-// return null;
+//incastrix
+ // return new DefaultInformationControl(parent, SWT.NONE,
+// new HTMLTextPresenter(true), PHPDebugUiMessages
+// .getString("PHPDebugHover.16")); //$NON-NLS-1$
+ return new DefaultInformationControl(parent, PHPDebugUiMessages.getString("JavaDebugHover.16"),
+ new HTMLTextPresenter(true));
+ }
+ };
+ }
+ return null;
}
}