diff options
author | Lars Vogel | 2019-09-06 09:02:01 +0000 |
---|---|---|
committer | Karsten Thoms | 2019-09-13 20:15:00 +0000 |
commit | e641b20fa856205ec4def44c018935045a43824d (patch) | |
tree | b0ae7f4619a07534609178aceb00348dc0c7b416 /org.eclipse.tips.json | |
parent | 984450b37da0b786b1953684e52b02cfb852b6d9 (diff) | |
download | eclipse.platform.ua-e641b20fa856205ec4def44c018935045a43824d.tar.gz eclipse.platform.ua-e641b20fa856205ec4def44c018935045a43824d.tar.xz eclipse.platform.ua-e641b20fa856205ec4def44c018935045a43824d.zip |
Bug 550830 - [Tip of the day] Incorrect usage of SubMonitor APII20190913-1800
Includes version update for 4.14 stream
Includes API filter, as we do not want our messages to be exposed as API
Change-Id: I8ae40695b0759d053afa8545e7827f456bc0e7b1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Also-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'org.eclipse.tips.json')
-rw-r--r-- | org.eclipse.tips.json/.settings/.api_filters | 19 | ||||
-rw-r--r-- | org.eclipse.tips.json/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.tips.json/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java | 9 | ||||
-rw-r--r-- | org.eclipse.tips.json/src/org/eclipse/tips/json/internal/Messages.java (renamed from org.eclipse.tips.json/src/org/eclipse/tips/json/Messages.java) | 3 | ||||
-rw-r--r-- | org.eclipse.tips.json/src/org/eclipse/tips/json/internal/messages.properties (renamed from org.eclipse.tips.json/src/org/eclipse/tips/json/messages.properties) | 1 |
6 files changed, 27 insertions, 9 deletions
diff --git a/org.eclipse.tips.json/.settings/.api_filters b/org.eclipse.tips.json/.settings/.api_filters new file mode 100644 index 000000000..08d04fa9a --- /dev/null +++ b/org.eclipse.tips.json/.settings/.api_filters @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.tips.json" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter comment="MessagesshouldnotbeAPI" id="923795461"> + <message_arguments> + <message_argument value="0.1.500"/> + <message_argument value="0.1.400"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.tips.json.Messages"> + <filter comment="Messages are not API" id="305324134"> + <message_arguments> + <message_argument value="org.eclipse.tips.json.Messages"/> + <message_argument value="org.eclipse.tips.json_0.1.500"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/org.eclipse.tips.json/META-INF/MANIFEST.MF b/org.eclipse.tips.json/META-INF/MANIFEST.MF index 63f25ab66..bf2860b22 100644 --- a/org.eclipse.tips.json/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.json/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tips.json;singleton:=true -Bundle-Version: 0.1.400.qualifier +Bundle-Version: 0.1.500.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0", org.eclipse.jface;bundle-version="3.0.0", diff --git a/org.eclipse.tips.json/pom.xml b/org.eclipse.tips.json/pom.xml index 66a853c9a..0ebfd36f3 100644 --- a/org.eclipse.tips.json/pom.xml +++ b/org.eclipse.tips.json/pom.xml @@ -18,6 +18,6 @@ t SPDX-License-Identifier: EPL-2.0 Contributors: wim.jongman@remainsoftware.com </parent> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.tips.json</artifactId> - <version>0.1.400-SNAPSHOT</version> + <version>0.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java b/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java index 20efdb3ae..50638114c 100644 --- a/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java +++ b/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java @@ -33,6 +33,7 @@ import org.eclipse.tips.core.internal.LogUtil; import org.eclipse.tips.json.internal.JsonConstants; import org.eclipse.tips.json.internal.JsonHTMLTip; import org.eclipse.tips.json.internal.JsonUrlTip; +import org.eclipse.tips.json.internal.Messages; import org.eclipse.tips.json.internal.Util; import com.google.gson.JsonArray; @@ -76,11 +77,11 @@ public abstract class JsonTipProvider extends TipProvider { */ @Override public synchronized IStatus loadNewTips(IProgressMonitor monitor) { - SubMonitor subMonitor = SubMonitor.convert(monitor); + SubMonitor subMonitor = SubMonitor.convert(monitor, getDescription() + SPACE + Messages.JsonTipProvider_1, 3); ArrayList<Tip> result = new ArrayList<>(); try { - subMonitor.beginTask(getDescription() + SPACE + Messages.JsonTipProvider_1, -1); fJsonObject = loadJsonObject(); + subMonitor.worked(1); if (fJsonObject == null) { return new Status(IStatus.INFO, "org.eclipse.tips.json", MessageFormat.format("Could not parse json for {0}. Cache invalidated.", getID()), null); @@ -90,8 +91,9 @@ public abstract class JsonTipProvider extends TipProvider { fImage = Util.getValueOrDefault(provider, JsonConstants.P_IMAGE, null); setExpression(Util.getValueOrDefault(provider, JsonConstants.P_EXPRESSION, null)); JsonArray tips = provider.getAsJsonArray(JsonConstants.P_TIPS); - subMonitor.beginTask(getDescription() + SPACE + Messages.JsonTipProvider_2, -1); + subMonitor.worked(1); tips.forEach(parm -> result.add(createJsonTip(parm))); + subMonitor.worked(1); } catch (Exception e) { Status status = new Status(IStatus.ERROR, "org.eclipse.tips.json", e.getMessage(), e); //$NON-NLS-1$ getManager().log(status); @@ -99,7 +101,6 @@ public abstract class JsonTipProvider extends TipProvider { } getManager().log(LogUtil.info(MessageFormat.format(Messages.JsonTipProvider_4, result.size() + ""))); //$NON-NLS-1$ setTips(result); - subMonitor.done(); return Status.OK_STATUS; } diff --git a/org.eclipse.tips.json/src/org/eclipse/tips/json/Messages.java b/org.eclipse.tips.json/src/org/eclipse/tips/json/internal/Messages.java index 5b7ed51dc..a7ddac247 100644 --- a/org.eclipse.tips.json/src/org/eclipse/tips/json/Messages.java +++ b/org.eclipse.tips.json/src/org/eclipse/tips/json/internal/Messages.java @@ -1,11 +1,10 @@ -package org.eclipse.tips.json; +package org.eclipse.tips.json.internal; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.tips.json.messages"; //$NON-NLS-1$ public static String JsonTipProvider_1; - public static String JsonTipProvider_2; public static String JsonTipProvider_4; static { // initialize resource bundle diff --git a/org.eclipse.tips.json/src/org/eclipse/tips/json/messages.properties b/org.eclipse.tips.json/src/org/eclipse/tips/json/internal/messages.properties index dc0689287..75eecda9f 100644 --- a/org.eclipse.tips.json/src/org/eclipse/tips/json/messages.properties +++ b/org.eclipse.tips.json/src/org/eclipse/tips/json/internal/messages.properties @@ -1,3 +1,2 @@ JsonTipProvider_1=Loading Tips -JsonTipProvider_2=Creating Tips JsonTipProvider_4={0} Tips loaded |