.gitignore

@@ -12,3 +12,4 @@ Snap.*
 # maven
 /*/target/
 .DS_Store
+/target/

debian/changelog

+eclipse-platform-ua (4.13-1) unstable; urgency=medium
+
+  * New upstream version 4.13
+  * Bump policy version (no changes)
+  * switch to debhelper-compat and debhelper 12
+  * add Salsa CI
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Sun, 15 Sep 2019 17:37:28 +0200
+
 eclipse-platform-ua (4.12-1) unstable; urgency=medium
 
   * New upstream release

debian/compat

-11

debian/control

@@ -6,7 +6,7 @@ Uploaders:
  Emmanuel Bourg <ebourg@apache.org>,
  Jochen Sprickerhof <jspricke@debian.org>
 Build-Depends:
- debhelper (>= 11~),
+ debhelper-compat (= 12),
  default-jdk,
  eclipse-debian-helper,
  libeclipse-core-expressions-java,
@@ -16,7 +16,7 @@ Build-Depends:
  libequinox-preferences-java,
  libequinox-registry-java,
  libicu4j-java
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 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/gitlab-ci.yml

+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs

@@ -230,6 +230,8 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
@@ -261,6 +263,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declar
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
@@ -299,6 +302,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
@@ -346,6 +351,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_decla
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs

@@ -37,6 +37,8 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
 sp_cleanup.remove_redundant_type_arguments=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
@@ -61,3 +63,4 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
+sp_org.autorefactor.ui.autorefactor_clean_up=false

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

org.eclipse.help.base/doc/book.css

@@ -40,3 +40,13 @@ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt
 body	     { font-size: 83%; background: #FFFFFF; margin-bottom: 1em }
 h1           { font-size: 140%; margin-top: 25px; margin-bottom: 3px }	
 h2           { font-size: 110%; margin-top: 20px; margin-bottom: 3px }
+
+@media (prefers-color-scheme: dark) {
+	body { 
+		color: #f0f0f0; 
+		background: #3d3d3d;
+	} 
+	body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {
+		color: #f0f0f0;
+	}
+}
\ No newline at end of file

org.eclipse.help.base/doc/darkTheme.css

+@media (prefers-color-scheme: dark) {
+	body { 
+		color: #f0f0f0; 
+		background: #3d3d3d;
+	} 
+	a {
+		color:#ffffff;
+	}
+	a.active{ 
+		color:#ffffff;
+	}
+	
+	a.nolink:link, 
+	a.nolink:visited {
+		color:#ffffff;
+	}
+}
\ No newline at end of file

org.eclipse.help.base/pom.xml

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

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

@@ -196,7 +196,7 @@ public final class BaseHelpSystem {
 
 	public static URL resolve(String href, boolean documentOnly) {
 		String url = null;
-		if (href == null || href.indexOf("://") != -1 //$NON-NLS-1$
+		if (href == null || href.contains("://") //$NON-NLS-1$
 					|| isFileProtocol(href))
 			url = href;
 		else {
@@ -216,7 +216,7 @@ public final class BaseHelpSystem {
 
 	public static URL resolve(String href, String servlet) {
 		String url = null;
-		if (href == null || href.indexOf("://") != -1 //$NON-NLS-1$
+		if (href == null || href.contains("://") //$NON-NLS-1$
 			|| isFileProtocol(href)) {
 			url = href;
 		}

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

@@ -120,7 +120,7 @@ public class BookmarkManager extends Observable {
 			// separate the url and title by vertical bar
 
 			// check for duplicates
-			if (bookmarks.indexOf("," + encode(bookmarkURL) + "|") != -1) //$NON-NLS-1$ //$NON-NLS-2$
+			if (bookmarks.contains("," + encode(bookmarkURL) + "|")) //$NON-NLS-1$ //$NON-NLS-2$
 				return;
 			bookmarks = bookmarks
 					+ "," + encode(bookmarkURL) + "|" + encode(title); //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -31,11 +31,11 @@ public class HelpBasePreferenceInitializer extends
 
 		String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); //$NON-NLS-1$
 
-		if (os.indexOf("windows") != -1) { //$NON-NLS-1$
+		if (os.contains("windows")) { //$NON-NLS-1$
 			prefs
 					.put("custom_browser_path", //$NON-NLS-1$
 							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
-		} else if (os.indexOf("linux") != -1) { //$NON-NLS-1$
+		} else if (os.contains("linux")) { //$NON-NLS-1$
 			prefs.put("custom_browser_path", //$NON-NLS-1$
 					"konqueror %1"); //$NON-NLS-1$
 		} else {