[power-architect] r3967 committed - More finalizing of the ClientSideSessions and NetworkConflictResolvers

[codesite-noreply]

Revision: 3967
Author: gtc.c...@gmail.com
Date: Mon Oct 18 07:34:57 2010
Log: More finalizing of the ClientSideSessions and NetworkConflictResolvers
http://code.google.com/p/power-architect/source/detail?r=3967
Modified:
  
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Fri Oct 15 16:01:09 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Mon Oct 18 07:34:57 2010
@@ -77,11 +77,12 @@
 import ca.sqlpower.sqlobject.UserDefinedSQLTypeSnapshot;
 import ca.sqlpower.swingui.event.SessionLifecycleEvent;
 import ca.sqlpower.swingui.event.SessionLifecycleListener;
+import ca.sqlpower.util.DefaultUserPrompterFactory;
 import ca.sqlpower.util.SQLPowerUtils;
 import ca.sqlpower.util.TransactionEvent;
-import ca.sqlpower.util.UserPrompterFactory;
 import ca.sqlpower.util.UserPrompter.UserPromptOptions;
 import ca.sqlpower.util.UserPrompter.UserPromptResponse;
+import ca.sqlpower.util.UserPrompterFactory;

 public class ArchitectClientSideSession extends ArchitectSessionImpl  
implements RevisionController {

@@ -717,7 +718,7 @@
         return ClientSideSessionUtils.createNewServerSession(serviceInfo,
                 name,
                 cookieStore,
-                session);
+                new DefaultUserPrompterFactory());
     }

     public static List<ProjectLocation> getWorkspaceNames(SPServerInfo  
serviceInfo)
@@ -728,7 +729,7 @@
 	public static void deleteServerWorkspace(ProjectLocation projectLocation,  
ArchitectSession session) throws URISyntaxException,  
ClientProtocolException, IOException {

            ClientSideSessionUtils.deleteServerWorkspace(projectLocation,
-                   cookieStore, session);
+                   cookieStore, new DefaultUserPrompterFactory());
     }

     public ArchitectNetworkConflictResolver getUpdater() {