Changeset 14253 in josm

Timestamp:

2018-09-16T02:25:19+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - kill Main. RIP

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (deleted)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (2 diffs)

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

@@ -88 +88 @@
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.data.osm.OsmDataManager;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
@@ -173 +169 @@
  * @author imi
  */
-@SuppressWarnings("deprecation")
-public class MainApplication extends org.openstreetmap.josm.Main {
+public class MainApplication {
 
     /**
@@ -416 +411 @@
     public static MainFrame getMainFrame() {
         return mainFrame;
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().getInProgressSelection()}
-     */
-    @Deprecated
-    @Override
-    public Collection<OsmPrimitive> getInProgressSelection() {
-        return OsmDataManager.getInstance().getInProgressSelection();
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().getInProgressSelection()}
-     */
-    @Deprecated
-    @Override
-    public Collection<? extends IPrimitive> getInProgressISelection() {
-        return OsmDataManager.getInstance().getInProgressSelection();
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().getEditDataSet()}
-     */
-    @Deprecated
-    @Override
-    public DataSet getEditDataSet() {
-        return OsmDataManager.getInstance().getEditDataSet();
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().getActiveDataSet()}
-     */
-    @Deprecated
-    @Override
-    public DataSet getActiveDataSet() {
-        return OsmDataManager.getInstance().getActiveDataSet();
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().setActiveDataSet}
-     */
-    @Deprecated
-    @Override
-    public void setActiveDataSet(DataSet ds) {
-        OsmDataManager.getInstance().setActiveDataSet(ds);
-    }
-
-    /**
-     * @deprecated Use {@code OsmDataManager.getInstance().containsDataSet}
-     */
-    @Deprecated
-    @Override
-    public boolean containsDataSet(DataSet ds) {
-        return getLayerManager().getLayersOfType(OsmDataLayer.class).stream().anyMatch(l -> l.data.equals(ds));
     }
 
@@ -881 +822 @@
         }
         mainPanel = mainFrame.getPanel();
-        org.openstreetmap.josm.Main.parent = mainFrame;
 
         if (args.hasOption(Option.LOAD_PREFERENCES)) {

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -155 +155 @@
     }
 
-    @SuppressWarnings("deprecation")
     private void setupGUI() {
         JOSMTestRules.cleanLayerEnvironment();
@@ -165 +164 @@
         initMainPanel(false);
         initToolbar();
-        if (Main.main == null) {
+        if (MainApplication.getMenu() == null) {
             Lifecycle.initialize(new MainInitialization(new MainApplication()));
         }