--- a/.hgignore	Wed Jul 02 15:53:32 2014 +0200
+++ b/.hgignore	Wed Jul 02 17:08:49 2014 +0200
@@ -15,3 +15,4 @@
 ^client/dist$
 ^client/data/example-cinema\.json$
 ^client/data/dynamic-data\.json$
+spring-shell.log

--- a/server/renkan-management/src/main/java/org/iri_research/renkan/management/CorrectProjectId.java	Wed Jul 02 15:53:32 2014 +0200
+++ b/server/renkan-management/src/main/java/org/iri_research/renkan/management/CorrectProjectId.java	Wed Jul 02 17:08:49 2014 +0200
@@ -1,5 +1,10 @@
 package org.iri_research.renkan.management;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.iri_research.renkan.models.Edge;
+import org.iri_research.renkan.models.Node;
 import org.iri_research.renkan.models.Project;
 import org.iri_research.renkan.repositories.EdgesRepository;
 import org.iri_research.renkan.repositories.NodesRepository;
@@ -42,24 +47,30 @@
         for (Project proj : projectsRepository.findAll()) {
             
             System.out.format("Processing project %s %n", proj.getId());
-//            List<Node> nodes = new ArrayList<>();
-            
-//            for(Node node: proj.getNodes()) {
-//                if(node.getProjectId() == null) {
-//                    node.setProjectId(proj.getId());
-//                    nodes.add(node);
-//                }
-//            }
-//            nodesRepository.save(nodes);
-//            
-//            List<Edge> edges = new ArrayList<>();
-//            for(Edge edge : proj.getEdges()) {
-//                if(edge.getProjectId() == null) {
-//                    edge.setProjectId(proj.getId());
-//                    edges.add(edge);
-//                }
-//            }
-//            edgesRepository.save(edges);
+
+            if(proj.getNodes() != null) {
+                List<Node> nodes = new ArrayList<>();
+                for(Node node: proj.getNodes()) {
+                    if(node != null && node.getProjectId() == null) {
+                        node.setProjectId(proj.getId());
+                        nodes.add(node);
+                    }
+                }
+                nodesRepository.save(nodes);
+            }
+            System.out.format("Node saved %s %n", proj.getId());
+
+            if(proj.getEdges() != null) {
+                List<Edge> edges = new ArrayList<>();
+                for(Edge edge : proj.getEdges()) {
+                    if(edge != null && edge.getProjectId() == null) {
+                        edge.setProjectId(proj.getId());
+                        edges.add(edge);
+                    }
+                }
+                edgesRepository.save(edges);
+            }
+            System.out.format("Edge saved %s %n", proj.getId());
         }
     }
 }