Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimeon Andreev2019-06-12 06:51:06 +0000
committerSimeon Andreev2019-06-24 10:40:27 +0000
commit68c0b2fa5325eacfc6f00650302e2e53a2fc53b0 (patch)
tree26b23f6d0cfc157e6d7f0e903bc05007cc80925b
parent9c53375825ddc35cdec925787c5a7ae538de11c9 (diff)
downloadeclipse.platform.ua-68c0b2fa5325eacfc6f00650302e2e53a2fc53b0.tar.gz
eclipse.platform.ua-68c0b2fa5325eacfc6f00650302e2e53a2fc53b0.tar.xz
eclipse.platform.ua-68c0b2fa5325eacfc6f00650302e2e53a2fc53b0.zip
Bug 548173 - Tips dialog not shown with org.eclipse.tips.startup.default
The default configuration area preference is set to "background" in TipsPreferences.initializeDefaultPreferences(). So when checking whether a dialog is needed, DefaultTipManager.mustOpen() will return "no", regardless of specifying -Dorg.eclipse.tips.startup=dialog VM property when launching Eclipse. This change ensures that when the default start-up behavior is written to the configuration area, the VM proprety is also taken into account. Change-Id: I667f7fad0bb8491f48cee627c5af1dbd9a9ecd3d Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
-rw-r--r--org.eclipse.tips.ide/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.tips.ide/pom.xml2
-rw-r--r--org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index c8536637c..01abcd11d 100644
--- a/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.1.500.qualifier
+Bundle-Version: 0.1.600.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
org.eclipse.core.runtime;bundle-version="3.0.0",
diff --git a/org.eclipse.tips.ide/pom.xml b/org.eclipse.tips.ide/pom.xml
index 4d01e9330..8e999dcbe 100644
--- a/org.eclipse.tips.ide/pom.xml
+++ b/org.eclipse.tips.ide/pom.xml
@@ -22,6 +22,6 @@
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.tips.ide</artifactId>
- <version>0.1.500-SNAPSHOT</version>
+ <version>0.1.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java
index 6aaf8f0c5..8f5508d38 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java
@@ -69,7 +69,7 @@ public class TipsPreferences extends AbstractPreferenceInitializer {
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences node = getPreferences();
- node.putInt(PREF_STARTUP_BEHAVIOR, TipManager.START_BACKGROUND);
+ node.putInt(PREF_STARTUP_BEHAVIOR, getDefaultStartupBehavior());
node.putBoolean(PREF_SERVE_READ_TIPS, false);
try {
node.flush();
@@ -191,7 +191,7 @@ public class TipsPreferences extends AbstractPreferenceInitializer {
}
private static int getDefaultStartupBehavior() {
- String startupBehavior = System.getProperty("org.eclipse.tips.startup");
+ String startupBehavior = System.getProperty("org.eclipse.tips.startup.default");
if ("dialog".equals(startupBehavior)) {
return TipManager.START_DIALOG;
} else if ("background".equals(startupBehavior)) {

Back to the top