Changeset 18208 in josm for trunk/src/org

Timestamp:

2021-09-11T17:50:57+02:00 (3 years ago)

Author:

Don-vip

Message:

global use of Utils.isEmpty/isBlank

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (4 diffs)
• actions/CombineWayAction.java (modified) (2 diffs)
• actions/CreateMultipolygonAction.java (modified) (1 diff)
• actions/DownloadReferrersAction.java (modified) (2 diffs)
• actions/OpenFileAction.java (modified) (1 diff)
• actions/UpdateSelectionAction.java (modified) (2 diffs)
• actions/UploadSelectionAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• actions/relation/AbstractRelationAction.java (modified) (1 diff)
• actions/relation/RecentRelationsAction.java (modified) (2 diffs)
• command/ChangePropertyCommand.java (modified) (6 diffs)
• command/DeleteCommand.java (modified) (2 diffs)
• command/SelectCommand.java (modified) (2 diffs)
• data/DataSource.java (modified) (2 diffs)
• data/UserIdentityManager.java (modified) (3 diffs)
• data/gpx/GpxExtension.java (modified) (3 diffs)
• data/gpx/GpxExtensionCollection.java (modified) (2 diffs)
• data/imagery/LayerDetails.java (modified) (3 diffs)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/ChangesetCache.java (modified) (2 diffs)
• data/osm/DefaultNameFormatter.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (2 diffs)
• data/osm/OsmUtils.java (modified) (2 diffs)
• data/osm/QuadBuckets.java (modified) (2 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/TagCollection.java (modified) (3 diffs)
• data/osm/Way.java (modified) (1 diff)
• data/osm/search/SearchCompiler.java (modified) (4 diffs)
• data/osm/search/SearchSetting.java (modified) (2 diffs)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• data/sources/SourceInfo.java (modified) (3 diffs)
• data/validation/OsmValidator.java (modified) (2 diffs)
• data/validation/ValidationTask.java (modified) (2 diffs)
• data/validation/routines/InetAddressValidator.java (modified) (2 diffs)
• data/validation/routines/RegexValidator.java (modified) (2 diffs)
• data/validation/tests/ConnectivityRelations.java (modified) (2 diffs)
• data/validation/tests/MultipolygonTest.java (modified) (2 diffs)
• data/validation/tests/OpeningHourTest.java (modified) (3 diffs)
• data/validation/tests/RelationChecker.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (3 diffs)
• data/vector/VectorNode.java (modified) (2 diffs)
• gui/ImageryMenu.java (modified) (2 diffs)
• gui/PleaseWaitDialog.java (modified) (3 diffs)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• gui/conflict/tags/RelationMemberConflictResolver.java (modified) (1 diff)
• gui/dialogs/MapPaintDialog.java (modified) (1 diff)
• gui/dialogs/NotesDialog.java (modified) (3 diffs)
• gui/dialogs/OsmIdSelectionDialog.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• gui/dialogs/SelectionListDialog.java (modified) (2 diffs)
• gui/dialogs/UserListDialog.java (modified) (1 diff)
• gui/dialogs/ValidatorListManagementDialog.java (modified) (2 diffs)
• gui/dialogs/changeset/AbstractCellRenderer.java (modified) (2 diffs)
• gui/dialogs/changeset/ChangesetListModel.java (modified) (2 diffs)
• gui/dialogs/changeset/query/UidInputFieldValidator.java (modified) (3 diffs)
• gui/dialogs/properties/AbstractCopyAction.java (modified) (2 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (3 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (5 diffs)
• gui/dialogs/relation/actions/AddFromSelectionAction.java (modified) (2 diffs)
• gui/dialogs/relation/actions/SetRoleAction.java (modified) (1 diff)
• gui/dialogs/relation/sort/RelationNodeMap.java (modified) (2 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (2 diffs)
• gui/download/BookmarkSelection.java (modified) (2 diffs)
• gui/help/HelpUtil.java (modified) (2 diffs)
• gui/io/CustomConfigurator.java (modified) (1 diff)
• gui/io/LayerNameAndFilePathTableCell.java (modified) (2 diffs)
• gui/io/OpenChangesetComboBoxModel.java (modified) (2 diffs)
• gui/layer/NoteLayer.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• gui/layer/gpx/ConvertFromGpxLayerAction.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSRuleIndex.java (modified) (1 diff)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• gui/preferences/SourceEditor.java (modified) (1 diff)
• gui/preferences/TabPreferenceSetting.java (modified) (2 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (2 diffs)
• gui/preferences/display/GPXSettingsPanel.java (modified) (3 diffs)
• gui/preferences/imagery/ImageryProvidersPanel.java (modified) (2 diffs)
• gui/preferences/plugin/PluginListPanel.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetItem.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPresetItemGuiSupport.java (modified) (4 diffs)
• gui/tagging/presets/items/PresetListEntry.java (modified) (1 diff)
• gui/tagging/presets/items/Text.java (modified) (2 diffs)
• gui/widgets/FileChooserManager.java (modified) (2 diffs)
• gui/widgets/FilterField.java (modified) (1 diff)
• gui/widgets/OsmIdTextField.java (modified) (2 diffs)
• io/AbstractReader.java (modified) (1 diff)
• io/ChangesetQuery.java (modified) (4 diffs)
• io/OsmApiException.java (modified) (1 diff)
• io/OsmServerChangesetReader.java (modified) (3 diffs)
• io/remotecontrol/handler/RequestHandler.java (modified) (1 diff)
• io/session/GpxTracksSessionImporter.java (modified) (2 diffs)
• io/session/MarkerSessionImporter.java (modified) (2 diffs)
• io/session/NoteSessionImporter.java (modified) (2 diffs)
• io/session/OsmDataSessionImporter.java (modified) (2 diffs)
• plugins/ReadRemotePluginInformationTask.java (modified) (1 diff)
• spi/preferences/AbstractPreferences.java (modified) (2 diffs)
• tools/ExceptionUtil.java (modified) (1 diff)
• tools/Mediawiki.java (modified) (1 diff)
• tools/OsmPrimitiveImageProvider.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (1 diff)
• tools/Tag2Link.java (modified) (2 diffs)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -47 +47 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
@@ -115 +116 @@
             case WMS_ENDPOINT:
                 // convert to WMS type
-                if (info.getDefaultLayers() == null || info.getDefaultLayers().isEmpty()) {
+                if (Utils.isEmpty(info.getDefaultLayers())) {
                     return getWMSLayerInfo(info);
                 } else {
@@ -122 +123 @@
             case WMTS:
                 // specify which layer to use
-                if (info.getDefaultLayers() == null || info.getDefaultLayers().isEmpty()) {
+                if (Utils.isEmpty(info.getDefaultLayers())) {
                     WMTSTileSource tileSource = new WMTSTileSource(info);
                     DefaultLayer layerId = tileSource.userSelectLayer();
@@ -169 +170 @@
             }
         } catch (IllegalArgumentException | ReportedException ex) {
-            if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) {
+            if (Utils.isEmpty(ex.getMessage()) || GraphicsEnvironment.isHeadless()) {
                 throw ex;
             } else {

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -50 +50 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -113 +114 @@
         // prepare and clean the list of ways to combine
         //
-        if (ways == null || ways.isEmpty())
+        if (Utils.isEmpty(ways))
             return null;
         ways.remove(null); // just in case -  remove all null ways from the collection

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -387 +387 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null || selection.isEmpty()) {
+        if (ds == null || Utils.isEmpty(selection)) {
             setEnabled(false);
         } else if (update) {

trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -44 +45 @@
      */
     public static void downloadReferrers(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) {
-        if (children == null || children.isEmpty())
+        if (Utils.isEmpty(children))
             return;
         MainApplication.worker.submit(new DownloadReferrersTask(targetLayer, children));

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -261 +261 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            if (files == null || files.isEmpty()) return;
+            if (Utils.isEmpty(files)) return;
 
             /**

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -120 +121 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (selection == null || selection.isEmpty()) {
+        if (Utils.isEmpty(selection)) {
             setEnabled(false);
         } else {

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -34 +34 @@
 import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -138 +139 @@
      */
     public void uploadPrimitives(OsmDataLayer layer, Collection<OsmPrimitive> toUpload) {
-        if (toUpload == null || toUpload.isEmpty()) return;
+        if (Utils.isEmpty(toUpload)) return;
         UploadHullBuilder builder = new UploadHullBuilder();
         toUpload = builder.build(toUpload);

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

@@ -188 +188 @@
     protected final void extractOsmFilename(DownloadParams settings, String pattern, String url) {
         newLayerName = settings.getLayerName();
-        if (newLayerName == null || newLayerName.isEmpty()) {
+        if (Utils.isEmpty(newLayerName)) {
             Matcher matcher = Pattern.compile(pattern).matcher(url);
             newLayerName = matcher.matches() && matcher.groupCount() > 0 ? Utils.decodeUrl(matcher.group(1)) : null;

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -36 +36 @@
      */
     protected static final Collection<IRelation<?>> getRelations(Collection<? extends IPrimitive> primitives) {
-        if (primitives == null || primitives.isEmpty()) {
+        if (Utils.isEmpty(primitives)) {
             return Collections.<IRelation<?>>emptySet();
         } else {

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -73 +74 @@
     public static Relation getLastRelation() {
         List<Relation> recentRelations = getRecentRelationsOnActiveLayer();
-        if (recentRelations == null || recentRelations.isEmpty())
+        if (Utils.isEmpty(recentRelations))
             return null;
         return recentRelations.stream().filter(RecentRelationsAction::isRelationListable)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -139 +140 @@
                 String newVal = tag.getValue();
 
-                if (newVal == null || newVal.isEmpty()) {
+                if (Utils.isEmpty(newVal)) {
                     if (oldVal != null) {
                         // new value is null and tag exists (will delete tag)
@@ -173 +174 @@
                     String newVal = tag.getValue();
 
-                    if (newVal == null || newVal.isEmpty()) {
+                    if (Utils.isEmpty(newVal)) {
                         if (oldVal != null)
                             osm.remove(tag.getKey());
@@ -204 +205 @@
             String msg;
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
-            if (entry.getValue() == null || entry.getValue().isEmpty()) {
+            if (Utils.isEmpty(entry.getValue())) {
                 switch(OsmPrimitiveType.from(primitive)) {
                 case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
@@ -223 +224 @@
         } else if (objects.size() > 1 && tags.size() == 1) {
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
-            if (entry.getValue() == null || entry.getValue().isEmpty()) {
+            if (Utils.isEmpty(entry.getValue())) {
                 /* I18n: plural form for objects, but value < 2 not possible! */
                 text = trn("Remove \"{0}\" for {1} object", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
@@ -233 +234 @@
         } else {
             boolean allNull = this.tags.entrySet().stream()
-                    .allMatch(tag -> tag.getValue() == null || tag.getValue().isEmpty());
+                    .allMatch(tag -> Utils.isEmpty(tag.getValue()));
 
             if (allNull) {

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -296 +296 @@
      */
     public static Command deleteWithReferences(Collection<? extends OsmPrimitive> selection, boolean silent) {
-        if (selection == null || selection.isEmpty()) return null;
+        if (Utils.isEmpty(selection)) return null;
         Set<OsmPrimitive> parents = OsmPrimitive.getReferrer(selection);
         parents.addAll(selection);
@@ -402 +402 @@
      */
     public static Command delete(Collection<? extends OsmPrimitive> selection, boolean alsoDeleteNodesInWay, boolean silent) {
-        if (selection == null || selection.isEmpty())
+        if (Utils.isEmpty(selection))
             return null;
 

trunk/src/org/openstreetmap/josm/command/SelectCommand.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -33 +34 @@
     public SelectCommand(DataSet dataset, Collection<OsmPrimitive> newSelection) {
         super(dataset);
-        if (newSelection == null || newSelection.isEmpty()) {
+        if (Utils.isEmpty(newSelection)) {
             this.newSelection = Collections.emptySet();
         } else if (newSelection.contains(null)) {

trunk/src/org/openstreetmap/josm/data/DataSource.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -75 +76 @@
      */
     public static Area getDataSourceArea(Collection<DataSource> dataSources) {
-        if (dataSources == null || dataSources.isEmpty()) {
+        if (Utils.isEmpty(dataSources)) {
             return null;
         }

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

@@ -24 +24 @@
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -277 +278 @@
         switch (evt.getKey()) {
         case "osm-server.username":
-            String newUserName = null;
+            String newUserName = "";
             if (evt.getNewValue() instanceof StringSetting) {
                 newUserName = ((StringSetting) evt.getNewValue()).getValue();
             }
-            if (newUserName == null || newUserName.trim().isEmpty()) {
+            if (Utils.isBlank(newUserName)) {
                 setAnonymous();
-            } else {
-                if (!newUserName.equals(userName)) {
-                    setPartiallyIdentified(newUserName);
-                }
+            } else if (!newUserName.equals(userName)) {
+                setPartiallyIdentified(newUserName);
             }
             return;
@@ -294 +293 @@
                 newUrl = ((StringSetting) evt.getNewValue()).getValue();
             }
-            if (newUrl == null || newUrl.trim().isEmpty()) {
+            if (Utils.isBlank(newUrl)) {
                 setAnonymous();
             } else if (isFullyIdentified()) {

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

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.gpx.GpxData.XMLNamespace;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.Attributes;
 
@@ -174 +175 @@
         if (parent instanceof GpxExtension) {
             GpxExtension gpx = ((GpxExtension) parent);
-            if ((gpx.getValue() == null || gpx.getValue().trim().isEmpty())
-                    && gpx.getAttributes().isEmpty()
-                    && gpx.getExtensions().isEmpty()) {
+            if (Utils.isBlank(gpx.getValue())
+                    && Utils.isEmpty(gpx.getAttributes())
+                    && Utils.isEmpty(gpx.getExtensions())) {
                 gpx.remove();
             }
@@ -190 +191 @@
         if (parent != null && parent instanceof GpxExtension) {
             GpxExtension gpx = (GpxExtension) parent;
-            if ((gpx.getValue() == null || gpx.getValue().trim().isEmpty())
+            if (Utils.isBlank(gpx.getValue())
                     && gpx.getAttributes().isEmpty()
                     && !gpx.getExtensions().isVisible()) {

trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

@@ -12 +12 @@
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.Attributes;
 
@@ -66 +67 @@
      */
     public void closeChild(String qName, String value) {
-        if (childStack == null || childStack.isEmpty()) {
+        if (Utils.isEmpty(childStack)) {
             Logging.warn("Can''t close child ''{0}'', no element in stack.", qName);
             return;

trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -150 +151 @@
     @Override
     public String toString() {
-        String baseName = (title == null || title.isEmpty()) ? name : title;
+        String baseName = Utils.isEmpty(title) ? name : title;
         return abstr == null || abstr.equalsIgnoreCase(baseName) ? baseName : baseName + " (" + abstr + ')';
     }
@@ -184 +185 @@
      */
     public boolean isSelectable() {
-        return !(name == null || name.isEmpty());
+        return !Utils.isEmpty(name);
     }
 

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

@@ -536 +536 @@
     public void setKeys(Map<String, String> keys) {
         Map<String, String> originalKeys = getKeys();
-        if (keys == null || keys.isEmpty()) {
+        if (Utils.isEmpty(keys)) {
             this.keys = null;
             keysChangedImpl(originalKeys);

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -17 +17 @@
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -110 +111 @@
      */
     public void update(Collection<Changeset> changesets) {
-        if (changesets == null || changesets.isEmpty()) return;
+        if (Utils.isEmpty(changesets)) return;
         DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
         for (Changeset cs: changesets) {

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -247 +247 @@
                     }
                 }
-                if (n == null || n.isEmpty()) {
+                if (Utils.isEmpty(n)) {
                     n = String.valueOf(way.getId());
                 }

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -173 +174 @@
      */
     public synchronized void createNote(LatLon location, String text) {
-        if (text == null || text.isEmpty()) {
+        if (Utils.isEmpty(text)) {
             throw new IllegalArgumentException("Comment can not be blank when creating a note");
         }

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -11 +11 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.TextTagParser;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -224 +225 @@
      */
     public static boolean isOsmCollectionEditable(Collection<? extends IPrimitive> collection) {
-        if (collection == null || collection.isEmpty()) {
+        if (Utils.isEmpty(collection)) {
             return false;
         }

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.QuadTiling;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -352 +353 @@
 
         boolean canRemove() {
-            return (content == null || content.isEmpty()) && !this.hasChildren();
+            return Utils.isEmpty(content) && !this.hasChildren();
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -385 +385 @@
     public void removeMembersFor(Collection<? extends OsmPrimitive> primitives) {
         checkDatasetNotReadOnly();
-        if (primitives == null || primitives.isEmpty())
+        if (Utils.isEmpty(primitives))
             return;
 

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -23 +23 @@
 
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -118 +119 @@
     public static TagCollection commonToAllPrimitives(Collection<? extends Tagged> primitives) {
         TagCollection tags = new TagCollection();
-        if (primitives == null || primitives.isEmpty()) return tags;
+        if (Utils.isEmpty(primitives)) return tags;
         // initialize with the first
         tags.add(TagCollection.from(primitives.iterator().next()));
@@ -565 +566 @@
         ensureApplicableToPrimitive();
         for (Tag tag: tags.keySet()) {
-            if (tag.getValue() == null || tag.getValue().isEmpty()) {
+            if (Utils.isEmpty(tag.getValue())) {
                 primitive.remove(tag.getKey());
             } else {

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -54 +54 @@
             }
 
-            if (nodes == null || nodes.isEmpty()) {
+            if (Utils.isEmpty(nodes)) {
                 this.nodes = EMPTY_NODES;
             } else {

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -54 +54 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -1877 +1878 @@
         protected Collection<Bounds> getBounds(OsmPrimitive primitive) {
             final Collection<Bounds> bounds = super.getBounds(primitive);
-            return bounds == null || bounds.isEmpty() ?
+            return Utils.isEmpty(bounds) ?
                     Collections.singleton(ProjectionRegistry.getProjection().getWorldBoundsLatLon()) : bounds;
         }
@@ -1896 +1897 @@
         Preset(String presetName) throws SearchParseError {
 
-            if (presetName == null || presetName.isEmpty()) {
+            if (Utils.isEmpty(presetName)) {
                 throw new SearchParseError("The name of the preset is required");
             }
@@ -2219 +2220 @@
     public static String buildSearchStringForTag(String key, String value) {
         final String forKey = '"' + escapeStringForSearch(key) + '"' + '=';
-        if (value == null || value.isEmpty()) {
+        if (Utils.isEmpty(value)) {
             return forKey + '*';
         } else {

trunk/src/org/openstreetmap/josm/data/osm/search/SearchSetting.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -172 +173 @@
      */
     public String writeToString() {
-        if (text == null || text.isEmpty())
+        if (Utils.isEmpty(text))
             return "";
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -613 +613 @@
         TextLabel text = bs.text;
         String s = text.labelCompositionStrategy.compose(n);
-        if (s == null || s.isEmpty()) return;
+        if (Utils.isEmpty(s)) return;
 
         Font defaultFont = g.getFont();
@@ -1145 +1145 @@
         }
         String name = text.getString(osm);
-        if (name == null || name.isEmpty()) {
+        if (Utils.isEmpty(name)) {
             return;
         }

trunk/src/org/openstreetmap/josm/data/sources/SourceInfo.java

@@ -730 +730 @@
      */
     public void setNoTileHeaders(MultiMap<String, String> noTileHeaders) {
-       if (noTileHeaders == null || noTileHeaders.isEmpty()) {
+       if (Utils.isEmpty(noTileHeaders)) {
            this.noTileHeaders = null;
        } else {
@@ -750 +750 @@
      */
     public void setNoTileChecksums(MultiMap<String, String> noTileChecksums) {
-        if (noTileChecksums == null || noTileChecksums.isEmpty()) {
+        if (Utils.isEmpty(noTileChecksums)) {
             this.noTileChecksums = null;
         } else {
@@ -770 +770 @@
      */
     public void setMetadataHeaders(Map<String, String> metadataHeaders) {
-        if (metadataHeaders == null || metadataHeaders.isEmpty()) {
+        if (Utils.isEmpty(metadataHeaders)) {
             this.metadataHeaders = null;
         } else {

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -82 +82 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Stopwatch;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -505 +506 @@
         int i = 0;
         while (i < list.size()) {
-            if (list.get(i) == null || list.get(i).isEmpty()) {
+            if (Utils.isEmpty(list.get(i))) {
                 list.remove(i);
                 continue;

trunk/src/org/openstreetmap/josm/data/validation/ValidationTask.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -78 +79 @@
     @Override
     protected void realRun() {
-        if (tests == null || tests.isEmpty())
+        if (Utils.isEmpty(tests))
             return;
         errors = new ArrayList<>();

trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java

@@ -20 +20 @@
 import java.util.Arrays;
 import java.util.List;
+
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -96 +98 @@
         // verify that address subgroups are legal
         for (String ipSegment : groups) {
-            if (ipSegment == null || ipSegment.isEmpty()) {
+            if (Utils.isEmpty(ipSegment)) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java

@@ -23 +23 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -126 +128 @@
         int flags = caseSensitive ? 0 : Pattern.CASE_INSENSITIVE;
         for (int i = 0; i < regexs.length; i++) {
-            if (regexs[i] == null || regexs[i].isEmpty()) {
+            if (Utils.isEmpty(regexs[i])) {
                 throw new IllegalArgumentException("Regular expression[" + i + "] is missing");
             }

trunk/src/org/openstreetmap/josm/data/validation/tests/ConnectivityRelations.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -76 +77 @@
     public static Map<Integer, Map<Integer, Boolean>> parseConnectivityTag(Relation relation) {
         final String cnTag = relation.get(CONNECTIVITY_TAG);
-        if (cnTag == null || cnTag.isEmpty()) {
+        if (Utils.isEmpty(cnTag)) {
             return Collections.emptyMap();
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -440 +441 @@
         PolygonLevelFinder levelFinder = new PolygonLevelFinder(sharedNodes);
         List<PolygonLevel> list = levelFinder.findOuterWays(allPolygons);
-        if (list == null || list.isEmpty()) {
+        if (Utils.isEmpty(list)) {
             return;
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -16 +16 @@
 import javax.swing.JPanel;
 
-import ch.poole.openinghoursparser.OpeningHoursParseException;
-import ch.poole.openinghoursparser.OpeningHoursParser;
-import ch.poole.openinghoursparser.Rule;
-import ch.poole.openinghoursparser.Util;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -28 +24 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
+
+import ch.poole.openinghoursparser.OpeningHoursParseException;
+import ch.poole.openinghoursparser.OpeningHoursParser;
+import ch.poole.openinghoursparser.Rule;
+import ch.poole.openinghoursparser.Util;
 
 /**
@@ -93 +95 @@
      */
     List<TestError> checkOpeningHourSyntax(final String key, final String value, OsmPrimitive p, Locale locale) {
-        if (value == null || value.isEmpty()) {
+        if (Utils.isEmpty(value)) {
             return Collections.emptyList();
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -333 +333 @@
                 String templates = allroles.keySet().stream()
                         .map(r -> r.key)
-                        .map(r -> r == null || r.isEmpty() ? tr("<empty>") : r)
+                        .map(r -> Utils.isEmpty(r) ? tr("<empty>") : r)
                         .distinct()
                         .collect(Collectors.joining("/"));

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

@@ -880 +880 @@
 
     private void checkSingleTagComplex(MultiMap<OsmPrimitive, String> withErrors, OsmPrimitive p, String key, String value) {
-        if (!checkValues || key == null || value == null || value.isEmpty())
+        if (!checkValues || key == null || Utils.isEmpty(value))
             return;
         if (additionalPresetsValueData != null && !isTagIgnored(key, value)) {
@@ -937 +937 @@
         // try to fix common typos and check again if value is still unknown
         final String harmonizedValue = harmonizeValue(value);
-        if (harmonizedValue == null || harmonizedValue.isEmpty())
+        if (Utils.isEmpty(harmonizedValue))
             return;
         String fixedValue;
@@ -1219 +1219 @@
                 String key = prop.getKey();
                 String value = prop.getValue();
-                if (value == null || value.trim().isEmpty()) {
+                if (Utils.isBlank(value)) {
                     commands.add(new ChangePropertyCommand(p, key, null));
                 } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {

trunk/src/org/openstreetmap/josm/data/vector/VectorNode.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -83 +84 @@
         // when way is cloned
         List<? extends IPrimitive> referrers = super.getReferrers();
-        if (referrers == null || referrers.isEmpty())
+        if (Utils.isEmpty(referrers))
             return false;
         if (referrers instanceof IPrimitive)

trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

@@ -44 +44 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -151 +152 @@
     private static boolean isPosInOneShapeIfAny(ImageryInfo info, LatLon pos) {
         List<Shape> shapes = info.getBounds().getShapes();
-        return shapes == null || shapes.isEmpty() || shapes.stream().anyMatch(s -> s.contains(pos));
+        return Utils.isEmpty(shapes) || shapes.stream().anyMatch(s -> s.contains(pos));
     }
 

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

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -106 +107 @@
     @Override
     public void setCustomText(String text) {
-        if (text == null || text.trim().isEmpty()) {
+        if (Utils.isBlank(text)) {
             customText.setVisible(false);
             adjustLayout();
@@ -131 +132 @@
     @Override
     public void appendLogMessage(String message) {
-        if (message == null || message.trim().isEmpty())
+        if (Utils.isBlank(message))
             return;
         if (!spLog.isVisible()) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -637 +638 @@
         String values = normalizedTags.getValues(key)
                 .stream()
-                .map(x -> (x == null || x.isEmpty()) ? tr("<i>missing</i>") : x)
+                .map(x -> Utils.isEmpty(x) ? tr("<i>missing</i>") : x)
                 .collect(Collectors.joining(tr(", ")));
         return tr("{0} ({1})", key, values);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -195 +195 @@
         if (tfValue.getText().trim().isEmpty())
             return null;
-        if (primitives == null || primitives.isEmpty())
+        if (Utils.isEmpty(primitives))
             return null;
         return new ChangePropertyCommand(primitives, Utils.removeWhiteSpaces(tfKey.getText()), Utils.removeWhiteSpaces(tfValue.getText()));

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -664 +664 @@
             final int sel = tblStyles.getSelectionModel().getLeadSelectionIndex();
             final StyleSource style = sel >= 0 && sel < model.getRowCount() ? model.getRow(sel) : null;
-            if (style == null || style.settings.isEmpty()) {
+            if (style == null || Utils.isEmpty(style.settings)) {
                 setMenu.setEnabled(false);
             } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -59 +59 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -244 +245 @@
 
     static boolean matchesNote(String filter, Note note) {
-        if (filter == null || filter.isEmpty()) {
+        if (Utils.isEmpty(filter)) {
             return true;
         }
@@ -287 +288 @@
                     String text = fstComment.getText();
                     String userName = fstComment.getUser().getName();
-                    if (userName == null || userName.isEmpty()) {
+                    if (Utils.isEmpty(userName)) {
                         userName = "<Anonymous>";
                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -221 +221 @@
     protected void tryToPasteFromClipboard(OsmIdTextField tfId, OsmPrimitiveTypesComboBox cbType) {
         String buf = ClipboardUtils.getClipboardStringContent();
-        if (buf == null || buf.isEmpty()) return;
+        if (Utils.isEmpty(buf)) return;
         if (buf.length() > Config.getPref().getInt("downloadprimitive.max-autopaste-length", 2000)) return;
         final List<SimplePrimitiveId> ids = SimplePrimitiveId.fuzzyParse(buf);

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -308 +308 @@
      */
     public void selectRelations(Collection<? extends IRelation<?>> relations) {
-        if (relations == null || relations.isEmpty()) {
+        if (Utils.isEmpty(relations)) {
             model.setSelectedRelations(null);
         } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -38 +38 @@
 import javax.swing.event.PopupMenuEvent;
 
+import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
-import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.AutoScaleAction.AutoScaleMode;
@@ -838 +838 @@
     protected static class SelectionHistoryPopup extends JPopupMenu {
         public static void launch(Component parent, Collection<Collection<? extends OsmPrimitive>> history) {
-            if (history == null || history.isEmpty()) return;
+            if (Utils.isEmpty(history)) return;
             if (parent.isShowing()) {
                 JPopupMenu menu = new SelectionHistoryPopup(history);

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -310 +310 @@
         protected Map<User, Integer> computeStatistics(Collection<? extends OsmPrimitive> primitives) {
             Map<User, Integer> ret = new HashMap<>();
-            if (primitives == null || primitives.isEmpty())
+            if (Utils.isEmpty(primitives))
                 return ret;
             for (OsmPrimitive primitive: primitives) {

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorListManagementDialog.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -224 +225 @@
         List<TestError> errors = map.validatorDialog.tree.getErrors();
         ValidateAction validateAction = ValidatorDialog.validateAction;
-        if (!validateAction.isEnabled() || errors == null || errors.isEmpty()) return JOptionPane.NO_OPTION;
+        if (!validateAction.isEnabled() || Utils.isEmpty(errors)) return JOptionPane.NO_OPTION;
         final int answer = ConditionalOptionPaneUtil.showOptionDialog(
                 "rerun_validation_when_ignorelist_changed",

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

@@ -14 +14 @@
 
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -56 +57 @@
 
     protected void renderUser(User user) {
-        if (user == null || user.getName().trim().isEmpty()) {
+        if (user == null || Utils.isBlank(user.getName())) {
             setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
             setText(tr("anonymous"));

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.TableHelper;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -95 +96 @@
      */
     public void initFromChangesetIds(Collection<Integer> ids) {
-        if (ids == null || ids.isEmpty()) {
+        if (Utils.isEmpty(ids)) {
             setChangesets(null);
             return;

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -39 +40 @@
     public void validate() {
         String value = getComponent().getText();
-        if (value == null || value.trim().isEmpty()) {
+        if (Utils.isBlank(value)) {
             feedbackInvalid("");
             return;
@@ -62 +63 @@
     public int getUid() {
         String value = getComponent().getText();
-        if (value == null || value.trim().isEmpty()) return 0;
+        if (Utils.isBlank(value)) return 0;
         try {
             int uid = Integer.parseInt(value.trim());

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -44 +45 @@
         int[] rows = tagTable.getSelectedRows();
         Collection<? extends Tagged> sel = objectSupplier.get();
-        if (rows.length == 0 || sel == null || sel.isEmpty()) return Stream.empty();
+        if (rows.length == 0 || Utils.isEmpty(sel)) return Stream.empty();
         return Arrays.stream(rows)
                 .mapToObj(keySupplier)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -247 +247 @@
             activeDataSet.beginUpdate();
             sel = OsmDataManager.getInstance().getInProgressSelection();
-            if (sel == null || sel.isEmpty())
+            if (Utils.isEmpty(sel))
                 return;
 
@@ -281 +281 @@
         changedKey = null;
         sel = OsmDataManager.getInstance().getInProgressSelection();
-        if (sel == null || sel.isEmpty())
+        if (Utils.isEmpty(sel))
             return;
 
@@ -914 +914 @@
             while (true) {
                 s = JOptionPane.showInputDialog(this, tr("Please enter the number of recently added tags to display"), s);
-                if (s == null || s.isEmpty()) {
+                if (Utils.isEmpty(s)) {
                     return;
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -417 +418 @@
 
     private void addMembersAtIndex(List<? extends OsmPrimitive> primitives, int index) {
-        if (primitives == null || primitives.isEmpty())
+        if (Utils.isEmpty(primitives))
             return;
         int idx = index;
@@ -547 +548 @@
      */
     public void setSelectedMembers(Collection<RelationMember> selectedMembers) {
-        if (selectedMembers == null || selectedMembers.isEmpty()) {
+        if (Utils.isEmpty(selectedMembers)) {
             getSelectionModel().clearSelection();
             return;
@@ -571 +572 @@
      */
     public void setSelectedMembersIdx(Collection<Integer> selectedIndices) {
-        if (selectedIndices == null || selectedIndices.isEmpty()) {
+        if (Utils.isEmpty(selectedIndices)) {
             getSelectionModel().clearSelection();
             return;
@@ -652 +653 @@
      */
     public static boolean hasMembersReferringTo(Collection<RelationMember> members, Collection<OsmPrimitive> primitives) {
-        if (primitives == null || primitives.isEmpty())
+        if (Utils.isEmpty(primitives))
             return false;
         Set<OsmPrimitive> referrers = members.stream().map(RelationMember::getMember).collect(Collectors.toSet());

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -30 +31 @@
 
     protected List<OsmPrimitive> filterConfirmedPrimitives(List<OsmPrimitive> primitives) throws AddAbortException {
-        if (primitives == null || primitives.isEmpty())
+        if (Utils.isEmpty(primitives))
             return primitives;
         List<OsmPrimitive> ret = new ArrayList<>();

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

@@ -45 +45 @@
 
     protected boolean isEmptyRole() {
-        return tfRole.getText() == null || tfRole.getText().trim().isEmpty();
+        return Utils.isBlank(tfRole.getText());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.IWay;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -260 +261 @@
     private static Integer findAdjacentWay(NodesWays nw, INode n) {
         Set<Integer> adj = nw.nodes.get(n);
-        if (adj == null || adj.isEmpty()) return null;
+        if (Utils.isEmpty(adj)) return null;
         return adj.iterator().next();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -43 +43 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -260 +261 @@
                     if (groupNode != null) {
                         searchMsg = description;
-                    } else if (description == null || description.isEmpty()) {
+                    } else if (Utils.isEmpty(description)) {
                         searchMsg = message;
                     } else {

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -223 +224 @@
         public void actionPerformed(ActionEvent e) {
             List<Bookmark> sels = bookmarks.getSelectedValuesList();
-            if (sels == null || sels.isEmpty())
+            if (Utils.isEmpty(sels))
                 return;
             for (Object sel: sels) {

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

@@ -16 +16 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -149 +150 @@
     public static String buildAbsoluteHelpTopic(String topic, LocaleType type) {
         String prefix = getHelpTopicPrefix(type);
-        if (prefix == null || topic == null || topic.trim().isEmpty() || "/".equals(topic.trim()))
+        if (prefix == null || Utils.isBlank(topic) || "/".equals(topic.trim()))
             return prefix;
         prefix += '/' + topic;

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -149 +149 @@
      */
     public static void messageBox(String type, String text) {
-        char c = (type == null || type.isEmpty() ? "plain" : type).charAt(0);
+        char c = (Utils.isEmpty(type) ? "plain" : type).charAt(0);
         MainFrame parent = MainApplication.getMainFrame();
         switch (c) {

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

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -229 +230 @@
     @Override
     public boolean stopCellEditing() {
-        if (tfFilename.getText() == null || tfFilename.getText().trim().isEmpty()) {
+        if (Utils.isBlank(tfFilename.getText())) {
             value = null;
         } else {

trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.ChangesetCacheListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -54 +55 @@
      */
     public void selectFirstChangeset() {
-        if (changesets == null || changesets.isEmpty()) {
+        if (Utils.isEmpty(changesets)) {
             setSelectedItem(null);
         } else {

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

@@ -57 +57 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -314 +315 @@
                 sb.append("<hr/>");
                 String userName = XmlWriter.encode(comment.getUser().getName());
-                if (userName == null || userName.trim().isEmpty()) {
+                if (Utils.isBlank(userName)) {
                     userName = "&lt;Anonymous&gt;";
                 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -135 +135 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -653 +654 @@
     public void cleanupAfterUpload(final Collection<? extends IPrimitive> processed) {
         // return immediately if an upload attempt failed
-        if (processed == null || processed.isEmpty())
+        if (Utils.isEmpty(processed))
             return;
 

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -54 +54 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.Interval;
 
@@ -181 +182 @@
                 int row = t.rowAtPoint(e.getPoint());
                 String url = (String) t.getValueAt(row, col);
-                if (url == null || url.isEmpty()) {
+                if (Utils.isEmpty(url)) {
                     return;
                 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java

@@ -37 +37 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -159 +160 @@
                 String extpre = "extension:";
                 String pre = ext.getPrefix();
-                if (pre == null || pre.isEmpty()) {
+                if (Utils.isEmpty(pre)) {
                     pre = "other";
                 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRuleIndex.java

@@ -157 +157 @@
                 }
                 final List<Condition> conditions = selRightmost.getConditions();
-                if (conditions == null || conditions.isEmpty()) {
+                if (Utils.isEmpty(conditions)) {
                     remaining.set(ruleIndex);
                     continue;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -458 +458 @@
 
             void execGeometryTests() {
-                if (toCheck == null || toCheck.isEmpty())
+                if (Utils.isEmpty(toCheck))
                     return;
                 for (IPrimitive p : Geometry.filterInsideAnyPolygon(toCheck, e.osm)) {

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

@@ -759 +759 @@
 
     private static void prepareFileChooser(String url, AbstractFileChooser fc) {
-        if (url == null || url.trim().isEmpty()) return;
+        if (Utils.isBlank(url)) return;
         URL sourceUrl = null;
         try {

trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -28 +29 @@
     default ImageIcon getIcon(ImageProvider.ImageSizes size) {
         String iconName = getIconName();
-        return iconName == null || iconName.isEmpty()
+        return Utils.isEmpty(iconName)
                 ? null
                 : iconName.contains("/")

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -85 +85 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -1088 +1089 @@
 
     public static Collection<String> getToolString() {
-
         Collection<String> toolStr = Config.getPref().getList("toolbar", Arrays.asList(deftoolbar));
-        if (toolStr == null || toolStr.isEmpty()) {
+        if (Utils.isEmpty(toolStr)) {
             toolStr = Arrays.asList(deftoolbar);
         }

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

@@ -40 +40 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
 import org.openstreetmap.josm.tools.template_engine.TemplateParser;
@@ -143 +144 @@
         super(new GridBagLayout());
         this.layers = layers;
-        if (layers == null || layers.isEmpty()) {
+        if (Utils.isEmpty(layers)) {
             throw new InvalidArgumentException("At least one layer required");
         }
@@ -262 +263 @@
      */
     public static void putLayerPrefLocal(GpxData data, String key, String value) {
-        if (value == null || value.trim().isEmpty() ||
+        if (Utils.isBlank(value) ||
                 (getLayerPref(null, key).equals(value) && DEFAULT_PREFS.get(key) != null && DEFAULT_PREFS.get(key).toString().equals(value))) {
             data.getLayerPrefs().remove(key);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java

@@ -73 +73 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -479 +480 @@
                     activeModel.addRow(p.getImageryInfo());
                 } catch (IllegalArgumentException ex) {
-                    if (ex.getMessage() == null || ex.getMessage().isEmpty())
+                    if (Utils.isEmpty(ex.getMessage()))
                         throw ex;
                     else {

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

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -63 +64 @@
     protected static String formatPluginRemoteVersion(PluginInformation pi) {
         StringBuilder sb = new StringBuilder();
-        if (pi.version == null || pi.version.trim().isEmpty()) {
+        if (Utils.isBlank(pi.version)) {
             sb.append(tr("unknown"));
         } else {
@@ -77 +78 @@
         if (pi == null)
             return tr("unknown");
-        if (pi.localversion == null || pi.localversion.trim().isEmpty())
+        if (Utils.isBlank(pi.localversion))
             return tr("unknown");
         return pi.localversion;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -414 +414 @@
             return roles.roles.stream()
                     .filter(i -> i.memberExpression != null && i.memberExpression.match(osm))
-                    .filter(i -> i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)))
+                    .filter(i -> Utils.isEmpty(i.types) || i.types.contains(TaggingPresetType.forPrimitive(osm)))
                     .findFirst()
                     .map(i -> i.key)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -83 +84 @@
 
     protected static Set<TaggingPresetType> getType(String types) throws SAXException {
-        if (types == null || types.isEmpty()) {
+        if (Utils.isEmpty(types)) {
             throw new SAXException(tr("Unknown type: {0}", types));
         }
@@ -118 +119 @@
 
     protected static Integer parseInteger(String str) {
-        if (str == null || str.isEmpty())
+        if (Utils.isEmpty(str))
             return null;
         try {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupport.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Supplier;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -7 +12 @@
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.function.Supplier;
 
 /**
@@ -92 +93 @@
     /**
      * Get tags with values as currently shown in the dialog.
-     * If exactly one primitive is selected, get all tags of it, then 
+     * If exactly one primitive is selected, get all tags of it, then
      * overwrite with the current values shown in the dialog.
      * Else get only the tags shown in the dialog.
@@ -116 +117 @@
     public Object getTemplateValue(String key, boolean special) {
         String value = getTagged().get(key);
-        return (value == null || value.isEmpty()) ? null : value;
+        return Utils.isEmpty(value) ? null : value;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java

@@ -67 +67 @@
         String shortDescription = getShortDescription(true);
 
-        if (displayValue.isEmpty() && (shortDescription == null || shortDescription.isEmpty()))
+        if (displayValue.isEmpty() && Utils.isEmpty(shortDescription))
             return " ";
 
         final StringBuilder res = new StringBuilder("<b>").append(displayValue).append("</b>");
-        if (shortDescription != null) {
+        if (!Utils.isEmpty(shortDescription)) {
             // wrap in table to restrict the text width
             res.append("<div style=\"width:300px; padding:0 0 5px 5px\">")

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -234 +234 @@
     @Override
     public Collection<String> getValues() {
-        if (default_ == null || default_.isEmpty())
+        if (Utils.isEmpty(default_))
             return Collections.emptyList();
         return Collections.singleton(default_);
@@ -254 +254 @@
 
     private void setupListeners(AutoCompletingTextField textField, TaggingPresetItemGuiSupport support) {
-        // value_templates don't work well with multiple selected items because, 
-        // as the command queue is currently implemented, we can only save 
-        // the same value to all selected primitives, which is probably not 
+        // value_templates don't work well with multiple selected items because,
+        // as the command queue is currently implemented, we can only save
+        // the same value to all selected primitives, which is probably not
         // what you want.
         if (valueTemplate == null || support.getSelected().size() > 1) { // only fire on normal fields

trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java

@@ -19 +19 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -98 +99 @@
     public FileChooserManager(boolean open, String lastDirProperty, String defaultDir) {
         this.open = open;
-        this.lastDirProperty = lastDirProperty == null || lastDirProperty.isEmpty() ? "lastDirectory" : lastDirProperty;
+        this.lastDirProperty = Utils.isEmpty(lastDirProperty) ? "lastDirectory" : lastDirProperty;
         this.curDir = Config.getPref().get(this.lastDirProperty).isEmpty() ?
-                defaultDir == null || defaultDir.isEmpty() ? "." : defaultDir
+                Utils.isEmpty(defaultDir) ? "." : defaultDir
                 : Config.getPref().get(this.lastDirProperty);
     }

trunk/src/org/openstreetmap/josm/gui/widgets/FilterField.java

@@ -93 +93 @@
                 final TableRowSorter<? extends TableModel> sorter =
                     (TableRowSorter<? extends TableModel>) table.getRowSorter();
-                if (expr == null || expr.isEmpty()) {
+                if (Utils.isEmpty(expr)) {
                     sorter.setRowFilter(null);
                 } else {

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -94 +95 @@
             String value = getComponent().getText();
             char c;
-            if (value == null || value.trim().isEmpty()) {
+            if (Utils.isBlank(value)) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -427 +427 @@
 
     protected final void parseTimestamp(PrimitiveData current, String time) {
-        if (time == null || time.isEmpty()) {
+        if (Utils.isEmpty(time)) {
             return;
         }

trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -432 +432 @@
     public static class ChangesetQueryUrlParser {
         protected int parseUid(String value) throws ChangesetQueryUrlException {
-            if (value == null || value.trim().isEmpty())
+            if (Utils.isBlank(value))
                 throw new ChangesetQueryUrlException(
                         tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
@@ -449 +449 @@
 
         protected boolean parseBoolean(String value, String parameter) throws ChangesetQueryUrlException {
-            if (value == null || value.trim().isEmpty())
+            if (Utils.isBlank(value))
                 throw new ChangesetQueryUrlException(
                         tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
@@ -464 +464 @@
 
         protected Instant parseDate(String value, String parameter) throws ChangesetQueryUrlException {
-            if (value == null || value.trim().isEmpty())
+            if (Utils.isBlank(value))
                 throw new ChangesetQueryUrlException(
                         tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
@@ -488 +488 @@
 
         protected Collection<Long> parseLongs(String value) {
-            if (value == null || value.isEmpty()) {
+            if (Utils.isEmpty(value)) {
                 return Collections.<Long>emptySet();
             } else {

trunk/src/org/openstreetmap/josm/io/OsmApiException.java

@@ -215 +215 @@
         String header = Utils.strip(errorHeader);
         String body = Utils.strip(errorBody);
-        if ((header == null || header.isEmpty()) && (body == null || body.isEmpty())) {
+        if (Utils.isEmpty(header) && Utils.isEmpty(body)) {
             sb.append(tr("The server replied an error with code {0}.", responseCode));
         } else {

trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

@@ -20 +20 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlParsingException;
 
@@ -124 +125 @@
                 monitor.indeterminateSubTask(tr("Downloading changeset {0} ...", id));
                 List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
-                if (changesets == null || changesets.isEmpty())
+                if (Utils.isEmpty(changesets))
                     return null;
                 result = changesets.get(0);
@@ -173 +174 @@
                     monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2}...", i, ids.size(), id));
                     List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
-                    if (changesets == null || changesets.isEmpty()) {
+                    if (Utils.isEmpty(changesets)) {
                         continue;
                     }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -279 +279 @@
             for (String key : mandatory) {
                 String value = args.get(key);
-                if (value == null || value.isEmpty()) {
+                if (Utils.isEmpty(value)) {
                     error = true;
                     Logging.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -40 +41 @@
             XPathExpression fileExp = xpath.compile("file/text()");
             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
-            if (fileStr == null || fileStr.isEmpty()) {
+            if (Utils.isEmpty(fileStr)) {
                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
             }

trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java

@@ -21 +21 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -40 +41 @@
             XPathExpression fileExp = xpath.compile("file/text()");
             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
-            if (fileStr == null || fileStr.isEmpty()) {
+            if (Utils.isEmpty(fileStr)) {
                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
             }

trunk/src/org/openstreetmap/josm/io/session/NoteSessionImporter.java

@@ -19 +19 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -39 +40 @@
             XPathExpression fileExp = xpath.compile("file/text()");
             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
-            if (fileStr == null || fileStr.isEmpty()) {
+            if (Utils.isEmpty(fileStr)) {
                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
             }

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java

@@ -19 +19 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -61 +62 @@
             XPathExpression fileExp = xpath.compile("file/text()");
             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
-            if (fileStr == null || fileStr.isEmpty()) {
+            if (Utils.isEmpty(fileStr)) {
                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
             }

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -204 +204 @@
     private void handleIOException(final ProgressMonitor monitor, IOException e, String details) {
         final String msg = e.getMessage();
-        if (details == null || details.isEmpty()) {
+        if (Utils.isEmpty(details)) {
             Logging.error(e.getClass().getSimpleName()+": " + msg);
         } else {

trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.tools.Logging;
+
+import com.jayway.jsonpath.internal.Utils;
 
 /**
@@ -24 +26 @@
     @Override
     public boolean put(final String key, String value) {
-        return putSetting(key, value == null || value.isEmpty() ? null : new StringSetting(value));
+        return putSetting(key, Utils.isEmpty(value) ? null : new StringSetting(value));
     }
 

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -461 +461 @@
     public static String explainGeneric(Exception e) {
         String msg = e.getMessage();
-        if (msg == null || msg.trim().isEmpty()) {
+        if (Utils.isBlank(msg)) {
             msg = e.toString();
         }

trunk/src/org/openstreetmap/josm/tools/Mediawiki.java

@@ -62 +62 @@
         for (String page : distinctPages) {
             String normalized = xPath.evaluate("/api/query/normalized/n[@from='" + page + "']/@to", document);
-            if (normalized == null || normalized.isEmpty()) {
+            if (Utils.isEmpty(normalized)) {
                 normalized = page;
             }

trunk/src/org/openstreetmap/josm/tools/OsmPrimitiveImageProvider.java

@@ -58 +58 @@
             final Optional<ImageResource> icon = TaggingPresets.getMatchingPresets(primitive).stream()
                     .sorted(Comparator.comparing(p -> (p.iconName != null && p.iconName.contains("multipolygon"))
-                            || p.types == null || p.types.isEmpty() ? Integer.MAX_VALUE : p.types.size()))
+                            || Utils.isEmpty(p.types) ? Integer.MAX_VALUE : p.types.size()))
                     .map(TaggingPreset::getImageResource)
                     .filter(Objects::nonNull)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -390 +390 @@
     public File getDefaultCacheDirectory() {
         String p = getSystemEnv("LOCALAPPDATA");
-        if (p == null || p.isEmpty()) {
+        if (Utils.isEmpty(p)) {
             // Fallback for Windows OS earlier than Windows Vista, where the variable is not defined
             p = getSystemEnv("APPDATA");

trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

@@ -35 +35 @@
 /**
  * Extracts web links from OSM tags.
- * 
+ *
  * The following rules are used:
  * <ul>
@@ -144 +144 @@
     public static void getLinksForTag(String key, String value, LinkConsumer linkConsumer) {
 
-        if (value == null || value.isEmpty()) {
+        if (Utils.isEmpty(value)) {
             return;
         }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -709 +709 @@
 
     /**
+     * Determines if a multimap is null or empty.
+     * @param map map
+     * @return {@code true} if map is null or empty
+     * @since 18208
+     */
+    public static boolean isEmpty(MultiMap<?, ?> map) {
+        return map == null || map.isEmpty();
+    }
+
+    /**
      * Determines if a string is null or empty.
      * @param string string
@@ -716 +726 @@
     public static boolean isEmpty(String string) {
         return string == null || string.isEmpty();
+    }
+
+    /**
+     * Determines if a string is null or blank.
+     * @param string string
+     * @return {@code true} if string is null or blank
+     * @since 18208
+     */
+    public static boolean isBlank(String string) {
+        return string == null || strip(string).isEmpty();
     }