hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix typo

Browse Source
This commit is contained in:
Ivan Masár
2015-01-04 22:10:55 +01:00
parent 91217421ef
commit 52bcc60944
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
View File

@@ -1405,7 +1405,7 @@ public class ItemExport
public static void emailErrorMessage(EPerson eperson, String error)
throws MessagingException
{
log.warn("An error occured during item export, the user will be notified. " + error);
log.warn("An error occurred during item export, the user will be notified. " + error);
try
{
Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);

2
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
View File

@@ -2362,7 +2362,7 @@ public class ItemImport
public static void emailErrorMessage(EPerson eperson, String error)
throws MessagingException
{
log.warn("An error occured during item import, the user will be notified. " + error);
log.warn("An error occurred during item import, the user will be notified. " + error);
try
{
Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);

2
dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java
View File

@@ -76,7 +76,7 @@ public class SFXFileReader {
/** Parses XML file and returns XML document.
* @param fileName XML file to parse
* @return XML document or <B>null</B> if error occured. The error is caught and logged.
* @return XML document or <B>null</B> if error occurred. The error is caught and logged.
*/
public static Document parseFile(String fileName) {

2
dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
View File

@@ -114,7 +114,7 @@ public class OREIngestionCrosswalk
xpathLinks.addNamespace(ATOM_NS);
entryId = ((Attribute)xpathLinks.selectSingleNode(doc)).getValue();
} catch (JDOMException e) {
throw new CrosswalkException("JDOM exception occured while ingesting the ORE", e);
throw new CrosswalkException("JDOM exception occurred while ingesting the ORE", e);
}
// Next for each resource, create a bitstream

12
dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
View File

@@ -375,8 +375,8 @@ public class OAIHarvester {
}
}
catch (HarvestingException hex) {
log.error("Harvesting error occured while processing an OAI record: " + hex.getMessage());
harvestRow.setHarvestMessage("Error occured while processing an OAI record");
log.error("Harvesting error occurred while processing an OAI record: " + hex.getMessage());
harvestRow.setHarvestMessage("Error occurred while processing an OAI record");
// if the last status is also an error, alert the admin
if (harvestRow.getHarvestMessage().contains("Error")) {
@@ -386,10 +386,10 @@ public class OAIHarvester {
return;
}
catch (Exception ex) {
harvestRow.setHarvestMessage("Unknown error occured while generating an OAI response");
harvestRow.setHarvestMessage("Unknown error occurred while generating an OAI response");
harvestRow.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
alertAdmin(HarvestedCollection.STATUS_UNKNOWN_ERROR, ex);
log.error("Error occured while generating an OAI response: " + ex.getMessage() + " " + ex.getCause());
log.error("Error occurred while generating an OAI response: " + ex.getMessage() + " " + ex.getCause());
ex.printStackTrace();
return;
}
@@ -1382,13 +1382,13 @@ public class OAIHarvester {
catch (RuntimeException e) {
log.error("Runtime exception in thread: " + this.toString());
log.error(e.getMessage() + " " + e.getCause());
hc.setHarvestMessage("Runtime error occured while generating an OAI response");
hc.setHarvestMessage("Runtime error occurred while generating an OAI response");
hc.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
}
catch (Exception ex) {
log.error("General exception in thread: " + this.toString());
log.error(ex.getMessage() + " " + ex.getCause());
hc.setHarvestMessage("Error occured while generating an OAI response");
hc.setHarvestMessage("Error occurred while generating an OAI response");
hc.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
}
finally

2
dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
View File

@@ -613,7 +613,7 @@ public class DOIIdentifierProvider
}
catch (SQLException ex)
{
log.error("SQLException occured while deleting a DOI out of an item: "
log.error("SQLException occurred while deleting a DOI out of an item: "
+ ex.getMessage());
throw new RuntimeException("Error while deleting a DOI out of the " +
"metadata of an Item " + dso.getID(), ex);

4
dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
View File

@@ -490,7 +490,7 @@ implements DOIConnector
log.error("Caught an AuthorizeException while disseminating DSO "
+ "with type " + dso.getType() + " and ID " + dso.getID()
+ ". Giving up to reserve DOI " + doi + ".", ae);
throw new DOIIdentifierException("AuthorizeException occured while "
throw new DOIIdentifierException("AuthorizeException occurred while "
+ "converting " + dso.getTypeText() + "/" + dso.getID()
+ " using crosswalk " + this.CROSSWALK_NAME + ".", ae,
DOIIdentifierException.CONVERSION_ERROR);
@@ -500,7 +500,7 @@ implements DOIConnector
log.error("Caught an CrosswalkException while reserving a DOI ("
+ doi + ") for DSO with type " + dso.getType() + " and ID "
+ dso.getID() + ". Won't reserve the doi.", ce);
throw new DOIIdentifierException("CrosswalkException occured while "
throw new DOIIdentifierException("CrosswalkException occurred while "
+ "converting " + dso.getTypeText() + "/" + dso.getID()
+ " using crosswalk " + this.CROSSWALK_NAME + ".", ce,
DOIIdentifierException.CONVERSION_ERROR);

10
dspace-api/src/main/java/org/dspace/rdf/RDFizer.java
View File

@@ -585,7 +585,7 @@ public class RDFizer {
{
log.error(ex);
System.err.println("A problem with the database connection "
+ "occured. Canceled pending actions.");
+ "occurred. Canceled pending actions.");
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
@@ -626,7 +626,7 @@ public class RDFizer {
{
log.error(ex);
System.err.println("A problem with the database connection "
+ "occured. Canceled pending actions.");
+ "occurred. Canceled pending actions.");
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
@@ -645,7 +645,7 @@ public class RDFizer {
{
log.error(ex);
System.err.println("A problem with the database connection "
+ "occured. Canceled pending actions.");
+ "occurred. Canceled pending actions.");
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
@@ -668,7 +668,7 @@ public class RDFizer {
{
log.error(ex);
System.err.println("A problem with the database connection "
+ "occured. Canceled pending actions.");
+ "occurred. Canceled pending actions.");
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
@@ -796,7 +796,7 @@ public class RDFizer {
try {
myself = new RDFizer();
} catch (SQLException ex) {
System.err.println("A problem with the database occured: "
System.err.println("A problem with the database occurred: "
+ ex.getMessage());
ex.printStackTrace(System.err);
log.error(ex);

2
dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/ActionResult.java
View File

@@ -12,7 +12,7 @@ package org.dspace.xmlworkflow.state.actions;
* The result consists of 2 parts a type & and a result
* The type is represented by an enum & can either be something like
* TYPE_OUTCOME: we have a certain outcome so move to another action/step
* TYPE_ERROR: an error has occured while processing the action
* TYPE_ERROR: an error has occurred while processing the action
* ...
*
* The optional results integer is used to determine

4
dspace-api/src/main/resources/Messages.properties
View File

@@ -304,7 +304,7 @@ jsp.dspace-admin.group-group-select.heading = Select Group t
jsp.dspace-admin.group-group-select.title = Select Group
jsp.dspace-admin.batchmetadataimport.title = Batch import metadata (BTE)
jsp.dspace-admin.batchmetadataimport.success = The job was taken over, an email will be sent as soon as it's finished
jsp.dspace-admin.batchmetadataimport.genericerror = An error occured! Please, try again!
jsp.dspace-admin.batchmetadataimport.genericerror = An error occurred! Please, try again!
jsp.dspace-admin.batchmetadataimport.selectfile = Select data file to upload
jsp.dspace-admin.batchmetadataimport.selectinputfile = Select the type of the input data
jsp.dspace-admin.batchmetadataimport.selectcollection = Select the collection the items will be imported to
@@ -868,7 +868,7 @@ jsp.search.results.searchfor = for
jsp.search.results.searchin = Search:
jsp.search.results.title = Search Results
jsp.search.title = Search
jsp.search.error.discovery = An error has occured. Your query is invalid or the search engine is down.
jsp.search.error.discovery = An error has occurred. Your query is invalid or the search engine is down.
jsp.search.facet.refine = Discover
jsp.search.facet.refine.author = Author
jsp.search.facet.refine.subject = Subject

10
dspace-jspui/src/main/java/org/dspace/app/webui/servlet/DisplayStatisticsServlet.java
View File

@@ -145,7 +145,7 @@ public class DisplayStatisticsServlet extends DSpaceServlet
} catch (Exception e)
{
log.error(
"Error occured while creating statistics for dso with ID: "
"Error occurred while creating statistics for dso with ID: "
+ dso.getID() + " and type " + dso.getType()
+ " and handle: " + dso.getHandle(), e);
}
@@ -189,7 +189,7 @@ public class DisplayStatisticsServlet extends DSpaceServlet
} catch (Exception e)
{
log.error(
"Error occured while creating statistics for dso with ID: "
"Error occurred while creating statistics for dso with ID: "
+ dso.getID() + " and type " + dso.getType()
+ " and handle: " + dso.getHandle(), e);
}
@@ -233,7 +233,7 @@ public class DisplayStatisticsServlet extends DSpaceServlet
catch (Exception e)
{
log.error(
"Error occured while creating statistics for dso with ID: "
"Error occurred while creating statistics for dso with ID: "
+ dso.getID() + " and type " + dso.getType()
+ " and handle: " + dso.getHandle(), e);
}
@@ -276,7 +276,7 @@ public class DisplayStatisticsServlet extends DSpaceServlet
catch (Exception e)
{
log.error(
"Error occured while creating statistics for dso with ID: "
"Error occurred while creating statistics for dso with ID: "
+ dso.getID() + " and type " + dso.getType()
+ " and handle: " + dso.getHandle(), e);
}
@@ -318,7 +318,7 @@ public class DisplayStatisticsServlet extends DSpaceServlet
catch (Exception e)
{
log.error(
"Error occured while creating statistics for dso with ID: "
"Error occurred while creating statistics for dso with ID: "
+ dso.getID() + " and type " + dso.getType()
+ " and handle: " + dso.getHandle(), e);
}

2
dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java
View File

@@ -1732,7 +1732,7 @@ public class SubmissionController extends DSpaceServlet
// try to delete destination file, as we got an exception while writing it.
if(!destFile.delete())
{
log.warn("While writing an uploaded file an error occured. "
log.warn("While writing an uploaded file an error occurred. "
+ "We were unable to delete the damaged file: "
+ destFile.getAbsolutePath() + ".");
}

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/WorkflowExceptionTransformer.java
View File

@@ -39,7 +39,7 @@ public class WorkflowExceptionTransformer extends AbstractDSpaceTransformer {
}
Division div = body.addDivision("error");
Table table = div.addTable("table0",2,1);
table.addRow().addCell().addContent("An error has occured:");
table.addRow().addCell().addContent("An error has occurred:");
table.addRow().addCell().addContent(error);
}

2
dspace-xmlui/src/main/resources/aspects/EPerson/eperson.js
View File

@@ -111,7 +111,7 @@ function doRegister()
}
catch (error)
{
// If any errors occured while trying to send the email set the field in error.
// If any errors occurred while trying to send the email set the field in error.
errors = new Array("email");
continue;
}