[Git][java-team/eclipse-platform-ua][upstream] New upstream version 4.22
Jochen Sprickerhof (@jspricke)
gitlab at salsa.debian.org
Sat Jan 1 09:38:24 GMT 2022
Jochen Sprickerhof pushed to branch upstream at Debian Java Maintainers / eclipse-platform-ua
Commits:
c1aae9dd by Jochen Sprickerhof at 2022-01-01T08:38:19+01:00
New upstream version 4.22
- - - - -
30 changed files:
- .mvn/extensions.xml
- infocenter-web/infocenter-app/pom.xml
- infocenter-web/infocenter-product/pom.xml
- infocenter-web/pom.xml
- org.eclipse.help.base/META-INF/MANIFEST.MF
- org.eclipse.help.base/pom.xml
- org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
- org.eclipse.help.ui/META-INF/MANIFEST.MF
- org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java
- org.eclipse.help.webapp/META-INF/MANIFEST.MF
- org.eclipse.help.webapp/pom.xml
- org.eclipse.help/pom.xml
- org.eclipse.tips.feature/feature.xml
- org.eclipse.tips.feature/pom.xml
- org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF
- + org.eclipse.ua.tests.doc/OSGI-INF/l10n/bundle.properties
- org.eclipse.ua.tests.doc/build.properties
- org.eclipse.ua.tests.doc/plugin.xml
- org.eclipse.ua.tests.doc/pom.xml
- org.eclipse.ua.tests/pom.xml
- org.eclipse.ui.cheatsheets/pom.xml
- org.eclipse.ui.intro.quicklinks.examples/pom.xml
- org.eclipse.ui.intro.solstice.examples/pom.xml
- org.eclipse.ui.intro/META-INF/MANIFEST.MF
- org.eclipse.ui.intro/pom.xml
- org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
- org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java
- org.eclipse.ui.intro/src/org/eclipse/ui/intro/contentproviders/EclipseRSSViewer.java
- pom.xml
- tests-pom/pom.xml
Changes:
=====================================
.mvn/extensions.xml
=====================================
@@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
</extension>
</extensions>
\ No newline at end of file
=====================================
infocenter-web/infocenter-app/pom.xml
=====================================
@@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.help</groupId>
<artifactId>infocenter-parent</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<artifactId>infocenter-app</artifactId>
<packaging>war</packaging>
=====================================
infocenter-web/infocenter-product/pom.xml
=====================================
@@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.help</groupId>
<artifactId>infocenter-parent</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<artifactId>infocenter-product</artifactId>
<packaging>eclipse-repository</packaging>
=====================================
infocenter-web/pom.xml
=====================================
@@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
<relativePath>../../eclipse-platform-parent</relativePath>
</parent>
<groupId>org.eclipse.help</groupId>
=====================================
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.3.400.qualifier
+Bundle-Version: 4.3.500.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.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.help</groupId>
<artifactId>org.eclipse.help.base</artifactId>
- <version>4.3.400-SNAPSHOT</version>
+ <version>4.3.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
=====================================
org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
=====================================
@@ -325,7 +325,7 @@ public final class BaseHelpSystem {
Class<?> c = bundle.loadClass(className);
Object o = c.getDeclaredConstructor().newInstance();
//Runnable runnable = null;
- if (o != null && o instanceof ILiveHelpAction) {
+ if (o instanceof ILiveHelpAction) {
ILiveHelpAction helpExt = (ILiveHelpAction) o;
if (arg != null)
helpExt.setInitializationString(arg);
@@ -352,7 +352,7 @@ public final class BaseHelpSystem {
/**
* Check supplied token against stored token. Clears the stored token if
* successful.
- *
+ *
* @param helpSessionToken
* @return true if match successful
*/
=====================================
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.3.100.qualifier
+Bundle-Version: 4.3.200.qualifier
Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
=====================================
org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java
=====================================
@@ -155,7 +155,9 @@ public class EngineResultSection {
searchResults.setImage(ISharedImages.IMG_OBJS_ERROR_TSK, PlatformUI.getWorkbench().getSharedImages()
.getImage(ISharedImages.IMG_OBJS_ERROR_TSK));
searchResults.setImage(desc.getId(), desc.getIconImage());
- searchResults.setImage(KEY_PREFIX_GRAYED + desc.getId(), getGrayedImage(desc.getIconImage()));
+ Image grayedImage = getGrayedImage(desc.getIconImage());
+ searchResults.setImage(KEY_PREFIX_GRAYED + desc.getId(), grayedImage);
+ searchResults.addDisposeListener(e -> grayedImage.dispose());
searchResults.addHyperlinkListener(new IHyperlinkListener() {
@Override
=====================================
org.eclipse.help.webapp/META-INF/MANIFEST.MF
=====================================
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_webapp_plugin_name
Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
=====================================
org.eclipse.help.webapp/pom.xml
=====================================
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.help</groupId>
<artifactId>org.eclipse.help.webapp</artifactId>
- <version>3.10.400-SNAPSHOT</version>
+ <version>3.10.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
=====================================
org.eclipse.help/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.help</groupId>
<artifactId>org.eclipse.help</artifactId>
=====================================
org.eclipse.tips.feature/feature.xml
=====================================
@@ -15,7 +15,7 @@
<feature
id="org.eclipse.tips.feature"
label="%featureName"
- version="0.2.1500.qualifier"
+ version="0.2.1600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
=====================================
org.eclipse.tips.feature/pom.xml
=====================================
@@ -18,12 +18,12 @@
<parent>
<groupId>eclipse.platform.ua</groupId>
<artifactId>eclipse.platform.ua</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.tips.feature</artifactId>
- <version>0.2.1500-SNAPSHOT</version>
+ <version>0.2.1600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
=====================================
org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF
=====================================
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Doc
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.ua.tests.doc;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.equinox.http.registry;bundle-version="1.0.200",
@@ -23,3 +23,4 @@ Export-Package: org.eclipse.ua.tests.doc,
org.eclipse.ua.tests.doc.internal.linkchecker;x-internal:=true
Eclipse-BundleShape: dir
Automatic-Module-Name: org.eclipse.ua.tests.doc
+Bundle-Vendor: %Bundle-Vendor
=====================================
org.eclipse.ua.tests.doc/OSGI-INF/l10n/bundle.properties
=====================================
@@ -0,0 +1,5 @@
+#Properties file for org.eclipse.ua.tests.doc
+actionSet.label = Link Check Action Set
+action.label = Check TOC links
+Bundle-Vendor = Eclipse.org
+Bundle-Name = Doc
\ No newline at end of file
=====================================
org.eclipse.ua.tests.doc/build.properties
=====================================
@@ -18,4 +18,6 @@ bin.includes = META-INF/,\
plugin.xml,\
checkdoc.js,\
about.html,\
- test.xml
+ test.xml,\
+ OSGI-INF/l10n/bundle.properties,\
+ OSGI-INF/
=====================================
org.eclipse.ua.tests.doc/plugin.xml
=====================================
@@ -30,12 +30,12 @@
point="org.eclipse.ui.actionSets">
<actionSet
id="org.eclipse.help.pageloader.actionSet"
- label="Link Check Action Set"
+ label="%actionSet.label"
visible="true">
<action
class="org.eclipse.ua.tests.doc.internal.actions.LoadTocAction"
id="org.eclipse.ua.tests.loadToc"
- label="Check TOC links"
+ label="%action.label"
menubarPath="help/group.tutorials"
style="push">
</action>
=====================================
org.eclipse.ua.tests.doc/pom.xml
=====================================
@@ -14,12 +14,12 @@
<parent>
<artifactId>tests-pom</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
<groupId>org.eclipse.ua</groupId>
<artifactId>org.eclipse.ua.tests.doc</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
=====================================
org.eclipse.ua.tests/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>tests-pom</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
<groupId>org.eclipse.ua</groupId>
=====================================
org.eclipse.ui.cheatsheets/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.cheatsheets</artifactId>
=====================================
org.eclipse.ui.intro.quicklinks.examples/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.intro.quicklinks.examples</artifactId>
=====================================
org.eclipse.ui.intro.solstice.examples/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.intro.solstice.examples</artifactId>
=====================================
org.eclipse.ui.intro/META-INF/MANIFEST.MF
=====================================
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.ui.intro; singleton:=true
-Bundle-Version: 3.6.300.qualifier
+Bundle-Version: 3.6.400.qualifier
Bundle-Activator: org.eclipse.ui.internal.intro.impl.IntroPlugin
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
=====================================
org.eclipse.ui.intro/pom.xml
=====================================
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.intro</artifactId>
- <version>3.6.300-SNAPSHOT</version>
+ <version>3.6.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
=====================================
org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
=====================================
@@ -14,6 +14,8 @@
package org.eclipse.ui.internal.intro.impl.model.url;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.Properties;
@@ -581,7 +583,7 @@ public class IntroURL implements IIntroURL {
// we are told to decode the parameters of the url through
// the decode parameter. Assume that parameters are
// UTF-8 encoded.
- return StringUtil.decode(value, "UTF-8"); //$NON-NLS-1$
+ return URLDecoder.decode(value, StandardCharsets.UTF_8);
return value;
} catch (Exception e) {
// should never be here.
=====================================
org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java
=====================================
@@ -13,9 +13,6 @@
*******************************************************************************/
package org.eclipse.ui.internal.intro.impl.util;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
public class StringUtil {
public static String concat(String... strings) {
@@ -26,16 +23,6 @@ public class StringUtil {
return buffer.toString();
}
- public static String decode(String s, String enc) throws UnsupportedEncodingException {
- try {
- return URLDecoder.decode(s, enc);
- }
- catch (Exception ex) {
- // fall back to original string
- return s;
- }
- }
-
// Removes leading and trailing whitespace and replaces other
// occurrences with a single space.
=====================================
org.eclipse.ui.intro/src/org/eclipse/ui/intro/contentproviders/EclipseRSSViewer.java
=====================================
@@ -18,11 +18,11 @@ package org.eclipse.ui.intro.contentproviders;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -266,11 +266,7 @@ public class EclipseRSSViewer implements IIntroContentProvider {
private String createExternalURL(String url) {
- try {
- return INTRO_SHOW_IN_BROWSER + URLEncoder.encode(url, "UTF-8"); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- return INTRO_SHOW_IN_BROWSER + url;
- }
+ return INTRO_SHOW_IN_BROWSER + URLEncoder.encode(url, StandardCharsets.UTF_8);
}
@Override
=====================================
pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>eclipse.platform.ua</groupId>
=====================================
tests-pom/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<groupId>eclipse.platform.ua</groupId>
<artifactId>eclipse.platform.ua</artifactId>
- <version>4.21.0-SNAPSHOT</version>
+ <version>4.22.0-SNAPSHOT</version>
</parent>
<artifactId>tests-pom</artifactId>
<packaging>pom</packaging>
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-ua/-/commit/c1aae9dd7419be848d9348386761ef11ecdcc819
--
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-ua/-/commit/c1aae9dd7419be848d9348386761ef11ecdcc819
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220101/1e00f325/attachment.htm>
More information about the pkg-java-commits
mailing list