sniff test fails, Workbench User Guide is not the first InfoSet
diff --git a/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/WorkbenchHelpPlugin.java b/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/WorkbenchHelpPlugin.java index 975c73b..1b208db 100644 --- a/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/WorkbenchHelpPlugin.java +++ b/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/WorkbenchHelpPlugin.java
@@ -13,6 +13,8 @@ import org.eclipse.help.internal.navigation.*; import org.eclipse.help.internal.ui.util.*; import org.eclipse.help.internal.HelpSystem; +import org.eclipse.ui.*; +import org.eclipse.ui.internal.*; /** * This class is a UI plugin. This may need to change to regular @@ -84,6 +86,10 @@ public void startup() { if(getWorkbench()!=null) initializeFromStore(); + // Set the order of infosets in NavigationManager + String infoSetIDs = ((Workbench)PlatformUI.getWorkbench()).getProductInfo().getInformationSetIds(); + if(infoSetIDs!=null) + HelpSystem.setInformationSetIds(infoSetIDs); HelpSystem.startup(); } }
diff --git a/org.eclipse.help/Eclipse Help/help.properties b/org.eclipse.help/Eclipse Help/help.properties index 999732f..3893147 100644 --- a/org.eclipse.help/Eclipse Help/help.properties +++ b/org.eclipse.help/Eclipse Help/help.properties
@@ -96,8 +96,6 @@ WS02 = Document model %1 could not be read. Index will be created using the default model. WS03 = Help Action Contribution %1 could not be executed. -W001= Problems reading product.ini file - # Info Messages # -------------
diff --git a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/HelpSystem.java b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/HelpSystem.java index 5c52111..d4cc4d7 100644 --- a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/HelpSystem.java +++ b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/HelpSystem.java
@@ -24,6 +24,8 @@ protected ContextManager contextManager; protected ISearchEngine searchManager; protected Plugin plugin; + // Information Set order for Navigation Manager + protected String informationSetIds = null; int debug_level; private String browserPath; @@ -90,6 +92,12 @@ public static int getDebugLevel() { return getInstance().debug_level; } + /** + * Gets suggested order of information sets + */ + public static String getInformationSetIds(){ + return getInstance().informationSetIds; + } public static HelpSystem getInstance() { return instance; } @@ -184,6 +192,13 @@ getInstance().debug_level = debug_level; Logger.setDebugLevel(debug_level); } + /** + * Sets suggested order of information sets + * @param IDs comma separated list of information set IDs + */ + public static void setInformationSetIds(String IDs){ + getInstance().informationSetIds=IDs; + } public static void setInstall(int install) { int oldInstall = getInstance().install; getInstance().install = install;
diff --git a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/navigation/HelpNavigationManager.java b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/navigation/HelpNavigationManager.java index 35b1bdd..fcbe3d4 100644 --- a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/navigation/HelpNavigationManager.java +++ b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/navigation/HelpNavigationManager.java Binary files differ