Changeset 6084 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2013-07-26T13:38:17+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
r4162 r6084 14 14 setOpaque(true); 15 15 } 16 @Override 16 17 public Component getListCellRendererComponent( 17 18 JList list, -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r6070 r6084 168 168 * @see PropertiesMergeModel 169 169 */ 170 @Override 170 171 public void propertyChange(PropertyChangeEvent evt) { 171 172 if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r6070 r6084 842 842 } 843 843 844 @Override 844 845 public Object getElementAt(int index) { 845 846 if (index < compareModes.size()) … … 848 849 } 849 850 851 @Override 850 852 public int getSize() { 851 853 return compareModes.size(); 852 854 } 853 855 856 @Override 854 857 public Object getSelectedItem() { 855 858 return compareModes.get(selectedIdx); 856 859 } 857 860 861 @Override 858 862 public void setSelectedItem(Object anItem) { 859 863 int i = compareModes.indexOf(anItem); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r6070 r6084 437 437 } 438 438 439 @Override 439 440 public void actionPerformed(ActionEvent arg0) { 440 441 int [] rows = myEntriesTable.getSelectedRows(); … … 442 443 } 443 444 445 @Override 444 446 public void valueChanged(ListSelectionEvent e) { 445 447 setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); … … 464 466 } 465 467 468 @Override 466 469 public void actionPerformed(ActionEvent arg0) { 467 470 int [] rows = myEntriesTable.getSelectedRows(); … … 469 472 } 470 473 474 @Override 471 475 public void valueChanged(ListSelectionEvent e) { 472 476 setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); … … 491 495 } 492 496 497 @Override 493 498 public void actionPerformed(ActionEvent arg0) { 494 499 int [] myRows = myEntriesTable.getSelectedRows(); … … 500 505 } 501 506 507 @Override 502 508 public void valueChanged(ListSelectionEvent e) { 503 509 setEnabled( … … 525 531 } 526 532 533 @Override 527 534 public void actionPerformed(ActionEvent arg0) { 528 535 int [] myRows = myEntriesTable.getSelectedRows(); … … 534 541 } 535 542 543 @Override 536 544 public void valueChanged(ListSelectionEvent e) { 537 545 setEnabled( … … 554 562 } 555 563 564 @Override 556 565 public void actionPerformed(ActionEvent arg0) { 557 566 int [] rows = theirEntriesTable.getSelectedRows(); … … 559 568 } 560 569 570 @Override 561 571 public void valueChanged(ListSelectionEvent e) { 562 572 setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); … … 576 586 } 577 587 588 @Override 578 589 public void actionPerformed(ActionEvent arg0) { 579 590 int [] rows = theirEntriesTable.getSelectedRows(); … … 581 592 } 582 593 594 @Override 583 595 public void valueChanged(ListSelectionEvent e) { 584 596 setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); … … 598 610 } 599 611 612 @Override 600 613 public void actionPerformed(ActionEvent arg0) { 601 614 int [] myRows = theirEntriesTable.getSelectedRows(); … … 607 620 } 608 621 622 @Override 609 623 public void valueChanged(ListSelectionEvent e) { 610 624 setEnabled( … … 627 641 } 628 642 643 @Override 629 644 public void actionPerformed(ActionEvent arg0) { 630 645 int [] myRows = theirEntriesTable.getSelectedRows(); … … 636 651 } 637 652 653 @Override 638 654 public void valueChanged(ListSelectionEvent e) { 639 655 setEnabled( … … 652 668 } 653 669 670 @Override 654 671 public void actionPerformed(ActionEvent arg0) { 655 672 model.copyAll(ListRole.MY_ENTRIES); … … 661 678 } 662 679 680 @Override 663 681 public void update(Observable o, Object arg) { 664 682 updateEnabledState(); 665 683 } 666 684 685 @Override 667 686 public void propertyChange(PropertyChangeEvent evt) { 668 687 updateEnabledState(); … … 678 697 } 679 698 699 @Override 680 700 public void actionPerformed(ActionEvent arg0) { 681 701 model.copyAll(ListRole.THEIR_ENTRIES); … … 687 707 } 688 708 709 @Override 689 710 public void update(Observable o, Object arg) { 690 711 updateEnabledState(); 691 712 } 692 713 714 @Override 693 715 public void propertyChange(PropertyChangeEvent evt) { 694 716 updateEnabledState(); … … 708 730 } 709 731 732 @Override 710 733 public void actionPerformed(ActionEvent arg0) { 711 734 int [] rows = mergedEntriesTable.getSelectedRows(); … … 713 736 } 714 737 738 @Override 715 739 public void valueChanged(ListSelectionEvent e) { 716 740 int [] rows = mergedEntriesTable.getSelectedRows(); … … 740 764 } 741 765 766 @Override 742 767 public void actionPerformed(ActionEvent arg0) { 743 768 int [] rows = mergedEntriesTable.getSelectedRows(); … … 745 770 } 746 771 772 @Override 747 773 public void valueChanged(ListSelectionEvent e) { 748 774 int [] rows = mergedEntriesTable.getSelectedRows(); … … 772 798 } 773 799 800 @Override 774 801 public void actionPerformed(ActionEvent arg0) { 775 802 int [] rows = mergedEntriesTable.getSelectedRows(); … … 777 804 } 778 805 806 @Override 779 807 public void valueChanged(ListSelectionEvent e) { 780 808 int [] rows = mergedEntriesTable.getSelectedRows(); … … 803 831 } 804 832 833 @Override 805 834 public void actionPerformed(ActionEvent arg0) { 806 835 // do nothing … … 818 847 addPropertyChangeListener( 819 848 new PropertyChangeListener() { 849 @Override 820 850 public void propertyChange(PropertyChangeEvent evt) { 821 851 if (evt.getPropertyName().equals(PROP_SELECTED)) { … … 827 857 } 828 858 859 @Override 829 860 public void itemStateChanged(ItemEvent e) { 830 861 int state = e.getStateChange(); … … 867 898 } 868 899 900 @Override 869 901 public void propertyChange(PropertyChangeEvent evt) { 870 902 if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) { … … 877 909 } 878 910 911 @Override 879 912 public void update(Observable o, Object arg) { 880 913 lblMyVersion.setText( … … 935 968 * 936 969 */ 970 @Override 937 971 public void adjustmentValueChanged(AdjustmentEvent e) { 938 972 if (! enabledMap.get(e.getAdjustable())) … … 1001 1035 // 1002 1036 view.addItemListener(new ItemListener() { 1037 @Override 1003 1038 public void itemStateChanged(ItemEvent e) { 1004 1039 switch(e.getStateChange()) { … … 1019 1054 observable.addObserver( 1020 1055 new Observer() { 1056 @Override 1021 1057 public void update(Observable o, Object arg) { 1022 1058 boolean sync = isParticipatingInSynchronizedScrolling(adjustable); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
r6070 r6084 53 53 } 54 54 55 @Override 55 56 public void populate(Conflict<? extends OsmPrimitive> conflict) { 56 57 Way myWay = (Way)conflict.getMy(); … … 61 62 } 62 63 64 @Override 63 65 public void deletePrimitive(boolean deleted) { 64 66 if (deleted) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
r5299 r6084 151 151 } 152 152 153 @Override 153 154 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, 154 155 int row, int column) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r5266 r6084 381 381 } 382 382 383 @Override 383 384 public void update(Observable o, Object arg) { 384 385 updateCoordinates(); … … 397 398 } 398 399 400 @Override 399 401 public void actionPerformed(ActionEvent e) { 400 402 model.decideCoordsConflict(MergeDecisionType.KEEP_MINE); 401 403 } 402 404 405 @Override 403 406 public void update(Observable o, Object arg) { 404 407 setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); … … 412 415 } 413 416 417 @Override 414 418 public void actionPerformed(ActionEvent e) { 415 419 model.decideCoordsConflict(MergeDecisionType.KEEP_THEIR); 416 420 } 417 421 422 @Override 418 423 public void update(Observable o, Object arg) { 419 424 setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); … … 427 432 } 428 433 434 @Override 429 435 public void actionPerformed(ActionEvent e) { 430 436 model.decideCoordsConflict(MergeDecisionType.UNDECIDED); 431 437 } 432 438 439 @Override 433 440 public void update(Observable o, Object arg) { 434 441 setEnabled(model.hasCoordConflict() && model.isDecidedCoord()); … … 442 449 } 443 450 451 @Override 444 452 public void actionPerformed(ActionEvent e) { 445 453 model.decideDeletedStateConflict(MergeDecisionType.KEEP_MINE); 446 454 } 447 455 456 @Override 448 457 public void update(Observable o, Object arg) { 449 458 setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); … … 457 466 } 458 467 468 @Override 459 469 public void actionPerformed(ActionEvent e) { 460 470 model.decideDeletedStateConflict(MergeDecisionType.KEEP_THEIR); 461 471 } 462 472 473 @Override 463 474 public void update(Observable o, Object arg) { 464 475 setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); … … 472 483 } 473 484 485 @Override 474 486 public void actionPerformed(ActionEvent e) { 475 487 model.decideDeletedStateConflict(MergeDecisionType.UNDECIDED); 476 488 } 477 489 490 @Override 478 491 public void update(Observable o, Object arg) { 479 492 setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState()); … … 481 494 } 482 495 496 @Override 483 497 public void deletePrimitive(boolean deleted) { 484 498 if (deleted) { … … 491 505 } 492 506 507 @Override 493 508 public void populate(Conflict<? extends OsmPrimitive> conflict) { 494 509 model.populate(conflict); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
r5335 r6084 49 49 } 50 50 51 @Override 51 52 public void populate(Conflict<? extends OsmPrimitive> conflict) { 52 53 Relation myRel = (Relation)conflict.getMy(); … … 61 62 } 62 63 64 @Override 63 65 public void deletePrimitive(boolean deleted) { 64 66 if (deleted) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java
r5886 r6084 37 37 } 38 38 39 @Override 39 40 public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { 40 41 // Do not edit empty or incomplete members ! (fix #5374 and #6315) … … 49 50 } 50 51 52 @Override 51 53 public Object getCellEditorValue() { 52 54 return editor.getText(); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
r5835 r6084 147 147 } 148 148 149 @Override 149 150 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, 150 151 int row, int column) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
r4162 r6084 23 23 } 24 24 25 @Override 25 26 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, 26 27 int col) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r5932 r6084 280 280 } 281 281 282 @Override 282 283 public void actionPerformed(ActionEvent arg0) { 283 284 int rows[] = mineTable.getSelectedRows(); … … 288 289 } 289 290 291 @Override 290 292 public void valueChanged(ListSelectionEvent e) { 291 293 setEnabled(mineTable.getSelectedRowCount() > 0); … … 310 312 } 311 313 314 @Override 312 315 public void actionPerformed(ActionEvent arg0) { 313 316 int rows[] = theirTable.getSelectedRows(); … … 318 321 } 319 322 323 @Override 320 324 public void valueChanged(ListSelectionEvent e) { 321 325 setEnabled(theirTable.getSelectedRowCount() > 0); … … 346 350 } 347 351 352 @Override 348 353 public void adjustmentValueChanged(AdjustmentEvent e) { 349 354 for (Adjustable a : synchronizedAdjustables) { … … 405 410 } 406 411 412 @Override 407 413 public void actionPerformed(ActionEvent arg0) { 408 414 int rows[] = mergedTable.getSelectedRows(); … … 412 418 } 413 419 420 @Override 414 421 public void valueChanged(ListSelectionEvent e) { 415 422 setEnabled(mergedTable.getSelectedRowCount() > 0); … … 417 424 } 418 425 426 @Override 419 427 public void deletePrimitive(boolean deleted) { 420 428 // Use my entries, as it doesn't really matter … … 425 433 } 426 434 435 @Override 427 436 public void populate(Conflict<? extends OsmPrimitive> conflict) { 428 437 model.populate(conflict.getMy(), conflict.getTheir()); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r6070 r6084 389 389 } 390 390 391 @Override 391 392 public void actionPerformed(ActionEvent arg0) { 392 393 setCanceled(true); … … 404 405 } 405 406 407 @Override 406 408 public void actionPerformed(ActionEvent arg0) { 407 409 setVisible(false); … … 414 416 } 415 417 418 @Override 416 419 public void propertyChange(PropertyChangeEvent evt) { 417 420 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { … … 444 447 } 445 448 449 @Override 446 450 public void ancestorResized(HierarchyEvent e) { 447 451 setDividerLocation((int) (dividerLocation * getHeight())); 448 452 } 449 453 454 @Override 450 455 public void ancestorMoved(HierarchyEvent e) { 451 456 // do nothing 452 457 } 453 458 459 @Override 454 460 public void propertyChange(PropertyChangeEvent evt) { 455 461 if (evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
r5429 r6084 129 129 } 130 130 131 @Override 131 132 public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { 132 133 MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value; … … 136 137 } 137 138 139 @Override 138 140 public Object getCellEditorValue() { 139 141 return editor.getSelectedItem(); … … 180 182 } 181 183 184 @Override 182 185 public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, 183 186 boolean cellHasFocus) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
r5429 r6084 124 124 } 125 125 126 @Override 126 127 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, 127 128 int row, int column) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r5998 r6084 272 272 } 273 273 274 @Override 274 275 public void actionPerformed(ActionEvent arg0) { 275 276 setVisible(false); … … 287 288 } 288 289 290 @Override 289 291 public void actionPerformed(ActionEvent arg0) { 290 292 setVisible(false); … … 305 307 } 306 308 309 @Override 307 310 public void propertyChange(PropertyChangeEvent evt) { 308 311 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { … … 334 337 } 335 338 339 @Override 336 340 public void propertyChange(PropertyChangeEvent evt) { 337 341 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { … … 471 475 } 472 476 477 @Override 473 478 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, 474 479 boolean hasFocus, int row, int column) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
r5450 r6084 23 23 /* TableCellEditor */ 24 24 /* --------------------------------------------------------------------------------- */ 25 @Override 25 26 public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { 26 27 setSelectedItem(value); … … 32 33 private RelationMemberConflictDecisionType originalValue; 33 34 35 @Override 34 36 public void addCellEditorListener(CellEditorListener l) { 35 37 tableCellEditorSupport.addCellEditorListener(l); 36 38 } 37 39 40 @Override 38 41 public void cancelCellEditing() { 39 42 setSelectedItem(originalValue); … … 41 44 } 42 45 46 @Override 43 47 public Object getCellEditorValue() { 44 48 return getSelectedItem(); 45 49 } 46 50 51 @Override 47 52 public boolean isCellEditable(EventObject anEvent) { 48 53 return true; 49 54 } 50 55 56 @Override 51 57 public void removeCellEditorListener(CellEditorListener l) { 52 58 tableCellEditorSupport.removeCellEditorListener(l); 53 59 } 54 60 61 @Override 55 62 public boolean shouldSelectCell(EventObject anEvent) { 56 63 return true; 57 64 } 58 65 66 @Override 59 67 public boolean stopCellEditing() { 60 68 tableCellEditorSupport.fireEditingStopped(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
r5451 r6084 40 40 /* TableCellRenderer */ 41 41 /* --------------------------------------------------------------------------------- */ 42 @Override 42 43 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, 43 44 int row, int column) { … … 58 59 /* ListCellRenderer */ 59 60 /* --------------------------------------------------------------------------------- */ 61 @Override 60 62 public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, 61 63 boolean cellHasFocus) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
r3479 r6084 148 148 } 149 149 150 @Override 150 151 public void actionPerformed(ActionEvent e) { 151 152 model.applyRole(tfRole.getText()); … … 154 155 155 156 class ToggleTagRelationsAction implements ChangeListener { 157 @Override 156 158 public void stateChanged(ChangeEvent e) { 157 159 ButtonModel buttonModel = ((AbstractButton) e.getSource()).getModel(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
r5429 r6084 52 52 */ 53 53 class SelectNextColumnCellAction extends AbstractAction { 54 @Override 54 55 public void actionPerformed(ActionEvent e) { 55 56 run(); … … 82 83 class SelectPreviousColumnCellAction extends AbstractAction { 83 84 85 @Override 84 86 public void actionPerformed(ActionEvent e) { 85 87 run(); … … 105 107 } 106 108 109 @Override 107 110 public void gotoNextDecision() { 108 111 selectNextColumnCellAction.run(); 109 112 } 110 113 114 @Override 111 115 public void gotoPreviousDecision() { 112 116 selectPreviousColumnCellAction.run(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
r5832 r6084 52 52 cbShowTagsWithConflictsOnly.addChangeListener( 53 53 new ChangeListener() { 54 @Override 54 55 public void stateChanged(ChangeEvent e) { 55 56 model.setShowTagsWithConflictsOnly(cbShowTagsWithConflictsOnly.isSelected()); … … 63 64 cbShowTagsWithMultiValuesOnly.addChangeListener( 64 65 new ChangeListener() { 66 @Override 65 67 public void stateChanged(ChangeEvent e) { 66 68 model.setShowTagsWithMultiValuesOnly(cbShowTagsWithMultiValuesOnly.isSelected()); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
r5988 r6084 65 65 displayedKeys, 66 66 new Comparator<String>() { 67 @Override 67 68 public int compare(String key1, String key2) { 68 69 if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided()) -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
r5429 r6084 54 54 */ 55 55 class SelectNextColumnCellAction extends AbstractAction { 56 @Override 56 57 public void actionPerformed(ActionEvent e) { 57 58 run(); … … 84 85 class SelectPreviousColumnCellAction extends AbstractAction { 85 86 87 @Override 86 88 public void actionPerformed(ActionEvent e) { 87 89 run(); … … 107 109 } 108 110 111 @Override 109 112 public void gotoNextDecision() { 110 113 selectNextColumnCellAction.run(); 111 114 } 112 115 116 @Override 113 117 public void gotoPreviousDecision() { 114 118 selectPreviousColumnCellAction.run();
Note:
See TracChangeset
for help on using the changeset viewer.