Improve error warnings

bbimber · bbimber · commit b107e00f9078 · 2023-08-21T09:17:49.000-07:00
diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseController.java b/jbrowse/src/org/labkey/jbrowse/JBrowseController.java
@@ -516,13 +516,11 @@ public void validateForm(GetGenotypesForm form, Errors errors)
                 errors.reject(ERROR_MSG, "Must provide the trackId");
                 return;
             }
-            else
+
+            if (!isValidUUID(form.getTrackId()))
             {
-                if (!isValidUUID(form.getTrackId()))
-                {
-                    errors.reject(ERROR_MSG, "Invalid track ID: " + form.getTrackId());
-                    return;
-                }
+                errors.reject(ERROR_MSG, "Invalid track ID: " + form.getTrackId());
+                return;
             }
 
             List<JsonFile> jsonFiles = getJsonFiles(form);

Original file line number	Diff line number	Diff line change
`@@ -516,13 +516,11 @@ public void validateForm(GetGenotypesForm form, Errors errors)`
`516`	`516`	`errors.reject(ERROR_MSG, "Must provide the trackId");`
`517`	`517`	`return;`
`518`	`518`	`}`
`519`		`- else`
	`519`	`+`
	`520`	`+ if (!isValidUUID(form.getTrackId()))`
`520`	`521`	`{`
`521`		`- if (!isValidUUID(form.getTrackId()))`
`522`		`- {`
`523`		`- errors.reject(ERROR_MSG, "Invalid track ID: " + form.getTrackId());`
`524`		`- return;`
`525`		`- }`
	`522`	`+ errors.reject(ERROR_MSG, "Invalid track ID: " + form.getTrackId());`
	`523`	`+ return;`
`526`	`524`	`}`
`527`	`525`
`528`	`526`	`List<JsonFile> jsonFiles = getJsonFiles(form);`