Changeset 33549 in osm for applications/editors/josm/plugins/pointInfo/src/org/openstreetmap

Timestamp:

2017-08-27T07:50:20+02:00 (7 years ago)

Author:

mkyral

Message:

PointInfo: Replace depricated functions.

Location:

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo

Files:

• PointInfoAction.java (modified) (8 diffs)
• PointInfoPlugin.java (modified) (2 diffs)
• ruian/RuianModule.java (modified) (2 diffs)
• ruian/RuianRecord.java (modified) (69 diffs)

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -18 +18 @@
 import javax.swing.event.HyperlinkEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -27 +27 @@
 import org.openstreetmap.josm.plugins.pointinfo.ruian.RuianModule;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -41 +42 @@
     private String coordinatesText = "";
 
-    PointInfoAction(MapFrame mapFrame) {
+    PointInfoAction() {
         super(tr("Point info"), "info-sml", tr("Point info."),
                 Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT),
-                mapFrame, getCursor());
+                getCursor());
     }
 
@@ -53 +54 @@
         }
         super.enterMode();
-        Main.map.mapView.setCursor(getCursor());
-        Main.map.mapView.addMouseListener(this);
+        MainApplication.getMap().mapView.setCursor(getCursor());
+        MainApplication.getMap().mapView.addMouseListener(this);
     }
 
@@ -60 +61 @@
     public void exitMode() {
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
+        MainApplication.getMap().mapView.removeMouseListener(this);
     }
 
@@ -72 +73 @@
          * Positional data
          */
-        final LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y);
+        final LatLon pos = MainApplication.getMap().mapView.getLatLon(clickPoint.x, clickPoint.y);
 
         try {
@@ -123 +124 @@
             new Thread(infoTask).start();
         } catch (Exception e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
@@ -164 +165 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable()) {
+        if (!MainApplication.getMap().mapView.isActiveLayerDrawable()) {
             return;
         }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.pointinfo;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -19 +19 @@
     public PointInfoPlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.moreToolsMenu, new PointInfoAction(Main.map));
+        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new PointInfoAction());
     }
 }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java

@@ -4 +4 @@
 import java.net.URL;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -48 +48 @@
             m_record.parseJSON(HttpClient.create(new URL(request)).connect().fetchContent());
         } catch (Exception e) {
-            Main.warn(e);
+            Logging.warn(e);
         }
     }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java

@@ -17 +17 @@
 import javax.json.JsonValue;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.pointinfo.PointInfoUtils;
+import org.openstreetmap.josm.tools.Logging;
+import java.util.logging.Level;
 
 /**
@@ -186 +188 @@
                 m_coor_lat = Double.parseDouble(coorObjekt.getString("lat"));
             } catch (NumberFormatException e) {
-                Main.warn(e, "coordinates.lat:");
+                Logging.log(Level.WARNING, "coordinates.lat:", e);
             }
 
@@ -192 +194 @@
                 m_coor_lon = Double.parseDouble(coorObjekt.getString("lon"));
             } catch (NumberFormatException e) {
-                Main.warn(e, "coordinates.lon:");
+                Logging.log(Level.WARNING, "coordinates.lon:", e);
             }
 
@@ -198 +200 @@
                 m_source = obj.getString("source");
             } catch (RuntimeException e) {
-                Main.warn(e, "source:");
+                Logging.log(Level.WARNING, "source:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "coordinates:");
+            Logging.log(Level.WARNING, "coordinates:", e);
         }
     }
@@ -213 +215 @@
                 m_objekt_ruian_id = Long.parseLong(stavebniObjekt.getString("ruian_id"));
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.ruian_id:");
+                Logging.log(Level.WARNING, "stavebni_objekt.ruian_id:", e);
             }
 
@@ -219 +221 @@
                 m_objekt_podlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi"));
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.pocet_podlazi:");
+                Logging.log(Level.WARNING, "stavebni_objekt.pocet_podlazi:", e);
             }
 
@@ -225 +227 @@
                 m_objekt_byty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu"));
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.pocet_bytu:");
+                Logging.log(Level.WARNING, "stavebni_objekt.pocet_bytu:", e);
             }
 
@@ -231 +233 @@
                 m_objekt_zpusob_vyuziti = stavebniObjekt.getString("zpusob_vyuziti");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.zpusob_vyuziti:");
+                Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti:", e);
             }
 
@@ -237 +239 @@
                 m_objekt_zpusob_vyuziti_kod = stavebniObjekt.getString("zpusob_vyuziti_kod");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.m_objekt_zpusob_vyuziti_kod:");
+                Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_kod:", e);
             }
 
@@ -243 +245 @@
                 m_objekt_zpusob_vyuziti_key = stavebniObjekt.getString("zpusob_vyuziti_key");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.zpusob_vyuziti_key:");
+                Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti_key:", e);
             }
 
@@ -249 +251 @@
                 m_objekt_zpusob_vyuziti_val = stavebniObjekt.getString("zpusob_vyuziti_val");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.m_objekt_zpusob_vyuziti_val:");
+                Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_val:", e);
             }
 
@@ -255 +257 @@
                 m_objekt_plati_od = stavebniObjekt.getString("plati_od");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.plati_od:");
+                Logging.log(Level.WARNING, "stavebni_objekt.plati_od:", e);
             }
 
@@ -261 +263 @@
                 m_objekt_dokonceni = stavebniObjekt.getString("dokonceni");
             } catch (Exception e) {
-                Main.warn(e, "stavebni_objekt.dokonceni:");
+                Logging.log(Level.WARNING, "stavebni_objekt.dokonceni:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "stavebni_objekt:");
+            Logging.log(Level.WARNING, "stavebni_objekt:", e);
         }
     }
@@ -276 +278 @@
                 m_err_user = errObjekt.getString("uzivatel");
             } catch (Exception e) {
-                Main.warn(e, "nahlaseny_problem.uzivatel:");
+                Logging.log(Level.WARNING, "nahlaseny_problem.uzivatel:", e);
             }
 
@@ -282 +284 @@
                 m_err_date = errObjekt.getString("datum");
             } catch (Exception e) {
-                Main.warn(e, "nahlaseny_problem.datum:");
+                Logging.log(Level.WARNING, "nahlaseny_problem.datum:", e);
             }
 
@@ -288 +290 @@
                 m_err_type = errObjekt.getString("duvod");
             } catch (Exception e) {
-                Main.warn(e, "nahlaseny_problem.duvod:");
+                Logging.log(Level.WARNING, "nahlaseny_problem.duvod:", e);
             }
 
@@ -294 +296 @@
                 m_err_note = errObjekt.getString("poznamka");
             } catch (Exception e) {
-                Main.warn(e, "nahlaseny_problem.poznamka:");
+                Logging.log(Level.WARNING, "nahlaseny_problem.poznamka:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "nahlaseny_problem:");
+            Logging.log(Level.WARNING, "nahlaseny_problem:", e);
         }
     }
@@ -313 +315 @@
                     so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id")));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.ruian_id:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.ruian_id:", e);
                 }
 
@@ -319 +321 @@
                     so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi")));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.pocet_podlazi:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.pocet_podlazi:", e);
                 }
 
@@ -325 +327 @@
                     so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu")));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.pocet_bytu:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.pocet_bytu:", e);
                 }
 
@@ -331 +333 @@
                     so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.zpusob_vyuziti:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti:", e);
                 }
 
@@ -337 +339 @@
                     so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_kod:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_kod:", e);
                 }
 
@@ -343 +345 @@
                     so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_key:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_key:", e);
                 }
 
@@ -349 +351 @@
                     so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_val:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_val:", e);
                 }
 
@@ -355 +357 @@
                     so.setDokonceni(soBezGeom.getString("dokonceni"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.dokonceni:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.dokonceni:", e);
                 }
 
@@ -361 +363 @@
                     so.setPlatiOd(soBezGeom.getString("plati_od"));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.plati_od:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.plati_od:", e);
                 }
 
@@ -367 +369 @@
                     so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost")));
                 } catch (Exception e) {
-                    Main.warn(e, "so_bez_geometrie.vzdalenost:");
+                    Logging.log(Level.WARNING, "so_bez_geometrie.vzdalenost:", e);
                 }
 
@@ -373 +375 @@
             }
         } catch (Exception e) {
-            Main.warn(e, "so_bez_geometrie:");
+            Logging.log(Level.WARNING, "so_bez_geometrie:", e);
         }
     }
@@ -388 +390 @@
                     am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.ruian_id:");
+                    Logging.log(Level.WARNING, "adresni_mista.ruian_id:", e);
                 }
 
@@ -398 +400 @@
                             );
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.pozice:");
+                    Logging.log(Level.WARNING, "adresni_mista.pozice:", e);
                 }
 
@@ -404 +406 @@
                     am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.budova_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.budova_kod:", e);
                 }
 
@@ -410 +412 @@
                     am.setCisloTyp(adresniMisto.getString("cislo_typ"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.cislo_typ:");
+                    Logging.log(Level.WARNING, "adresni_mista.cislo_typ:", e);
                 }
 
@@ -416 +418 @@
                     am.setCisloDomovni(adresniMisto.getString("cislo_domovni"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.cislo_domovni:");
+                    Logging.log(Level.WARNING, "adresni_mista.cislo_domovni:", e);
                 }
 
@@ -422 +424 @@
                     am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.cislo_orientacni:");
+                    Logging.log(Level.WARNING, "adresni_mista.cislo_orientacni:", e);
                 }
 
@@ -428 +430 @@
                     am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.ulice_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.ulice_kod:", e);
                 }
 
@@ -434 +436 @@
                     am.setUlice(adresniMisto.getString("ulice"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.ulice:");
+                    Logging.log(Level.WARNING, "adresni_mista.ulice:", e);
                 }
 
@@ -440 +442 @@
                     am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.cast_obce_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.cast_obce_kod:", e);
                 }
 
@@ -446 +448 @@
                     am.setCastObce(adresniMisto.getString("cast_obce"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.m_cast_obce:");
+                    Logging.log(Level.WARNING, "adresni_mista.m_cast_obce:", e);
                 }
 
@@ -452 +454 @@
                     am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.mestska_cast_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.mestska_cast_kod:", e);
                 }
 
@@ -458 +460 @@
                     am.setMestskaCast(adresniMisto.getString("mestska_cast"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.mestska_cast:");
+                    Logging.log(Level.WARNING, "adresni_mista.mestska_cast:", e);
                 }
 
@@ -464 +466 @@
                     am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.obec_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.obec_kod:", e);
                 }
 
@@ -470 +472 @@
                     am.setObec(adresniMisto.getString("obec"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.obec:");
+                    Logging.log(Level.WARNING, "adresni_mista.obec:", e);
                 }
 
@@ -476 +478 @@
                     am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.okres_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.okres_kod:", e);
                 }
 
@@ -482 +484 @@
                     am.setOkres(adresniMisto.getString("okres"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.okres:");
+                    Logging.log(Level.WARNING, "adresni_mista.okres:", e);
                 }
 
@@ -488 +490 @@
                     am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.kraj_kod:");
+                    Logging.log(Level.WARNING, "adresni_mista.kraj_kod:", e);
                 }
 
@@ -494 +496 @@
                     am.setKraj(adresniMisto.getString("kraj"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.kraj:");
+                    Logging.log(Level.WARNING, "adresni_mista.kraj:", e);
                 }
 
@@ -500 +502 @@
                     am.setPsc(adresniMisto.getString("psc"));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.psc:");
+                    Logging.log(Level.WARNING, "adresni_mista.psc:", e);
                 }
 
@@ -506 +508 @@
                     am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost")));
                 } catch (Exception e) {
-                    Main.warn(e, "adresni_mista.vzdalenost:");
+                    Logging.log(Level.WARNING, "adresni_mista.vzdalenost:", e);
                 }
 
@@ -512 +514 @@
             }
         } catch (Exception e) {
-            Main.warn(e, "adresni_mista:");
+            Logging.log(Level.WARNING, "adresni_mista:", e);
         }
     }
@@ -523 +525 @@
                 m_parcela_ruian_id = Long.parseLong(parcela.getString("ruian_id"));
             } catch (Exception e) {
-                Main.warn(e, "parcela.ruian_id:");
+                Logging.log(Level.WARNING, "parcela.ruian_id:", e);
             }
 
@@ -529 +531 @@
                 m_parcela_druh_pozemku = parcela.getString("druh_pozemku");
             } catch (Exception e) {
-                Main.warn(e, "parcela.druh_pozemku:");
+                Logging.log(Level.WARNING, "parcela.druh_pozemku:", e);
             }
 
@@ -535 +537 @@
                 m_parcela_zpusob_vyuziti = parcela.getString("zpusob_vyuziti");
             } catch (Exception e) {
-                Main.warn(e, "parcela.zpusob_vyuziti:");
+                Logging.log(Level.WARNING, "parcela.zpusob_vyuziti:", e);
             }
 
@@ -541 +543 @@
                 m_parcela_plati_od = parcela.getString("plati_od");
             } catch (Exception e) {
-                Main.warn(e, "parcela.plati_od:");
+                Logging.log(Level.WARNING, "parcela.plati_od:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "parcela:");
+            Logging.log(Level.WARNING, "parcela:", e);
         }
     }
@@ -556 +558 @@
                 m_ulice_ruian_id = Long.parseLong(ulice.getString("ruian_id"));
             } catch (Exception e) {
-                Main.warn(e, "ulice.ruian_id:");
+                Logging.log(Level.WARNING, "ulice.ruian_id:", e);
             }
 
@@ -562 +564 @@
                 m_ulice_jmeno = ulice.getString("jmeno");
             } catch (Exception e) {
-                Main.warn(e, "ulice.jmeno:");
+                Logging.log(Level.WARNING, "ulice.jmeno:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "ulice:");
+            Logging.log(Level.WARNING, "ulice:", e);
         }
     }
@@ -577 +579 @@
                 m_katastr_ruian_id = Long.parseLong(katastr.getString("ruian_id"));
             } catch (Exception e) {
-                Main.warn(e, "katastr.ruian_id:");
+                Logging.log(Level.WARNING, "katastr.ruian_id:", e);
             }
 
@@ -583 +585 @@
                 m_katastr_nazev = katastr.getString("nazev");
             } catch (Exception e) {
-                Main.warn(e, "katastr.nazev:");
+                Logging.log(Level.WARNING, "katastr.nazev:", e);
             }
 
@@ -589 +591 @@
                 m_katastr_obec_kod = Long.parseLong(katastr.getString("obec_kod"));
             } catch (Exception e) {
-                Main.warn(e, "katastr.obec_kod:");
+                Logging.log(Level.WARNING, "katastr.obec_kod:", e);
             }
 
@@ -595 +597 @@
                 m_katastr_obec = katastr.getString("obec");
             } catch (Exception e) {
-                Main.warn(e, "katastr.okres:");
+                Logging.log(Level.WARNING, "katastr.okres:", e);
             }
 
@@ -601 +603 @@
                 m_katastr_okres_kod = Long.parseLong(katastr.getString("okres_kod"));
             } catch (Exception e) {
-                Main.warn(e, "katastr.okres_kod:");
+                Logging.log(Level.WARNING, "katastr.okres_kod:", e);
             }
 
@@ -607 +609 @@
                 m_katastr_okres = katastr.getString("okres");
             } catch (Exception e) {
-                Main.warn(e, "katastr.okres:");
+                Logging.log(Level.WARNING, "katastr.okres:", e);
             }
 
@@ -613 +615 @@
                 m_katastr_kraj_kod = Long.parseLong(katastr.getString("kraj_kod"));
             } catch (Exception e) {
-                Main.warn(e, "katastr.kraj_kod:");
+                Logging.log(Level.WARNING, "katastr.kraj_kod:", e);
             }
 
@@ -619 +621 @@
                 m_katastr_kraj = katastr.getString("kraj");
             } catch (Exception e) {
-                Main.warn(e, "katastr.kraj:");
+                Logging.log(Level.WARNING, "katastr.kraj:", e);
             }
 
         } catch (Exception e) {
-            Main.warn(e, "katastr:");
+            Logging.log(Level.WARNING, "katastr:", e);
         }
     }
@@ -933 +935 @@
             r = Integer.toString(year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day);
         } catch (Exception e) {
-            Main.warn(e);
+            Logging.warn(e);
         }
 
@@ -1016 +1018 @@
                     String[] key = keyType.split(":");
                     i = Integer.valueOf(key[1]);
-                    Main.info("Address ID: " + i);
+                    Logging.info("Address ID: " + i);
                 }
 
@@ -1117 +1119 @@
         for (String line : list) {
             String[] tag = line.split("\"=\"");
-            Main.info("<" + tag[0] + ">. <" + tag[1] +">");
+            Logging.info("<" + tag[0] + ">. <" + tag[1] +">");
             tc.add(new Tag(tag[0].substring(1), tag[1].substring(0, tag[1].length()-1)));
         }
@@ -1123 +1125 @@
         tc.applyTo(coll);
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Add new address point"), commands));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Add new address point"), commands));
     }
 
@@ -1133 +1135 @@
     public void performAction(String act) {
 
-        Main.info("act: " + act.substring(7));
+        Logging.info("act: " + act.substring(7));
         String[] params = act.substring(7).split("/");
         if (!params[0].equals("tags.copy") && !params[0].startsWith("tags.create")) {