source: josm/trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @10552   8 years Don-vip checkstyle
(edit) @10548   8 years simon04 Remove duplicated code Use updateEnabledStateOnCurrentSelection …
(edit) @10463   8 years Don-vip sonar - squid:S1166 - Exception handlers should preserve the original …
(edit) @10448   8 years Don-vip fix more deprecation warnings
(edit) @10413   8 years Don-vip fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by …
(edit) @10382   8 years Don-vip see #12943 - gsoc-core - fix most of deprecation warnings (static …
(edit) @9970   8 years Don-vip sonar - remove useless parentheses
(edit) @9473   8 years simon04 fix #12343 - Display at most 20 primitives for some confirmation …
(edit) @9062   8 years Don-vip Sonar - squid:S1941 - Variables should not be declared before they are …
(edit) @8919   8 years Don-vip move UserCancelException class in tools package and use it where …
(edit) @8513   9 years Don-vip checkstyle: blocks
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8443   9 years Don-vip remove extra whitespaces
(edit) @8378   9 years Don-vip fix copyright/license headers globally
(edit) @8291   9 years Don-vip fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for …
(edit) @7859   9 years Don-vip fix various Sonar issues, improve Javadoc
(edit) @7509   10 years stoecker remove tabs
(edit) @7025   10 years Don-vip Sonar - fix various issues
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6679   10 years stoecker see #9110 - fix singular forms, even if they are useless
(edit) @6507   10 years simon04 fix #9110 - i18n: fix errors in usage of plural forms
(edit) @6380   10 years Don-vip update license/copyright information
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6275   11 years Don-vip fix #9129 - unnecessary change command when merning two nodes with …
(edit) @6202   11 years Don-vip fix #2447 - Unnessary changes of a target node by dragging another …
(edit) @6130   11 years bastiK see #6963 - converted popups to notifications for all actions in the …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5989   11 years Don-vip fix #8760 - When merging nodes, keep the oldest used one, not just …
(edit) @5818   11 years stoecker javadoc fixes
(edit) @5360   12 years Don-vip fix #7776 - Selection of deleted objects
(edit) @5265   12 years bastiK fixed #7673 - select target node after merge
(edit) @5216   12 years Don-vip fix #7673 - merging nodes with Ctrl key sometimes replaces known id …
(edit) @5132   12 years simon04 fix #7513 - Warn non-experts when combining ways with conflicting tags …
(edit) @5059   12 years simon04 fix #6561 - fix several overflowing dialog texts
(edit) @4982   12 years stoecker see #7226 - patch by akks (fixed a bit) - fix shortcut deprecations
(edit) @4315   13 years bastiK applied #6696 - Another way of computing merged node location (patch …
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4045   13 years stoecker fix #6097 - i18n issues
(edit) @3757   13 years stoecker fix help topics
(edit) @3713   13 years jttt Fix #5724 Merge node to the nearest one
(edit) @3596   14 years bastiK applied #5531 (patch by Martin Ždila) - There should be way to merge …
(edit) @3530   14 years stoecker fix array preferences
(edit) @3217   14 years bastiK fixed #4971 NullPointerException at OsmReader.java:586, caused by …
(edit) @3142   14 years bastiK see #4554 - Fixing duplicate nodes takes increasingly longer
(edit) @3134   14 years bastiK fixed #4606 - merging a new and an already existing node (better …
(edit) @2842   14 years mjulius fix messages for actions
(edit) @2711   14 years stoecker fix bad line endings
(edit) @2565   14 years Gubaer Removed BackReferenceDataSet and CollectBackReferenceVisitor because …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2414   14 years Gubaer Removed methods made @deprecated in r2411.
(edit) @2341   14 years Gubaer applied #3798: patch by bastiK: Merge nodes tool - respect selection order
(edit) @2333   14 years Gubaer fixed #3753: Merging the ends of two node ways produces corrupt way
(edit) @2323   14 years Gubaer Added explicit help topics See also …
(edit) @2315   14 years Gubaer fixed #3753: Merging the ends of two node ways produces corrupt way …
(edit) @2273   15 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2256   15 years Gubaer Removed inefficient DataSet:getSelected() when responding to …
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2202   15 years Gubaer fixed #3553: Error on join overlapped areas
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2113   15 years Gubaer fixed #3469: Merge nodes produce bad results
(edit) @2102   15 years Gubaer see #3466: Merge nodes produce bad results
(edit) @2098   15 years Gubaer see #3347: patches by singularita@…: Merging nodes, fixing …
(edit) @2095   15 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2064   15 years Gubaer applied #3384: patch by anonymous: Prevent modified status even if no …
(edit) @2039   15 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(edit) @2025   15 years Gubaer new: improved dialog for uploading/saving modified layers on exit new: …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1951   15 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1937   15 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1930   15 years jttt Replace RelationMember.role with RelationMember.getRole() and …
(edit) @1925   15 years jttt Replaced Relation.members with Relation.getMembers()
(edit) @1912   15 years Gubaer Updated w.getNodes().contains(..) to w.containsNode(...)
(edit) @1862   15 years jttt Way refactoring - added method that will in future replace public …
(edit) @1857   15 years Gubaer replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(edit) @1847   15 years Gubaer replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
(edit) @1820   15 years Gubaer JosmAction is now a LayerChangeListener and a SelectionChangeListener …
(edit) @1814   15 years Gubaer removed dependencies to Main.ds, removed Main.ds removed AddVisitor, …
(edit) @1677   15 years stoecker remove all these ugly tab stops introduced in the last half year
(edit) @1530   15 years framm upload more precise version number in changeset. drop some …
(edit) @1397   15 years stoecker apply patches from xeen for #1977.
(edit) @1169   15 years stoecker removed usage of tab stops
(edit) @1084   15 years framm - cosmetics: rename ShortCut to Shortcut, and shortCut to shortcut
(edit) @1054   15 years stoecker fixed a lot of the shortcut related translations
(edit) @1023   16 years stoecker close bug #1622. Keyboard shortcuts and specific OS handling
(edit) @734   16 years stoecker No longer make a created_by conflict for way or node joining. In case …
(edit) @627   16 years framm - added svn:eol-style prop to all .java files. it is suggested that …
(edit) @582   16 years framm - got rid of a few compiler warnings
(edit) @529   16 years gebner Part one of patch by Dave Hansen <dave@…> - Remove unused …
(edit) @469   16 years gebner Remove ctrl+shift escapes from most actions.
(edit) @429   16 years gebner Add a generic pair class.
(edit) @428   16 years gebner Apply changes from CombineWayAction to MergeNodesAction.
(edit) @424   16 years gebner Add new icon for the merge-nodes action.
(add) @422   16 years framm - added patch by Matthew Newton <matthew-osm@…> to …
Note: See TracRevisionLog for help on using the revision log.