X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2FJcrPreferenceStore.java;fp=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2FJcrPreferenceStore.java;h=1018ddd29774846b7d8eba3c243a0b8c27f52f69;hb=afd41f657b0eecb1e9a1db85af8bff0cc7bc4804;hp=f8dc23f47c2b6bab131ade2c4e37c6ddb9919d29;hpb=4f9e031032fcb062185501193886b7997d38052e;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
index f8dc23f47..1018ddd29 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
@@ -10,30 +10,60 @@ import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.version.VersionManager;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.ArgeoException;
 import org.argeo.jcr.ArgeoNames;
+import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.osgi.framework.BundleContext;
 
-/** Persist preferences as key/value pairs under ~/argeo:preferences */
-public class JcrPreferenceStore extends PreferenceStore {
+/**
+ * Persist preferences as key/value pairs under ~/argeo:preferences.<br>
+ * TODO: better integrate JCR and Eclipse:<br>
+ * - typing<br>
+ * - use eclipse preferences<br>
+ * - better integrate with {@link ScopedPreferenceStore} provided by RAP
+ */
+public class JcrPreferenceStore extends PreferenceStore implements ArgeoNames {
 	private Session session;
+	private BundleContext bundleContext;
 
 	/** Retrieves the preference node */
 	protected Node getPreferenceNode() {
 		try {
+			if (session.hasPendingChanges())
+				session.save();
 			Node userHome = JcrUtils.getUserHome(session);
+			if (userHome == null)
+				throw new ArgeoException("No user home for "
+						+ session.getUserID());
 			Node preferences;
-			if (!userHome.hasNode(ArgeoNames.ARGEO_PREFERENCES)) {
-				preferences = userHome.addNode(ArgeoNames.ARGEO_PREFERENCES);
+			if (!userHome.hasNode(ARGEO_PREFERENCES)) {
+				preferences = userHome.addNode(ARGEO_PREFERENCES);
+				preferences.addMixin(ArgeoTypes.ARGEO_PREFERENCE_NODE);
 				session.save();
-			} else {
-				preferences = userHome.getNode(ArgeoNames.ARGEO_PREFERENCES);
-			}
-			return preferences;
+			} else
+				preferences = userHome.getNode(ARGEO_PREFERENCES);
+
+			String pluginPreferencesName = bundleContext.getBundle()
+					.getSymbolicName();
+			Node pluginPreferences;
+			if (!preferences.hasNode(pluginPreferencesName)) {
+				VersionManager vm = session.getWorkspace().getVersionManager();
+				vm.checkout(preferences.getPath());
+				pluginPreferences = preferences.addNode(pluginPreferencesName);
+				pluginPreferences.addMixin(ArgeoTypes.ARGEO_PREFERENCE_NODE);
+				session.save();
+				vm.checkin(preferences.getPath());
+			} else
+				pluginPreferences = preferences.getNode(pluginPreferencesName);
+			return pluginPreferences;
 		} catch (RepositoryException e) {
+			e.printStackTrace();
 			JcrUtils.discardQuietly(session);
 			throw new ArgeoException("Cannot retrieve preferences", e);
 		}
@@ -49,7 +79,7 @@ public class JcrPreferenceStore extends PreferenceStore {
 			PropertyIterator it = getPreferenceNode().getProperties();
 			while (it.hasNext()) {
 				Property p = it.nextProperty();
-				if (!p.isMultiple()) {
+				if (!p.isMultiple() && !p.getDefinition().isProtected()) {
 					props.setProperty(p.getName(), p.getValue().getString());
 				}
 			}
@@ -58,6 +88,7 @@ public class JcrPreferenceStore extends PreferenceStore {
 			in = new ByteArrayInputStream(out.toByteArray());
 			load(in);
 		} catch (Exception e) {
+			e.printStackTrace();
 			throw new ArgeoException("Cannot load preferences", e);
 		} finally {
 			IOUtils.closeQuietly(in);
@@ -69,31 +100,48 @@ public class JcrPreferenceStore extends PreferenceStore {
 	public void save() throws IOException {
 		ByteArrayOutputStream out = null;
 		ByteArrayInputStream in = null;
-		Node preferences = null;
+		Node pluginPreferences = null;
 		try {
 			out = new ByteArrayOutputStream();
 			save(out, "");
 			in = new ByteArrayInputStream(out.toByteArray());
 			Properties props = new Properties();
 			props.load(in);
-			preferences = getPreferenceNode();
+			pluginPreferences = getPreferenceNode();
+			VersionManager vm = pluginPreferences.getSession().getWorkspace()
+					.getVersionManager();
+			vm.checkout(pluginPreferences.getPath());
 			for (Object key : props.keySet()) {
 				String name = key.toString();
 				String value = props.getProperty(name);
-				preferences.setProperty(name, value);
+				pluginPreferences.setProperty(name, value);
 			}
-			preferences.getSession().save();
+			JcrUtils.updateLastModified(pluginPreferences);
+			pluginPreferences.getSession().save();
+			vm.checkin(pluginPreferences.getPath());
 		} catch (Exception e) {
-			JcrUtils.discardUnderlyingSessionQuietly(preferences);
-			throw new ArgeoException("Cannot load preferences", e);
+			JcrUtils.discardUnderlyingSessionQuietly(pluginPreferences);
+			throw new ArgeoException("Cannot save preferences", e);
 		} finally {
 			IOUtils.closeQuietly(in);
 			IOUtils.closeQuietly(out);
 		}
 	}
 
+	public void init() {
+		try {
+			load();
+		} catch (IOException e) {
+			throw new ArgeoException("Cannot initialize preference store", e);
+		}
+	}
+
 	public void setSession(Session session) {
 		this.session = session;
 	}
 
+	public void setBundleContext(BundleContext bundleContext) {
+		this.bundleContext = bundleContext;
+	}
+
 }