[power-architect] r3304 committed - A server project's name is now set upon its creation by the user.

[codesite-noreply]

Revision: 3304
Author: ferguson.sebastian
Date: Wed Feb 17 14:46:02 2010
Log: A server project's name is now set upon its creation by the user.
http://code.google.com/p/power-architect/source/detail?r=3304
Modified:
 /trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
 /trunk/src/ca/sqlpower/architect/enterprise/ProjectLocation.java
  
/trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionContextImpl.java
  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java

=======================================
---  
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Wed Feb 17 13:45:03 2010
+++  
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Wed Feb 17 14:46:02 2010
@@ -317,13 +317,12 @@

     }

-    public static ProjectLocation createNewServerSession(SPServerInfo  
serviceInfo) throws URISyntaxException, ClientProtocolException,  
IOException, JSONException {
+    public static ProjectLocation createNewServerSession(SPServerInfo  
serviceInfo, String name) throws URISyntaxException,  
ClientProtocolException, IOException, JSONException {
        HttpClient httpClient = createHttpClient(serviceInfo);
        try {
-
-
-    		HttpUriRequest request = new  
HttpGet(getServerURI(serviceInfo, "/jcr/projects/new"));
-
+
+    		HttpUriRequest request = new  
HttpGet(getServerURI(serviceInfo, "/jcr/projects/new", "name=" + name));
+               System.out.println(request.getURI());
     		String responseBody = httpClient.execute(request, new  
JSONResponseHandler());
                JSONObject response = new JSONObject(responseBody);
                logger.debug("New Workspace:" + responseBody);
@@ -435,24 +434,6 @@
             new UsernamePasswordCredentials(serviceInfo.getUsername(),  
serviceInfo.getPassword()));
         return httpClient;
        }
-
-	public static ArchitectClientSideSession  
openServerSession(ArchitectSessionContext context, ProjectLocation  
projectLoc)
-       throws SQLObjectException {
-    	final ArchitectClientSideSession session = new  
ArchitectClientSideSession(context, projectLoc.getName(), projectLoc);
-       // TODO
-       //context.registerChildSession(session);
-               //session.startUpdaterThread();
-               return session;
-    }
-
-	public static List<ArchitectClientSideSession>  
openServerSessions(ArchitectSessionContext context, SPServerInfo serverInfo)
-	throws IOException, URISyntaxException, JSONException, SQLObjectException  
{
-		List<ArchitectClientSideSession> openedSessions = new  
ArrayList<ArchitectClientSideSession>();
-		for (ProjectLocation workspaceLoc :  
ArchitectClientSideSession.getWorkspaceNames(serverInfo)) {
-                       openedSessions.add(openServerSession(context, 
workspaceLoc));
-               }
-        return openedSessions;
-    }

 	// Contained classes  
--------------------------------------------------------------------

=======================================
--- /trunk/src/ca/sqlpower/architect/enterprise/ProjectLocation.java	Wed  
Feb 10 11:19:11 2010
+++ /trunk/src/ca/sqlpower/architect/enterprise/ProjectLocation.java	Wed  
Feb 17 14:46:02 2010
@@ -36,6 +36,6 @@

        @Override
        public String toString() {
-               return name + " (" +uuid +")";
+               return getName();
        }
 }
=======================================
---  
/trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionContextImpl.java	 
Wed Feb 17 13:45:03 2010
+++  
/trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionContextImpl.java	 
Wed Feb 17 14:46:02 2010
@@ -268,7 +268,7 @@
     }

     public ArchitectSwingSession createNewServerSession(SPServerInfo  
serverInfo, boolean initGUI) throws SQLObjectException,  
ClientProtocolException, URISyntaxException, IOException, JSONException {
-        ProjectLocation projectLocation =  
ArchitectClientSideSession.createNewServerSession(serverInfo);
+        ProjectLocation projectLocation =  
ArchitectClientSideSession.createNewServerSession(serverInfo, "New_Project");
         ArchitectSession clientSession = new  
ArchitectClientSideSession(this, projectLocation.getName(),  
projectLocation);
         ArchitectSwingSession swingSession = new  
ArchitectSwingSessionImpl(this, clientSession);
         getSessions().add(swingSession);
=======================================
---  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java	 
Tue Feb 16 14:24:13 2010
+++  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java	 
Wed Feb 17 14:46:02 2010
@@ -71,7 +71,7 @@

                 if (name != null) {
                     try {
-                         
ArchitectClientSideSession.createNewServerSession(getSelectedServerInfo());
+                         
ArchitectClientSideSession.createNewServerSession(getSelectedServerInfo(),  
name);
                     } catch (Exception ex) {
                         throw new RuntimeException("Unable to create new  
project", ex);
                     }
@@ -263,7 +263,6 @@
             try {
                 for (ProjectLocation pl :  
ArchitectClientSideSession.getWorkspaceNames(serviceInfo)) {
                     model.addElement(pl);
-
                 }
                 connected = true;
             } catch (Exception ex) {