using predefined constants, organize imports

19 files changed, 98 insertions, 89 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
index 7dd37a203..a3451edbe 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
@@ -5,6 +5,7 @@
 package org.eclipse.help.ui.browser;
 
 import org.eclipse.core.runtime.*;
+import org.eclipse.help.browser.*;
 import org.eclipse.help.browser.IBrowser;
 import org.eclipse.help.internal.browser.*;
 import org.eclipse.help.ui.internal.util.*;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java
index 9b268b7f2..e9f4acb02 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java
@@ -4,14 +4,14 @@ package org.eclipse.help.ui.internal;
  * All Rights Reserved.
  */
 import org.eclipse.core.runtime.*;
+import org.eclipse.help.internal.appserver.*;
 import org.eclipse.help.ui.internal.util.*;
 import org.eclipse.jface.preference.*;
 import org.eclipse.jface.resource.*;
 import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.help.internal.appserver.*;
 import org.eclipse.ui.*;
 import org.eclipse.ui.help.*;
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpContentsAction.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpContentsAction.java
index 9917ca425..9ed616413 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpContentsAction.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpContentsAction.java
@@ -5,11 +5,11 @@ package org.eclipse.help.ui.internal;
  */
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.jface.action.*;
+import org.eclipse.jface.viewers.*;
+import org.eclipse.swt.custom.*;
 import org.eclipse.ui.*;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.help.*;
 
 /**
  * ShowHelp
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkAdapter.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkAdapter.java
index 6f8ffd9c0..61519e97c 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkAdapter.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkAdapter.java
@@ -3,7 +3,7 @@ package org.eclipse.help.ui.internal;
  * (c) Copyright IBM Corp. 2000, 2002.
  * All Rights Reserved.
  */
-import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.*;
 public class HyperlinkAdapter implements IHyperlinkListener {
 	/**
 	 * HyperlinkAdapter constructor comment.
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
index 3923d4408..8d5930cfd 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
@@ -5,7 +5,7 @@ package org.eclipse.help.ui.internal;
  */
 import java.util.*;
 
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.widgets.*;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkLabel.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkLabel.java
index 07353453c..e670453c1 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkLabel.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkLabel.java
@@ -5,7 +5,7 @@
 
 package org.eclipse.help.ui.internal;
 
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
 import org.eclipse.swt.accessibility.*;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHelpUIConstants.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHelpUIConstants.java
index 1935a2ab5..5fc2139a4 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHelpUIConstants.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHelpUIConstants.java
@@ -8,7 +8,8 @@ package org.eclipse.help.ui.internal;
  */
 public interface IHelpUIConstants {
 	// Help UI pluging id with a "." for convenience.
-	public static final String HELP_UI_PLUGIN_ID = "org.eclipse.help.ui.";
+	public static final String HELP_UI_PLUGIN_ID =
+		WorkbenchHelpPlugin.PLUGIN_ID + ".";
 	// F1 ids
 	public static final String F1_SHELL = HELP_UI_PLUGIN_ID + "f1Shell";
 	public static final String PREF_PAGE_BROWSERS =
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHyperlinkListener.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHyperlinkListener.java
index fb727b7ef..136ad9054 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHyperlinkListener.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/IHyperlinkListener.java
@@ -5,7 +5,7 @@ package org.eclipse.help.ui.internal;
  */
 
 
-import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.*;
 
 /**
  * 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/OpenHelpSearchPageAction.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/OpenHelpSearchPageAction.java
index 2068f2564..425f51a90 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/OpenHelpSearchPageAction.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/OpenHelpSearchPageAction.java
@@ -16,7 +16,7 @@ import org.eclipse.ui.*;
 public class OpenHelpSearchPageAction
 	implements IWorkbenchWindowActionDelegate {
 
-	private static final String HELP_SEARCH_PAGE_ID = "org.eclipse.help.ui.searchPage"; //$NON-NLS-1$
+	private static final String HELP_SEARCH_PAGE_ID = WorkbenchHelpPlugin.PLUGIN_ID+".searchPage"; //$NON-NLS-1$
 
 	private IWorkbenchWindow fWindow;
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java
index 11fdebbb4..58954a0fe 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java
@@ -6,6 +6,7 @@ package org.eclipse.help.ui.internal.browser;
 import org.eclipse.core.runtime.*;
 import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.browser.*;
+import org.eclipse.help.internal.browser.BrowserManager;
 import org.eclipse.help.ui.internal.*;
 import org.eclipse.help.ui.internal.util.*;
 import org.eclipse.jface.dialogs.*;
@@ -17,7 +18,6 @@ import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
 import org.eclipse.ui.help.*;
-import org.eclipse.help.internal.browser.BrowserManager;
 
 /**
  * Preference page for selecting default web browser.
@@ -37,7 +37,7 @@ public class BrowsersPreferencePage
 	 */
 	protected Control createContents(Composite parent) {
 		Font font = parent.getFont();
-		
+
 		noDefaultAndApplyButton();
 		WorkbenchHelp.setHelp(parent, IHelpUIConstants.PREF_PAGE_BROWSERS);
 		Composite mainComposite = new Composite(parent, SWT.NULL);
@@ -47,17 +47,17 @@ public class BrowsersPreferencePage
 		//data.grabExcessHorizontalSpace = true;
 		mainComposite.setLayoutData(data);
 		mainComposite.setFont(font);
-		
+
 		GridLayout layout = new GridLayout();
 		layout.marginHeight = 0;
 		layout.marginWidth = 0;
 		mainComposite.setLayout(layout);
-		
+
 		Label description = new Label(mainComposite, SWT.NULL);
 		description.setFont(font);
 		description.setText(WorkbenchResources.getString("select_browser"));
 		createSpacer(mainComposite);
-		
+
 		Label tableDescription = new Label(mainComposite, SWT.NULL);
 		tableDescription.setFont(font);
 		tableDescription.setText(
@@ -114,7 +114,7 @@ public class BrowsersPreferencePage
 	}
 	protected void createCustomBrowserPathPart(Composite mainComposite) {
 		Font font = mainComposite.getFont();
-		
+
 		// vertical space
 		new Label(mainComposite, SWT.NULL);
 
@@ -179,8 +179,7 @@ public class BrowsersPreferencePage
 	 * @see IPreferencePage
 	 */
 	public boolean performOk() {
-		Preferences pref =
-			HelpPlugin.getDefault().getPluginPreferences();
+		Preferences pref = HelpPlugin.getDefault().getPluginPreferences();
 		TableItem[] items = browsersTable.getItems();
 		for (int i = 0; i < items.length; i++) {
 			if (items[i].getChecked()) {
@@ -219,7 +218,7 @@ public class BrowsersPreferencePage
 		for (int i = 0; i < items.length; i++) {
 			if (items[i].getChecked()) {
 				boolean enabled =
-					"org.eclipse.help.custombrowser".equals(
+					(HelpPlugin.PLUGIN_ID + ".custombrowser").equals(
 						BrowserManager
 							.getInstance()
 							.getBrowserDescriptors()[i]
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/SystemBrowserAdapter.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/SystemBrowserAdapter.java
index 43415edcb..d75e9cb8b 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/SystemBrowserAdapter.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/SystemBrowserAdapter.java
@@ -3,9 +3,9 @@
  * All Rights Reserved.
  */
 package org.eclipse.help.ui.internal.browser;
-import org.eclipse.help.browser.IBrowser;
+import org.eclipse.help.browser.*;
 import org.eclipse.help.ui.internal.util.*;
-import org.eclipse.swt.program.Program;
+import org.eclipse.swt.program.*;
 /**
  * Implmentation of IBrowser interface, using org.eclipse.swt.Program
  */
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchPage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchPage.java
index f208a8acd..3f6623127 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchPage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchPage.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.window.*;
 import org.eclipse.search.ui.*;
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchSorter.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchSorter.java
index f6d9e5fcc..9f6bd7abe 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchSorter.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/HelpSearchSorter.java
@@ -1,35 +1,35 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

-package org.eclipse.help.ui.internal.search;

-import org.eclipse.help.ui.internal.IHelpUIConstants;

-import org.eclipse.jface.viewers.*;

-import org.eclipse.search.ui.ISearchResultViewEntry;

-/**

- * Sorts results of help sarch in search view.

- */

-public class HelpSearchSorter extends ViewerSorter {

-	/**

-	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.ViewerSorter,java.lang.Object,java.lang.Object)

-	 */

-	public int compare(Viewer viewer, Object e1, Object e2) {

-		try {

-			ISearchResultViewEntry entry1 = (ISearchResultViewEntry) e1;

-			int order1 =

-				Integer.parseInt(

-					entry1.getSelectedMarker().getAttribute(

-						IHelpUIConstants.HIT_MARKER_ATTR_ORDER,

-						"0"));

-			ISearchResultViewEntry entry2 = (ISearchResultViewEntry) e2;

-			int order2 =

-				Integer.parseInt(

-					entry2.getSelectedMarker().getAttribute(

-						IHelpUIConstants.HIT_MARKER_ATTR_ORDER,

-						"0"));

-			return order1 - order2;

-		} catch (Exception e) {

-		}

-		return super.compare(viewer, e1, e2);

-	}

+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+package org.eclipse.help.ui.internal.search;
+import org.eclipse.help.ui.internal.*;
+import org.eclipse.jface.viewers.*;
+import org.eclipse.search.ui.*;
+/**
+ * Sorts results of help sarch in search view.
+ */
+public class HelpSearchSorter extends ViewerSorter {
+	/**
+	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.ViewerSorter,java.lang.Object,java.lang.Object)
+	 */
+	public int compare(Viewer viewer, Object e1, Object e2) {
+		try {
+			ISearchResultViewEntry entry1 = (ISearchResultViewEntry) e1;
+			int order1 =
+				Integer.parseInt(
+					entry1.getSelectedMarker().getAttribute(
+						IHelpUIConstants.HIT_MARKER_ATTR_ORDER,
+						"0"));
+			ISearchResultViewEntry entry2 = (ISearchResultViewEntry) e2;
+			int order2 =
+				Integer.parseInt(
+					entry2.getSelectedMarker().getAttribute(
+						IHelpUIConstants.HIT_MARKER_ATTR_ORDER,
+						"0"));
+			return order1 - order2;
+		} catch (Exception e) {
+		}
+		return super.compare(viewer, e1, e2);
+	}
 }
\ No newline at end of file
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/RuntimeErrorDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/RuntimeErrorDialog.java
index ecc6f75ae..67760abb9 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/RuntimeErrorDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/RuntimeErrorDialog.java
@@ -4,7 +4,7 @@ package org.eclipse.help.ui.internal.util;
  * All Rights Reserved.
  */
 import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 /**
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/SWTUtil.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/SWTUtil.java
index dec9fdf0f..8e1539d3a 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/SWTUtil.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/SWTUtil.java
@@ -3,11 +3,11 @@
  * All Rights Reserved.
  */
 package org.eclipse.help.ui.internal.util;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
+import org.eclipse.jface.dialogs.*;
+import org.eclipse.jface.util.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 /**
  * Utility class to simplify access to some SWT resources. 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/WorkbenchResources.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/WorkbenchResources.java
index e9459b91a..46c9dcb8a 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/WorkbenchResources.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/WorkbenchResources.java
@@ -4,10 +4,10 @@ package org.eclipse.help.ui.internal.util;
  * All Rights Reserved.
  */
 import java.net.*;
-import java.text.MessageFormat;
+import java.text.*;
 import java.util.*;
 
-import org.eclipse.help.ui.internal.WorkbenchHelpPlugin;
+import org.eclipse.help.ui.internal.*;
 /**
  * Uses a resource bundle to load images and strings from
  * a property file.
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSet.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSet.java
index 57a00425e..b4fdb60a2 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSet.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSet.java
@@ -5,9 +5,9 @@ package org.eclipse.help.ui.internal.workingset;
  * All Rights Reserved.
  */
 
-import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.*;
 import org.eclipse.help.*;
-import org.eclipse.help.internal.HelpSystem;
+import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.workingset.*;
 import org.eclipse.ui.*;
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetPage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetPage.java
index 17e09295b..dea210e41 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetPage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetPage.java
@@ -5,24 +5,24 @@ package org.eclipse.help.ui.internal.workingset;
  * All Rights Reserved.
  */
 
-import java.util.ArrayList;
+import java.util.*;
 
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.help.internal.HelpSystem;
+import org.eclipse.core.runtime.*;
+import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.workingset.*;
-import org.eclipse.help.ui.internal.WorkbenchHelpPlugin;
-import org.eclipse.help.ui.internal.util.WorkbenchResources;
-import org.eclipse.jface.util.Assert;
+import org.eclipse.help.ui.internal.*;
+import org.eclipse.help.ui.internal.util.*;
+import org.eclipse.jface.util.*;
 import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.jface.wizard.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
 import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.IWorkingSetPage;
+import org.eclipse.ui.dialogs.*;
 
 /**
  * Page for help working sets.
@@ -30,7 +30,7 @@ import org.eclipse.ui.dialogs.IWorkingSetPage;
 public class HelpWorkingSetPage extends WizardPage implements IWorkingSetPage {
 
 	public final static String PAGE_ID =
-		"org.eclipse.help.ui.HelpWorkingSetPage";
+		WorkbenchHelpPlugin.PLUGIN_ID + ".HelpWorkingSetPage";
 	public final static String PAGE_TITLE =
 		WorkbenchResources.getString("WorkingSetPageTitle");
 	public final static String PAGE_DESCRIPTION =
@@ -143,7 +143,11 @@ public class HelpWorkingSetPage extends WizardPage implements IWorkingSetPage {
 		if (workingSet != null) {
 			workingSetName.setText(workingSet.getName());
 			// May need to reconcile working sets
-			WorkbenchHelpPlugin.getDefault().getWorkingSetSynchronizer().addWorkingSet(workingSet);
+			WorkbenchHelpPlugin
+				.getDefault()
+				.getWorkingSetSynchronizer()
+				.addWorkingSet(
+				workingSet);
 		}
 		initializeCheckedState();
 		validateInput();
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetSynchronizer.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetSynchronizer.java
index 84394d75b..88bf6cde4 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetSynchronizer.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/workingset/HelpWorkingSetSynchronizer.java
@@ -5,6 +5,7 @@ import java.util.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.workingset.*;
+import org.eclipse.help.ui.internal.*;
 import org.eclipse.jface.util.*;
 import org.eclipse.ui.*;
 
@@ -98,14 +99,17 @@ public class HelpWorkingSetSynchronizer
 		} else if (
 			event.getProperty().equals(
 				WorkingSetManager.CHANGE_WORKING_SETS_SYNCH)) {
-			
+
 			// remove working sets not present in the UI
-			WorkingSet[] baseWorkingSets = getHelpWorkingSetManager().getWorkingSets();
-			for (int i=0; i<baseWorkingSets.length; i++) {
+			WorkingSet[] baseWorkingSets =
+				getHelpWorkingSetManager().getWorkingSets();
+			for (int i = 0; i < baseWorkingSets.length; i++) {
 				IWorkingSet iws =
-					getEclipseWorkingSetManager().getWorkingSet(baseWorkingSets[i].getName());
-				if (iws == null) 
-					getHelpWorkingSetManager().removeWorkingSet(baseWorkingSets[i]);
+					getEclipseWorkingSetManager().getWorkingSet(
+						baseWorkingSets[i].getName());
+				if (iws == null)
+					getHelpWorkingSetManager().removeWorkingSet(
+						baseWorkingSets[i]);
 			}
 		}
 	}
@@ -195,8 +199,8 @@ public class HelpWorkingSetSynchronizer
 			getEclipseWorkingSetManager().createWorkingSet(
 				ws.getName(),
 				ws.getElements());
-			// the id of the workingSet extension point in plugin.xml
-			w.setId("org.eclipse.help.ui.HelpWorkingSetPage");
+		// the id of the workingSet extension point in plugin.xml
+		w.setId(WorkbenchHelpPlugin.PLUGIN_ID + ".HelpWorkingSetPage");
 		return w;
 	}