Changeset 12755 in josm for trunk/src

Timestamp:

2017-09-06T10:26:14+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - make Main to not depend on JCS

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
-import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
@@ -757 +756 @@
         if (!GraphicsEnvironment.isHeadless()) {
             ImageProvider.shutdown(false);
-            JCSCacheManager.shutdown();
         }
         try {

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -76 +76 @@
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -385 +386 @@
         if (!GraphicsEnvironment.isHeadless()) {
             worker.shutdown();
+            JCSCacheManager.shutdown();
         }
         if (mainFrame != null) {