debian/changelog

+eclipse-platform-ua (4.11-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 11 Jul 2019 11:06:12 +0200
+
 eclipse-platform-ua (4.10-1) unstable; urgency=medium
 
   * New upstream release

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.2.400.qualifier
+Bundle-Version: 4.2.500.qualifier
 Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

org.eclipse.help.base/about.properties

@@ -22,6 +22,6 @@ blurb=Eclipse Help\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2000, 2018.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2019.  All rights reserved.\n\
 Visit http://www.eclipse.org/platform
 

org.eclipse.help.base/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.platform.ua</artifactId>
     <groupId>eclipse.platform.ua</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.help</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>4.2.400-SNAPSHOT</version>
+  <version>4.2.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>

org.eclipse.help.base/src/org/eclipse/help/browser/package.html

@@ -16,26 +16,26 @@ Base Help System, requires web browser to display help document.  Since
 availability of web browsers differ from system to system, it is possible
 to configure browser adapters in addition to ones provided with the base. 
 The browser (or browser adapter) can be configured by
-providing extension for <tt>org.eclipse.help.base.browser</tt> extension point.&nbsp;
+providing extension for <code>org.eclipse.help.base.browser</code> extension point.&nbsp;
 If more than one browser is available on a user system, the default browser
 can be designated in Help preference page.
 <p>In general terms, implementing a web browser involves:
 <ul>
 <li>
-Implementing standalone UI element having the <tt>IBrowser</tt> API, and
+Implementing standalone UI element having the <code>IBrowser</code> API, and
 capable of displaying HTML documents given a URL.</li>
 
 <li>
 Providing a factory for managing of browsers on a particular system, by
-implementing <tt>IBrowserFactory</tt> interface.</li>
+implementing <code>IBrowserFactory</code> interface.</li>
 
 <li>
-Declaring an extension of the <tt>org.eclipse.help.base.browser</tt> extension
+Declaring an extension of the <code>org.eclipse.help.base.browser</code> extension
 point that mentions the name of that factory class.</li>
 </ul>
 Note that browser factory will be created on every system.&nbsp; If the
 factory is not capable of creating a browser on some system configurations,
-due to missing prerequisites e.t.c., its <tt>isAvailable()</tt> method
+due to missing prerequisites e.t.c., its <code>isAvailable()</code> method
 should be returning false on these systems.
 
 </body>

org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java

 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -44,8 +44,8 @@ public class DisplayUtils {
 				return;
 			}
 			Class<?> c = bundle.loadClass(LOOP_CLASS_NAME);
-			Method m = c.getMethod(method, new Class[]{});
-			m.invoke(null, new Object[]{});
+			Method m = c.getMethod(method);
+			m.invoke(null);
 		} catch (Exception e) {
 		}
 	}

org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java

 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -45,9 +45,6 @@ public class HelpApplication implements IApplication, IExecutableExtension {
 	private FileLock lock;
 	private RandomAccessFile raf;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
 	@Override
 	public synchronized Object start(IApplicationContext context) throws Exception {
 		if (status == STATE_RESTARTING) {
@@ -86,9 +83,6 @@ public class HelpApplication implements IApplication, IExecutableExtension {
 		return EXIT_OK;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
 	@Override
 	public void stop() {
 		stopHelp();
@@ -117,9 +111,6 @@ public class HelpApplication implements IApplication, IExecutableExtension {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public void setInitializationData(IConfigurationElement configElement, String propertyName, Object data) {
 		String value = (String)((Map<?, ?>)data).get("mode"); //$NON-NLS-1$

org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -25,11 +25,6 @@ import org.osgi.service.prefs.BackingStoreException;
 public class HelpBasePreferenceInitializer extends
 		AbstractPreferenceInitializer {
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
 	@Override
 	public void initializeDefaultPreferences() {
 		IEclipsePreferences prefs = DefaultScope.INSTANCE.getNode(HelpBasePlugin.PLUGIN_ID);

org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java

 /*******************************************************************************
- * Copyright (c) 2011, 2015 IBM Corporation and others.
+ * Copyright (c) 2011, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -28,9 +28,6 @@ import org.eclipse.help.internal.protocols.HelpURLStreamHandler;
  */
 public class HelpProvider implements IHelpProvider {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.help.internal.HelpPlugin.IHelpProvider#getHelpContent(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public InputStream getHelpContent(String href, String locale) {
 		try {

org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java

 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -31,9 +31,6 @@ import org.eclipse.osgi.util.NLS;
  */
 public class IndexToolApplication implements IApplication {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
 	@Override
 	public synchronized Object start(IApplicationContext context) throws Exception {
 		try {
@@ -61,9 +58,6 @@ public class IndexToolApplication implements IApplication {
 		return EXIT_OK;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
 	@Override
 	public synchronized void stop() {
 	}

org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java

 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -104,11 +104,6 @@ public class RemoteContextProvider extends AbstractContextProvider {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.help.AbstractContextProvider#getPlugins()
-	 */
 	@Override
 	public String[] getPlugins() {
 		// this is a global provider

org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java

 /*******************************************************************************
- * Copyright (c) 2006, 2016 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -42,9 +42,6 @@ public class RemoteIndexProvider extends AbstractIndexProvider {
 		RemoteHelp.addPreferenceChangeListener(event -> contentChanged());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.help.AbstractIndexProvider#getIndexContributions(String)
-	 */
 	@Override
 	public IIndexContribution[] getIndexContributions(String locale) {
 		if (RemoteHelp.isEnabled()) {

org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java

 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -78,9 +78,6 @@ public class RemoteSearchParser extends DefaultHandler {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
 	@Override
 	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
 		if (qName.equals("hit")) { //$NON-NLS-1$
@@ -91,9 +88,6 @@ public class RemoteSearchParser extends DefaultHandler {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void endElement(String uri, String localName, String qName) throws SAXException {
 		if (qName.equals("hit")) { //$NON-NLS-1$

org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java

 /*******************************************************************************
- * Copyright (c) 2006, 2016 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -41,11 +41,6 @@ public class RemoteTocProvider extends AbstractTocProvider {
 		RemoteHelp.addPreferenceChangeListener(event -> contentChanged());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.help.AbstractTocProvider#getTocContributions(java.lang.String)
-	 */
 	@Override
 	public ITocContribution[] getTocContributions(String locale) {
 
@@ -143,11 +138,6 @@ public class RemoteTocProvider extends AbstractTocProvider {
 		return new ITocContribution[0];
 	}
 
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.help.AbstractTocProvider#getPriority()
-	 */
 	@Override
 	public int getPriority() {
 

org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -37,23 +37,17 @@ public class CurrentBrowser implements IBrowser {
 		this.browserAdapterId = browserAdapterId;
 		this.external = externalBrowser;
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#close()
-	 */
+
 	@Override
 	public void close() {
 		browserAdapter.close();
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isCloseSupported()
-	 */
+
 	@Override
 	public boolean isCloseSupported() {
 		return browserAdapter.isCloseSupported();
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#displayURL(java.lang.String)
-	 */
+
 	@Override
 	public void displayURL(String url) throws Exception {
 		checkDefaultAdapter();
@@ -72,9 +66,7 @@ public class CurrentBrowser implements IBrowser {
 		}
 		browserAdapter.displayURL(url);
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetLocationSupported()
-	 */
+
 	@Override
 	public boolean isSetLocationSupported() {
 		checkDefaultAdapter();
@@ -84,9 +76,7 @@ public class CurrentBrowser implements IBrowser {
 		return browserAdapter.isSetLocationSupported()
 				|| newBrowserAdapter.isSetLocationSupported();
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetSizeSupported()
-	 */
+
 	@Override
 	public boolean isSetSizeSupported() {
 		checkDefaultAdapter();
@@ -96,9 +86,7 @@ public class CurrentBrowser implements IBrowser {
 		return browserAdapter.isSetSizeSupported()
 				|| newBrowserAdapter.isSetSizeSupported();
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setLocation(int, int)
-	 */
+
 	@Override
 	public void setLocation(int x, int y) {
 		checkDefaultAdapter();
@@ -107,9 +95,7 @@ public class CurrentBrowser implements IBrowser {
 		this.x = x;
 		this.y = y;
 	}
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setSize(int, int)
-	 */
+
 	@Override
 	public void setSize(int width, int height) {
 		checkDefaultAdapter();

org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -22,30 +22,18 @@ import org.eclipse.help.internal.base.*;
 import org.eclipse.osgi.service.environment.*;
 import org.eclipse.osgi.util.NLS;
 
-/**
- *
- */
 public class CustomBrowser implements IBrowser {
 	public static final String CUSTOM_BROWSER_PATH_KEY = "custom_browser_path"; //$NON-NLS-1$
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#close()
-	 */
 	@Override
 	public void close() {
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isCloseSupported()
-	 */
 	@Override
 	public boolean isCloseSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#displayURL(java.lang.String)
-	 */
 	@Override
 	public void displayURL(String url) throws Exception {
 		String path =  Platform.getPreferencesService().getString
@@ -73,32 +61,20 @@ public class CustomBrowser implements IBrowser {
 		}
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetLocationSupported()
-	 */
 	@Override
 	public boolean isSetLocationSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetSizeSupported()
-	 */
 	@Override
 	public boolean isSetSizeSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setLocation(int, int)
-	 */
 	@Override
 	public void setLocation(int x, int y) {
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setSize(int, int)
-	 */
 	@Override
 	public void setSize(int width, int height) {
 	}

org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -20,17 +20,11 @@ import org.eclipse.help.browser.*;
  */
 public class CustomBrowserFactory implements IBrowserFactory {
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowserFactory#isAvailable()
-	 */
 	@Override
 	public boolean isAvailable() {
 		return true;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowserFactory#createBrowser()
-	 */
 	@Override
 	public IBrowser createBrowser() {
 		return new CustomBrowser();

org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java

 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -63,16 +63,10 @@ public class MozillaBrowserAdapter implements IBrowser {
 		this.executableName = executableName;
 	}
 
-	/*
-	 * @see IBrowser#close()
-	 */
 	@Override
 	public void close() {
 	}
 
-	/*
-	 * @see IBrowser#displayURL(String)
-	 */
 	@Override
 	public void displayURL(String url) {
 		if (lastBrowserThread != null)
@@ -86,33 +80,21 @@ public class MozillaBrowserAdapter implements IBrowser {
 		setSizePending = false;
 	}
 
-	/*
-	 * @see IBrowser#isCloseSupported()
-	 */
 	@Override
 	public boolean isCloseSupported() {
 		return false;
 	}
 
-	/*
-	 * @see IBrowser#isSetLocationSupported()
-	 */
 	@Override
 	public boolean isSetLocationSupported() {
 		return true;
 	}
 
-	/*
-	 * @see IBrowser#isSetSizeSupported()
-	 */
 	@Override
 	public boolean isSetSizeSupported() {
 		return true;
 	}
 
-	/*
-	 * @see IBrowser#setLocation(int, int)
-	 */
 	@Override
 	public void setLocation(int x, int y) {
 		this.x = x;
@@ -120,9 +102,6 @@ public class MozillaBrowserAdapter implements IBrowser {
 		setLocationPending = true;
 	}
 
-	/*
-	 * @see IBrowser#setSize(int, int)
-	 */
 	@Override
 	public void setSize(int width, int height) {
 		this.width = width;

org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -36,9 +36,7 @@ public class MozillaFactory implements IBrowserFactory, IExecutableExtension {
 	public MozillaFactory() {
 		super();
 	}
-	/*
-	 * @see IBrowserFactory#isAvailable()
-	 */
+
 	@Override
 	public boolean isAvailable() {
 		if (!isSupportedOS(System.getProperty("os.name"))) { //$NON-NLS-1$
@@ -92,9 +90,7 @@ public class MozillaFactory implements IBrowserFactory, IExecutableExtension {
 		}
 		return false;
 	}
-	/*
-	 * @see IBrowserFactory#createBrowser()
-	 */
+
 	@Override
 	public IBrowser createBrowser() {
 		// Create single browser for all clients
@@ -104,10 +100,7 @@ public class MozillaFactory implements IBrowserFactory, IExecutableExtension {
 		}
 		return browserInstance;
 	}
-	/**
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
+
 	@Override
 	public void setInitializationData(IConfigurationElement config,
 			String propertyName, Object data) throws CoreException {

org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java

 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -28,16 +28,10 @@ public class DefaultBrowserAdapter implements IBrowser {
 		return fgInstance;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#close()
-	 */
 	@Override
 	public void close() {
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#displayURL(String)
-	 */
 	@Override
 	public void displayURL(String url) {
 		/*
@@ -52,40 +46,25 @@ public class DefaultBrowserAdapter implements IBrowser {
 		}
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isCloseSupported()
-	 */
 	@Override
 	public boolean isCloseSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetLocationSupported()
-	 */
 	@Override
 	public boolean isSetLocationSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#isSetSizeSupported()
-	 */
 	@Override
 	public boolean isSetSizeSupported() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setLocation(int, int)
-	 */
 	@Override
 	public void setLocation(int x, int y) {
 	}
 
-	/**
-	 * @see org.eclipse.help.browser.IBrowser#setSize(int, int)
-	 */
 	@Override
 	public void setSize(int width, int height) {
 	}