Changeset 14606 in josm
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
r14605 r14606 81 81 @ClassRule 82 82 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 83 public static JOSMTestRules test = new JOSMTestRules().https(). preferences().projection().projectionNadGrids()83 public static JOSMTestRules test = new JOSMTestRules().https().i18n().preferences().projection().projectionNadGrids() 84 84 .timeout((int) TimeUnit.MINUTES.toMillis(40)); 85 85 … … 123 123 ImageryLayerInfo.instance.load(false); 124 124 return ImageryLayerInfo.instance.getDefaultLayers() 125 .stream().map(x -> new Object[] {x.getId(), x}) 125 .stream() 126 .map(x -> new Object[] {x.getId(), x}) 126 127 .collect(Collectors.toList()); 127 128 } … … 137 138 138 139 private boolean addError(ImageryInfo info, String error) { 139 return !ignoredErrors.contains(error) && 140 String errorMsg = error.replace('\n', ' '); 141 return !ignoredErrors.contains(errorMsg) && 140 142 errors.computeIfAbsent(info.getCountryCode(), x -> Collections.synchronizedMap(new TreeMap<>())) 141 143 .computeIfAbsent(info, x -> Collections.synchronizedList(new ArrayList<>())) 142 .add(error );144 .add(errorMsg); 143 145 } 144 146 -
trunk/tools/checkstyle/josm_filters.xml
r13227 r14606 45 45 <suppress checks="HeaderCheck" files="MultiSplitLayout\.java" /> 46 46 <suppress checks="HeaderCheck" files="MultiSplitPane\.java" /> 47 <suppress checks="HeaderCheck" files="ParallelParameterized\.java" /> 48 <suppress checks="HeaderCheck" files="ParallelScheduler\.java" /> 47 49 <suppress checks="FileLengthCheck" files="DomainValidator\.java" /> 48 50 <suppress checks="org.openstreetmap.josm.TopLevelJavadocCheck" files="package-info\.java" />
Note:
See TracChangeset
for help on using the changeset viewer.