Fixed bug 408899: [Help] Extenders of help.base.activitySupport see a warning regarding "localScopeCheckbox" although that element is unused

9 files changed, 25 insertions, 42 deletions

diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
index 0af7e6baf..590f5df9e 100644
--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_base_plugin_name
 Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.help.base/pom.xml b/org.eclipse.help.base/pom.xml
index 46cf2f20a..d6538c654 100644
--- a/org.eclipse.help.base/pom.xml
+++ b/org.eclipse.help.base/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012 Eclipse Foundation.
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.help</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.help.base/schema/activitySupport.exsd b/org.eclipse.help.base/schema/activitySupport.exsd
index 431db48bd..7ad39aceb 100644
--- a/org.eclipse.help.base/schema/activitySupport.exsd
+++ b/org.eclipse.help.base/schema/activitySupport.exsd
@@ -54,7 +54,7 @@
    <element name="support">
       <complexType>
          <sequence>
-            <element ref="localScopeCheckbox"/>
+            <element ref="localScopeCheckbox" minOccurs="0" maxOccurs="1"/>
             <element ref="documentMessage"/>
             <element ref="showAllMessage"/>
          </sequence>
@@ -82,10 +82,10 @@
    <element name="localScopeCheckbox" type="string">
       <annotation>
          <appInfo>
-            <meta.element translatable="true"/>
+            <meta.element translatable="true" deprecated="true"/>
          </appInfo>
          <documentation>
-            a label of the checkbox in the local search scope preference page. When the checkbox is selected, search hits in documents that belong to disabled activites will be included in the search results.
+            a label of the checkbox in the local search scope preference page. When the checkbox is selected, search hits in documents that belong to disabled activites will be included in the search results. &lt;strong&gt;As of 3.6, this element is no longer used&lt;/strong&gt;.
          </documentation>
       </annotation>
    </element>
@@ -178,7 +178,7 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2005, 2013 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
index 2710c088a..e8c9bdeee 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,12 +13,14 @@ package org.eclipse.help.internal.base;
 import java.io.File;
 import java.net.URL;
 
+import org.osgi.framework.BundleContext;
+
+import org.eclipse.osgi.service.datalocation.Location;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.osgi.framework.BundleContext;
 
 /**
  * Help Base plug-in.
@@ -59,9 +61,6 @@ public class HelpBasePlugin extends Plugin {
 		public boolean getDocumentMessageUsesLiveHelp(boolean embedded) {
 			return false;
 		}
-		public String getLocalScopeCheckboxLabel() {
-			return null;
-		}
 	};
 
 	public static synchronized void logError(String message, Throwable ex) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
index 20a4ff9d6..aabf27f94 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,13 +83,6 @@ public interface IHelpActivitySupport {
 	public String getDocumentMessage(boolean embedded);
 
 	/**
-	 * Returns the label for the checkbox in the local scope page
-	 * that allows search hits from disabled activities to be shown. 
-	 * @return the checkbox label 
-	 */
-	public String getLocalScopeCheckboxLabel();
-
-	/**
 	 * @param embedded
 	 *            if <code>true</code>, the message will be added to a
 	 *            document in the workbench window. Otherwise, it will be shown
diff --git a/org.eclipse.help.ui/META-INF/MANIFEST.MF b/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 2c14fc06e..dc4b9cae1 100644
--- a/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_system_plugin_name
 Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.help.ui/pom.xml b/org.eclipse.help.ui/pom.xml
index 9f9a913b2..ee9421054 100644
--- a/org.eclipse.help.ui/pom.xml
+++ b/org.eclipse.help.ui/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012 Eclipse Foundation.
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.help</groupId>
   <artifactId>org.eclipse.help.ui</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
index f538a3240..25341f0af 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,20 +14,23 @@ package org.eclipse.help.ui.internal;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.osgi.service.prefs.BackingStoreException;
+
+import org.eclipse.help.internal.HelpPlugin;
+import org.eclipse.help.internal.base.HelpBasePlugin;
+import org.eclipse.help.internal.base.IHelpActivitySupport;
+import org.eclipse.help.internal.toc.Toc;
+
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.help.internal.HelpPlugin;
-import org.eclipse.help.internal.base.HelpBasePlugin;
-import org.eclipse.help.internal.base.IHelpActivitySupport;
-import org.eclipse.help.internal.toc.Toc;
+
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.IIdentifier;
 import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.osgi.service.prefs.BackingStoreException;
 
 /**
  * Wrapper for eclipse ui activity support
@@ -82,14 +85,6 @@ public class HelpActivitySupport implements IHelpActivitySupport {
 				return child.getValue();
 			return null;
 		}
-		public String getLocalScopeCheckboxLabel() {
-			if (config==null)
-				return null;
-			IConfigurationElement child = getChild("localScopeCheckbox"); //$NON-NLS-1$
-			if (child!=null)
-				return child.getValue();
-			return null;
-		}
 		public boolean needsLiveHelp(boolean embedded) {
 			getDocumentMessage(embedded);
 			return needsLiveHelp;
@@ -295,7 +290,4 @@ public class HelpActivitySupport implements IHelpActivitySupport {
 	public boolean getDocumentMessageUsesLiveHelp(boolean embedded) {
 		return activityDescriptor.needsLiveHelp(embedded);
 	}
-	public String getLocalScopeCheckboxLabel() {
-		return activityDescriptor.getLocalScopeCheckboxLabel();
-	}
 }
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
index 8d5ddd316..3bf5ad4a2 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
@@ -174,7 +174,6 @@ InfoCenterPage_invalidURL=Invalid URL
 InfoCenterPage_tocError=Error while loading table of contents
 WebSearchPage_label=&URL template:
 WebSearchPage_info=You can capture the URL template by copying the web query from the browser address field and replacing the search word with {expression}.
-LocalHelpPage_capabilityFiltering_name= &Include results about disabled capabilities
 RootScopePage_masterButton=&Enable search engine
 RootScopePage_name=Na&me:
 RootScopePage_desc=Descri&ption: