debian/changelog

+eclipse-platform-ua (4.14-1) unstable; urgency=medium
+
+  * New upstream version 4.14
+  * Update copyright
+  * Bump policy versions (no changes)
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Mon, 30 Dec 2019 12:10:48 +0100
+
 eclipse-platform-ua (4.13-1) unstable; urgency=medium
 
   * New upstream version 4.13

debian/control

@@ -16,7 +16,7 @@ Build-Depends:
  libequinox-preferences-java,
  libequinox-registry-java,
  libicu4j-java
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-ua.git
 Vcs-Browser: https://salsa.debian.org/java-team/eclipse-platform-ua
 Homepage: https://www.eclipse.org/eclipse/platform-ua/main.html

debian/copyright

@@ -9,7 +9,7 @@ Files-Excluded: *.jar
 
 Files: *
 Copyright: 2000-2018, Eclipse Foundation and others
-           2000-2017, IBM Corporation and others
+           2000-2019, IBM Corporation and others
            2005-2016, Intel Corporation and others
            1986, International Organization for Standardization
            2016, Manumitting Technologies Inc and others

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

org.eclipse.help.base/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.platform.ua</artifactId>
     <groupId>eclipse.platform.ua</groupId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.help</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>4.2.700-SNAPSHOT</version>
+  <version>4.2.800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>

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

@@ -253,9 +253,9 @@ public final class BaseHelpSystem {
 				getBase("/help/nftopic"),  //$NON-NLS-1$
 				getBase("/help/ntopic"),  //$NON-NLS-1$
 				getBase("/help/rtopic") }; //$NON-NLS-1$
-		for (int i = 0; i < baseVariants.length; i++) {
-			if (href.startsWith(baseVariants[i])) {
-				return href.substring(baseVariants[i].length());
+		for (String baseVariant : baseVariants) {
+			if (href.startsWith(baseVariant)) {
+				return href.substring(baseVariant.length());
 			}
 		}
 		return href;

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

@@ -88,7 +88,7 @@ public class HelpApplication implements IApplication, IExecutableExtension {
 		stopHelp();
 
 		// wait until start has finished
-		synchronized(this) {};
+		synchronized(this) {}
 	}
 
 	/**

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

@@ -151,7 +151,7 @@ public class HelpDisplay {
 	 * Display help to search view for given query and selected topic.
 	 *
 	 * @param searchQuery
-	 *            search query in URL format key=value&key=value
+	 *            search query in URL format {@literal key=value&key=value }
 	 * @param topic
 	 *            selected from the search results
 	 */

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

@@ -100,8 +100,8 @@ public class IndexToolApplication implements IApplication {
 			if(files == null) {
 				throw new IOException("Content from directory '" + file.getAbsolutePath() + "' can not be listed."); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-			for (int i = 0; i < files.length; i++) {
-				delete(files[i]);
+			for (File fileToDelete : files) {
+				delete(fileToDelete);
 			}
 		}
 		if (!file.delete()) {
@@ -127,14 +127,14 @@ public class IndexToolApplication implements IApplication {
 		String[] files = dir.list();
 		if (files == null || files.length == 0)
 			return;
-		for (int i = 0; i < files.length; i++) {
+		for (String file : files) {
 			String path;
 			if (base == null) {
-				path = files[i];
+				path = file;
 			} else {
-				path = base + "/" + files[i]; //$NON-NLS-1$
+				path = base + "/" + file; //$NON-NLS-1$
 			}
-			File f = new File(dir, files[i]);
+			File f = new File(dir, file);
 			if (f.isDirectory())
 				zipDirectory(f, zout, path);
 			else {

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

@@ -17,7 +17,6 @@ package org.eclipse.help.internal.base;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -98,8 +97,7 @@ public class MissingContentManager {
 		// Read the placeholders from the extension registry
 		IConfigurationElement[] elements = registry
 				.getConfigurationElementsFor(EXTENSION_POINT_ID_TOC);
-		for (int i = 0; i < elements.length; ++i) {
-			IConfigurationElement elem = elements[i];
+		for (IConfigurationElement elem : elements) {
 			String pluginId = elem.getContributor().getName();
 			if (elem.getName().equals(ELEMENT_NAME_PLACEHOLDER)) {
 				try {
@@ -132,8 +130,7 @@ public class MissingContentManager {
 	 * @return a place holder page if defined, otherwise an error page
 	 */
 	public String getPageNotFoundPage(String path, boolean showPlaceholderPage) {
-		for (Iterator<Placeholder> iter = placeholders.iterator(); iter.hasNext(); ) {
-			Placeholder placeholder = iter.next();
+		for (Placeholder placeholder : placeholders) {
 			if (path.startsWith(placeholder.path) && Platform.getBundle(placeholder.bundle) == null) {
 				if ( showPlaceholderPage) {
 					return placeholder.placeholderPage;
@@ -187,8 +184,7 @@ public class MissingContentManager {
 	public Placeholder[] getUnresolvedPlaceholders() {
 		List<Placeholder> unresolved;
 		unresolved = new ArrayList<>();
-		for (Iterator<Placeholder> iter = placeholders.iterator(); iter.hasNext(); ) {
-			Placeholder ph = iter.next();
+		for (Placeholder ph : placeholders) {
 			String bundle = ph.bundle;
 			if (bundle != null && !bundlesToIgnore.contains(bundle) ) {
 				if (Platform.getBundle(bundle) == null ) {
@@ -203,8 +199,8 @@ public class MissingContentManager {
 	public void ignoreAllMissingPlaceholders() {
 		Placeholder[] unresolved = getUnresolvedPlaceholders();
 		String ignoredBundles = Platform.getPreferencesService().getString(HelpBasePlugin.PLUGIN_ID, IGNORE_MISSING_PLACEHOLDER_PREFERENCE, "", null); //$NON-NLS-1$
-		for ( int i = 0; i < unresolved.length; i++) {
-			String bundle = unresolved[i].bundle;
+		for (Placeholder element : unresolved) {
+			String bundle = element.bundle;
 			bundlesToIgnore.add(bundle);
 			if (ignoredBundles.length() > 0) {
 				ignoredBundles = ignoredBundles + ',';

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

@@ -139,8 +139,7 @@ public class PreferenceFileHandler {
 	/**
 	 * This methods writes the remote infocenters in the table model to the preferences.ini.
 	 *
-	 * @param List
-	 *            of RemoteIC Objects
+	 * @param remoteICs List of RemoteIC Objects
 	 *
 	 */
 	public static void commitRemoteICs(RemoteIC[] remoteICs) {

org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java

@@ -16,7 +16,6 @@ package org.eclipse.help.internal.base.scope;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 
@@ -61,8 +60,7 @@ public class ScopeRegistry {
 
 
 		// Lookup in scope registry
-		for (Iterator<IScopeHandle> iter = scopes.iterator(); iter.hasNext();) {
-			IScopeHandle handle = iter.next();
+		for (IScopeHandle handle : scopes) {
 			if (id.equals(handle.getId())) {
 				return handle.getScope();
 			}
@@ -78,17 +76,17 @@ public class ScopeRegistry {
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] elements = registry
 				.getConfigurationElementsFor(SCOPE_XP_NAME);
-		for (int i = 0; i < elements.length; i++) {
+		for (IConfigurationElement element : elements) {
 
 			Object obj = null;
 			try {
-				obj = elements[i].createExecutableExtension("class"); //$NON-NLS-1$
+				obj = element.createExecutableExtension("class"); //$NON-NLS-1$
 			} catch (CoreException e) {
 				HelpBasePlugin.logError("Create extension failed:[" //$NON-NLS-1$
 						+ SCOPE_XP_NAME + "].", e); //$NON-NLS-1$
 			}
 			if (obj instanceof AbstractHelpScope) {
-				String id = elements[i].getAttribute("id"); //$NON-NLS-1$
+				String id = element.getAttribute("id"); //$NON-NLS-1$
 				IScopeHandle filter = new ScopeHandle(id, (AbstractHelpScope) obj);
 				scopes.add(filter);
 			}
@@ -117,9 +115,8 @@ public class ScopeRegistry {
 	{
 		ArrayList<AbstractHelpScope> scopes = new ArrayList<>();
 
-		for (int p=0;p<phrases.length;p++)
-		{
-			AbstractHelpScope scope = parseScopePhrase(phrases[p]);
+		for (String phrase : phrases) {
+			AbstractHelpScope scope = parseScopePhrase(phrase);
 			if (scope!=null)
 				scopes.add(scope);
 		}

org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java

@@ -81,8 +81,8 @@ public class ScopeUtils {
 	 */
 	public static boolean hasInScopeDescendent(ITopic topic, AbstractHelpScope scope) {
 		ITopic[] subtopics = topic.getSubtopics();
-		for (int i = 0; i < subtopics.length; i++) {
-			if (showInTree(subtopics[i], scope)) {
+		for (ITopic subtopic : subtopics) {
+			if (showInTree(subtopic, scope)) {
 				return true;
 			}
 		}
@@ -95,8 +95,8 @@ public class ScopeUtils {
 	 */
 	public static boolean hasInScopeDescendent(IToc toc, AbstractHelpScope scope) {
 		ITopic[] topics = toc.getTopics();
-		for (int i = 0; i < topics.length; i++) {
-			if (showInTree(topics[i], scope)) {
+		for (ITopic topic : topics) {
+			if (showInTree(topic, scope)) {
 				return true;
 			}
 		}
@@ -110,21 +110,21 @@ public class ScopeUtils {
 	public static boolean hasInScopeDescendent(IIndexEntry entry,
 			AbstractHelpScope scope) {
 		ITopic[] topics = entry.getTopics();
-		for (int t = 0; t < topics.length; t++) {
-			if (showInTree(topics[t], scope)) {
+		for (ITopic topic : topics) {
+			if (showInTree(topic, scope)) {
 				return true;
 			}
 		}
 		IIndexEntry[] entries = entry.getSubentries();
-		for (int e = 0; e < entries.length; e++) {
-			if (showInTree(entries[e], scope)) {
+		for (IIndexEntry innerEntry : entries) {
+			if (showInTree(innerEntry, scope)) {
 				return true;
 			}
 		}
 		if (entry instanceof IIndexEntry2) {
 			IIndexSee[] sees = ((IIndexEntry2)entry).getSees();
-			for (int s = 0; s < sees.length; s++) {
-				if (showInTree(sees[s], scope)) {
+			for (IIndexSee see : sees) {
+				if (showInTree(see, scope)) {
 					return true;
 				}
 			}

org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java

@@ -37,8 +37,8 @@ public class UnionScope extends AbstractHelpScope {
 
 	@Override
 	public boolean inScope(IToc toc) {
-		for (int scope = 0; scope < scopes.length; scope ++) {
-			if (scopes[scope].inScope(toc)) {
+		for (AbstractHelpScope scope : scopes) {
+			if (scope.inScope(toc)) {
 				return true;
 			}
 		}
@@ -47,8 +47,8 @@ public class UnionScope extends AbstractHelpScope {
 
 	@Override
 	public boolean inScope(ITopic topic) {
-		for (int scope = 0; scope < scopes.length; scope ++) {
-			if (scopes[scope].inScope(topic)) {
+		for (AbstractHelpScope scope : scopes) {
+			if (scope.inScope(topic)) {
 				return true;
 			}
 		}
@@ -57,8 +57,8 @@ public class UnionScope extends AbstractHelpScope {
 
 	@Override
 	public boolean inScope(IIndexEntry entry) {
-		for (int scope = 0; scope < scopes.length; scope ++) {
-			if (scopes[scope].inScope(entry)) {
+		for (AbstractHelpScope scope : scopes) {
+			if (scope.inScope(entry)) {
 				return true;
 			}
 		}
@@ -67,8 +67,8 @@ public class UnionScope extends AbstractHelpScope {
 
 	@Override
 	public boolean inScope(IIndexSee see) {
-		for (int scope = 0; scope < scopes.length; scope ++) {
-			if (scopes[scope].inScope(see)) {
+		for (AbstractHelpScope scope : scopes) {
+			if (scope.inScope(see)) {
 				return true;
 			}
 		}
@@ -82,8 +82,8 @@ public class UnionScope extends AbstractHelpScope {
 
 	@Override
 	public boolean isHierarchicalScope() {
-		for (int scope = 0; scope < scopes.length; scope ++) {
-			if (!scopes[scope].isHierarchicalScope()) {
+		for (AbstractHelpScope scope : scopes) {
+			if (!scope.isHierarchicalScope()) {
 				return false;
 			}
 		}

org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java

@@ -194,8 +194,7 @@ public class WorkingSetScope extends AbstractHelpScope {
 			anchorlessHref = href;
 		}
 
-		for (int i = 0; i < elements.length; i++) {
-			AdaptableHelpResource adaptable = elements[i];
+		for (AdaptableHelpResource adaptable : elements) {
 			if (adaptable.getTopic(anchorlessHref) != null) {
 				return true;
 			}

org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java

@@ -40,8 +40,7 @@ public class CriteriaUtilities {
 	}
 
 	public static void addCriteriaToMap(Map<String, Set<String>> map, ICriteria[] criteria) {
-		for (int i = 0; i < criteria.length; ++i) {
-			ICriteria criterion = criteria[i];
+		for (ICriteria criterion : criteria) {
 			String name = criterion.getName();
 			List<String> values = CriteriaUtilities.getCriteriaValues(criterion.getValue());
 			if (name != null && name.length() > 0 && values.size() > 0) {
@@ -57,8 +56,7 @@ public class CriteriaUtilities {
 	}
 
 	public static void addCriteriaToMap(Map<String, Set<String>> map, CriterionResource[] criteria) {
-		for(int i = 0; i < criteria.length; ++ i){
-			CriterionResource criterion = criteria[i];
+		for (CriterionResource criterion : criteria) {
 			String criterionName = criterion.getCriterionName();
 			List<String> criterionValues = criterion.getCriterionValues();
 

org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java

@@ -43,9 +43,9 @@ public class IndexUtils {
 		}
 		String[] path = getPath(see);
 		IUAElement[] children = index.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] instanceof IIndexEntry) {
-				IIndexEntry indexEntry = (IIndexEntry)children[i];
+		for (IUAElement element : children) {
+			if (element instanceof IIndexEntry) {
+				IIndexEntry indexEntry = (IIndexEntry) element;
 				String entryKeyword = indexEntry.getKeyword();
 				if (path[depth].equals(entryKeyword)) {
 					if (path.length == depth + 1) {

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

@@ -15,7 +15,6 @@ package org.eclipse.help.internal.browser;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -390,8 +389,7 @@ public class BrowserManager {
 			// nothing to do, do not initialize
 			return;
 		}
-		for (Iterator<IBrowser> it = browsers.iterator(); it.hasNext();) {
-			IBrowser browser = it.next();
+		for (IBrowser browser : browsers) {
 			browser.close();
 		}
 	}

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

@@ -54,8 +54,8 @@ public class MozillaBrowserAdapter implements IBrowser {
 	/**
 	 * Constructor
 	 *
-	 * @executable executable filename to launch
-	 * @executableName name of the program to display when error occurs
+	 * @param executable     executable filename to launch
+	 * @param executableName name of the program to display when error occurs
 	 */
 	MozillaBrowserAdapter(String executable, String executableName) {
 		this.uiThread = Thread.currentThread();
@@ -181,12 +181,11 @@ public class MozillaBrowserAdapter implements IBrowser {
 
 		/**
 		 * On some OSes 0 is always returned by netscape -remote. It is
-		 * necessary to examine ouput to find out failure
+		 * necessary to examine output to find out failure
 		 *
 		 * @param outputs
 		 * @param errors
-		 * @return @throws
-		 *         InterruptedException
+		 * @return
 		 */
 		private boolean errorsInOutput(StreamConsumer outputs, StreamConsumer errors) {
 			try {