Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
- Timestamp:
- 2020-05-17T14:18:22+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
r14214 r16438 6 6 import java.io.File; 7 7 import java.util.ArrayList; 8 import java.util.Collections; 8 9 import java.util.Comparator; 9 10 import java.util.List; 11 import java.util.stream.Collectors; 10 12 11 13 import javax.swing.table.DefaultTableModel; … … 120 122 121 123 public List<SaveLayerInfo> getLayersWithoutFilesAndSaveRequest() { 122 List<SaveLayerInfo> ret = new ArrayList<>(); 123 if (layerInfo != null) { 124 for (SaveLayerInfo info: layerInfo) { 125 if (info.isDoSaveToFile() && info.getFile() == null) { 126 ret.add(info); 127 } 128 } 129 } 130 return ret; 124 if (layerInfo == null) { 125 return Collections.emptyList(); 126 } 127 return layerInfo.stream().filter(info -> info.isDoSaveToFile() && info.getFile() == null).collect(Collectors.toList()); 131 128 } 132 129 133 130 public List<SaveLayerInfo> getLayersWithIllegalFilesAndSaveRequest() { 134 List<SaveLayerInfo> ret = new ArrayList<>(); 135 if (layerInfo != null) { 136 for (SaveLayerInfo info: layerInfo) { 137 if (info.isDoSaveToFile() && info.getFile() != null && info.getFile().exists() && !info.getFile().canWrite()) { 138 ret.add(info); 139 } 140 } 141 } 142 return ret; 131 if (layerInfo == null) { 132 return Collections.emptyList(); 133 } 134 return layerInfo.stream() 135 .filter(info -> info.isDoSaveToFile() && info.getFile() != null && info.getFile().exists() && !info.getFile().canWrite()) 136 .collect(Collectors.toList()); 143 137 } 144 138 … … 157 151 158 152 public List<SaveLayerInfo> getLayersToUpload() { 159 List<SaveLayerInfo> ret = new ArrayList<>(); 160 if (layerInfo != null) { 161 for (SaveLayerInfo info: layerInfo) { 162 if (info.isDoUploadToServer()) { 163 ret.add(info); 164 } 165 } 166 } 167 return ret; 153 if (layerInfo == null) { 154 return Collections.emptyList(); 155 } 156 return layerInfo.stream().filter(SaveLayerInfo::isDoUploadToServer).collect(Collectors.toList()); 168 157 } 169 158 170 159 public List<SaveLayerInfo> getLayersToSave() { 171 List<SaveLayerInfo> ret = new ArrayList<>(); 172 if (layerInfo != null) { 173 for (SaveLayerInfo info: layerInfo) { 174 if (info.isDoSaveToFile()) { 175 ret.add(info); 176 } 177 } 178 } 179 return ret; 160 if (layerInfo == null) { 161 return Collections.emptyList(); 162 } 163 return layerInfo.stream().filter(SaveLayerInfo::isDoSaveToFile).collect(Collectors.toList()); 180 164 } 181 165 … … 197 181 198 182 public SaveLayerInfo getSaveLayerInfo(AbstractModifiableLayer layer) { 199 for (SaveLayerInfo info: this.layerInfo) { 200 if (info.getLayer() == layer) 201 return info; 202 } 203 return null; 183 return this.layerInfo.stream() 184 .filter(info -> info.getLayer() == layer) 185 .findFirst().orElse(null); 204 186 } 205 187 … … 222 204 223 205 public int getNumCancel() { 224 int ret = 0; 225 for (SaveLayerInfo info: layerInfo) { 226 if (UploadOrSaveState.CANCELED == info.getSaveState() 227 || UploadOrSaveState.CANCELED == info.getUploadState()) { 228 ret++; 229 } 230 } 231 return ret; 206 return (int) layerInfo.stream() 207 .filter(info -> UploadOrSaveState.CANCELED == info.getSaveState() || UploadOrSaveState.CANCELED == info.getUploadState()) 208 .count(); 232 209 } 233 210 234 211 public int getNumFailed() { 235 int ret = 0; 236 for (SaveLayerInfo info: layerInfo) { 237 if (UploadOrSaveState.FAILED == info.getSaveState() 238 || UploadOrSaveState.FAILED == info.getUploadState()) { 239 ret++; 240 } 241 } 242 return ret; 212 return (int) layerInfo.stream() 213 .filter(info -> UploadOrSaveState.FAILED == info.getSaveState() || UploadOrSaveState.FAILED == info.getUploadState()) 214 .count(); 243 215 } 244 216 }
Note:
See TracChangeset
for help on using the changeset viewer.