-
Notifications
You must be signed in to change notification settings - Fork 193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for deprecated attribute and update the presets search dialog #123
Open
Sarabjeet108
wants to merge
3
commits into
JOSM:master
Choose a base branch
from
Sarabjeet108:attr-deprecated
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
37 changes: 37 additions & 0 deletions
37
src/org/openstreetmap/josm/gui/tagging/presets/PresetSearchFilter.java
This file contains 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
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,37 @@ | ||||||||
// License: GPL. For details, see LICENSE file. | ||||||||
package org.openstreetmap.josm.gui.tagging.presets; | ||||||||
|
||||||||
import static org.openstreetmap.josm.tools.I18n.marktr; | ||||||||
|
||||||||
/** | ||||||||
* This enum defines different filters for searching presets. | ||||||||
*/ | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
public enum PresetSearchFilter { | ||||||||
ONLY_APPLICABLE(marktr("Show only applicable to selection")), | ||||||||
SEARCH_IN_TAGS(marktr("Search in tags")), | ||||||||
DEPRECATED_TAGS(marktr("Show deprecated tags")); | ||||||||
|
||||||||
/** | ||||||||
* The translated text associated with the enum constant. | ||||||||
*/ | ||||||||
private final String textToBeTranslated; | ||||||||
|
||||||||
/** | ||||||||
* Constructor for the PresetSearchFilter enum. | ||||||||
* Initializes an enum constant with its corresponding translated text. | ||||||||
* | ||||||||
* @param textToBeTranslated The translated text associated with the enum constant. | ||||||||
*/ | ||||||||
PresetSearchFilter(String textToBeTranslated) { | ||||||||
this.textToBeTranslated = textToBeTranslated; | ||||||||
} | ||||||||
|
||||||||
/** | ||||||||
* Returns the text associated with the filter | ||||||||
* @return the text marked for translation | ||||||||
*/ | ||||||||
public String getText() { | ||||||||
return textToBeTranslated; | ||||||||
} | ||||||||
|
||||||||
} |
This file contains 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
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -136,6 +136,10 @@ public class TaggingPreset extends AbstractAction implements ActiveLayerChangeLi | |||||||
* Show the preset name if true | ||||||||
*/ | ||||||||
public boolean preset_name_label; | ||||||||
/** | ||||||||
* True if the preset is deprecated | ||||||||
*/ | ||||||||
private boolean deprecated; | ||||||||
|
||||||||
/** | ||||||||
* The types as preparsed collection. | ||||||||
|
@@ -349,6 +353,23 @@ public void setMatch_expression(String filter) throws SAXException { | |||||||
} | ||||||||
} | ||||||||
|
||||||||
/** | ||||||||
* @return true if the preset is deprecated | ||||||||
* @apiNote this is not {@code isDeprecated} just in case we decide to make {@link TaggingPreset} a record class. | ||||||||
* @since xxx | ||||||||
*/ | ||||||||
public final boolean deprecated() { | ||||||||
return this.deprecated; | ||||||||
} | ||||||||
|
||||||||
/** | ||||||||
* Set if the preset is deprecated | ||||||||
* @param deprecated if true the preset is deprecated | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
*/ | ||||||||
public final void setDeprecated(boolean deprecated) { | ||||||||
this.deprecated = deprecated; | ||||||||
} | ||||||||
|
||||||||
private static class PresetPanel extends JPanel { | ||||||||
private boolean hasElements; | ||||||||
|
||||||||
|
This file contains 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
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -34,7 +34,8 @@ private TaggingPresetSearchDialog() { | |||||||
super(MainApplication.getMainFrame(), tr("Search presets"), tr("Select"), tr("Cancel")); | ||||||||
setButtonIcons("dialogs/search", "cancel"); | ||||||||
configureContextsensitiveHelp("/Action/TaggingPresetSearch", true /* show help button */); | ||||||||
selector = new TaggingPresetSelector(true, true); | ||||||||
selector = new TaggingPresetSelector(PresetSearchFilter.ONLY_APPLICABLE, PresetSearchFilter.SEARCH_IN_TAGS, | ||||||||
PresetSearchFilter.DEPRECATED_TAGS); | ||||||||
Comment on lines
+37
to
+38
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
setContent(selector, false); | ||||||||
SelectionEventManager.getInstance().addSelectionListener(selector); | ||||||||
selector.setDblClickListener(e -> buttonAction(0, null)); | ||||||||
|
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.