Remove unnecessary null URI parameters

Author: kwvanderlinde

src/main/java/net/rptools/maptool/client/macro/MacroLocation.java

@@ -197,7 +197,7 @@ public static MacroLocation parseMacroName(
       String macroName = qMacroName.substring(0, qMacroName.indexOf("@"));
       String location = qMacroName.substring(qMacroName.indexOf("@") + 1);
       String namespace = location.replaceFirst("(?i)lib:", "");
-      return new MacroLocation(macroName, MacroSource.library, namespace, location, null);
+      return new MacroLocation(macroName, MacroSource.library, namespace, location);
     }
 
     if (qMacroNameLower.contains("@this")) {
@@ -212,7 +212,7 @@ public static MacroLocation parseMacroName(
         }
       }
       return new MacroLocation(
-          name, cfrom.getSource(), cfrom.getLocation(), cfrom.getCallableLocation(), null);
+          name, cfrom.getSource(), cfrom.getLocation(), cfrom.getCallableLocation());
     }
 
     // If none of the above then assume it is a URI

src/main/java/net/rptools/maptool/client/macro/MacroLocationFactory.java

@@ -88,8 +88,7 @@ public MacroLocation createCampaignLocation(@Nonnull String name) {
    * @return a new {@link MacroLocation} object for a token.
    */
   public MacroLocation createTokenLocation(@Nonnull String name, @Nonnull Token token) {
-    return new MacroLocation(
-        name, MacroSource.token, token.getName(), "Token:" + token.getName(), null);
+    return new MacroLocation(name, MacroSource.token, token.getName(), "Token:" + token.getName());
   }
 
   /**
@@ -101,7 +100,7 @@ public MacroLocation createTokenLocation(@Nonnull String name, @Nonnull Token to
    */
   public MacroLocation createLibTokenLocation(@Nonnull String name, @Nonnull Token libToken) {
     return new MacroLocation(
-        name, MacroSource.library, libToken.getName().substring(4), libToken.getName(), null);
+        name, MacroSource.library, libToken.getName().substring(4), libToken.getName());
   }
 
   /**
@@ -212,11 +211,8 @@ public MacroLocation createChatLocation() {
    * @return a new {@link MacroLocation} object for a tooltip.
    */
   public MacroLocation createToolTipLocation(@Nullable Token token) {
+    var location = token != null ? token.getName() : "";
     return new MacroLocation(
-        MacroSource.tooltip.getSourceName(),
-        MacroSource.tooltip,
-        token != null ? token.getName() : "",
-        token != null ? token.getName() : "",
-        null);
+        MacroSource.tooltip.getSourceName(), MacroSource.tooltip, location, location);
   }
 }