From 6c03c9e1876c161f1782bcbbe3a006517cbc60a4 Mon Sep 17 00:00:00 2001 From: incastrix Date: Wed, 23 Dec 2009 17:31:31 +0000 Subject: [PATCH] Refactory: remove unused classes, imports, fields and methods. --- .../webbrowser/internal/BrowserManager.java | 12 +++--- .../webbrowser/internal/BusyIndicator.java | 6 +- .../phpeclipse/webbrowser/internal/Favorite.java | 4 +- .../phpeclipse/webbrowser/internal/WebBrowser.java | 18 ++++---- .../webbrowser/internal/WebBrowserEditor.java | 20 +++++----- .../webbrowser/internal/WebBrowserUtil.java | 40 ++++++++++---------- .../phpeclipse/webbrowser/views/BrowserView.java | 40 ++++++++++---------- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java index cd2b875..7131dbc 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java @@ -253,18 +253,18 @@ public class BrowserManager { * * @param listener */ - public void addWebBrowserListener(IWebBrowserListener listener) { - browserListeners.add(listener); - } +// public void addWebBrowserListener(IWebBrowserListener listener) { +// browserListeners.add(listener); +// } /** * Remove Web browser listener. * * @param listener */ - public void removeWebBrowserListener(IWebBrowserListener listener) { - browserListeners.remove(listener); - } +// public void removeWebBrowserListener(IWebBrowserListener listener) { +// browserListeners.remove(listener); +// } /** * Fire a Web browser event. diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BusyIndicator.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BusyIndicator.java index 958eba1..111a872 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BusyIndicator.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BusyIndicator.java @@ -115,9 +115,9 @@ public class BusyIndicator extends Canvas { /** * Return the image or null. */ - public Image getImage() { - return image; - } +// public Image getImage() { +// return image; +// } /** * Returns true if it is currently busy. diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/Favorite.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/Favorite.java index 41aface..d189cf8 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/Favorite.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/Favorite.java @@ -18,8 +18,8 @@ public class Favorite { protected String name; - public Favorite() { - } +// public Favorite() { +// } public Favorite(String name, String url) { if (name == null) diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java index 6fc07d8..4fc84c2 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java @@ -684,15 +684,15 @@ public class WebBrowser extends Composite { combo.setText(temp); } - public void addProgressListener(ProgressListener listener) { - browser.addProgressListener(listener); - } +// public void addProgressListener(ProgressListener listener) { +// browser.addProgressListener(listener); +// } - public void addStatusTextListener(StatusTextListener listener) { - browser.addStatusTextListener(listener); - } +// public void addStatusTextListener(StatusTextListener listener) { +// browser.addStatusTextListener(listener); +// } - public void addTitleListener(TitleListener listener) { - browser.addTitleListener(listener); - } +// public void addTitleListener(TitleListener listener) { +// browser.addTitleListener(listener); +// } } \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java index 0c11f2f..d31c8e9 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java @@ -16,7 +16,7 @@ import net.sourceforge.phpeclipse.webbrowser.IWebBrowserEditorInput; import net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; +//import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; @@ -184,8 +184,8 @@ public class WebBrowserEditor extends EditorPart { * * @see IEditorPart */ - public void gotoMarker(IMarker marker) { - } +// public void gotoMarker(IMarker marker) { +// } /* * (non-Javadoc) Initializes the editor part with a site and input.

@@ -267,13 +267,13 @@ public class WebBrowserEditor extends EditorPart { * * @return boolean */ - public boolean isToolbarVisible() { - IWebBrowserEditorInput input = getWebBrowserEditorInput(); - if (input == null || input.isToolbarVisible()) - return true; - else - return false; - } +// public boolean isToolbarVisible() { +// IWebBrowserEditorInput input = getWebBrowserEditorInput(); +// if (input == null || input.isToolbarVisible()) +// return true; +// else +// return false; +// } /** * Open the input in the internal Web browser. diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java index e5e0e72..de4787a 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java @@ -46,7 +46,7 @@ public class WebBrowserUtil { private static List unlockedFavorites; - private static final String BROWSER_PACKAGE_NAME = "org.eclipse.swt.browser.Browser"; + //private static final String BROWSER_PACKAGE_NAME = "org.eclipse.swt.browser.Browser"; public static Boolean isInternalBrowserOperational; @@ -90,9 +90,9 @@ public class WebBrowserUtil { /** * WebBrowserUtil constructor comment. */ - public WebBrowserUtil() { - super(); - } +// public WebBrowserUtil() { +// super(); +// } /** * Returns true if we're running on Windows. @@ -112,13 +112,13 @@ public class WebBrowserUtil { * * @return boolean */ - public static boolean isLinux() { - String os = System.getProperty("os.name"); - if (os != null && os.toLowerCase().indexOf("lin") >= 0) - return true; - else - return false; - } +// public static boolean isLinux() { +// String os = System.getProperty("os.name"); +// if (os != null && os.toLowerCase().indexOf("lin") >= 0) +// return true; +// else +// return false; +// } /** * Open a dialog window. @@ -259,15 +259,15 @@ public class WebBrowserUtil { * * @return boolean */ - public static boolean canUseInternalWebBrowser() { - try { - Class clazz = Class.forName(BROWSER_PACKAGE_NAME); - if (clazz != null) - return true; - } catch (ClassNotFoundException e) { - } - return false; - } +// public static boolean canUseInternalWebBrowser() { +// try { +// Class clazz = Class.forName(BROWSER_PACKAGE_NAME); +// if (clazz != null) +// return true; +// } catch (ClassNotFoundException e) { +// } +// return false; +// } /** * This method checks to see if it can new up a new Browser. If the SWT diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java index bb4c837..a5791e8 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java @@ -18,9 +18,9 @@ import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.CloseWindowListener; -import org.eclipse.swt.browser.ProgressListener; -import org.eclipse.swt.browser.StatusTextListener; -import org.eclipse.swt.browser.TitleListener; +//import org.eclipse.swt.browser.ProgressListener; +//import org.eclipse.swt.browser.StatusTextListener; +//import org.eclipse.swt.browser.TitleListener; import org.eclipse.swt.browser.WindowEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.IShowInTarget; @@ -151,23 +151,23 @@ public class BrowserView extends ViewPart implements IShowInTarget { } } - public void addProgressListener(ProgressListener listener) { - if (fInstance != null) { - fInstance.addProgressListener(listener); - } - } - - public void addStatusTextListener(StatusTextListener listener) { - if (fInstance != null) { - fInstance.addStatusTextListener(listener); - } - } - - public void addTitleListener(TitleListener listener) { - if (fInstance != null) { - fInstance.addTitleListener(listener); - } - } +// public void addProgressListener(ProgressListener listener) { +// if (fInstance != null) { +// fInstance.addProgressListener(listener); +// } +// } + +// public void addStatusTextListener(StatusTextListener listener) { +// if (fInstance != null) { +// fInstance.addStatusTextListener(listener); +// } +// } + +// public void addTitleListener(TitleListener listener) { +// if (fInstance != null) { +// fInstance.addTitleListener(listener); +// } +// } public boolean show(ShowInContext context) { if (context instanceof ShowInContextBrowser) { -- 1.7.1