fix some more typos

dspace-api/src/main/java/org/dspace/content/Collection.java

@@ -468,7 +468,7 @@ public String getName()
     }
 
     /**
-     * Get the logo for the collection. <code>null</code> is return if the
+     * Get the logo for the collection. <code>null</code> is returned if the
      * collection does not have a logo.
      * 
      * @return the logo of the collection, or <code>null</code>
@@ -482,11 +482,11 @@ public Bitstream getLogo()
      * Give the collection a logo. Passing in <code>null</code> removes any
      * existing logo. You will need to set the format of the new logo bitstream
      * before it will work, for example to "JPEG". Note that
-     * <code>update(/code> will need to be called for the change to take
+     * <code>update</code> will need to be called for the change to take
      * effect.  Setting a logo and not calling <code>update</code> later may
      * result in a previous logo lying around as an "orphaned" bitstream.
      *
-     * @param  is   the stream to use as the new logo
+     * @param  is the stream to use as the new logo
      *
      * @return   the new logo bitstream, or <code>null</code> if there is no
      *           logo (<code>null</code> was passed in)
@@ -865,7 +865,7 @@ public void createTemplateItem() throws SQLException, AuthorizeException
     /**
      * Remove the template item for this collection, if there is one. Note that
      * since this has to remove the old template item ID from the collection
-     * record in the database, the colletion record will be changed, including
+     * record in the database, the collection record will be changed, including
      * any other changes made; in other words, this method does an
      * <code>update</code>.
      * 
@@ -887,7 +887,7 @@ public void removeTemplateItem() throws SQLException, AuthorizeException,
             log.info(LogManager.getHeader(ourContext, "remove_template_item",
                     "collection_id=" + getID() + ",template_item_id="
                             + template.getID()));
-            // temporary turn off auth system, we have already checked the permission on the top of the method
+            // temporarily turn off auth system, we have already checked the permission on the top of the method
             // check it again will fail because we have already broken the relation between the collection and the item
             ourContext.turnOffAuthorisationSystem();
             template.delete();
@@ -943,7 +943,7 @@ public void removeItem(Item item) throws SQLException, AuthorizeException,
         // Check authorisation
         AuthorizeManager.authorizeAction(ourContext, this, Constants.REMOVE);
 
-        // will be the item an orphan?
+        // will the item be an orphan?
         TableRow row = DatabaseManager.querySingle(ourContext,
                 "SELECT COUNT(DISTINCT collection_id) AS num FROM collection2item WHERE item_id= ? ",
                 item.getID());
@@ -967,7 +967,7 @@ public void removeItem(Item item) throws SQLException, AuthorizeException,
     }
 
     /**
-     * Update the collection metadata (including logo, and workflow groups) to
+     * Update the collection metadata (including logo and workflow groups) to
      * the database. Inserts if this is a new collection.
      * 
      * @throws SQLException
@@ -1082,7 +1082,7 @@ void delete() throws SQLException, AuthorizeException, IOException
 
         		if (item.isOwningCollection(this))
         		{
-        			// the collection to be deletd is the owning collection, thus remove
+        			// the collection to be deleted is the owning collection, thus remove
         			// the item from all collections it belongs to
         			Collection[] collections = item.getCollections();
         			for (int i=0; i< collections.length; i++)
@@ -1356,7 +1356,7 @@ public int getType()
      * @param comm
      *            (optional) restrict search to a community, else null
      * @param actionID
-     *            fo the action
+     *            of the action
      * 
      * @return Collection [] of collections with matching permissions
      * @throws SQLException

dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java

@@ -45,11 +45,11 @@
 import ORG.oclc.oai.server.verb.OAIInternalServerError;
 
 /**
- * This is class extends OAICat's AbstractCatalog base class to allow metadata
+ * This class extends OAICat's AbstractCatalog base class to allow
  * harvesting of the metadata in DSpace via OAI-PMH 2.0.
  * 
  * FIXME: Some CNRI Handle-specific stuff in here. Anyone wanting to use
- * something else will need to update this code too. Sorry about that.
+ * something else will need to update this code, too. Sorry about that.
  * 
  * @author Robert Tansley
  * @version $Revision$
@@ -102,7 +102,7 @@ public Vector getSchemaLocations(String identifier)
         {
             context = new Context();
 
-            // Valid identifiers all have prefix "oai:hostname:"
+            // All valid identifiers have the "oai:hostname:" prefix 
             if (identifier != null && identifier.startsWith(OAI_ID_PREFIX))
             {
                 itemInfo = Harvest.getSingle(context, identifier
@@ -444,7 +444,7 @@ public Map listRecords(String from, String until, String set,
 
         Map m = doRecordHarvest(from, until, set, metadataPrefix, 0);
 
-        // Null means bad metadata prefix was bad
+        // Null means bad metadata prefix
         if (m == null)
         {
             log.info(LogManager.getHeader(null, "oai_error",
@@ -894,8 +894,7 @@ private Object[] decodeResumptionToken(String token)
                 String s = st.nextToken();
 
                 // If this value is a delimiter /, we have no value for this
-                // part
-                // of the resumption token.
+                // part of the resumption token.
                 if (s.equals("/"))
                 {
                     obj[i] = null;

dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/client/ClientOptions.java

@@ -109,7 +109,7 @@ public class ClientOptions
    private String formatNamespace = null; 
 
    /**
-    * Introduce a checksum error. This is used to simualte an error with the 
+    * Introduce a checksum error. This is used to simulate an error with the 
     * MD5 value. 
     */
    private boolean checksumError = false;
@@ -130,7 +130,7 @@ public class ClientOptions
    private static final Pattern multiPattern = Pattern.compile("(.*?)(\\[(.*?)\\]){0,1}(:(.*)){0,1}@(http://.*)");
 
    /**
-    * Flag that indicates if the gui mode has been set. This is 
+    * Flag that indicates if the GUI mode has been set. This is 
     * true by default. 
     */
    private boolean guiMode = true; 

dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/client/PostMessage.java

@@ -95,7 +95,7 @@ public class PostMessage
    private String packaging;
 
    /**
-    * True if the deposit should simualte a checksum error. The client should check this
+    * True if the deposit should simulate a checksum error. The client should check this
     * field to determine if a correct MD5 checksum should be sent or whether the checksum should
     * be modified so that it generates an error at the server.
     */
@@ -362,4 +362,4 @@ public String getUserAgent() {
 	public void setUserAgent(String userAgent) {
 		this.userAgent = userAgent;
 	}
-}
+}

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/viewArtifacts/Navigation.java

@@ -95,7 +95,7 @@ public void addPageMeta(PageMeta pageMeta) throws SAXException,
             WingException, UIException, SQLException, IOException,
             AuthorizeException
     {
-        // FIXME: I don't think these should be set here, but there needed and I'm
+        // FIXME: I don't think these should be set here, but they're needed and I'm
         // not sure where else it could go. Perhaps the linkResolver?
         Request request = ObjectModelHelper.getRequest(objectModel);
         pageMeta.addMetadata("contextPath").addContent(contextPath);