diff --git a/src/firefly/java/edu/caltech/ipac/astro/CoordUtil.java b/src/firefly/java/edu/caltech/ipac/astro/CoordUtil.java index 49a6c3030b..0ff1ea2a52 100644 --- a/src/firefly/java/edu/caltech/ipac/astro/CoordUtil.java +++ b/src/firefly/java/edu/caltech/ipac/astro/CoordUtil.java @@ -33,7 +33,7 @@ public class CoordUtil private static final String LON_TOO_BIG = "Longitude is too big (>=360.0)"; private static final String LON_NEGATIVE = - "Longitude can not be negative"; + "Longitude cannot be negative"; private static final String RA_TOO_BIG = "RA is too big (>=24 hours)"; private static final String INVALID_STRING = "Invalid Input"; diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/ServerContext.java b/src/firefly/java/edu/caltech/ipac/firefly/server/ServerContext.java index 913764bd58..ba97b3c4c7 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/ServerContext.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/ServerContext.java @@ -832,7 +832,7 @@ public static String resolveUrl(String url) { return ServerContext.getRequestOwner().getBaseUrl() + url; } } catch (Exception e) { - throw new IllegalStateException("host url can not be derived"); + throw new IllegalStateException("host url cannot be derived"); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/GatorQuery.java b/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/GatorQuery.java index d85d0487b1..6a21cb1716 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/GatorQuery.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/GatorQuery.java @@ -154,7 +154,7 @@ protected String getParams(CatalogRequest req) throws EndUserException, IOExcept sb.append(param(CatalogRequest.POLYGON, urlEncode(req.getPolygon()))); break; case TABLE: - throw new EndUserException("Could not do Multi Object search, internal configuration wrong.", + throw new EndUserException("Could not do Multi Object search, the internal configuration is wrong.", "table should be a post search not a get"); default: assert false; // should only happend if a new method was added and not added here @@ -240,7 +240,7 @@ protected void insertPostParams(CatalogRequest req) throws EndUserException, IOE requiredPostFileCacheParam(CatalogRequest.FILE_NAME, req.getFileName()); } else { - throw new EndUserException("Could not do search, internal configuration wrong.", + throw new EndUserException("Could not do search, the internal configuration is wrong.", "search should be a get search not a post"); } switch (req.getMethod()) { diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/SDSSQuery.java b/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/SDSSQuery.java index 02cd6ff766..d5da2f67e8 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/SDSSQuery.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/catquery/SDSSQuery.java @@ -134,7 +134,7 @@ protected File loadDataFile(TableServerRequest request) throws IOException, Data sdssUFile = getSDSSUploadFile(uploadFile); } else { throw new EndUserException("SDSS catalog search failed", - "Can not read uploaded file: "+ uploadFname); + "Cannot read uploaded file: "+ uploadFname); } URL url = new URL(SERVICE_URL_UPLOAD); @@ -241,7 +241,7 @@ private void insertPostParams(TableServerRequest request, File sdssUFile) throw _postBuilder.addFile("targets",sdssUFile); } else { throw new EndUserException("SDSS catalog search failed", - "Can not read uploaded file in SDSS format: "+ sdssUFile); + "Cannot read uploaded file in SDSS format: "+ sdssUFile); } String radiusArcMin = request.getParam(SDSSRequest.RADIUS_ARCMIN); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/persistence/QueryByConeSearchURL.java b/src/firefly/java/edu/caltech/ipac/firefly/server/persistence/QueryByConeSearchURL.java index 3c64bc6079..ec39191907 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/persistence/QueryByConeSearchURL.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/persistence/QueryByConeSearchURL.java @@ -44,7 +44,7 @@ protected String getQueryString(TableServerRequest req) throws DataAccessExcepti WorldPt wpt = req.getWorldPtParam(ServerParams.USER_TARGET_WORLD_PT); if (wpt == null) { - throw new DataAccessException("could not find the paramater: " + ServerParams.USER_TARGET_WORLD_PT); + throw new DataAccessException("could not find the parameter: " + ServerParams.USER_TARGET_WORLD_PT); } wpt = VisUtil.convert(wpt, CoordinateSys.EQ_J2000); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/BaseFileInfoProcessor.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/BaseFileInfoProcessor.java index 214a3e1fc7..b860d13b61 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/BaseFileInfoProcessor.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/BaseFileInfoProcessor.java @@ -50,7 +50,7 @@ public FileInfo getData(ServerRequest request) throws DataAccessException { } catch (DataAccessException e) { throw e; } catch (Exception e) { - throw new DataAccessException("Request failed due to unexpected exception: ", e); + throw new DataAccessException("Request failed due to an unexpected exception", e); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/DaliQuery.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/DaliQuery.java index 2d391bb848..88d0df0591 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/DaliQuery.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/DaliQuery.java @@ -36,7 +36,7 @@ public DataGroup fetchDataGroup(TableServerRequest req) throws DataAccessExcepti File outFile = createTempFile(req, ".vot"); HttpServices.Status status = HttpServices.getData(inputs, outFile); if (status.isError()) { - throw DaliUtil.createDax("Failed to retrieve the result from", inputs.getRequestUrl(), status.getException()); + throw DaliUtil.createDax("Failed to retrieve the result", inputs.getRequestUrl(), status.getException()); } DataGroup[] results = VoTableReader.voToDataGroups(outFile.getAbsolutePath()); @@ -45,7 +45,7 @@ public DataGroup fetchDataGroup(TableServerRequest req) throws DataAccessExcepti return results.length > 0 ? results[0] : null; } catch (Exception e) { - throw DaliUtil.createDax("Failed to retrieve the result from", inputs.getRequestUrl(), e); + throw DaliUtil.createDax("Failed to retrieve the result", inputs.getRequestUrl(), e); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/FileGroupsProcessor.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/FileGroupsProcessor.java index 83722732c8..ccc72e2d85 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/FileGroupsProcessor.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/FileGroupsProcessor.java @@ -54,7 +54,7 @@ public List getData(ServerRequest sr) throws DataAccessException { return fileGroups; } catch (Exception e) { LOGGER.error(e, "Error while processing request:" + StringUtils.truncate(sr, 512)); - throw new DataAccessException("Request failed due to unexpected exception: ", e); + throw new DataAccessException("Request failed due to an unexpected exception", e); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java index 3a3b2cd8b0..432af52e7f 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java @@ -670,7 +670,7 @@ private double[] concatenate(double[] a, double[] b) throws DataAccessException if (a == null && b != null) return b; if (b == null && a != null) return a; if (a == null && b == null) { - throw new DataAccessException("can not concatenate two null data arrays "); + throw new DataAccessException("cannot concatenate two null data arrays"); } double[] r = new double[a.length + b.length]; System.arraycopy(a, 0, r, 0, a.length); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/JsonFromExternalTask.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/JsonFromExternalTask.java index 1befbc610a..7d47cd10ec 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/JsonFromExternalTask.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/JsonFromExternalTask.java @@ -44,7 +44,7 @@ public String getUniqueID(ServerRequest request) { public String fetchData(ServerRequest request) throws DataAccessException { String launcher = request.getParam(ExternalTaskHandler.LAUNCHER); if (launcher == null) { - throw new DataAccessException(ExternalTaskHandler.LAUNCHER+" parameter is not found in request."); + throw new DataAccessException(ExternalTaskHandler.LAUNCHER+" parameter was not found in the request."); } ExternalTaskLauncher taskLauncher = new ExternalTaskLauncher(launcher); @@ -75,7 +75,7 @@ public String fetchData(ServerRequest request) throws DataAccessException { return jsonText; } catch(ParseException pe){ LOGGER.error(getUniqueID(request) + " Can not parse returned JSON: " + pe.toString() + "\n" + jsonText); - throw new DataAccessException(request.getRequestId()+" Can not parse returned JSON: " + pe.toString()); + throw new DataAccessException(request.getRequestId()+" Cannot parse returned JSON: " + pe.toString()); } catch (Exception e) { LOGGER.error(e, "Unable get to data from external task: "+request.toString()); throw new DataAccessException("Unable to get data from external task: "+e.getMessage()); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/SearchManager.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/SearchManager.java index 3a9076141e..69ea90897c 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/SearchManager.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/SearchManager.java @@ -73,7 +73,7 @@ public FileInfo save(OutputStream saveTo, TableServerRequest dataRequest, Format if (dataRequest != null) { return processor.writeData(saveTo, dataRequest, format, mode); } else { - throw new DataAccessException("Request fail inspection. Operation aborted."); + throw new DataAccessException("Request failed inspection. Operation aborted."); } } catch (Exception e) { throw new DataAccessException("Error while writing to Stream", e); @@ -107,7 +107,7 @@ public FileInfo getFileInfo(TableServerRequest request) throws DataAccessExcepti } } catch (ClassCastException e) { LOGGER.error(e, "Invalid processor mapping. Return value is not of type FileInfo."); - throw new DataAccessException("Request failed due to unexpected exception.", e); + throw new DataAccessException("Request failed due to an unexpected exception.", e); } } return null; diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/UwsJobProcessor.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/UwsJobProcessor.java index c3e3ecb1a9..7f671946e4 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/UwsJobProcessor.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/UwsJobProcessor.java @@ -341,13 +341,13 @@ public static DataGroup getTableResult(String url, File workDir) throws DataAcce // Must followRedirect because TAP specifically say this endpoint may be redirected. HttpServices.Status status = HttpServices.getData(url, outFile); if (status.isError()) { - throw createDax("Failed to retrieve the result from", url, status.getException()); + throw createDax("Failed to retrieve the result", url, status.getException()); } DataGroup[] results = VoTableReader.voToDataGroups(outFile.getAbsolutePath()); return results.length > 0 ? results[0] : null; } catch (Exception e) { - throw createDax("Fail to fetch result", url, e); + throw createDax("Failed to fetch the result", url, e); } } @@ -373,7 +373,7 @@ public static JobInfo getUwsJobInfo(String jobUrl) throws DataAccessException { return new HttpServices.Status(404, error); } }); - if (status.isError()) throw createDax("Fail to fetch UWS job info", jobUrl, status.getException()); + if (status.isError()) throw createDax("Failed to fetch UWS job info", jobUrl, status.getException()); JobInfo jobInfo = jInfo.get(); if (jobInfo != null) jobInfo.getAux().setJobUrl(jobUrl); return jobInfo; diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/WiseLightCurveFileGroupsProcessor.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/WiseLightCurveFileGroupsProcessor.java index ad84b0e46b..a26658102f 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/WiseLightCurveFileGroupsProcessor.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/WiseLightCurveFileGroupsProcessor.java @@ -141,7 +141,7 @@ private List computeFileGroup(DownloadRequest request) throws IOExcep scanId = (String) dgData.get(rowIdx, "scan_id"); frameNum = (Integer) dgData.get(rowIdx, "frame_num"); if(scanId ==null || frameNum ==null){ - throw new DataAccessException("Missing column name for downnloading images"); + throw new DataAccessException("Missing column name for downloading images"); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/ptf/PtfFileRetrieve.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/ptf/PtfFileRetrieve.java index 2042033e5c..02950f4939 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/ptf/PtfFileRetrieve.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/ptf/PtfFileRetrieve.java @@ -34,7 +34,7 @@ public URL getURL(ServerRequest sr) throws MalformedURLException { return l1FileRetrieve.getURL(sr); } else { Logger.warn("cannot find param: productLevel or the param returns null"); - throw new MalformedURLException("Can not find the file"); + throw new MalformedURLException("Cannot find the file"); } } @@ -47,7 +47,7 @@ public static String getBaseURL(ServerRequest sr) throws MalformedURLException { return PtfProcimsFileRetrieve.getBaseURL(sr); } else { Logger.warn("cannot find param: productLevel or the param returns null"); - throw new MalformedURLException("Can not find the file"); + throw new MalformedURLException("Cannot find the file"); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IrsaSiaUpload.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IrsaSiaUpload.java index 94cf1403e4..eb8ab8ffb2 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IrsaSiaUpload.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IrsaSiaUpload.java @@ -57,7 +57,7 @@ public DataGroup fetchDataGroup(TableServerRequest req) throws DataAccessExcepti var fileStr= (String)uploadParams.get("serverFile"); var circleSize= req.getParam("circleSize"); if (lonCol==null || latCol==null || fileStr==null || circleSize==null) { - throw new DataAccessException("lonCol, latCol, circleSize and serverFile is required"); + throw new DataAccessException("lonCol, latCol, circleSize and serverFile are required"); } updateJob(ji -> { ji.getAux().setJobUrl(urlStr); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/wise/QueryWise.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/wise/QueryWise.java index 4dd81e2aa5..b077437ac3 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/wise/QueryWise.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/wise/QueryWise.java @@ -205,7 +205,7 @@ private DataGroup uploadedPreprocess(WiseRequest req) throws EndUserException, I return dg; } } - throw new EndUserException("Can not find " + colName + " column in the uploaded table.", "Unable to create search request."); + throw new EndUserException("Cannot find " + colName + " column in the uploaded table.", "Unable to create search request."); } private File uploadedPostprocess(WiseRequest req, DataGroup inDg, File outFile) throws IpacTableException, IOException { diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/ztf/ZtfFileRetrieve.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/ztf/ZtfFileRetrieve.java index 5a3317d792..5ce00a6d5f 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/query/ztf/ZtfFileRetrieve.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/query/ztf/ZtfFileRetrieve.java @@ -40,7 +40,7 @@ public URL getURL(ServerRequest sr) throws MalformedURLException { return sciFileRetrieve.getURL(sr); } else { Logger.warn("cannot find param: productLevel or the param returns null"); - throw new MalformedURLException("Can not find the file"); + throw new MalformedURLException("Cannot find the file"); } } @@ -53,7 +53,7 @@ public static String getBaseURL(ServerRequest sr) throws MalformedURLException { return ZtfSciimsFileRetrieve.getBaseURL(sr); } else { Logger.warn("cannot find param: productLevel or the param returns null"); - throw new MalformedURLException("Can not find the file"); + throw new MalformedURLException("Cannot find the file"); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/util/LockingRetrieve.java b/src/firefly/java/edu/caltech/ipac/firefly/server/util/LockingRetrieve.java index 762f1a319a..81d982f7c7 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/util/LockingRetrieve.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/util/LockingRetrieve.java @@ -61,7 +61,7 @@ public static FileInfo downloadWithCacheMsg(Object uri) throws FailedRequestExce **/ public static FileInfo downloadWithCacheMsg(Object uri, File downloadDir) throws FailedRequestException { UriRef ref= UriRef.make(uri); - if (ref == null) throw new FailedRequestException("uri is not valid much be URL, String, S3Ref, or UriRef"); + if (ref == null) throw new FailedRequestException("uri is not valid, must be a URL, String, S3Ref, or UriRef"); var params= new UriRefParams(ref,downloadDir); params.setMaxSizeToDownload(VisContext.FITS_MAX_SIZE); params.setExpectStaticFile(true); diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java b/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java index a91a82adad..5bd130b6d9 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java @@ -595,7 +595,7 @@ public static List getTargetList(File ufile) throws DataAcces } IpacTableTargetsParser.parseTargets(dg, targetList, true); } - if (targetList.size()==0) throw createEndUserException("Unable to uploaded file:" + ufile.getName()); + if (targetList.size()==0) throw createEndUserException("Unable to parse uploaded file: " + ufile.getName()); for (TargetFixedSingle t: targetList) { //check for invalid targets diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/CtxControl.java b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/CtxControl.java index efc5435c79..c05d5171ee 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/CtxControl.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/CtxControl.java @@ -28,7 +28,7 @@ public class CtxControl { private static final AtomicLong cnt = new AtomicLong(0); public static void confirmFiles(PlotState state) throws FailedRequestException { - if (state==null) throw new FailedRequestException("state cannot but null"); + if (state==null) throw new FailedRequestException("state cannot be null"); if (isFitsFilesMissing(state)) revalidatePlot(state,true); //most of the time the files are there so nothing happens } @@ -41,7 +41,7 @@ private static boolean isFitsFilesMissing(PlotState state) { } public static ActiveFitsReadGroup prepare(PlotState state) throws FailedRequestException { - if (state==null) throw new FailedRequestException("state cannot but null"); + if (state==null) throw new FailedRequestException("state cannot be null"); try { return revalidatePlot(state, false); } catch (FailedRequestException e) { @@ -67,7 +67,7 @@ private static ActiveFitsReadGroup revalidatePlot(PlotState state, boolean recre } catch (IOException|FitsException e) { if (recreate) Logger.getLogger().warn(e, "prepare failed on re-validate plot: " + e.getMessage()); throw new FailedRequestException( - recreate ? "Could not revalidate plot after recreation" : "Could ot revalidate",e); + recreate ? "Could not revalidate plot after recreation" : "Could not revalidate",e); } } diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/LocalFileRetriever.java b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/LocalFileRetriever.java index ff0e348343..1af7cd90b0 100644 --- a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/LocalFileRetriever.java +++ b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/LocalFileRetriever.java @@ -48,14 +48,14 @@ public FileInfo getFileByName(String fileName) throws FailedRequestException, Se if (f==null) { if (fStr.charAt(0)==File.separatorChar) { if (new File(fStr).canRead()) { - throw new FailedRequestException("Could read file, "+ + throw new FailedRequestException("Could not read file, "+ fileName + " is not in the path specified by " + "visualize.fits.search.path in the configuration file"); } else { throw new FailedRequestException("File not found", "Could not find your requested file, "+ - "the file: " + fileName + " is was not found"); + "the file: " + fileName + " was not found"); } } else { diff --git a/src/firefly/java/edu/caltech/ipac/visualize/net/AtlasIbeImageGetter.java b/src/firefly/java/edu/caltech/ipac/visualize/net/AtlasIbeImageGetter.java index 4269fc0002..eed52ef0cb 100644 --- a/src/firefly/java/edu/caltech/ipac/visualize/net/AtlasIbeImageGetter.java +++ b/src/firefly/java/edu/caltech/ipac/visualize/net/AtlasIbeImageGetter.java @@ -68,7 +68,7 @@ public static FileInfo get(AtlasImageParams params) throws FailedRequestExceptio dataParam.setDoZip(true); return ibe.getData(dataParam, null); } else { - throw new FailedRequestException("Area not covered "+ + throw new FailedRequestException("Area not covered in "+ params.getSchema()+"/"+params.getTable()+"/"+params.getBand()); } } catch (IOException me) { diff --git a/src/firefly/js/Firefly.js b/src/firefly/js/Firefly.js index b701035872..82e4450fef 100644 --- a/src/firefly/js/Firefly.js +++ b/src/firefly/js/Firefly.js @@ -501,7 +501,7 @@ function mergeAppOptions(ops, overrideOps) { function renderRoot(root, viewer, props, webApiCommands) { const element= document.getElementById(props.div); if (!element) { - showInfoPopup('HTML page is not setup correctly, Firefly cannot start.'); + showInfoPopup('HTML page is not set up correctly, Firefly cannot start.'); logger.error(`DOM Element "${props.div}" is not found in the document, Firefly cannot start.`); return; } diff --git a/src/firefly/js/charts/ui/ColumnOrExpression.jsx b/src/firefly/js/charts/ui/ColumnOrExpression.jsx index 58ddb665cf..e9381cc908 100644 --- a/src/firefly/js/charts/ui/ColumnOrExpression.jsx +++ b/src/firefly/js/charts/ui/ColumnOrExpression.jsx @@ -32,7 +32,7 @@ export const ColsShape = PropTypes.arrayOf(PropTypes.shape({ })); -const DEFAULT_MSG= 'Can not be empty. Please provide value or expression'; +const DEFAULT_MSG= 'Cannot be empty. Please provide value or expression'; export function getColValidator(cols, required=true, canBeExpression=true, message=DEFAULT_MSG) { const colNames = cols.map((colVal) => {return colVal.name;}); diff --git a/src/firefly/js/charts/ui/CompareRowCharts.jsx b/src/firefly/js/charts/ui/CompareRowCharts.jsx index 990e140463..706bebf27e 100644 --- a/src/firefly/js/charts/ui/CompareRowCharts.jsx +++ b/src/firefly/js/charts/ui/CompareRowCharts.jsx @@ -40,7 +40,7 @@ export function CompareRowCharts({fetchRowChart, activatePinnedCharts, rowLimit= const buttonTip = 'Combine charts (from the selected rows)'; if (selectedRowIdxs.length > rowLimit) { - const content = `Number of rows selected for chart comparison exceeds the limit! Please select ${rowLimit} rows or lesser.`; + const content = `Number of rows selected for chart comparison exceeds the limit! Please select ${rowLimit} rows or fewer.`; return (showInfoPopup(content)} tip={buttonTip} {...slotProps?.button}/>); } diff --git a/src/firefly/js/charts/ui/options/BasicOptions.jsx b/src/firefly/js/charts/ui/options/BasicOptions.jsx index ba8af7d738..8d83c7ef7d 100644 --- a/src/firefly/js/charts/ui/options/BasicOptions.jsx +++ b/src/firefly/js/charts/ui/options/BasicOptions.jsx @@ -155,7 +155,7 @@ export function basicFieldReducer({chartId, activeTrace}) { if (Number.isFinite(valMin)) { if (logVal && valMin <= 0) { inFields = updateSet(inFields, [v.min, 'valid'], false); - inFields = updateSet(inFields, [v.min, 'message'], 'The minimum of a log axis can not be 0 or less'); + inFields = updateSet(inFields, [v.min, 'message'], 'The minimum of a log axis cannot be 0 or less'); } else { const valMax = Number.parseFloat(get(inFields, [v.max, 'value'])); if (Number.isFinite(valMax) && valMin > valMax) { diff --git a/src/firefly/js/metaConvert/AnalysisUtils.js b/src/firefly/js/metaConvert/AnalysisUtils.js index 8fc3b4bf5a..f7fff1b157 100644 --- a/src/firefly/js/metaConvert/AnalysisUtils.js +++ b/src/firefly/js/metaConvert/AnalysisUtils.js @@ -99,7 +99,7 @@ export function makeAnalysisGetGridDataProduct(makeReq) { const activate = createGridImagesActivate(newReqAry, imageViewerId, table.tbl_id, plotRows); return Promise.resolve(dpdtImage({name:'Image', activate})); } else { - return Promise.resolve(dpdtMessage('This product cannot be show in image grid', undefined, {gridNotSupported: true})); + return Promise.resolve(dpdtMessage('This product cannot be shown in image grid', undefined, {gridNotSupported: true})); } }) .catch(() => { diff --git a/src/firefly/js/metaConvert/UploadAndAnalysis.js b/src/firefly/js/metaConvert/UploadAndAnalysis.js index 44dda65efc..c7b52ab1c0 100644 --- a/src/firefly/js/metaConvert/UploadAndAnalysis.js +++ b/src/firefly/js/metaConvert/UploadAndAnalysis.js @@ -342,7 +342,7 @@ function getImmediateResponse(fileFormat,request,url,serDef,parts,menuKey) { case FileAnalysisType.TAR: return makeTarEntry(url); case FileAnalysisType.REGION: - return dpdtMessageWithDownload('Cannot not display Region file, you may only download it', 'Download Region File', url); + return dpdtMessageWithDownload('Cannot display Region file, you may only download it', 'Download Region File', url); case FileAnalysisType.PNG: return makePngEntry(url); case FileAnalysisType.HTML: diff --git a/src/firefly/js/metaConvert/VoUITitles.js b/src/firefly/js/metaConvert/VoUITitles.js index 82d95650d4..2d80dc51dd 100644 --- a/src/firefly/js/metaConvert/VoUITitles.js +++ b/src/firefly/js/metaConvert/VoUITitles.js @@ -95,12 +95,12 @@ export function getBasicTitling(title,obsTitle='',fileType='') { loadInBrowserMsg: 'Open PDF File'+obsTitleMsg }; case Format.HTML : return {...defResult('HTML', 'Open'), - message: 'This is a web page or web application. It can be open in another tab', + message: 'This is a web page or web application. It can be opened in another tab', loadInBrowserMsg: 'Open Page'+obsTitleMsg }; default: return { ...defResult('Unknown', 'Download'), - message: 'This file may only only be downloaded' + message: 'This file may only be downloaded' }; } diff --git a/src/firefly/js/metaConvert/vo/DataLinkProcessor.js b/src/firefly/js/metaConvert/vo/DataLinkProcessor.js index c25ea1adb6..994c771c49 100644 --- a/src/firefly/js/metaConvert/vo/DataLinkProcessor.js +++ b/src/firefly/js/metaConvert/vo/DataLinkProcessor.js @@ -437,13 +437,13 @@ export function createDataLinkSingleRowItem({dlData, activateParams, options}) { export function getCutoutTotalWarning(dlDataAry, length) { const allSize= dlDataAry.map ( (d) => d.size).reduce((tot,v) => tot+v,0) ; if (isWarnSize(allSize)) { - return `Warning: Loading ${length} images with a total size of ${getSizeAsString(allSize)}, it might take awhile to load`; + return `Warning: Loading ${length} images with a total size of ${getSizeAsString(allSize)}, it might take a while to load`; } } export function getCutoutSizeWarning(dlData) { if (isWarnSize(dlData.size)) { - return `Warning: Full image file is ${getSizeAsString(dlData.size)}, it might take awhile to load`; + return `Warning: Full image file is ${getSizeAsString(dlData.size)}, it might take a while to load`; } } diff --git a/src/firefly/js/metaConvert/vo/ObsCoreConverter.js b/src/firefly/js/metaConvert/vo/ObsCoreConverter.js index b795e5a8df..469d8067c9 100644 --- a/src/firefly/js/metaConvert/vo/ObsCoreConverter.js +++ b/src/firefly/js/metaConvert/vo/ObsCoreConverter.js @@ -108,14 +108,14 @@ export async function getObsCoreRelatedDataProduct(table, row, threeColorOps, hi const {hasRelatedBands:canGrid=false, relatedBandMethod=GROUP_BY_DATALINK_RESULT }= options ?? {}; if (!canGrid) return Promise.reject('related data products not supported'); if (relatedBandMethod!==GROUP_BY_DATALINK_RESULT && relatedBandMethod!==GROUP_BY_RELATED_COLUMNS) { - return dpdtSimpleMsg(`related data products not supported (related band method no supported: ${relatedBandMethod})`); + return dpdtSimpleMsg(`related data products not supported (related band method not supported: ${relatedBandMethod})`); } const {dataSource,prodType,isDataLinkRow, isPng}= getObsCoreRowMetaInfo(table,row); const errMsg= doErrorChecks(table,row,prodType,dataSource); if (errMsg) return errMsg; if (prodType!=='image') return dpdtSimpleMsg(`${prodType} is not supported for grid`); - if (isPng) return dpdtSimpleMsg(`${prodType} must be fits for related grid support`); - if (!isDataLinkRow) return dpdtSimpleMsg('datalink required for supported for related grid'); + if (isPng) return dpdtSimpleMsg(`${prodType} must be FITS for related grid support`); + if (!isDataLinkRow) return dpdtSimpleMsg('datalink is required for related grid support'); if (relatedBandMethod===GROUP_BY_DATALINK_RESULT) { return getDatalinkRelatedImageGridProduct({dlTableUrl:dataSource, activateParams,table,row,threeColorOps, options}); diff --git a/src/firefly/js/metaConvert/vo/ServDescConverter.js b/src/firefly/js/metaConvert/vo/ServDescConverter.js index cfde33ee6d..7d11a2847b 100644 --- a/src/firefly/js/metaConvert/vo/ServDescConverter.js +++ b/src/firefly/js/metaConvert/vo/ServDescConverter.js @@ -101,7 +101,7 @@ export async function getServiceDescRelatedDataProduct(table, row, threeColorOps if (!descriptors) return dpdtSimpleMsg('Could not find any service descriptors'); if (!hasRowAccess(table, row)) return dpdtSimpleMsg('You do not have access to these data.'); const dlTableUrl= makeDlUrl(findDataLinkServeDescs(descriptors)[0],table, row); - if (!dlTableUrl) return dpdtSimpleMsg('a datalink service descriptors return images is required for related grid'); + if (!dlTableUrl) return dpdtSimpleMsg('a datalink service descriptor that returns images is required for related grid'); return getDatalinkRelatedImageGridProduct({dlTableUrl, activateParams,table,row,threeColorOps,options}); } diff --git a/src/firefly/js/ui/FileUploadProcessor.jsx b/src/firefly/js/ui/FileUploadProcessor.jsx index 3f964c5a9d..6b1788c885 100644 --- a/src/firefly/js/ui/FileUploadProcessor.jsx +++ b/src/firefly/js/ui/FileUploadProcessor.jsx @@ -89,8 +89,8 @@ export function resultSuccess(request,cacheKey) { if (unsupportedIndexes.length>0) { showInfoPopup(unsupportedIndexes.length===1 - ? 'You have select a unsupported item, loading the rest' - : 'You have select some unsupported items, loading the rest', + ? 'You have selected an unsupported item, loading the rest' + : 'You have selected some unsupported items, loading the rest', 'Unsupported items' ); } @@ -248,13 +248,13 @@ const errorObj = { noExtensionErr: {valid: false, errorMsg: 'No extension is selected', title:'Validation Error'}, nonMocFitsErr: {valid: false, errorMsg: 'Warning: Loading a non-MOC FITS file from this dialog is not supported.', title: 'File Type Mismatch'}, nonDLErr: {valid: false, errorMsg: 'Warning: Loading a non-DataLink Table file from this dialog is not supported.', title: 'File Type Mismatch'}, - nonMocAndDLErr: {valid: false, errorMsg: 'Warning: You may only load a MOC FITS or Data Link Table file from here.', title: 'File Type Mismatch'}, + nonMocAndDLErr: {valid: false, errorMsg: 'Warning: You may only load a MOC FITS or DataLink Table file from here.', title: 'File Type Mismatch'}, noImgOrTblErr: {valid: false, errorMsg: 'You may not load a FITS file from here.', title: 'File Type Mismatch'}, noTblSelectedErr: {valid: false, errorMsg: 'You must select at least one Table.', title: 'Validation Error'}, noImgSelectedErr: {valid: false, errorMsg: 'You must select at least one Image.', title: 'Validation Error'}, imgNotAcceptedErr: {valid: false, errorMsg: 'You may not load an image file from here.', title: 'File Type Mismatch'}, tblNotAcceptedErr: {valid: false, errorMsg: 'You may not load tables from here.', title: 'File Type Mismatch'}, - unsupportedMultiErr: {valid: false, errorMsg: 'All selected images are not supported', title: 'Unsupported'}, + unsupportedMultiErr: {valid: false, errorMsg: 'None of the selected items are supported', title: 'Unsupported'}, unsupportedSingleErr: {valid: false, errorMsg: 'Unsupported item', title: 'Unsupported'}, }; diff --git a/src/firefly/js/ui/WorkspaceViewer.jsx b/src/firefly/js/ui/WorkspaceViewer.jsx index 8cc0c481c2..e49ab4815b 100644 --- a/src/firefly/js/ui/WorkspaceViewer.jsx +++ b/src/firefly/js/ui/WorkspaceViewer.jsx @@ -389,7 +389,7 @@ export function validateFileName(wsSelect, fileName) { const fullPath = getWorkspacePath(wsSelect, fileName); if (isExistWorspaceFile(fullPath)) { - workspacePopupMsg(`the file, ${fullPath}, already exists in workspace, please change the file name.`, + workspacePopupMsg(`The file, ${fullPath}, already exists in the workspace. Please change the file name.`, 'Save to workspace'); return false; } else { diff --git a/src/firefly/js/ui/dynamic/DLGeneratedDropDown.js b/src/firefly/js/ui/dynamic/DLGeneratedDropDown.js index eef030f9b4..e495c8c706 100644 --- a/src/firefly/js/ui/dynamic/DLGeneratedDropDown.js +++ b/src/firefly/js/ui/dynamic/DLGeneratedDropDown.js @@ -484,7 +484,7 @@ function doSubmitSearch(r,siaCtx,dataServiceId, docRows,qAna,fdAry,searchObjFds, if (!hasValidSpacialSearch(r,fds) && !doingUpload) { showInfoPopup( getSpacialSearchType(r,fds)===CONE_CHOICE_KEY ? 'Target is required' : - 'Search Area is require and must have at least 3 point pairs, each optionally separated by commas', + 'Search Area is required and must have at least 3 point pairs, each optionally separated by commas', 'Error'); return false; } diff --git a/src/firefly/js/ui/dynamic/DynamicUISearchPanel.jsx b/src/firefly/js/ui/dynamic/DynamicUISearchPanel.jsx index 9670063353..7958be969b 100644 --- a/src/firefly/js/ui/dynamic/DynamicUISearchPanel.jsx +++ b/src/firefly/js/ui/dynamic/DynamicUISearchPanel.jsx @@ -48,7 +48,7 @@ export function DynamicForm({DynLayoutPanel, groupKey,fieldDefAry, onSubmit, onE if (!hasValidSpacialSearch(request,fieldDefAry)) { showInfoPopup( getSpacialSearchType(request,fieldDefAry)===CONE_CHOICE_KEY ? - 'Target is required' : 'Search Area is require and must have a least 3 points'); + 'Target is required' : 'Search Area is required and must have at least 3 points'); return false; } return onSubmit?.(convertRequest(request, fieldDefAry)); diff --git a/src/firefly/js/ui/dynamic/ServiceDescriptorPanel.jsx b/src/firefly/js/ui/dynamic/ServiceDescriptorPanel.jsx index 46bfea7722..b2c49dc36e 100644 --- a/src/firefly/js/ui/dynamic/ServiceDescriptorPanel.jsx +++ b/src/firefly/js/ui/dynamic/ServiceDescriptorPanel.jsx @@ -135,7 +135,7 @@ function SDPanelContent({fieldDefAry, plotId, serDef={}, setSearchParams, dataSe slotProps={{ FormPanel: { onSuccess: (r) => submitSearch(r), - onError: () => showInfoPopup('Some field are not valid'), + onError: () => showInfoPopup('Some fields are not valid'), sx: hasSpacial && simpleTargetUI ? {alignSelf:'flex-start', mt:3} : undefined, }, }} diff --git a/src/firefly/js/ui/tap/AdvancedADQL.jsx b/src/firefly/js/ui/tap/AdvancedADQL.jsx index bc3d1e9c15..9914ed1c38 100644 --- a/src/firefly/js/ui/tap/AdvancedADQL.jsx +++ b/src/firefly/js/ui/tap/AdvancedADQL.jsx @@ -164,7 +164,7 @@ export function AdvancedADQL({adqlKey, defAdqlKey, serviceUrl, capabilities, sty // reload TAP schema when serviceUrl changes loadTapSchemas(serviceUrl).then(async (tm) => { if (tm.error) { - setError(`Fail to retrieve schema for: ${serviceUrl}`); + setError(`Failed to retrieve schema for: ${serviceUrl}`); return; } if (key === cFetchKey) { diff --git a/src/firefly/js/ui/tap/SIASearchRootPanel.jsx b/src/firefly/js/ui/tap/SIASearchRootPanel.jsx index 3447e34e38..0d1fb5793a 100644 --- a/src/firefly/js/ui/tap/SIASearchRootPanel.jsx +++ b/src/firefly/js/ui/tap/SIASearchRootPanel.jsx @@ -410,7 +410,7 @@ function getInitServiceUrl(initArgs,siaOps, lockedServiceUrl,lockedServiceName) const noRowLimitMsg = (
Disabling the row limit is not recommended.
- This may results in a HUGE amount of data.

+ This may result in a HUGE amount of data.

Are you sure you want to continue?
); diff --git a/src/firefly/js/ui/tap/SiaUI.jsx b/src/firefly/js/ui/tap/SiaUI.jsx index 071bb27600..7082810ee7 100644 --- a/src/firefly/js/ui/tap/SiaUI.jsx +++ b/src/firefly/js/ui/tap/SiaUI.jsx @@ -30,7 +30,7 @@ export function SiaUI({initArgs, serviceUrl, serviceLabel, siaMeta, sx={}}) { return ( {showNoMetaError && - {`Warning: The ${serviceLabel} SIAv2 service does not return any meta data to configure search panel`} + {`Warning: The ${serviceLabel} SIAv2 service does not return any metadata to configure the search panel`} } Disabling the row limit is not recommended.
You are about to submit a query without a TOP or WHERE constraint.
- This may results in a HUGE amount of data.

+ This may result in a HUGE amount of data.

Are you sure you want to continue? ); diff --git a/src/firefly/js/ui/tap/TapViewType.jsx b/src/firefly/js/ui/tap/TapViewType.jsx index a64a970412..5714d7ad33 100644 --- a/src/firefly/js/ui/tap/TapViewType.jsx +++ b/src/firefly/js/ui/tap/TapViewType.jsx @@ -101,7 +101,7 @@ function AdqlUI({serviceUrl, serviceLabel, servicesShowing, setServicesShowing, } loadTapCapabilities(serviceUrl) .then((c) => setCapabilities(c ?? getLoadedCapability(serviceUrl))) - .catch(() => setError(`Fail to retrieve capability for: ${serviceUrl}`)); + .catch(() => setError(`Failed to retrieve capability for: ${serviceUrl}`)); }, [serviceUrl]); @@ -175,7 +175,7 @@ function BasicUI(props) { } loadTapCapabilities(serviceUrl) .then((c) => setCapabilities(c ?? getLoadedCapability(serviceUrl))) - .catch(() => setError(`Fail to retrieve capability for: ${serviceUrl}`)); + .catch(() => setError(`Failed to retrieve capability for: ${serviceUrl}`)); }, [serviceUrl]); diff --git a/src/firefly/js/util/Validate.js b/src/firefly/js/util/Validate.js index 9cd39ff045..4047952d6d 100644 --- a/src/firefly/js/util/Validate.js +++ b/src/firefly/js/util/Validate.js @@ -129,7 +129,7 @@ export const validateDate = function(description, valStr){ } catch (e) { retval.valid = false; - retval.message = description + ': Unrecognized entry. date should follow the format yyyy-mm-dd'; + retval.message = description + ': Unrecognized entry. The date should follow the format yyyy-mm-dd'; } } return retval; diff --git a/src/firefly/js/util/expr/SyntaxException.js b/src/firefly/js/util/expr/SyntaxException.js index 075a04da94..5218aee742 100644 --- a/src/firefly/js/util/expr/SyntaxException.js +++ b/src/firefly/js/util/expr/SyntaxException.js @@ -104,7 +104,7 @@ function explainWhy(reason, expected, scanner) { sb.push('That variable is unknown or has no value.'); break; default: - throw 'Can not happen'; + throw 'Cannot happen'; } return ''.concat(...sb); } diff --git a/src/firefly/js/visualize/CoordUtil.js b/src/firefly/js/visualize/CoordUtil.js index 19049c51a0..6c44ff6b5d 100644 --- a/src/firefly/js/visualize/CoordUtil.js +++ b/src/firefly/js/visualize/CoordUtil.js @@ -21,7 +21,7 @@ const FORM_DMS = 1; // 12d34m23.4s const FORM_HMS = 2; // 12h34m23.4s const LAT_OUT_RANGE = 'Latitude is out of range [-90.0, +90.0]'; const LON_TOO_BIG = 'Longitude is too big (>=360.0)'; -const LON_NEGATIVE = 'Longitude can not be negative'; +const LON_NEGATIVE = 'Longitude cannot be negative'; const RA_TOO_BIG = 'RA is too big (>=24 hours)'; const INVALID_STRING = 'Invalid Input'; const HMS_FOR_LAT = 'HMS notation not valid for latitude'; diff --git a/src/firefly/js/visualize/WorkspaceCntlr.js b/src/firefly/js/visualize/WorkspaceCntlr.js index b55dc69ea6..58703e9c8e 100644 --- a/src/firefly/js/visualize/WorkspaceCntlr.js +++ b/src/firefly/js/visualize/WorkspaceCntlr.js @@ -285,7 +285,7 @@ export function getWorkspaceErrorMsg(){ errorMsg = 'You do not have access right'; break; case '404': - errorMsg = 'The request resources can not be found'; + errorMsg = 'The request resources cannot be found'; break; case '500': errorMsg = 'Internal Server Error'; diff --git a/src/firefly/js/visualize/task/PlotHipsTask.js b/src/firefly/js/visualize/task/PlotHipsTask.js index eda634054e..2891e77f62 100644 --- a/src/firefly/js/visualize/task/PlotHipsTask.js +++ b/src/firefly/js/visualize/task/PlotHipsTask.js @@ -310,7 +310,7 @@ export async function createHiPSMocLayer({ivoid, title, hipsUrl, plot, visible=f } } catch (e) { - showInfoPopup('Could not find the MOC for: '+ title, 'Moc Not Found'); + showInfoPopup('Could not find the MOC for: '+ title, 'MOC Not Found'); console.log(`MOC not found at URL (this is not uncommon): ${e}`) ; } } diff --git a/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx b/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx index a309999476..7b906523b0 100644 --- a/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx +++ b/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx @@ -120,7 +120,7 @@ function update3Color(request, bandData, viewerId, dataId) { function validate(request) { if (Object.keys(request).every( (k) => request[k]==='NONE')) { - return { valid:false, errStr: 'You must enable a least one color band' }; + return { valid:false, errStr: 'You must enable at least one color band' }; } return {valid:true}; } diff --git a/src/firefly/js/visualize/ui/extraction/ExtractionTable.jsx b/src/firefly/js/visualize/ui/extraction/ExtractionTable.jsx index b4aee8863c..8b09564183 100644 --- a/src/firefly/js/visualize/ui/extraction/ExtractionTable.jsx +++ b/src/firefly/js/visualize/ui/extraction/ExtractionTable.jsx @@ -61,7 +61,7 @@ let titleCnt = 1; export function keepZAxisExtraction(pt, pv, plot, filename, refHDUNum, extractionSize, combineOp, save = false, doOverlay = true) { if (!pv || !plot || !filename) { - showInfoPopup('Plot no longer exist. Cannot extract.'); + showInfoPopup('Plot no longer exists. Cannot extract.'); return; } @@ -130,7 +130,7 @@ export function keepDataExtraction({pv, baseImPtAry, save, doOverlay, axis='both const plot= primePlot(pv); const filename= plot?.plotState?.getWorkingFitsFileStr(); if (!pv || !plot || !filename) { - showInfoPopup('Plot no longer exist. Cannot extract.'); + showInfoPopup('Plot no longer exists. Cannot extract.'); return; } const extractionSizeX= axis==='x' ? 1 : pointSize;