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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8465   9 years Don-vip minor code style issues
(edit) @8444   9 years Don-vip remove extra whitespaces
(edit) @8426   9 years Don-vip Accessibility - global use of JLabel.setLabelFor() + various fixes …
(edit) @8419   9 years Don-vip Sonar: various code style cleanup: - fix copyright - classes that …
(edit) @8399   9 years Don-vip see #11397, see #11447 - partial revert of r8308 (SONARJAVA-1061: FP …
(edit) @8390   9 years Don-vip Sonar - various performance improvements
(edit) @8388   9 years Don-vip performance - use of EnumMap / EnumSet
(edit) @8379   9 years Don-vip Consecutively calls to StringBuffer/StringBuilder .append should reuse …
(edit) @8377   9 years Don-vip performance - remove useless boxing of boolean constants
(edit) @8375   9 years Don-vip code style - Method stores return result in local before immediately …
(edit) @8338   9 years Don-vip fix squid:S1319 - Declarations should use Java collection interfaces …
(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) @8285   9 years Don-vip fix sonar squid:S2039 - Member variable visibility should be specified
(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) @7937   9 years bastiK add subversion property svn:eol=native
(edit) @7864   9 years Don-vip global cleanup of IllegalArgumentExceptions thrown by JOSM
(edit) @7668   10 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
(edit) @7509   10 years stoecker remove tabs
(edit) @7029   10 years Don-vip fix more warnings, remove unused code
(edit) @7018   10 years Don-vip refactor duplicated code
(edit) @7017   10 years Don-vip see #8465 - fix easy compilation warnings
(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) @6912   10 years Don-vip Refactor duplicated code
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(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) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6666   10 years Don-vip see #9508 - refactor validator preferences + handling of JScrollPane …
(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) @6388   11 years simon04 fix #9111 - fix wording/typos in English strings
(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) @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) @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) @5932   11 years Don-vip fix #5680 - IndexOutOfBoundsException when resolving a conflict on …
(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) @5481   12 years stoecker some cleanup, mainly javadoc
(edit) @5429   12 years Don-vip fix #7917 - Control the number of items displayed at once in all …
(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) @4478   13 years Don-vip fix #5374 and #6315 - NPE in relations conflict manager
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4191   13 years stoecker remove old debug stuff
(edit) @4163   13 years stoecker improve color names of last checkin
(edit) @4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4116   13 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4115   13 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4072   13 years jttt Fix #6301 Check for null mandatory in …
(edit) @3995   13 years mjulius fix #3590 - Primitives or objects: Pick one
(edit) @3844   13 years stoecker see #5899 - support different display of closed ways and areas
(edit) @3786   13 years Upliner remove OperationCancelledException class which is unused since [3362] …
(edit) @3766   13 years stoecker fix help
(edit) @3719   13 years bastiK added missing license information
(edit) @3530   14 years stoecker fix array preferences
(edit) @3408   14 years jttt Show only actions that can work on all selected layers in …
(edit) @3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   14 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @3061   14 years jttt Fix #4612 delete members while relation dialog is open leads to data …
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @3025   14 years jttt Fix tests
(edit) @2991   14 years Gubaer Updated two tooltip texts
(edit) @2990   14 years jttt Fix some eclipse warnings
(edit) @2983   14 years Gubaer see #4054: Improving user feedback when trying to merge a deleted …
(edit) @2982   14 years jttt Calculate bbox for relations, use it in mappaint.
(edit) @2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2940   14 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   14 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2882   14 years jttt Fixed #4409 after confict management: nodes are not selectable
Note: See TracRevisionLog for help on using the revision log.