[power-architect] r3913 committed - Changing the FileLoader in OpenProjectAction back to static. The previ...

[codesite-noreply]

Revision: 3913
Author: terry...@gmail.com
Date: Fri Aug 20 15:11:42 2010
Log: Changing the FileLoader in OpenProjectAction back to static. The  
previous change that made it non-static broke functionality for creating  
new projects on the server.
http://code.google.com/p/power-architect/source/detail?r=3913
Modified:
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.java

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java	 
Fri Aug 20 14:09:41 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java	 
Fri Aug 20 15:11:42 2010
@@ -912,7 +912,7 @@
             public void loadFile(String fileName) throws IOException {
                 File f = new File(fileName);
                 try {
-                     
openProjectAction.getFileLoader().open(context.createSession(), f,  
currentSession, false);
+                     
OpenProjectAction.getFileLoader().open(context.createSession(), f,  
currentSession, false);
                 } catch (SQLObjectException ex) {
                      
SPSUtils.showExceptionDialogNoReport(ArchitectFrame.this,  
Messages.getString("ArchitectSwingSessionImpl.openProjectFileFailed"), ex);  
//$NON-NLS-1$
                 }
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java	 
Fri Aug 20 14:09:41 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java	 
Fri Aug 20 15:11:42 2010
@@ -73,6 +73,7 @@
 import ca.sqlpower.architect.swingui.action.AboutAction;
 import ca.sqlpower.architect.swingui.action.AddDataSourceAction;
 import ca.sqlpower.architect.swingui.action.NewDataSourceAction;
+import ca.sqlpower.architect.swingui.action.OpenProjectAction;
 import ca.sqlpower.architect.swingui.action.PreferencesAction;
 import ca.sqlpower.architect.swingui.dbtree.DBTreeCellRenderer;
 import ca.sqlpower.architect.swingui.olap.OLAPEditSession;
@@ -340,7 +341,7 @@
             public void loadFile(String fileName) throws IOException {
                 File f = new File(fileName);
                 try {
-                     
frame.getOpenProjectAction().getFileLoader().open(getContext().createSession(),  
f, ArchitectSwingSessionImpl.this, true);
+                     
OpenProjectAction.getFileLoader().open(getContext().createSession(), f,  
ArchitectSwingSessionImpl.this, true);
                 } catch (SQLObjectException ex) {
                      
SPSUtils.showExceptionDialogNoReport(getArchitectFrame(),  
Messages.getString("ArchitectSwingSessionImpl.openProjectFileFailed"), ex);  
//$NON-NLS-1$
                 }
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.java	 
Fri Aug 20 14:09:41 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.java	 
Fri Aug 20 15:11:42 2010
@@ -76,7 +76,7 @@
      *            and unmodified project) then openingSession.close() will  
be
      *            called once the project is finished loading.
      */
-    private FileLoader fileLoader = new FileLoader() {
+    private static FileLoader fileLoader = new FileLoader() {
         public void open(ArchitectSwingSession newSession, File f,  
ArchitectSwingSession openingSession, boolean separateThread) {
             LoadFileWorker worker;
             try {
@@ -106,11 +106,11 @@
         }
     };

-    public void setFileLoader(FileLoader loader) {
+    public static void setFileLoader(FileLoader loader) {
         fileLoader = loader;
     }

-    public FileLoader getFileLoader() {
+    public static FileLoader getFileLoader() {
         return fileLoader;
     }