[power-architect] r3912 committed - Made the OpenProjectAction's FileLoader an instance variable, instead ...

[codesite-noreply]

Revision: 3912
Author: mc3an...@uwaterloo.ca
Date: Fri Aug 20 14:09:41 2010
Log: Made the OpenProjectAction's FileLoader an instance variable, instead  
of a static, 'global,' variable.
http://code.google.com/p/power-architect/source/detail?r=3912
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 11:26:13 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java	 
Fri Aug 20 14:09:41 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 11:26:13 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java	 
Fri Aug 20 14:09:41 2010
@@ -73,7 +73,6 @@
 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;
@@ -341,7 +340,7 @@
             public void loadFile(String fileName) throws IOException {
                 File f = new File(fileName);
                 try {
-                     
OpenProjectAction.getFileLoader().open(getContext().createSession(), f,  
ArchitectSwingSessionImpl.this, true);
+                     
frame.getOpenProjectAction().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 11:26:13 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.java	 
Fri Aug 20 14:09:41 2010
@@ -76,7 +76,7 @@
      *            and unmodified project) then openingSession.close() will  
be
      *            called once the project is finished loading.
      */
-    private static FileLoader fileLoader = new FileLoader() {
+    private FileLoader fileLoader = new FileLoader() {
         public void open(ArchitectSwingSession newSession, File f,  
ArchitectSwingSession openingSession, boolean separateThread) {
             LoadFileWorker worker;
             try {
@@ -106,11 +106,11 @@
         }
     };

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

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