Skip to content

Commit

Permalink
JBIDE-19335 Revert API Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgolovin
dgolovin committed Jul 21, 2015
1 parent 975b80e commit c0a7157
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions .../org.jboss.tools.foundation.ui/src/org/jboss/tools/foundation/ui/util/BrowserUtility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class BrowserUtility {
* @param log
* the log provider to log against if an error occurred.
*/
public static void checkedCreateInternalBrowser(String url, String browserId, String pluginId, ILog log) {
public void checkedCreateInternalBrowser(String url, String browserId, String pluginId, ILog log) {
try {
openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, browserId, null, null), pluginId, log);
} catch (PartInitException e) {
Expand All @@ -76,7 +76,7 @@ public static void checkedCreateInternalBrowser(String url, String browserId, St
}
}

public static void checkedCreateExternalBrowser(String url, String pluginId, ILog log) {
public void checkedCreateExternalBrowser(String url, String pluginId, ILog log) {
try {
openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser(), pluginId, log);
} catch (PartInitException e) {
Expand All @@ -85,7 +85,7 @@ public static void checkedCreateExternalBrowser(String url, String pluginId, ILo
}
}

public static void openUrl(String url, IWebBrowser browser, String pluginId, ILog log) {
public void openUrl(String url, IWebBrowser browser, String pluginId, ILog log) {
try {
browser.openURL(new URL(url));
} catch (PartInitException e) {
Expand All @@ -97,7 +97,7 @@ public static void openUrl(String url, IWebBrowser browser, String pluginId, ILo
}
}

static public void openExtenalBrowser(String URL) {
public void openExtenalBrowser(String URL) {
checkedCreateExternalBrowser(URL,FoundationUIPlugin.PLUGIN_ID,FoundationUIPlugin.getDefault().getLog());
}

Expand All @@ -108,7 +108,7 @@ static public void openExtenalBrowser(String URL) {
* @return
*/

public static Browser createBrowser(int style, Composite parent) {
public Browser createBrowser(int style, Composite parent) {
return createBrowser(style, parent, getPreferredBrowser());
}

Expand All @@ -118,7 +118,7 @@ public static Browser createBrowser(int style, Composite parent) {
* @param preferredBrowser SWT.MOZILLA, SWT.WEBKIT or SWT.NONE
* @return
*/
public static Browser createBrowser(Composite parent) {
public Browser createBrowser(Composite parent) {
return createBrowser(SWT.READ_ONLY | SWT.NO_SCROLL, parent, getPreferredBrowser());
}

Expand All @@ -128,7 +128,7 @@ public static Browser createBrowser(Composite parent) {
* @param preferredBrowser SWT.MOZILLA, SWT.WEBKIT or SWT.NONE
* @return
*/
public static Browser createBrowser(Composite parent, int preferredBrowser) {
public Browser createBrowser(Composite parent, int preferredBrowser) {
return createBrowser(SWT.READ_ONLY | SWT.NO_SCROLL, parent, preferredBrowser);
}

Expand All @@ -140,7 +140,7 @@ public static Browser createBrowser(Composite parent, int preferredBrowser) {
* @return
* @see org.eclipse.swt.browser.Browser
*/
public static Browser createBrowser(int style, Composite parent, int preferredBrowser) {
public Browser createBrowser(int style, Composite parent, int preferredBrowser) {
/*
// We can provide webkit in this way:
String defaultBrowser = System.getProperty(Browser.PROPERTY_DEFAULTTYPE);
Expand Down Expand Up @@ -182,7 +182,7 @@ public static Browser createBrowser(int style, Composite parent, int preferredBr
return null;
}

public static Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, String url,
public Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, String url,
String noBrowserText, Menu contextMenu) {
Control result = createBrowserOrLink(style, parent, preferredBrowser, url, noBrowserText);
result.setMenu(createLinkDefaultContextMenu(result, url));
Expand All @@ -200,7 +200,7 @@ public static Control createBrowserOrLink(int style, Composite parent, int prefe
* @param noBrowserText
* @return
*/
public static Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, final String url,
public Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, final String url,
String noBrowserText) {
return createBrowserOrLink(style, parent, preferredBrowser, new IURLProvider() {
public String getUrl() {
Expand All @@ -209,7 +209,7 @@ public String getUrl() {
}, noBrowserText);
}

public static Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, IURLProvider url,
public Control createBrowserOrLink(int style, Composite parent, int preferredBrowser, IURLProvider url,
String noBrowserText) {

Control result = null;
Expand All @@ -228,7 +228,7 @@ public static Control createBrowserOrLink(int style, Composite parent, int prefe
return result;
}

private static Menu createLinkDefaultContextMenu (Control link, String url) {
private Menu createLinkDefaultContextMenu (Control link, String url) {
Menu popupMenu = new Menu(link);
MenuItem refreshItem = new MenuItem(popupMenu, SWT.NONE);
refreshItem.setText(BrowserUtilityMessages.Open_in_external_browser);
Expand Down Expand Up @@ -259,7 +259,7 @@ public static int getPreferredBrowser() {
return isMacOS ? SWT.WEBKIT : SWT.MOZILLA;
}

private static class OpenExBrowserListener extends SelectionAdapter {
public class OpenExBrowserListener extends SelectionAdapter {

private String url;
private IURLProvider provider;
Expand All @@ -275,9 +275,9 @@ public OpenExBrowserListener(IURLProvider provider) {

public void widgetSelected(SelectionEvent event) {
if( url != null ) {
BrowserUtility.openExtenalBrowser(url);
BrowserUtility.this.openExtenalBrowser(url);
} else {
BrowserUtility.openExtenalBrowser(provider.getUrl());
BrowserUtility.this.openExtenalBrowser(provider.getUrl());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ime.ui/src/org/jboss/tools/runtime/ui/internal/wizard/DownloadRuntimeLicenseFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public Composite createComposite(Composite parent, IWizardHandle handle) {
wrap.setLayout(new GridLayout(1, false));

browser = null;
Control ctrl = BrowserUtility.createBrowserOrLink(SWT.READ_ONLY, wrap, BrowserUtility.getPreferredBrowser(),
Control ctrl = new BrowserUtility().createBrowserOrLink(SWT.READ_ONLY, wrap, BrowserUtility.getPreferredBrowser(),
this,
Messages.DownloadRuntimeLicenseFragment_Please_read_and_accept_the_license_agreement);

Expand Down

0 comments on commit c0a7157

Please sign in to comment.