JOSM #22322 - Add tag list popup menu actions to create filters for selected tags#102
Open
Woazboat wants to merge 1 commit intoJOSM:masterfrom
Open
JOSM #22322 - Add tag list popup menu actions to create filters for selected tags#102Woazboat wants to merge 1 commit intoJOSM:masterfrom
Woazboat wants to merge 1 commit intoJOSM:masterfrom
Conversation
Add two menu items to the tag list dialog popup menu that create filtersto either hide or exclusively show objects with selected tags. If an equivalent filter is already present in the filter list, re-uses and enables that one instead.
Woazboat
changed the title
tsmock
requested changes
Oct 5, 2022
| String val = p.get(key); | ||
| if (val == null || (!sameType && consideredTokens.contains(val))) { | ||
| continue; | ||
| class FilterAction extends AbstractAction implements PopupMenuListener { |
There was a problem hiding this comment.
Stupid question: is there any particular reason why you aren't using JosmAction?
Author
There was a problem hiding this comment.
Mostly for similarity with all the other actions in the context menu which are also simply using AbstractAction. We don't really need any features that JosmAction provides (no shortcuts, listeners, etc...) so we wouldn't gain a lot from using it. Setting the icon etc... would be a tiny bit simplified.
| assertEquals(false, n2.isDisabled()); | ||
| assertEquals(true, n3.isDisabled()); | ||
| } catch (Exception e) { | ||
| fail("Should not throw", e); |
There was a problem hiding this comment.
I don't know if you are aware of assertDoesNotThrow or not, but you can use that instead of catching the exception.
Comment on lines
+190
to
+192
| assertEquals(false, n.isDisabled()); | ||
| assertEquals(false, n2.isDisabled()); | ||
| assertEquals(true, n3.isDisabled()); |
There was a problem hiding this comment.
Suggested change
| assertEquals(false, n.isDisabled()); | |
| assertEquals(false, n2.isDisabled()); | |
| assertEquals(true, n3.isDisabled()); | |
| assertFalse(n.isDisabled()); | |
| assertFalse(n2.isDisabled()); | |
| assertTrue(n3.isDisabled()); |
|
|
||
| assertEquals(expectedFilter, createdFilter); | ||
| assertEquals(0, createdFilter.compareTo(expectedFilter)); | ||
| assertEquals(true, createdFilter.enable); |
There was a problem hiding this comment.
Suggested change
| assertEquals(true, createdFilter.enable); | |
| assertTrue(createdFilter.enable); |
|
|
||
| tagTable.selectAll(); | ||
|
|
||
| assertEquals(0, filterModel.getFilters().size()); |
There was a problem hiding this comment.
Suggested change
| assertEquals(0, filterModel.getFilters().size()); | |
| assertTrue(filterModel.getFilters().isEmpty()); |
Comment on lines
+121
to
+125
| assertEquals(true, createdFilter.enable); | ||
|
|
||
| assertEquals(true, n.isDisabled()); | ||
| assertEquals(true, n2.isDisabled()); | ||
| assertEquals(false, n3.isDisabled()); |
There was a problem hiding this comment.
Suggested change
| assertEquals(true, createdFilter.enable); | |
| assertEquals(true, n.isDisabled()); | |
| assertEquals(true, n2.isDisabled()); | |
| assertEquals(false, n3.isDisabled()); | |
| assertTrue(createdFilter.enable); | |
| assertTrue(n.isDisabled()); | |
| assertTrue(n2.isDisabled()); | |
| assertFalse(n3.isDisabled()); |
| assertEquals(true, n2.isDisabled()); | ||
| assertEquals(false, n3.isDisabled()); | ||
| } catch (Exception e) { | ||
| fail("Should not throw", e); |
There was a problem hiding this comment.
I commented on a similar situation down below. That is what I get for skimming top->bottom and then reviewing from bottom -> top.
|
|
||
| tagTable.selectAll(); | ||
|
|
||
| assertEquals(0, filterModel.getFilters().size()); |
There was a problem hiding this comment.
Suggested change
| assertEquals(0, filterModel.getFilters().size()); | |
| assertTrue(filterModel.getFilters().isEmpty()); |
Comment on lines
+90
to
+100
| Field filterActionHideField = PropertiesDialog.class.getDeclaredField("filterActionHide"); | ||
| filterActionHideField.setAccessible(true); | ||
| FilterAction filterActionHide = (PropertiesDialog.FilterAction) filterActionHideField.get(propertiesDialog); | ||
|
|
||
| Field tagTableField = PropertiesDialog.class.getDeclaredField("tagTable"); | ||
| tagTableField.setAccessible(true); | ||
| JTable tagTable = (JTable) tagTableField.get(propertiesDialog); | ||
|
|
||
| Field tagDataField = PropertiesDialog.class.getDeclaredField("tagData"); | ||
| tagDataField.setAccessible(true); | ||
| ReadOnlyTableModel tagData = (ReadOnlyTableModel) tagDataField.get(propertiesDialog); |
There was a problem hiding this comment.
Maybe this should be extracted? The only difference between this block and the block in filterActionShowOnlyTest is the filterActionHide field.
Comment on lines
+253
to
+255
| return Arrays.stream(viewRows).boxed() | ||
| .map(r -> tagData.getValueAt(tagTable.convertRowIndexToModel(r), 0).toString()) | ||
| .collect(Collectors.toList()); |
There was a problem hiding this comment.
I don't think you need to do boxing here.
Suggested change
| return Arrays.stream(viewRows).boxed() | |
| .map(r -> tagData.getValueAt(tagTable.convertRowIndexToModel(r), 0).toString()) | |
| .collect(Collectors.toList()); | |
| return Arrays.stream(viewRows).map(tagTable::convertRowIndexToModel) | |
| .mapToObj(r -> tagData.getValueAt(r, 0).toString()).collect(Collectors.toList()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://josm.openstreetmap.de/ticket/22322
Add two menu items to the tag list dialog popup menu that create
filters to either hide or exclusively show objects with selected tags.
If an equivalent filter is already present in the filter list, re-uses
and enables that one instead.