From 5396611d725be558146bbe7aceb741b8f6443497 Mon Sep 17 00:00:00 2001 From: incastrix Date: Wed, 7 Oct 2009 16:41:15 +0000 Subject: [PATCH 1/1] Refactory: replaced deprecated constructor DefaultInformationControl(Shell, int, int, DefaultInformationControl.IInformationPresenter) --- .../phpdt/internal/debug/ui/PHPDebugHover.java | 18 ++++++++++++------ .../java/hover/AbstractJavaEditorTextHover.java | 9 ++++++--- .../ui/text/PHPSourceViewerConfiguration.java | 6 +++++- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java index d9053a9..efd1b93 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugHover.java @@ -252,9 +252,12 @@ public class PHPDebugHover implements IJavaEditorTextHover, // { //$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$ +//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)); } }; // } @@ -271,9 +274,12 @@ public class PHPDebugHover implements IJavaEditorTextHover, 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("PHPDebugHover.16")); //$NON-NLS-1$ +//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)); } }; } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java index de83858..d0576c1 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java @@ -137,9 +137,12 @@ public abstract class AbstractJavaEditorTextHover implements public IInformationControlCreator getHoverControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { - return new DefaultInformationControl(parent, SWT.NONE, - new HTMLTextPresenter(true), - getTooltipAffordanceString()); + //incastrix + // return new DefaultInformationControl(parent, SWT.NONE, +// new HTMLTextPresenter(true), +// getTooltipAffordanceString()); + return new DefaultInformationControl(parent, getTooltipAffordanceString(), + new HTMLTextPresenter(true)); } }; } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java index 3cba77d..62ccb11 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java @@ -14,6 +14,7 @@ package net.sourceforge.phpdt.ui.text; import java.util.Vector; import net.sourceforge.phpdt.core.JavaCore; +//import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; import net.sourceforge.phpdt.internal.ui.text.AbstractJavaScanner; import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference; import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter; @@ -1018,7 +1019,10 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration { ISourceViewer sourceViewer) { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { - return new DefaultInformationControl(parent, SWT.NONE, +//incastrix + // return new DefaultInformationControl(parent, SWT.NONE, +// new HTMLTextPresenter(true)); + return new DefaultInformationControl(parent, new HTMLTextPresenter(true)); // return new HoverBrowserControl(parent); } -- 1.7.1