[Openproj-commitlog] openproj_core/src/com/projity/session LocalSession.java, 1.7, 1.8 AbstractSession.java, 1.2, 1.3 Session.java, 1.3, 1.4

[Howard K. <ne...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/session
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28755/src/com/projity/session

Modified Files:
	LocalSession.java AbstractSession.java Session.java 
Log Message:
import after loading empty project now good

Index: AbstractSession.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/session/AbstractSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AbstractSession.java	31 Dec 2007 00:12:42 -0000	1.2
+++ AbstractSession.java	16 Dec 2008 07:21:07 -0000	1.3
@@ -52,6 +52,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.Closure;
+
 import com.projity.company.ApplicationUser;
 import com.projity.job.Job;
 import com.projity.job.JobQueue;
@@ -103,6 +105,9 @@
     	});
     	return job;
     }
+	public Closure getPostOpenAction() {
+		return null;
+	}
 
 
 }

Index: LocalSession.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/session/LocalSession.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LocalSession.java	13 Nov 2008 22:26:57 -0000	1.7
+++ LocalSession.java	16 Dec 2008 07:21:07 -0000	1.8
@@ -117,12 +117,13 @@
 	    		public Object run() throws Exception{
 	    			ResourcePool resourcePool=null;
 	    			if (MICROSOFT_PROJECT_IMPORTER.equals(opt.getImporter())){
-	    				DataFactoryUndoController undoController=new DataFactoryUndoController();
-	    				resourcePool = ResourcePoolFactory.getInstance().createResourcePool("",undoController);
-	    				resourcePool.setLocal(importer.getResourceMapping()==null);
-	    				Project project = Project.createProject(resourcePool,undoController);
 	    				
-	    				((DefaultNodeModel)project.getTaskOutline()).setDataFactory(project);		
+		    				DataFactoryUndoController undoController=new DataFactoryUndoController();
+		    				resourcePool = ResourcePoolFactory.getInstance().createResourcePool("",undoController);
+		    				resourcePool.setLocal(importer.getResourceMapping()==null);
+		    				Project project = Project.createProject(resourcePool,undoController);
+		    				
+		    				((DefaultNodeModel)project.getTaskOutline()).setDataFactory(project);		
 	    				importer.setProject(project);
 	    			}
 	     			setProgress(1.0f);
@@ -140,6 +141,16 @@
 	    				project.setMaster(true); //local project is always master
 	    				project.setLocal(true);
 	    			}
+    				Project importInto = ProjectFactory.getInstance().getImportInto();
+    				if (importInto != null) {
+    					System.out.println("removing old version");
+    					ProjectFactory.getInstance().setImportInto(null);
+    					project.setName(importInto.getName());
+    					long id = importInto.getUniqueId();
+    					ProjectFactory.getInstance().forceRemove(importInto);
+    					project.setId(id);
+    					project.setUniqueId(id);
+    				}
 	     			setProgress(1.0f);
 	                return project;
 	 			
@@ -246,6 +257,7 @@
 	public boolean projectExists(long id) {
 		return true;
 	}
+	
 
    
 }

Index: Session.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/session/Session.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Session.java	5 Apr 2008 05:58:26 -0000	1.3
+++ Session.java	16 Dec 2008 07:21:07 -0000	1.4
@@ -52,6 +52,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.collections.Closure;
+
 import com.projity.company.ApplicationUser;
 import com.projity.job.Job;
 import com.projity.job.JobQueue;
@@ -88,4 +90,5 @@
     
     public boolean isInitialized();
     public boolean projectExists(long id);
+	public Closure getPostOpenAction();
 }