X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fchangeset%2FMetadataUtils.java;h=ef1753396c1b03b33adbae36432a469068bc6d92;hp=31f29554ca49fdc5ac738721752022c31d7fec25;hb=ffdf83729b496d5afe74c7888075bb17ce1c4bbb;hpb=d1a82fe1414c77b97bec886d6a3ae3c5d926c334

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