|
|
|
@11330
|
7 years |
Don-vip |
sonar - fix recent issues
|
|
|
|
@11318
|
7 years |
Don-vip |
refactor conflict classes
|
|
|
|
@10454
|
8 years |
Don-vip |
fix #12999 - Exception after resolving conflicts (patch by …
|
|
|
|
@10378
|
8 years |
Don-vip |
Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
|
|
|
|
@9482
|
8 years |
simon04 |
see #12338 fix #12381 - AssertionError on "Resolve to their versions"
|
|
|
|
@9440
|
8 years |
simon04 |
see #12338 - Conflict resolution: add expert actions "Resolve to …
|
|
|
|
@8840
|
9 years |
Don-vip |
sonar - squid:S3052 - Fields should not be initialized to default values
|
|
|
|
@8510
|
9 years |
Don-vip |
checkstyle: enable relevant whitespace checks and fix them
|
|
|
|
@8509
|
9 years |
Don-vip |
fix many checkstyle violations
|
|
|
|
@8444
|
9 years |
Don-vip |
remove extra whitespaces
|
|
|
|
@8308
|
9 years |
Don-vip |
fix potential NPEs and Sonar issues related to serialization
|
|
|
|
@8061
|
9 years |
bastiK |
see #11096 - strip .png
|
|
|
|
@7005
|
10 years |
Don-vip |
see #8465 - use diamond operator where applicable
|
|
|
|
@6890
|
10 years |
Don-vip |
fix some Sonar issues (Constructor Calls Overridable Method)
|
|
|
|
@6887
|
10 years |
Don-vip |
package refactoring of conflict commands => move all of them to new …
|
|
|
|
@6883
|
10 years |
Don-vip |
fix some Sonar issues
|
|
|
|
@6814
|
10 years |
Don-vip |
fix #8234 - remove duplicated/unused icons + javadoc
|
|
|
|
@6316
|
11 years |
Don-vip |
Sonar/FindBugs - Loose coupling
|
|
|
|
@6084
|
11 years |
bastiK |
see #8902 - add missing @Override annotations (patch by shinigami)
|
|
|
|
@6070
|
11 years |
stoecker |
see #8853 remove tabs, trailing spaces, windows line ends, strange …
|
|
|
|
@5903
|
11 years |
stoecker |
fix javadoc
|
|
|
|
@5297
|
12 years |
Don-vip |
fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
|
|
|
|
@5288
|
12 years |
Don-vip |
fix #7601 - Conflicts dialog is now opened at the first tab showing a …
|
|
|
|
@5266
|
12 years |
bastiK |
fixed majority of javadoc warnings by replacing "{@see" by "{@link"
|
|
|
|
@4191
|
13 years |
stoecker |
remove old debug stuff
|
|
|
|
@3362
|
14 years |
stoecker |
fix #5182 - Conflict system simplification - patch by Upliner
|
|
|
|
@3083
|
14 years |
bastiK |
added svn:eol-style=native to source files
|
|
|
|
@3034
|
14 years |
jttt |
Fix #4467 Don't silently drop locally deleted member primitives from …
|
|
|
|
@2945
|
14 years |
jttt |
Improvements in conflicts gui
|
|
|
|
@2936
|
14 years |
jttt |
Fixed #4408 confict manager: do not have to solve tag- and …
|
|
|
|
@2846
|
14 years |
mjulius |
fix messages for gui/conflict
|
|
|
|
@2624
|
14 years |
mjulius |
fixes #4088,#4155 - when after conflict resolving the primitive has …
|
|
|
|
@2512
|
14 years |
stoecker |
i18n updated, fixed files to reduce problems when applying patches, …
|
|
|
|
@1954
|
15 years |
Gubaer |
Moved package org.openstreetmap.josm.gui.conflict to …
|
|
copied from trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java
|
|
|
|
@1942
|
15 years |
Gubaer |
fixed #3230: Bug affecting conflict resolving
|
