source: josm/trunk/src/org/openstreetmap/josm/gui/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8126   9 years Don-vip fix Sonar issue squid:S2444 - Lazy initialization of "static" fields …
(edit) @8061   9 years bastiK see #11096 - strip .png
(edit) @8056   9 years bastiK fixed #11096 - png -> svg
(edit) @8047   9 years bastiK see #11096 - fix png -> svg
(edit) @8005   9 years Don-vip fix #11064 - disable undo/redo feature for table cell editors
(edit) @7937   9 years bastiK add subversion property svn:eol=native
(edit) @7864   9 years Don-vip global cleanup of IllegalArgumentExceptions thrown by JOSM
(edit) @7801   9 years Don-vip fix some Sonar issues
(edit) @7751   9 years Don-vip see #10775 - allow to sum all numeric values as conflict resolution …
(edit) @7743   9 years Don-vip fix #10775 - allow to sum all numeric values as conflict resolution of …
(edit) @7674   9 years Don-vip code refactoring to avoid hacks in merge-overlap plugin
(edit) @7668   9 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
(edit) @7661   9 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
(edit) @7643   9 years Don-vip avoid potential NPE
(edit) @7642   9 years Don-vip fix #10156 - combine ways: conflicts not shown when no conflicting …
(edit) @7610   10 years Don-vip see #10626 - make rebuild() method public to allow reuse in plugins
(edit) @7509   10 years stoecker remove tabs
(edit) @7129   10 years simon04 see #10018 - Avoid broken relations after combining ways
(edit) @7029   10 years Don-vip fix more warnings, remove unused code
(edit) @7027   10 years Don-vip fix more warnings (-Xlint:rawtypes), remove deprecated method and …
(edit) @7022   10 years Don-vip see #8465 - enable and fix more warnings
(edit) @7018   10 years Don-vip refactor duplicated code
(edit) @7017   10 years Don-vip see #8465 - fix easy compilation warnings
(edit) @7015   10 years Don-vip see #8465 - fix generics for JComboBox/JList
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @7001   10 years Don-vip see #8465 - switch core to Java 7
(edit) @6991   10 years Balaitous fix little bug: In TagConflictResolver dialog, when user select a …
(edit) @6912   10 years Don-vip Refactor duplicated code
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6889   10 years Don-vip fix some Sonar issues (JLS order)
(edit) @6887   10 years Don-vip package refactoring of conflict commands => move all of them to new …
(edit) @6883   10 years Don-vip fix some Sonar issues
(edit) @6830   10 years Don-vip javadoc fixes for jdk8 compatibility
(edit) @6822   10 years bastiK see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6814   10 years Don-vip fix #8234 - remove duplicated/unused icons + javadoc
(edit) @6806   10 years Don-vip fix some Sonar issues introduced recently
(edit) @6802   10 years simon04 fix #9655 - Merge operations loosing tags (regression of r6770) …
(edit) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6770   10 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
(edit) @6739   10 years simon04 Fix NPE when cycling through conflicts with Tab key
(edit) @6715   10 years Don-vip fix #6633 - Needless 'No conflicts to resolve' dialog
(edit) @6699   10 years Don-vip fix #9547 - Remove multiple whitespaces inside values
(edit) @6679   10 years stoecker see #9110 - fix singular forms, even if they are useless
(edit) @6666   10 years Don-vip see #9508 - refactor validator preferences + handling of JScrollPane
(edit) @6624   10 years Don-vip fix #9521 - Colors no more displayed in preferences dialog since …
(edit) @6623   10 years Don-vip fix Sonar issues
(edit) @6616   10 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
(edit) @6565   10 years simon04 fix #9484 - source in upload dialog: add knowledge, survey to …
(edit) @6524   10 years Don-vip global use of Utils.joinAsHtmlUnorderedList()
(edit) @6507   10 years simon04 fix #9110 - i18n: fix errors in usage of plural forms
(edit) @6388   10 years simon04 fix #9111 - fix wording/typos in English strings
(edit) @6362   10 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
(edit) @6340   10 years Don-vip refactor of some GUI/widgets classes (impacts some plugins): - …
(edit) @6317   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6267   11 years Don-vip Sonar/FindBugs - Replace singular fields by local variables
(edit) @6265   11 years Don-vip Sonar/FindBugs: - Dodgy - Redundant nullcheck of value known to be …
(edit) @6264   11 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6258   11 years Don-vip Sonar/Findbugs - Performance - Inefficient use of keySet iterator …
(edit) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
(edit) @6222   11 years Don-vip Make some more defensive copies of user-supplied arrays, javadoc
(edit) @6147   11 years Don-vip sonar - move duplicated class between history and conflict to util
(edit) @6146   11 years Don-vip sonar - refactor inner classes of ListMerger to avoid lots of …
(edit) @6093   11 years akks see #8902 - collection size ==/!= 0 -> isEmpty()/!isEmpty() (patch by …
(edit) @6087   11 years Don-vip see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)
(edit) @6085   11 years Don-vip see #8902 - c-like array definitions changed to java-like (patch by …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6070   11 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5998   11 years Don-vip fix #8775 - IllegalComponentStateException when remembering position …
(edit) @5988   11 years Don-vip fix EDT violations observed while merging nodes
(edit) @5932   11 years Don-vip fix #5680 - IndexOutOfBoundsException when resolving a conflict on …
(edit) @5926   11 years bastiK clean up imports
(edit) @5903   11 years stoecker fix javadoc
(edit) @5886   11 years Don-vip see #4429 - Right click menu "undo, cut, copy, paste, delete, select …
(edit) @5835   11 years stoecker Javadoc fixes
(edit) @5832   11 years stoecker i18n update and javadoc fixes
(edit) @5792   11 years Don-vip code style - fix non-static access to static member
(edit) @5700   11 years stoecker remove hardcoded created_by
(edit) @5481   12 years stoecker some cleanup, mainly javadoc
(edit) @5464   12 years Don-vip Rework Properties a bit to simplify management of Color properties
(edit) @5451   12 years Don-vip fix #7978 - Merging nodes and upload were broken due to improper …
(edit) @5450   12 years Don-vip fix #7917 - Control the number of items displayed at once in all …
(edit) @5429   12 years Don-vip fix #7917 - Control the number of items displayed at once in all …
(edit) @5400   12 years Don-vip fix #7925 - tag conflict dialog shows wrong information in title
(edit) @5335   12 years Don-vip fix #7855 - conflict dialog: CCE selecting a way in members tab
(edit) @5310   12 years Don-vip fix #7750 - Conflict dialog: Really selects id:0 primitives without zooming
(edit) @5301   12 years Don-vip fix #4493, fix #7750 - conflict manager: select and zoom primitives …
(edit) @5299   12 years Don-vip conflict dialog: better display of empty rows in members tab, like …
(edit) @5298   12 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5297   12 years Don-vip fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
(edit) @5296   12 years Don-vip conflict dialog, nodes tab: better display of empty rows (display a …
(edit) @5291   12 years Don-vip fix #4688 - conflict manager, member and nodes tabs: set width of …
(edit) @5288   12 years Don-vip fix #7601 - Conflicts dialog is now opened at the first tab showing a …
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @5170   12 years Don-vip cleanup svn:mime-type properties preventing Java sources from being …
(edit) @5132   12 years simon04 fix #7513 - Warn non-experts when combining ways with conflicting tags …
(edit) @5090   12 years simon04 fix #4842 - Combine ways silently combines when tag is not present on …
(edit) @4478   13 years Don-vip fix #5374 and #6315 - NPE in relations conflict manager
(edit) @4387   13 years bastiK fixed #6746 - paste properties in new layer results in nullpointer …
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
Note: See TracRevisionLog for help on using the revision log.