See #23671: Deprecate Utils#isBlank and replace instances of it with Utils#isStripEmpty

As noted in r19079, the two functions were identical in behavior.

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19080 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

src/org/openstreetmap/josm/actions/downloadtasks/DownloadGeoJsonTask.java

@@ -5,6 +5,7 @@
 
 import java.util.Optional;
 import java.util.concurrent.Future;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -56,7 +57,7 @@ class InternalDownloadTask extends DownloadTask {
         @Override
         protected String generateLayerName() {
             return Optional.of(url.substring(url.lastIndexOf('/')+1))
-                .filter(it -> !Utils.isStripEmpty(it))
+                .filter(Predicate.not(Utils::isStripEmpty))
                 .orElse(super.generateLayerName());
         }
 

src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions.downloadtasks;
 
+import static java.util.function.Predicate.not;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -298,7 +299,7 @@ protected OsmDataLayer getFirstModifiableDataLayer() {
          */
         protected String generateLayerName() {
             return Optional.ofNullable(settings.getLayerName())
-                .filter(layerName -> !Utils.isStripEmpty(layerName))
+                .filter(not(Utils::isStripEmpty))
                 .orElse(OsmDataLayer.createNewName());
         }
 
@@ -359,7 +360,7 @@ protected OsmDataLayer addNewLayerIfRequired(String newLayerName) {
             if (settings.isNewLayer() || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
                 // the user explicitly wants a new layer, we don't have any layer at all
                 // or it is not clear which layer to merge to
-                final OsmDataLayer layer = createNewLayer(Optional.ofNullable(newLayerName).filter(it -> !Utils.isStripEmpty(it)));
+                final OsmDataLayer layer = createNewLayer(Optional.ofNullable(newLayerName).filter(not(Utils::isStripEmpty)));
                 MainApplication.getLayerManager().addLayer(layer, zoomAfterDownload);
                 return layer;
             }

src/org/openstreetmap/josm/data/UserIdentityManager.java

@@ -214,7 +214,7 @@ public User asUser() {
     public void initFromPreferences() {
         String credentialsUserName = CredentialsManager.getInstance().getUsername();
         if (isAnonymous()) {
-            if (!Utils.isBlank(credentialsUserName)) {
+            if (!Utils.isStripEmpty(credentialsUserName)) {
                 setPartiallyIdentified(credentialsUserName);
             }
         } else {
@@ -279,7 +279,7 @@ public void preferenceChanged(PreferenceChangeEvent evt) {
             if (evt.getNewValue() instanceof StringSetting) {
                 newUserName = ((StringSetting) evt.getNewValue()).getValue();
             }
-            if (Utils.isBlank(newUserName)) {
+            if (Utils.isStripEmpty(newUserName)) {
                 setAnonymous();
             } else if (!newUserName.equals(userName)) {
                 setPartiallyIdentified(newUserName);
@@ -290,7 +290,7 @@ public void preferenceChanged(PreferenceChangeEvent evt) {
             if (evt.getNewValue() instanceof StringSetting) {
                 newUrl = ((StringSetting) evt.getNewValue()).getValue();
             }
-            if (Utils.isBlank(newUrl)) {
+            if (Utils.isStripEmpty(newUrl)) {
                 setAnonymous();
             } else if (isFullyIdentified()) {
                 setPartiallyIdentified(getUserName());

src/org/openstreetmap/josm/data/gpx/GpxExtension.java

@@ -174,7 +174,7 @@ public void remove() {
         parent.getExtensions().remove(this);
         if (parent instanceof GpxExtension) {
             GpxExtension gpx = ((GpxExtension) parent);
-            if (Utils.isBlank(gpx.getValue())
+            if (Utils.isStripEmpty(gpx.getValue())
                     && Utils.isEmpty(gpx.getAttributes())
                     && Utils.isEmpty(gpx.getExtensions())) {
                 gpx.remove();
@@ -190,7 +190,7 @@ public void hide() {
         visible = false;
         if (parent != null && parent instanceof GpxExtension) {
             GpxExtension gpx = (GpxExtension) parent;
-            if (Utils.isBlank(gpx.getValue())
+            if (Utils.isStripEmpty(gpx.getValue())
                     && gpx.getAttributes().isEmpty()
                     && !gpx.getExtensions().isVisible()) {
                 gpx.hide();

src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java

@@ -272,7 +272,7 @@ private String parsePaintSymbol(
         boolean iconImage = false;
         if (layoutObject.containsKey("icon-image")) {
             sb.append(/* NO-ICON */"icon-image:concat(");
-            if (!Utils.isBlank(this.styleId)) {
+            if (!Utils.isStripEmpty(this.styleId)) {
                 sb.append('"').append(this.styleId).append('/').append("\",");
             }
             Matcher matcher = CURLY_BRACES.matcher(layoutObject.getString("icon-image"));

src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java

@@ -142,7 +142,7 @@ public MapboxVectorStyle(JsonObject jsonObject) {
                 MainApplication.worker.execute(() -> this.save((source == null ? data.hashCode() : source.getName()) + ".mapcss", style));
                 this.sources.put(source, new ElemStyles(Collections.singleton(style)));
             }
-            if (!Utils.isBlank(this.spriteUrl)) {
+            if (!Utils.isStripEmpty(this.spriteUrl)) {
                 MainApplication.worker.execute(this::fetchSprites);
             }
         } else {

src/org/openstreetmap/josm/data/oauth/OAuth20Token.java

@@ -81,7 +81,7 @@ public OAuth20Token(IOAuthParameters oauthParameters, String json) throws OAuth2
 
     @Override
     public void sign(HttpClient client) throws OAuthException {
-        if (!Utils.isBlank(this.oauthParameters.getApiUrl())
+        if (!Utils.isStripEmpty(this.oauthParameters.getApiUrl())
                 && !this.oauthParameters.getApiUrl().contains(client.getURL().getHost())) {
             String host = URI.create(this.oauthParameters.getAccessTokenUrl()).getHost();
             throw new IllegalArgumentException("Cannot sign URL with token for different host: Expected " + host

src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -718,7 +718,7 @@ public void putAll(Map<String, String> tags) {
         Map<String, String> originalKeys = getKeys();
         List<Map.Entry<String, String>> tagsToAdd = new ArrayList<>(tags.size());
         for (Map.Entry<String, String> tag : tags.entrySet()) {
-            if (!Utils.isBlank(tag.getKey())) {
+            if (!Utils.isStripEmpty(tag.getKey())) {
                 int keyIndex = indexOfKey(newKeys, tag.getKey());
                 // Realistically, we will not hit the newKeys == null branch. If it is null, keyIndex is always < 0
                 if (keyIndex < 0 || newKeys == null) {

src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -1402,7 +1402,7 @@ public Command fixError(TestError testError) {
             for (Entry<String, String> prop: tags.entrySet()) {
                 String key = prop.getKey();
                 String value = prop.getValue();
-                if (Utils.isBlank(value)) {
+                if (Utils.isStripEmpty(value)) {
                     commands.add(new ChangePropertyCommand(p, key, null));
                 } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {
                     commands.add(new ChangePropertyCommand(p, key, Utils.removeWhiteSpaces(value)));

src/org/openstreetmap/josm/gui/MapView.java

@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui;
 
+import static java.util.function.Predicate.not;
+
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -826,8 +828,9 @@ public void destroy() {
      */
     public String getLayerInformationForSourceTag() {
         return layerManager.getVisibleLayersInZOrder().stream()
-                .filter(layer -> !Utils.isBlank(layer.getChangesetSourceTag()))
-                .map(layer -> layer.getChangesetSourceTag().trim())
+                .map(Layer::getChangesetSourceTag)
+                .filter(not(Utils::isStripEmpty))
+                .map(String::trim)
                 .distinct()
                 .collect(Collectors.joining("; "));
     }

src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -106,7 +106,7 @@ protected void adjustLayout() {
      */
     @Override
     public void setCustomText(String text) {
-        if (Utils.isBlank(text)) {
+        if (Utils.isStripEmpty(text)) {
             customText.setVisible(false);
             adjustLayout();
             return;
@@ -131,7 +131,7 @@ public void setCurrentAction(String text) {
      */
     @Override
     public void appendLogMessage(String message) {
-        if (Utils.isBlank(message))
+        if (Utils.isStripEmpty(message))
             return;
         if (!spLog.isVisible()) {
             spLog.setVisible(true);

src/org/openstreetmap/josm/gui/dialogs/changeset/AbstractCellRenderer.java

@@ -56,7 +56,7 @@ protected void renderId(long id) {
     }
 
     protected void renderUser(User user) {
-        if (user == null || Utils.isBlank(user.getName())) {
+        if (user == null || Utils.isStripEmpty(user.getName())) {
             setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
             setText(tr("anonymous"));
         } else {

src/org/openstreetmap/josm/gui/dialogs/changeset/query/UidInputFieldValidator.java

@@ -39,7 +39,7 @@ public boolean isValid() {
     @Override
     public void validate() {
         String value = getComponent().getText();
-        if (Utils.isBlank(value)) {
+        if (Utils.isStripEmpty(value)) {
             feedbackInvalid("");
             return;
         }
@@ -62,7 +62,7 @@ public void validate() {
      */
     public int getUid() {
         String value = getComponent().getText();
-        if (Utils.isBlank(value)) return 0;
+        if (Utils.isStripEmpty(value)) return 0;
         try {
             int uid = Integer.parseInt(value.trim());
             return Math.max(uid, 0);

src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java

@@ -44,7 +44,7 @@ protected void updateEnabledState() {
     }
 
     protected boolean isEmptyRole() {
-        return Utils.isBlank(tfRole.getText());
+        return Utils.isStripEmpty(tfRole.getText());
     }
 
     protected boolean confirmSettingEmptyRole(int onNumMembers) {

src/org/openstreetmap/josm/gui/help/HelpUtil.java

@@ -149,7 +149,7 @@ private static String getHelpTopicPrefix(LocaleType type) {
      */
     public static String buildAbsoluteHelpTopic(String topic, LocaleType type) {
         String prefix = getHelpTopicPrefix(type);
-        if (prefix == null || Utils.isBlank(topic) || "/".equals(topic.trim()))
+        if (prefix == null || Utils.isStripEmpty(topic) || "/".equals(topic.trim()))
             return prefix;
         prefix += '/' + topic;
         return prefix.replaceAll("\\/+", "\\/"); // collapse sequences of //

src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

@@ -229,7 +229,7 @@ public boolean shouldSelectCell(EventObject anEvent) {
 
     @Override
     public boolean stopCellEditing() {
-        if (Utils.isBlank(tfFilename.getText())) {
+        if (Utils.isStripEmpty(tfFilename.getText())) {
             value = null;
         } else {
             value = new File(tfFilename.getText());

src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -311,10 +311,10 @@ public static String getNoteToolTip(Note note) {
         for (NoteComment comment : note.getComments()) {
             String commentText = comment.getText();
             //closing a note creates an empty comment that we don't want to show
-            if (!Utils.isBlank(commentText)) {
+            if (!Utils.isStripEmpty(commentText)) {
                 sb.append("<hr/>");
                 String userName = XmlWriter.encode(comment.getUser().getName());
-                if (Utils.isBlank(userName)) {
+                if (Utils.isStripEmpty(userName)) {
                     userName = "&lt;Anonymous&gt;";
                 }
                 sb.append(userName)

src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -185,7 +185,7 @@ public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer, final Strin
      * @since 18078
      */
     public GeoImageLayer(final List<ImageEntry> data, GpxData gpxData, final String name, boolean useThumbs) {
-        super(!Utils.isBlank(name) ? name : tr("Geotagged Images"));
+        super(!Utils.isStripEmpty(name) ? name : tr("Geotagged Images"));
         this.data = new ImageData(data);
         this.gpxData = gpxData;
         this.useThumbs = useThumbs;

src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -771,7 +771,7 @@ private void paintErrorMessage(Graphics g, IImageEntry<?> imageEntry, IImageEntr
         } else {
             errorMessage = null;
         }
-        if (!Utils.isBlank(errorMessage)) {
+        if (!Utils.isStripEmpty(errorMessage)) {
             Rectangle2D errorStringSize = g.getFontMetrics(g.getFont()).getStringBounds(errorMessage, g);
             if (Boolean.TRUE.equals(ERROR_MESSAGE_BACKGROUND.get())) {
                 int height = g.getFontMetrics().getHeight();

src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java

@@ -61,7 +61,7 @@ RemoteEntry getRemoteEntry() {
             if (this.isLatLonKnown()) {
                 remoteEntry.setPos(this);
             }
-            if (!Utils.isBlank(this.getText())) {
+            if (!Utils.isStripEmpty(this.getText())) {
                 remoteEntry.setDisplayName(this.getText());
             }
             return remoteEntry;

src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint.styleelement;
 
+import static java.util.function.Predicate.not;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -185,7 +187,7 @@ private static List<String> buildNameTags(List<String> nameTags) {
                 return new ArrayList<>();
             }
             return nameTags.stream()
-                    .filter(tag -> !Utils.isStripEmpty(tag))
+                    .filter(not(Utils::isStripEmpty))
                     .collect(Collectors.toList());
         }
 

src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -763,7 +763,7 @@ public SourceEntry setValue(int index, SourceEntry value) {
     }
 
     private static void prepareFileChooser(String url, AbstractFileChooser fc) {
-        if (Utils.isBlank(url)) return;
+        if (Utils.isStripEmpty(url)) return;
         URL sourceUrl;
         try {
             sourceUrl = new URL(url);

src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -292,7 +292,7 @@ public static void putLayerPrefLocal(GpxLayer layer, String key, String value) {
     public static void putDataPrefLocal(IGpxLayerPrefs data, String key, String value) {
         if (data == null) return;
         data.setModified(true);
-        if (Utils.isBlank(value) ||
+        if (Utils.isStripEmpty(value) ||
                 (getLayerPref(null, key).equals(value) && DEFAULT_PREFS.get(key) != null && DEFAULT_PREFS.get(key).toString().equals(value))) {
             data.getLayerPrefs().remove(key);
         } else {

src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -63,7 +63,7 @@ public PluginListPanel(PluginPreferencesModel model) {
 
     protected static String formatPluginRemoteVersion(PluginInformation pi) {
         StringBuilder sb = new StringBuilder();
-        if (Utils.isBlank(pi.version)) {
+        if (Utils.isStripEmpty(pi.version)) {
             sb.append(tr("unknown"));
         } else {
             sb.append(pi.version);
@@ -77,7 +77,7 @@ protected static String formatPluginRemoteVersion(PluginInformation pi) {
     protected static String formatPluginLocalVersion(PluginInformation pi) {
         if (pi == null)
             return tr("unknown");
-        if (Utils.isBlank(pi.localversion))
+        if (Utils.isStripEmpty(pi.localversion))
             return tr("unknown");
         return pi.localversion;
     }

src/org/openstreetmap/josm/gui/progress/CLIProgressMonitor.java

@@ -37,7 +37,7 @@ public CLIProgressMonitor() {
 
     @Override
     protected void doBeginTask() {
-        if (!Utils.isBlank(this.title)) {
+        if (!Utils.isStripEmpty(this.title)) {
             Logging.info(tr("Beginning task {2}: {0}{1}", this.title, this.customText,
                     Optional.ofNullable(this.taskId).map(ProgressTaskId::getId).map(id -> ' ' + id).orElse("")));
         }

src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging;
 
+import static java.util.function.Predicate.not;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.beans.PropertyChangeListener;
@@ -531,7 +532,7 @@ protected Command createDeleteTagsCommand(Collection<OsmPrimitive> primitives) {
     public List<String> getKeys() {
         return tags.stream()
                 .map(TagModel::getName)
-                .filter(name -> !Utils.isStripEmpty(name))
+                .filter(not(Utils::isStripEmpty))
                 .collect(Collectors.toList());
     }
 

src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java

@@ -81,7 +81,7 @@ public void tryToPasteFromClipboard() {
      * @return true if text has been pasted and valid ids have been read
      */
     public boolean tryToPasteFrom(String contents) {
-        if (!Utils.isBlank(contents)) {
+        if (!Utils.isStripEmpty(contents)) {
             setText(contents.trim());
             clearTextIfInvalid();
             return readIds();

src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java

@@ -74,7 +74,7 @@ public void validate() {
          */
         public boolean readChangesetId() {
             String value = getComponent().getText();
-            if (!Utils.isBlank(value)) {
+            if (!Utils.isStripEmpty(value)) {
                 value = value.trim();
                 id = 0;
                 try {

src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

@@ -94,7 +94,7 @@ public void validate() {
         public boolean readOsmIds() {
             String value = getComponent().getText();
             char c;
-            if (Utils.isBlank(value)) {
+            if (Utils.isStripEmpty(value)) {
                 return false;
             }
             ids.clear();

src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -75,7 +75,7 @@ private GpxData downloadRawGps(Bounds b, ProgressMonitor progressMonitor) throws
                     Object trackUrl = track.get("url");
                     if (trackUrl instanceof String) {
                         String sTrackUrl = (String) trackUrl;
-                        if (!Utils.isBlank(sTrackUrl) && !sTrackUrl.startsWith("http")) {
+                        if (!Utils.isStripEmpty(sTrackUrl) && !sTrackUrl.startsWith("http")) {
                             track.put("url", browseUrl + sTrackUrl);
                         }
                     }