[JPP-Devel] SVN: [4669] core/trunk/src/com/vividsolutions/jump/workbench

[jump-pilot-svn]

Revision: 4669
          http://sourceforge.net/p/jump-pilot/code/4669
Author:   edso
Date:     2015-12-26 17:25:13 +0000 (Sat, 26 Dec 2015)
Log Message:
-----------
cleanup JUMPConfiguration
move ConnectionManager.closeConnections() application exit handler to 
Connectionmanager

Modified Paths:
--------------
    core/trunk/src/com/vividsolutions/jump/workbench/JUMPConfiguration.java
    
core/trunk/src/com/vividsolutions/jump/workbench/datastore/ConnectionManager.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/JUMPConfiguration.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/JUMPConfiguration.java     
2015-12-26 11:15:31 UTC (rev 4668)
+++ core/trunk/src/com/vividsolutions/jump/workbench/JUMPConfiguration.java     
2015-12-26 17:25:13 UTC (rev 4669)
@@ -1082,20 +1082,20 @@
         System.out.println("oracle driver not found: " + e.toString() + ". 
dataStore NOT added");
     }
     */
-    // update exit handler
-    final ApplicationExitHandler oldApplicationExitHandler = context
-        .getWorkbench().getFrame().getApplicationExitHandler();
-    context.getWorkbench().getFrame()
-        .setApplicationExitHandler(new ApplicationExitHandler() {
-          public void exitApplication(JFrame mainFrame) {
-            try {
-              ConnectionManager.instance(context).closeConnections();
-            } catch (DataStoreException e) {
-              throw new RuntimeException(e);
-            }
-            oldApplicationExitHandler.exitApplication(mainFrame);
-          }
-        });
+//    // update exit handler
+//    final ApplicationExitHandler oldApplicationExitHandler = context
+//        .getWorkbench().getFrame().getApplicationExitHandler();
+//    context.getWorkbench().getFrame()
+//        .setApplicationExitHandler(new ApplicationExitHandler() {
+//          public void exitApplication(JFrame mainFrame) {
+//            try {
+//              ConnectionManager.instance(context).closeConnections();
+//            } catch (DataStoreException e) {
+//              throw new RuntimeException(e);
+//            }
+//            oldApplicationExitHandler.exitApplication(mainFrame);
+//          }
+//        });
   }
 
   private void configureStyles(WorkbenchContext workbenchContext) {

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/datastore/ConnectionManager.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/datastore/ConnectionManager.java
   2015-12-26 11:15:31 UTC (rev 4668)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/datastore/ConnectionManager.java
   2015-12-26 17:25:13 UTC (rev 4669)
@@ -18,10 +18,13 @@
 import com.vividsolutions.jump.io.FeatureInputStream;
 import com.vividsolutions.jump.util.Blackboard;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
+import com.vividsolutions.jump.workbench.ui.ApplicationExitHandler;
 import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
 
 import java.sql.Connection;
 
+import javax.swing.JFrame;
+
 /**
  * Reuses existing connections where possible.
  */
@@ -68,6 +71,21 @@
                         .addAll(connectionDescriptorToConnectionMap.keySet());
             }
         });
+        
+        // close all connections on exit
+        final ApplicationExitHandler oldApplicationExitHandler = context
+            .getWorkbench().getFrame().getApplicationExitHandler();
+        context.getWorkbench().getFrame()
+            .setApplicationExitHandler(new ApplicationExitHandler() {
+              public void exitApplication(JFrame mainFrame) {
+                try {
+                  closeConnections();
+                } catch (DataStoreException e) {
+                  throw new RuntimeException(e);
+                }
+                oldApplicationExitHandler.exitApplication(mainFrame);
+              }
+            });
     }
 
     private Map connectionDescriptorToConnectionMap = new HashMap();


------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel