Changeset 33549 in osm for applications/editors/josm
- Timestamp:
- 2017-08-27T07:50:20+02:00 (7 years ago)
- Location:
- applications/editors/josm/plugins/pointInfo
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/pointInfo/build.xml
r33129 r33549 3 3 4 4 <!-- enter the SVN commit message --> 5 <property name="commit.message" value="PointInfo: Add link to direct access to CUZK:KN info."/>5 <property name="commit.message" value="PointInfo: Replace depricated functions."/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value="1 0604"/>7 <property name="plugin.main.version" value="12666"/> 8 8 9 9 <!-- plugin can load at runtime --> -
applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java
r32848 r33549 18 18 import javax.swing.event.HyperlinkEvent; 19 19 20 import org.openstreetmap.josm.Main;21 20 import org.openstreetmap.josm.actions.mapmode.MapMode; 22 21 import org.openstreetmap.josm.data.coor.LatLon; 22 import org.openstreetmap.josm.gui.MainApplication; 23 23 import org.openstreetmap.josm.gui.MapFrame; 24 24 import org.openstreetmap.josm.gui.PleaseWaitRunnable; … … 27 27 import org.openstreetmap.josm.plugins.pointinfo.ruian.RuianModule; 28 28 import org.openstreetmap.josm.tools.ImageProvider; 29 import org.openstreetmap.josm.tools.Logging; 29 30 import org.openstreetmap.josm.tools.OpenBrowser; 30 31 import org.openstreetmap.josm.tools.Shortcut; … … 41 42 private String coordinatesText = ""; 42 43 43 PointInfoAction( MapFrame mapFrame) {44 PointInfoAction() { 44 45 super(tr("Point info"), "info-sml", tr("Point info."), 45 46 Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), 46 mapFrame,getCursor());47 getCursor()); 47 48 } 48 49 … … 53 54 } 54 55 super.enterMode(); 55 Main .map.mapView.setCursor(getCursor());56 Main .map.mapView.addMouseListener(this);56 MainApplication.getMap().mapView.setCursor(getCursor()); 57 MainApplication.getMap().mapView.addMouseListener(this); 57 58 } 58 59 … … 60 61 public void exitMode() { 61 62 super.exitMode(); 62 Main .map.mapView.removeMouseListener(this);63 MainApplication.getMap().mapView.removeMouseListener(this); 63 64 } 64 65 … … 72 73 * Positional data 73 74 */ 74 final LatLon pos = Main .map.mapView.getLatLon(clickPoint.x, clickPoint.y);75 final LatLon pos = MainApplication.getMap().mapView.getLatLon(clickPoint.x, clickPoint.y); 75 76 76 77 try { … … 123 124 new Thread(infoTask).start(); 124 125 } catch (Exception e) { 125 Main.error(e);126 Logging.error(e); 126 127 } 127 128 } … … 164 165 @Override 165 166 public void mousePressed(MouseEvent e) { 166 if (!Main .map.mapView.isActiveLayerDrawable()) {167 if (!MainApplication.getMap().mapView.isActiveLayerDrawable()) { 167 168 return; 168 169 } -
applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java
r32848 r33549 2 2 package org.openstreetmap.josm.plugins.pointinfo; 3 3 4 import org.openstreetmap.josm. Main;4 import org.openstreetmap.josm.gui.MainApplication; 5 5 import org.openstreetmap.josm.gui.MainMenu; 6 6 import org.openstreetmap.josm.plugins.Plugin; … … 19 19 public PointInfoPlugin(PluginInformation info) { 20 20 super(info); 21 MainMenu.add(Main .main.menu.moreToolsMenu, new PointInfoAction(Main.map));21 MainMenu.add(MainApplication.getMenu().moreToolsMenu, new PointInfoAction()); 22 22 } 23 23 } -
applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java
r32848 r33549 4 4 import java.net.URL; 5 5 6 import org.openstreetmap.josm.Main;7 6 import org.openstreetmap.josm.data.coor.LatLon; 8 7 import org.openstreetmap.josm.tools.HttpClient; 8 import org.openstreetmap.josm.tools.Logging; 9 9 10 10 /** … … 48 48 m_record.parseJSON(HttpClient.create(new URL(request)).connect().fetchContent()); 49 49 } catch (Exception e) { 50 Main.warn(e);50 Logging.warn(e); 51 51 } 52 52 } -
applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java
r33129 r33549 17 17 import javax.json.JsonValue; 18 18 19 import org.openstreetmap.josm.Main;20 19 import org.openstreetmap.josm.command.AddCommand; 21 20 import org.openstreetmap.josm.command.Command; … … 27 26 import org.openstreetmap.josm.data.osm.TagCollection; 28 27 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 28 import org.openstreetmap.josm.gui.MainApplication; 29 29 import org.openstreetmap.josm.plugins.pointinfo.PointInfoUtils; 30 import org.openstreetmap.josm.tools.Logging; 31 import java.util.logging.Level; 30 32 31 33 /** … … 186 188 m_coor_lat = Double.parseDouble(coorObjekt.getString("lat")); 187 189 } catch (NumberFormatException e) { 188 Main.warn(e, "coordinates.lat:");190 Logging.log(Level.WARNING, "coordinates.lat:", e); 189 191 } 190 192 … … 192 194 m_coor_lon = Double.parseDouble(coorObjekt.getString("lon")); 193 195 } catch (NumberFormatException e) { 194 Main.warn(e, "coordinates.lon:");196 Logging.log(Level.WARNING, "coordinates.lon:", e); 195 197 } 196 198 … … 198 200 m_source = obj.getString("source"); 199 201 } catch (RuntimeException e) { 200 Main.warn(e, "source:");202 Logging.log(Level.WARNING, "source:", e); 201 203 } 202 204 203 205 } catch (Exception e) { 204 Main.warn(e, "coordinates:");206 Logging.log(Level.WARNING, "coordinates:", e); 205 207 } 206 208 } … … 213 215 m_objekt_ruian_id = Long.parseLong(stavebniObjekt.getString("ruian_id")); 214 216 } catch (Exception e) { 215 Main.warn(e, "stavebni_objekt.ruian_id:");217 Logging.log(Level.WARNING, "stavebni_objekt.ruian_id:", e); 216 218 } 217 219 … … 219 221 m_objekt_podlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi")); 220 222 } catch (Exception e) { 221 Main.warn(e, "stavebni_objekt.pocet_podlazi:");223 Logging.log(Level.WARNING, "stavebni_objekt.pocet_podlazi:", e); 222 224 } 223 225 … … 225 227 m_objekt_byty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu")); 226 228 } catch (Exception e) { 227 Main.warn(e, "stavebni_objekt.pocet_bytu:");229 Logging.log(Level.WARNING, "stavebni_objekt.pocet_bytu:", e); 228 230 } 229 231 … … 231 233 m_objekt_zpusob_vyuziti = stavebniObjekt.getString("zpusob_vyuziti"); 232 234 } catch (Exception e) { 233 Main.warn(e, "stavebni_objekt.zpusob_vyuziti:");235 Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti:", e); 234 236 } 235 237 … … 237 239 m_objekt_zpusob_vyuziti_kod = stavebniObjekt.getString("zpusob_vyuziti_kod"); 238 240 } catch (Exception e) { 239 Main.warn(e, "stavebni_objekt.m_objekt_zpusob_vyuziti_kod:");241 Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_kod:", e); 240 242 } 241 243 … … 243 245 m_objekt_zpusob_vyuziti_key = stavebniObjekt.getString("zpusob_vyuziti_key"); 244 246 } catch (Exception e) { 245 Main.warn(e, "stavebni_objekt.zpusob_vyuziti_key:");247 Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti_key:", e); 246 248 } 247 249 … … 249 251 m_objekt_zpusob_vyuziti_val = stavebniObjekt.getString("zpusob_vyuziti_val"); 250 252 } catch (Exception e) { 251 Main.warn(e, "stavebni_objekt.m_objekt_zpusob_vyuziti_val:");253 Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_val:", e); 252 254 } 253 255 … … 255 257 m_objekt_plati_od = stavebniObjekt.getString("plati_od"); 256 258 } catch (Exception e) { 257 Main.warn(e, "stavebni_objekt.plati_od:");259 Logging.log(Level.WARNING, "stavebni_objekt.plati_od:", e); 258 260 } 259 261 … … 261 263 m_objekt_dokonceni = stavebniObjekt.getString("dokonceni"); 262 264 } catch (Exception e) { 263 Main.warn(e, "stavebni_objekt.dokonceni:");265 Logging.log(Level.WARNING, "stavebni_objekt.dokonceni:", e); 264 266 } 265 267 266 268 } catch (Exception e) { 267 Main.warn(e, "stavebni_objekt:");269 Logging.log(Level.WARNING, "stavebni_objekt:", e); 268 270 } 269 271 } … … 276 278 m_err_user = errObjekt.getString("uzivatel"); 277 279 } catch (Exception e) { 278 Main.warn(e, "nahlaseny_problem.uzivatel:");280 Logging.log(Level.WARNING, "nahlaseny_problem.uzivatel:", e); 279 281 } 280 282 … … 282 284 m_err_date = errObjekt.getString("datum"); 283 285 } catch (Exception e) { 284 Main.warn(e, "nahlaseny_problem.datum:");286 Logging.log(Level.WARNING, "nahlaseny_problem.datum:", e); 285 287 } 286 288 … … 288 290 m_err_type = errObjekt.getString("duvod"); 289 291 } catch (Exception e) { 290 Main.warn(e, "nahlaseny_problem.duvod:");292 Logging.log(Level.WARNING, "nahlaseny_problem.duvod:", e); 291 293 } 292 294 … … 294 296 m_err_note = errObjekt.getString("poznamka"); 295 297 } catch (Exception e) { 296 Main.warn(e, "nahlaseny_problem.poznamka:");298 Logging.log(Level.WARNING, "nahlaseny_problem.poznamka:", e); 297 299 } 298 300 299 301 } catch (Exception e) { 300 Main.warn(e, "nahlaseny_problem:");302 Logging.log(Level.WARNING, "nahlaseny_problem:", e); 301 303 } 302 304 } … … 313 315 so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id"))); 314 316 } catch (Exception e) { 315 Main.warn(e, "so_bez_geometrie.ruian_id:");317 Logging.log(Level.WARNING, "so_bez_geometrie.ruian_id:", e); 316 318 } 317 319 … … 319 321 so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi"))); 320 322 } catch (Exception e) { 321 Main.warn(e, "so_bez_geometrie.pocet_podlazi:");323 Logging.log(Level.WARNING, "so_bez_geometrie.pocet_podlazi:", e); 322 324 } 323 325 … … 325 327 so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu"))); 326 328 } catch (Exception e) { 327 Main.warn(e, "so_bez_geometrie.pocet_bytu:");329 Logging.log(Level.WARNING, "so_bez_geometrie.pocet_bytu:", e); 328 330 } 329 331 … … 331 333 so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti")); 332 334 } catch (Exception e) { 333 Main.warn(e, "so_bez_geometrie.zpusob_vyuziti:");335 Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti:", e); 334 336 } 335 337 … … 337 339 so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod")); 338 340 } catch (Exception e) { 339 Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_kod:");341 Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_kod:", e); 340 342 } 341 343 … … 343 345 so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key")); 344 346 } catch (Exception e) { 345 Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_key:");347 Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_key:", e); 346 348 } 347 349 … … 349 351 so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val")); 350 352 } catch (Exception e) { 351 Main.warn(e, "so_bez_geometrie.zpusob_vyuziti_val:");353 Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_val:", e); 352 354 } 353 355 … … 355 357 so.setDokonceni(soBezGeom.getString("dokonceni")); 356 358 } catch (Exception e) { 357 Main.warn(e, "so_bez_geometrie.dokonceni:");359 Logging.log(Level.WARNING, "so_bez_geometrie.dokonceni:", e); 358 360 } 359 361 … … 361 363 so.setPlatiOd(soBezGeom.getString("plati_od")); 362 364 } catch (Exception e) { 363 Main.warn(e, "so_bez_geometrie.plati_od:");365 Logging.log(Level.WARNING, "so_bez_geometrie.plati_od:", e); 364 366 } 365 367 … … 367 369 so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost"))); 368 370 } catch (Exception e) { 369 Main.warn(e, "so_bez_geometrie.vzdalenost:");371 Logging.log(Level.WARNING, "so_bez_geometrie.vzdalenost:", e); 370 372 } 371 373 … … 373 375 } 374 376 } catch (Exception e) { 375 Main.warn(e, "so_bez_geometrie:");377 Logging.log(Level.WARNING, "so_bez_geometrie:", e); 376 378 } 377 379 } … … 388 390 am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id"))); 389 391 } catch (Exception e) { 390 Main.warn(e, "adresni_mista.ruian_id:");392 Logging.log(Level.WARNING, "adresni_mista.ruian_id:", e); 391 393 } 392 394 … … 398 400 ); 399 401 } catch (Exception e) { 400 Main.warn(e, "adresni_mista.pozice:");402 Logging.log(Level.WARNING, "adresni_mista.pozice:", e); 401 403 } 402 404 … … 404 406 am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod"))); 405 407 } catch (Exception e) { 406 Main.warn(e, "adresni_mista.budova_kod:");408 Logging.log(Level.WARNING, "adresni_mista.budova_kod:", e); 407 409 } 408 410 … … 410 412 am.setCisloTyp(adresniMisto.getString("cislo_typ")); 411 413 } catch (Exception e) { 412 Main.warn(e, "adresni_mista.cislo_typ:");414 Logging.log(Level.WARNING, "adresni_mista.cislo_typ:", e); 413 415 } 414 416 … … 416 418 am.setCisloDomovni(adresniMisto.getString("cislo_domovni")); 417 419 } catch (Exception e) { 418 Main.warn(e, "adresni_mista.cislo_domovni:");420 Logging.log(Level.WARNING, "adresni_mista.cislo_domovni:", e); 419 421 } 420 422 … … 422 424 am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni")); 423 425 } catch (Exception e) { 424 Main.warn(e, "adresni_mista.cislo_orientacni:");426 Logging.log(Level.WARNING, "adresni_mista.cislo_orientacni:", e); 425 427 } 426 428 … … 428 430 am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod"))); 429 431 } catch (Exception e) { 430 Main.warn(e, "adresni_mista.ulice_kod:");432 Logging.log(Level.WARNING, "adresni_mista.ulice_kod:", e); 431 433 } 432 434 … … 434 436 am.setUlice(adresniMisto.getString("ulice")); 435 437 } catch (Exception e) { 436 Main.warn(e, "adresni_mista.ulice:");438 Logging.log(Level.WARNING, "adresni_mista.ulice:", e); 437 439 } 438 440 … … 440 442 am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod"))); 441 443 } catch (Exception e) { 442 Main.warn(e, "adresni_mista.cast_obce_kod:");444 Logging.log(Level.WARNING, "adresni_mista.cast_obce_kod:", e); 443 445 } 444 446 … … 446 448 am.setCastObce(adresniMisto.getString("cast_obce")); 447 449 } catch (Exception e) { 448 Main.warn(e, "adresni_mista.m_cast_obce:");450 Logging.log(Level.WARNING, "adresni_mista.m_cast_obce:", e); 449 451 } 450 452 … … 452 454 am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod"))); 453 455 } catch (Exception e) { 454 Main.warn(e, "adresni_mista.mestska_cast_kod:");456 Logging.log(Level.WARNING, "adresni_mista.mestska_cast_kod:", e); 455 457 } 456 458 … … 458 460 am.setMestskaCast(adresniMisto.getString("mestska_cast")); 459 461 } catch (Exception e) { 460 Main.warn(e, "adresni_mista.mestska_cast:");462 Logging.log(Level.WARNING, "adresni_mista.mestska_cast:", e); 461 463 } 462 464 … … 464 466 am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod"))); 465 467 } catch (Exception e) { 466 Main.warn(e, "adresni_mista.obec_kod:");468 Logging.log(Level.WARNING, "adresni_mista.obec_kod:", e); 467 469 } 468 470 … … 470 472 am.setObec(adresniMisto.getString("obec")); 471 473 } catch (Exception e) { 472 Main.warn(e, "adresni_mista.obec:");474 Logging.log(Level.WARNING, "adresni_mista.obec:", e); 473 475 } 474 476 … … 476 478 am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod"))); 477 479 } catch (Exception e) { 478 Main.warn(e, "adresni_mista.okres_kod:");480 Logging.log(Level.WARNING, "adresni_mista.okres_kod:", e); 479 481 } 480 482 … … 482 484 am.setOkres(adresniMisto.getString("okres")); 483 485 } catch (Exception e) { 484 Main.warn(e, "adresni_mista.okres:");486 Logging.log(Level.WARNING, "adresni_mista.okres:", e); 485 487 } 486 488 … … 488 490 am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod"))); 489 491 } catch (Exception e) { 490 Main.warn(e, "adresni_mista.kraj_kod:");492 Logging.log(Level.WARNING, "adresni_mista.kraj_kod:", e); 491 493 } 492 494 … … 494 496 am.setKraj(adresniMisto.getString("kraj")); 495 497 } catch (Exception e) { 496 Main.warn(e, "adresni_mista.kraj:");498 Logging.log(Level.WARNING, "adresni_mista.kraj:", e); 497 499 } 498 500 … … 500 502 am.setPsc(adresniMisto.getString("psc")); 501 503 } catch (Exception e) { 502 Main.warn(e, "adresni_mista.psc:");504 Logging.log(Level.WARNING, "adresni_mista.psc:", e); 503 505 } 504 506 … … 506 508 am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost"))); 507 509 } catch (Exception e) { 508 Main.warn(e, "adresni_mista.vzdalenost:");510 Logging.log(Level.WARNING, "adresni_mista.vzdalenost:", e); 509 511 } 510 512 … … 512 514 } 513 515 } catch (Exception e) { 514 Main.warn(e, "adresni_mista:");516 Logging.log(Level.WARNING, "adresni_mista:", e); 515 517 } 516 518 } … … 523 525 m_parcela_ruian_id = Long.parseLong(parcela.getString("ruian_id")); 524 526 } catch (Exception e) { 525 Main.warn(e, "parcela.ruian_id:");527 Logging.log(Level.WARNING, "parcela.ruian_id:", e); 526 528 } 527 529 … … 529 531 m_parcela_druh_pozemku = parcela.getString("druh_pozemku"); 530 532 } catch (Exception e) { 531 Main.warn(e, "parcela.druh_pozemku:");533 Logging.log(Level.WARNING, "parcela.druh_pozemku:", e); 532 534 } 533 535 … … 535 537 m_parcela_zpusob_vyuziti = parcela.getString("zpusob_vyuziti"); 536 538 } catch (Exception e) { 537 Main.warn(e, "parcela.zpusob_vyuziti:");539 Logging.log(Level.WARNING, "parcela.zpusob_vyuziti:", e); 538 540 } 539 541 … … 541 543 m_parcela_plati_od = parcela.getString("plati_od"); 542 544 } catch (Exception e) { 543 Main.warn(e, "parcela.plati_od:");545 Logging.log(Level.WARNING, "parcela.plati_od:", e); 544 546 } 545 547 546 548 } catch (Exception e) { 547 Main.warn(e, "parcela:");549 Logging.log(Level.WARNING, "parcela:", e); 548 550 } 549 551 } … … 556 558 m_ulice_ruian_id = Long.parseLong(ulice.getString("ruian_id")); 557 559 } catch (Exception e) { 558 Main.warn(e, "ulice.ruian_id:");560 Logging.log(Level.WARNING, "ulice.ruian_id:", e); 559 561 } 560 562 … … 562 564 m_ulice_jmeno = ulice.getString("jmeno"); 563 565 } catch (Exception e) { 564 Main.warn(e, "ulice.jmeno:");566 Logging.log(Level.WARNING, "ulice.jmeno:", e); 565 567 } 566 568 567 569 } catch (Exception e) { 568 Main.warn(e, "ulice:");570 Logging.log(Level.WARNING, "ulice:", e); 569 571 } 570 572 } … … 577 579 m_katastr_ruian_id = Long.parseLong(katastr.getString("ruian_id")); 578 580 } catch (Exception e) { 579 Main.warn(e, "katastr.ruian_id:");581 Logging.log(Level.WARNING, "katastr.ruian_id:", e); 580 582 } 581 583 … … 583 585 m_katastr_nazev = katastr.getString("nazev"); 584 586 } catch (Exception e) { 585 Main.warn(e, "katastr.nazev:");587 Logging.log(Level.WARNING, "katastr.nazev:", e); 586 588 } 587 589 … … 589 591 m_katastr_obec_kod = Long.parseLong(katastr.getString("obec_kod")); 590 592 } catch (Exception e) { 591 Main.warn(e, "katastr.obec_kod:");593 Logging.log(Level.WARNING, "katastr.obec_kod:", e); 592 594 } 593 595 … … 595 597 m_katastr_obec = katastr.getString("obec"); 596 598 } catch (Exception e) { 597 Main.warn(e, "katastr.okres:");599 Logging.log(Level.WARNING, "katastr.okres:", e); 598 600 } 599 601 … … 601 603 m_katastr_okres_kod = Long.parseLong(katastr.getString("okres_kod")); 602 604 } catch (Exception e) { 603 Main.warn(e, "katastr.okres_kod:");605 Logging.log(Level.WARNING, "katastr.okres_kod:", e); 604 606 } 605 607 … … 607 609 m_katastr_okres = katastr.getString("okres"); 608 610 } catch (Exception e) { 609 Main.warn(e, "katastr.okres:");611 Logging.log(Level.WARNING, "katastr.okres:", e); 610 612 } 611 613 … … 613 615 m_katastr_kraj_kod = Long.parseLong(katastr.getString("kraj_kod")); 614 616 } catch (Exception e) { 615 Main.warn(e, "katastr.kraj_kod:");617 Logging.log(Level.WARNING, "katastr.kraj_kod:", e); 616 618 } 617 619 … … 619 621 m_katastr_kraj = katastr.getString("kraj"); 620 622 } catch (Exception e) { 621 Main.warn(e, "katastr.kraj:");623 Logging.log(Level.WARNING, "katastr.kraj:", e); 622 624 } 623 625 624 626 } catch (Exception e) { 625 Main.warn(e, "katastr:");627 Logging.log(Level.WARNING, "katastr:", e); 626 628 } 627 629 } … … 933 935 r = Integer.toString(year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); 934 936 } catch (Exception e) { 935 Main.warn(e);937 Logging.warn(e); 936 938 } 937 939 … … 1016 1018 String[] key = keyType.split(":"); 1017 1019 i = Integer.valueOf(key[1]); 1018 Main.info("Address ID: " + i);1020 Logging.info("Address ID: " + i); 1019 1021 } 1020 1022 … … 1117 1119 for (String line : list) { 1118 1120 String[] tag = line.split("\"=\""); 1119 Main.info("<" + tag[0] + ">. <" + tag[1] +">");1121 Logging.info("<" + tag[0] + ">. <" + tag[1] +">"); 1120 1122 tc.add(new Tag(tag[0].substring(1), tag[1].substring(0, tag[1].length()-1))); 1121 1123 } … … 1123 1125 tc.applyTo(coll); 1124 1126 1125 Main .main.undoRedo.add(new SequenceCommand(tr("Add new address point"), commands));1127 MainApplication.undoRedo.add(new SequenceCommand(tr("Add new address point"), commands)); 1126 1128 } 1127 1129 … … 1133 1135 public void performAction(String act) { 1134 1136 1135 Main.info("act: " + act.substring(7));1137 Logging.info("act: " + act.substring(7)); 1136 1138 String[] params = act.substring(7).split("/"); 1137 1139 if (!params[0].equals("tags.copy") && !params[0].startsWith("tags.create")) {
Note:
See TracChangeset
for help on using the changeset viewer.