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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8871   9 years simon04 fix #10018 fix #11945 - Improve relation member conflict resolution …
(edit) @8855   9 years Don-vip sonar - Unused private method should be removed sonar - Unused …
(edit) @8849   9 years Don-vip sonar - squid:S1643 - Strings should not be concatenated using '+' in …
(edit) @8840   9 years Don-vip sonar - squid:S3052 - Fields should not be initialized to default values
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8540   9 years Don-vip fix remaining checkstyle issues
(edit) @8513   9 years Don-vip checkstyle: blocks
(edit) @8512   9 years Don-vip checkstyle: redundant modifiers
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8509   9 years Don-vip fix many checkstyle violations
(edit) @8470   9 years Don-vip javadoc fixes. Removed one duplicated method in exception handling
(edit) @8468   9 years Don-vip fix some minor sonar/code style issues: - Avoid Protected Field In …
(edit) @8444   9 years Don-vip remove extra whitespaces
(edit) @8419   9 years Don-vip Sonar: various code style cleanup: - fix copyright - classes that …
(edit) @8413   9 years Don-vip code style - A close curly brace should be located at the beginning of …
(edit) @8401   9 years Don-vip fix some minor Sonar issues
(edit) @8399   9 years Don-vip see #11397, see #11447 - partial revert of r8308 (SONARJAVA-1061: FP …
(edit) @8388   9 years Don-vip performance - use of EnumMap / EnumSet
(edit) @8373   9 years Don-vip code style - Method makes literal string comparisons passing the …
(edit) @8338   9 years Don-vip fix squid:S1319 - Declarations should use Java collection interfaces …
(edit) @8332   9 years Don-vip fix various issues: - performance - inefficient use of keySet iterator …
(edit) @8308   9 years Don-vip fix potential NPEs and Sonar issues related to serialization
(edit) @8291   9 years Don-vip fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for …
(edit) @8126   9 years Don-vip fix Sonar issue squid:S2444 - Lazy initialization of "static" fields …
(edit) @8005   9 years Don-vip fix #11064 - disable undo/redo feature for table cell editors
(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   10 years Don-vip code refactoring to avoid hacks in merge-overlap plugin
(edit) @7661   10 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
(edit) @7643   10 years Don-vip avoid potential NPE
(edit) @7642   10 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) @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) @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) @6883   10 years Don-vip fix some Sonar issues
(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) @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) @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   11 years Don-vip refactor of some GUI/widgets classes (impacts some plugins): - …
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(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) @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) @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) @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) @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) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(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) @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
(edit) @4223   13 years stoecker fix #6570 (revert change in r4215, see #6547), i18n update, fix typo …
(edit) @4191   13 years stoecker remove old debug stuff
(edit) @4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4112   13 years stoecker fix #4162 - patch by Hojoe - Mouseover in combine tags dialog wrong
(edit) @4072   13 years jttt Fix #6301 Check for null mandatory in …
(edit) @3719   13 years bastiK added missing license information
(edit) @3501   14 years bastiK fixed #4632 - Button Help puts help window under main window
(edit) @3479   14 years jttt cosmetics
(edit) @3385   14 years jttt Fix warnings
(edit) @3210   14 years bastiK autocompletion rework; breaks tageditor plugin and possibly other …
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2996   14 years jttt Fix #4406 tags disapear: merging node with ID:0 and tag to existing …
(edit) @2990   14 years jttt Fix some eclipse warnings
(edit) @2846   14 years mjulius fix messages for gui/conflict
(edit) @2814   14 years mjulius fixes #4347 - merging 2 nodes produces ERROR
(edit) @2779   14 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2726   14 years framm fix message text
(edit) @2712   14 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
Note: See TracRevisionLog for help on using the revision log.