Changeset 10590 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
- Timestamp:
- 2016-07-22T23:20:40+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
r10446 r10590 8 8 import java.awt.Dimension; 9 9 import java.awt.event.ActionEvent; 10 import java.awt.event.ItemEvent;11 import java.awt.event.ItemListener;12 10 import java.util.ArrayList; 13 11 import java.util.Collection; … … 47 45 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; 48 46 import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel; 49 import org.openstreetmap.josm.tools.Predicate;50 47 import org.openstreetmap.josm.tools.Utils; 51 48 … … 189 186 ckOnlyApplicable.setText(tr("Show only applicable to selection")); 190 187 pnChecks.add(ckOnlyApplicable); 191 ckOnlyApplicable.addItemListener(new ItemListener() { 192 @Override 193 public void itemStateChanged(ItemEvent e) { 194 filterItems(); 195 } 196 }); 188 ckOnlyApplicable.addItemListener(e -> filterItems()); 197 189 } else { 198 190 ckOnlyApplicable = null; … … 203 195 ckSearchInTags.setText(tr("Search in tags")); 204 196 ckSearchInTags.setSelected(SEARCH_IN_TAGS.get()); 205 ckSearchInTags.addItemListener(new ItemListener() { 206 @Override 207 public void itemStateChanged(ItemEvent e) { 208 filterItems(); 209 } 210 }); 197 ckSearchInTags.addItemListener(e -> filterItems()); 211 198 pnChecks.add(ckSearchInTags); 212 199 } else { … … 247 234 248 235 final TaggingPreset oldPreset = getSelectedPreset(); 249 lsResultModel.setItems(Utils.transform(result, new Utils.Function<PresetClassification, TaggingPreset>() { 250 @Override 251 public TaggingPreset apply(PresetClassification x) { 252 return x.preset; 253 } 254 })); 236 lsResultModel.setItems(Utils.transform(result, x -> x.preset)); 255 237 final TaggingPreset newPreset = getSelectedPreset(); 256 238 if (!Objects.equals(oldPreset, newPreset)) { … … 299 281 if (!suitable && preset.types.contains(TaggingPresetType.RELATION) 300 282 && preset.roles != null && !preset.roles.roles.isEmpty()) { 301 final Predicate<Role> memberExpressionMatchesOnePrimitive = new Predicate<Role>() { 302 @Override 303 public boolean evaluate(Role object) { 304 return object.memberExpression != null 305 && Utils.exists(selectedPrimitives, object.memberExpression); 306 } 307 }; 308 suitable = Utils.exists(preset.roles.roles, memberExpressionMatchesOnePrimitive); 283 suitable = preset.roles.roles.stream().anyMatch( 284 object -> object.memberExpression != null && Utils.exists(selectedPrimitives, object.memberExpression)); 309 285 // keep the preset to allow the creation of new relations 310 286 }
Note:
See TracChangeset
for help on using the changeset viewer.