[power-architect] r3970 committed - Due to changes in the library and enterprise edition for license handl...

Wed, 03 Nov 2010 12:00:36 -0700 

Revision: 3970
Author: [email protected]
Date: Wed Nov  3 12:00:08 2010
Log: Due to changes in the library and enterprise edition for license handling some methods need a user prompter now. 
http://code.google.com/p/power-architect/source/detail?r=3970

Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java 
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ArchitectServerProjectsManagerPanel.java /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java 

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java Mon Oct 18 07:34:57 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java Wed Nov 3 12:00:08 2010 
@@ -721,9 +721,10 @@
                 new DefaultUserPrompterFactory());
     }
- public static List<ProjectLocation> getWorkspaceNames(SPServerInfo serviceInfo) + public static List<ProjectLocation> getWorkspaceNames(SPServerInfo serviceInfo, 
+            UserPrompterFactory upf)
     throws IOException, URISyntaxException, JSONException {
- return ClientSideSessionUtils.getWorkspaceNames(serviceInfo, cookieStore); + return ClientSideSessionUtils.getWorkspaceNames(serviceInfo, cookieStore, upf); 
     }
public static void deleteServerWorkspace(ProjectLocation projectLocation, ArchitectSession session) throws URISyntaxException, ClientProtocolException, IOException { 
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java Fri Oct 15 15:51:41 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java Wed Nov 3 12:00:08 2010 
@@ -155,6 +155,7 @@
 import ca.sqlpower.swingui.RecentMenu;
 import ca.sqlpower.swingui.SPSUtils;
 import ca.sqlpower.swingui.StackedTabComponent;
+import ca.sqlpower.swingui.SwingUIUserPrompterFactory;
 import ca.sqlpower.swingui.StackedTabComponent.StackedTab;
import ca.sqlpower.swingui.SwingUIUserPrompterFactory.NonModalSwingUIUserPrompterFactory; 
 import ca.sqlpower.swingui.action.OpenUrlAction;
@@ -342,7 +343,8 @@

                         List<ProjectLocation> l =
                             ArchitectClientSideSession.getWorkspaceNames(
- findPanel((JButton) e.getSource()).getServerInfo()); + findPanel((JButton) e.getSource()).getServerInfo(), + new SwingUIUserPrompterFactory(ArchitectFrame.this)); 
                         if (l != null) {
                             msg = "Successfully connected to server";
                         }
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ArchitectServerProjectsManagerPanel.java Mon Oct 18 07:37:01 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ArchitectServerProjectsManagerPanel.java Wed Nov 3 12:00:08 2010 
@@ -166,7 +166,8 @@
         ((ArchitectSwingSessionContextImpl) session.getContext()).
             createSecuritySession(getSelectedServerInfo());
- return ArchitectClientSideSession.getWorkspaceNames(getSelectedServerInfo()); + return ArchitectClientSideSession.getWorkspaceNames(getSelectedServerInfo(), 
+                session);
     }

     @Override
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java Fri Oct 15 16:01:09 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java Wed Nov 3 12:00:08 2010 
@@ -549,7 +549,8 @@
((ArchitectSwingSessionContextImpl) session.getContext()).createSecuritySession(serviceInfo); 

                 // Sorts the project locations alphabetically
- List<ProjectLocation> projects = ArchitectClientSideSession.getWorkspaceNames(serviceInfo); + List<ProjectLocation> projects = ArchitectClientSideSession.getWorkspaceNames(serviceInfo, 
+                        session);
Collections.sort(projects, new Comparator<ProjectLocation>() { public int compare(ProjectLocation proj1, ProjectLocation proj2) { return proj1.getName().compareToIgnoreCase(proj2.getName());

Reply via email to