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 50af6b722201b4247ca460dfb7ddf84d80053a39..da2a697d2006d8f0cc4f7b876be119d35b37b6d4 100644 (file)
--- 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 2a83778fefa9c18d92787fa2c76d538685a1c6ec..d618cab6f6c07ec5495574e6292a2fc235e7c28c 100644 (file)
--- 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 23d593c70001d64297bda5dd037816e44f533722..6b6cb91f6b05a00c41145e752d08b2346a9d3fef 100644 (file)
--- 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 0e133421bbb27507dfbd20f92b13b6adc6b2387d..7a7c2714330d7d0cf18b5dc24ad54856bfe1f96a 100644 (file)
--- 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 f6eb4084e4a0f283be504068428b7d3221120079..1a194d90ae2b92ca90d25919cc9a783fcaabb5af 100644 (file)
--- 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 54cd0fc73965557158c3f29fa1fd3e8b04300f4a..447841443cf859692d5784d2a3e5bb6e3a6d20eb 100644 (file)
--- 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;
 
 /**