unification of bug fixes 1198893, 1404228

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / src / net / sourceforge / phpeclipse / ui / WebUI.java

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
index dfb8a52..76ccbd5 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
@@ -4,11 +4,11 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ *
  * Contributors:
  *     Christopher Lenz - initial implementation
- * 
- * $Id: WebUI.java,v 1.2 2004-09-03 17:30:32 jsurfer Exp $
+ *
+ * $Id: WebUI.java,v 1.6 2005-10-13 18:38:19 axelcl Exp $
  */
 
 package net.sourceforge.phpeclipse.ui;
@@ -53,17 +53,22 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
 
   /** The shared instance. */
   private static WebUI plugin;
+
   public static IWorkbenchPage getActivePage() {
     return getDefault().internalGetActivePage();
   }
 
+  private IWorkbenchPage internalGetActivePage() {
+    return getWorkbench().getActiveWorkbenchWindow().getActivePage();
+  }
+
   public static Shell getActiveWorkbenchShell() {
     return getActiveWorkbenchWindow().getShell();
   }
+
   public static IWorkbenchWindow getActiveWorkbenchWindow() {
     return getDefault().getWorkbench().getActiveWorkbenchWindow();
   }
-
   // Public Methods ----------------------------------------------------------
 
   /**
@@ -97,7 +102,7 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
 
   /**
    * Returns this plug-in's context type registry.
-   * 
+   *
    * @return the context type registry for this plug-in instance
    */
   public ContextTypeRegistry getContextTypeRegistry() {
@@ -116,7 +121,7 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
 
   /**
    * Returns an image descriptor for the image corresponding to the specified key (which is the name of the image file).
-   * 
+   *
    * @param key
    *          The key of the image
    * @return The descriptor for the requested image, or <code>null</code> if the image could not be found
@@ -132,7 +137,7 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
 
   /**
    * Returns this plug-in's template store.
-   * 
+   *
    * @return the template store of this plug-in instance
    */
   public TemplateStore getTemplateStore() {
@@ -150,12 +155,14 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
   protected void initializeDefaultPreferences(IPreferenceStore store) {
     store.setDefault(PHP_LOCALHOST_PREF, "http://localhost");
     store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
-    store.setDefault(PHP_BOOKMARK_DEFAULT, "");
+//    store.setDefault(PHP_BOOKMARK_DEFAULT, "");
 
     store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true");
     store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true");
-    store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true");
+//    store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true");
+//    store.setDefault(PHP_SHOW_XML_FILES_LOCAL, "false");
   }
+
   /*
    * @see AbstractUIPlugin#initializeImageRegistry(ImageRegistry)
    */
@@ -163,10 +170,10 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
     reg.put(ICON_OVERLAY_ERROR, getImageDescriptor(ICON_OVERLAY_ERROR));
     reg.put(ICON_OVERLAY_WARNING, getImageDescriptor(ICON_OVERLAY_WARNING));
   }
-  private IWorkbenchPage internalGetActivePage() {
-    IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
-    if (window != null)
-      return window.getActivePage();
-    return null;
-  }
+  //  private IWorkbenchPage internalGetActivePage() {
+  //    IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
+  //    if (window != null)
+  //      return window.getActivePage();
+  //    return null;
+  //  }
 }
\ No newline at end of file