Sync git svn branch with SVN repository r33249.

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / changeset / MetadataUtils.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/changeset/MetadataUtils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/changeset/MetadataUtils.java
index 31f29554ca49fdc5ac738721752022c31d7fec25..ef1753396c1b03b33adbae36432a469068bc6d92 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/changeset/MetadataUtils.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/changeset/MetadataUtils.java
@@ -122,22 +122,9 @@ public class MetadataUtils {
 //        Map<Long, Map<String,byte[]>> metadatas = getMetadatas(graph, support, revisionId, Long.MAX_VALUE);\r
         \r
         for(Map.Entry<Long, Map<String,byte[]>> e : metadatas.entrySet()) {\r
-//            System.err.println("metadata " + e.getKey() + " " + e.getValue());\r
-//            long csid = e.getKey();\r
+\r
             Map<String,byte[]> metadata = e.getValue();\r
-//          if(metadata == null) \r
-//          continue;\r
-//            if(metadata != null) {\r
-        \r
-//        for(ChangeSetIdentifier csi : csis) {\r
-//            if(csi.getId() < fromRevision) { // TODO remove this test when DB api is fixed\r
-//                System.err.println("ManagementSupport.getChangeSetIdentifiers returned identifiers outside of the requested range.");\r
-//                continue;\r
-//            }\r
-//            Map<String,byte[]> metadata = getMetadata(graph, support, csi);\r
-//            if(metadata == null) \r
-//                continue;\r
-            \r
+\r
             browseChanges: {\r
                 byte[] changesData = metadata.get(DependencyChanges.class.getName());\r
                 if(changesData == null || changesData.length == 0) \r
@@ -152,35 +139,13 @@ public class MetadataUtils {
                             visitor.visit(graph, change, inverted);\r
             }\r
             \r
-            browseUndos: {\r
-                byte[] undoMetadata = metadata.get(UndoMetadata.class.getName());\r
-                if(undoMetadata == null || undoMetadata.length == 0) \r
-                    break browseUndos;\r
+            byte[] undoMetadata = metadata.get(UndoMetadata.class.getName());\r
+            if(undoMetadata != null && undoMetadata.length != 0) { \r
                 UndoMetadata undo = UndoMetadata.deserialise(graph.getSession(), undoMetadata);\r
                 visitDependencyChangesBetween(graph, model, undo.getBeginCSId(), undo.getEndCSId(), visitor, \r
                         undo.isRedo() ? inverted : !inverted);\r
             }\r
         }\r
-       }\r
+    }\r
 \r
-//     public static Map<Resource, Collection<Change>> getDependencyChangeIndexFrom(ReadGraph graph, long revisionId) throws DatabaseException {\r
-//\r
-//             \r
-//             \r
-//             Map<Resource, Collection<Change>> index = new HashMap<Resource, Collection<Change>>();\r
-//\r
-//             for(Map<Resource, Collection<Change>> entry : getDependencyChangesFrom(graph, revisionId)) {\r
-//                     if(DEBUG) System.out.println("getDependencyChangeIndexFrom process " + entry);\r
-//                     Collection<DependencyChangeEntry> list = index.get(entry.getOwner());\r
-//                     if(list == null) {\r
-//                             list = new ArrayList<DependencyChangeEntry>();\r
-//                             index.put(entry.getOwner(), list);\r
-//                     }\r
-//                     list.add(entry);\r
-//             }\r
-//             \r
-//             return index;\r
-//             \r
-//     }\r
-       \r
 }\r