From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 15 Nov 2017 08:36:28 +0000 (+0200)
Subject: Export org.simantics.ui.workspace.tracker.IWorkbenchSizeTrackerConstants
X-Git-Tag: v1.31.0~34
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=dea81e1198856ee12e57c23064beb17bb490598f

Export org.simantics.ui.workspace.tracker.IWorkbenchSizeTrackerConstants

refs #7618

Change-Id: Ibbce58a704374c500dcff394cbe5c39b8d231e13
---

diff --git a/bundles/org.simantics.ui.workspace.tracker/META-INF/MANIFEST.MF b/bundles/org.simantics.ui.workspace.tracker/META-INF/MANIFEST.MF
index 50af6b722..da2a697d2 100644
--- a/bundles/org.simantics.ui.workspace.tracker/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.ui.workspace.tracker/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@ Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0",
  org.eclipse.e4.ui.workbench.modeling
 Bundle-ActivationPolicy: lazy
+Export-Package: org.simantics.ui.workspace.tracker
diff --git a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/IWorkspaceSizeTrackerConstants.java b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/IWorkspaceSizeTrackerConstants.java
similarity index 94%
rename from bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/IWorkspaceSizeTrackerConstants.java
rename to bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/IWorkspaceSizeTrackerConstants.java
index 2a83778fe..d618cab6f 100644
--- a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/IWorkspaceSizeTrackerConstants.java
+++ b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/IWorkspaceSizeTrackerConstants.java
@@ -1,4 +1,4 @@
-package org.simantics.ui.workspace.tracker.internal.contributions;
+package org.simantics.ui.workspace.tracker;
 
 /**
  * Preference constants for the heap status.
diff --git a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/Activator.java b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/Activator.java
index 23d593c70..6b6cb91f6 100644
--- a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/Activator.java
+++ b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/Activator.java
@@ -7,6 +7,7 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 import org.simantics.filesystem.services.sizetracker.DirectorySizeService;
+import org.simantics.ui.workspace.tracker.IWorkspaceSizeTrackerConstants;
 
 /**
  * @author Tuukka Lehtonen
@@ -57,7 +58,7 @@ public class Activator implements BundleActivator {
 
 	public IPreferenceStore getPreferenceStore() {
 		if (preferenceStore == null) {
-			preferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, context.getBundle().getSymbolicName());
+			preferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, IWorkspaceSizeTrackerConstants.P_NODE);
 		}
 		return preferenceStore;
 	}
diff --git a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/WorkspaceSizeTrackerTrim.java b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/WorkspaceSizeTrackerTrim.java
index 0e133421b..7a7c27143 100644
--- a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/WorkspaceSizeTrackerTrim.java
+++ b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/contributions/WorkspaceSizeTrackerTrim.java
@@ -35,6 +35,7 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Shell;
 import org.simantics.filesystem.services.sizetracker.SizeTracker;
+import org.simantics.ui.workspace.tracker.IWorkspaceSizeTrackerConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferenceInitializer.java b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferenceInitializer.java
index f6eb4084e..1a194d90a 100644
--- a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferenceInitializer.java
+++ b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferenceInitializer.java
@@ -4,7 +4,7 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.osgi.service.prefs.Preferences;
-import org.simantics.ui.workspace.tracker.internal.contributions.IWorkspaceSizeTrackerConstants;
+import org.simantics.ui.workspace.tracker.IWorkspaceSizeTrackerConstants;
 
 /**
  * @author Tuukka Lehtonen
diff --git a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferencePage.java b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferencePage.java
index 54cd0fc73..447841443 100644
--- a/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferencePage.java
+++ b/bundles/org.simantics.ui.workspace.tracker/src/org/simantics/ui/workspace/tracker/internal/preferences/WorkspaceSizeTrackingPreferencePage.java
@@ -7,8 +7,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.simantics.ui.workspace.tracker.IWorkspaceSizeTrackerConstants;
 import org.simantics.ui.workspace.tracker.internal.Activator;
-import org.simantics.ui.workspace.tracker.internal.contributions.IWorkspaceSizeTrackerConstants;
 import org.simantics.ui.workspace.tracker.internal.contributions.WorkspaceSizeTrackerContribution;
 
 /**