draft implementation of the history request.

git-svn-id: https://svn.argeo.org/commons/trunk@4089 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/plugins/org.argeo.eclipse.ui.jcr/pom.xml b/eclipse/plugins/org.argeo.eclipse.ui.jcr/pom.xml
index 4f041eeaa3348c8a5db39a0039bbcd59b75d7ec5..ec57b3104fdefbb761817efff632699ddbbc8f06 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui.jcr/pom.xml
+++ b/eclipse/plugins/org.argeo.eclipse.ui.jcr/pom.xml
@@ -70,11 +70,20 @@
                        <version>0.2.2-SNAPSHOT</version>
                </dependency>
 
-               <!-- Others -->
+               <!-- Logging -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+               </dependency>
+
 
        </dependencies>
 </project>

diff --git a/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
index 986d4b8296db7b11283b376f4391d7ba0395ffab..edcae870f617b859979b2d4d4f6f559a44c1481a 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
+++ b/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
@@ -119,22 +119,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
                        for (final String columnName : qr.getColumnNames()) {
                                TableViewerColumn tvc = new TableViewerColumn(viewer, SWT.NONE);
                                configureColumn(columnName, tvc);
-                               tvc.setLabelProvider(new ColumnLabelProvider() {
-
-                                       public String getText(Object element) {
-                                               Row row = (Row) element;
-                                               try {
-                                                       return row.getValue(columnName).getString();
-                                               } catch (RepositoryException e) {
-                                                       throw new ArgeoException("Cannot display row "
-                                                                       + row, e);
-                                               }
-                                       }
-
-                                       public Image getImage(Object element) {
-                                               return null;
-                                       }
-                               });
+                               tvc.setLabelProvider(getLabelProvider(columnName));
                                tableViewerColumns.add(tvc);
                        }
 
@@ -148,6 +133,26 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
                }
        }
 
+       /**
+        * To be overridden in order to configure column label providers .
+        */
+       protected ColumnLabelProvider getLabelProvider(final String columnName) {
+               return new ColumnLabelProvider() {
+                       public String getText(Object element) {
+                               Row row = (Row) element;
+                               try {
+                                       return row.getValue(columnName).getString();
+                               } catch (RepositoryException e) {
+                                       throw new ArgeoException("Cannot display row " + row, e);
+                               }
+                       }
+
+                       public Image getImage(Object element) {
+                               return null;
+                       }
+               };
+       }
+
        /** To be overridden in order to configure the columns. */
        protected void configureColumn(String jcrColumnName,
                        TableViewerColumn column) {

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index d70a51669f7dcf8bfa78f5b691cd1ed9e85a15e2..a579392dd50e97c7d13d06382f0c3904daf36978 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -21,6 +21,8 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
@@ -425,6 +427,46 @@ public class JcrUtils {
                }
        }
 
+       /**
+        * Compare only a restricted list of properties of two nodes. No
+        * recursivity.
+        * 
+        */
+       public static Map<String, PropertyDiff> diffProperties(Node reference,
+                       Node observed, List<String> properties) {
+               Map<String, PropertyDiff> diffs = new TreeMap<String, PropertyDiff>();
+               try {
+                       Iterator<String> pit = properties.iterator();
+
+                       while (pit.hasNext()) {
+                               String name = pit.next();
+                               if (!observed.hasProperty(name)) {
+                                       PropertyDiff pDiff = new PropertyDiff(PropertyDiff.REMOVED,
+                                                       name, reference.getProperty(name).getValue(), null);
+                                       diffs.put(name, pDiff);
+                               } else if (!reference.hasProperty(name)) {
+                                       PropertyDiff pDiff = new PropertyDiff(PropertyDiff.ADDED,
+                                                       name, null, observed.getProperty(name).getValue());
+                                       diffs.put(name, pDiff);
+                               } else {
+                                       Value referenceValue = reference.getProperty(name)
+                                                       .getValue();
+                                       Value newValue = observed.getProperty(name).getValue();
+                                       if (!referenceValue.equals(newValue)) {
+                                               PropertyDiff pDiff = new PropertyDiff(
+                                                               PropertyDiff.MODIFIED, name, referenceValue,
+                                                               newValue);
+                                               diffs.put(name, pDiff);
+                                       }
+                               }
+                       }
+               } catch (RepositoryException e) {
+                       throw new ArgeoException("Cannot diff " + reference + " and "
+                                       + observed, e);
+               }
+               return diffs;
+       }
+
        /** Builds a property relPath to be used in the diff. */
        private static String propertyRelPath(String baseRelPath,
                        String propertyName) {

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java
new file mode 100644 (file)
index 0000000..fc120d1
--- /dev/null
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/VersionDiff.java
@@ -0,0 +1,30 @@
+package org.argeo.jcr;
+
+import java.util.Calendar;
+import java.util.Map;
+
+public class VersionDiff {
+
+       private String userId;
+       private Map<String, PropertyDiff> diffs;
+       private Calendar updateTime;
+
+       public VersionDiff(String userId, Calendar updateTime,
+                       Map<String, PropertyDiff> diffs) {
+               this.userId = userId;
+               this.updateTime = updateTime;
+               this.diffs = diffs;
+       }
+
+       public String getUserId() {
+               return userId;
+       }
+
+       public Map<String, PropertyDiff> getDiffs() {
+               return diffs;
+       }
+
+       public Calendar getUpdateTime() {
+               return updateTime;
+       }
+}