Merge pull request #243 from luzpaz/typos-projectforge

Fix typos in projectforge*/ directories

projectforge-application/src/main/kotlin/org/projectforge/i18n/I18nKeysSourceAnalyzer.kt

@@ -108,7 +108,7 @@ internal class I18nKeysSourceAnalyzer {
         }
         getI18nEnums()
         getPropertyInfos()
-        // Now, add all found occurences of all i18n keys detected:
+        // Now, add all found occurrences of all i18n keys detected:
         i18nKeyMap.values.forEach { entry ->
             stringConstantsMap[entry.i18nKey]?.forEach { file ->
                 entry.addUsage(file)

projectforge-application/src/main/kotlin/org/projectforge/setup/wizard/FinalizeScreenSupport.kt

@@ -77,7 +77,7 @@ object FinalizeScreenSupport {
             sb.append("You chose a directory different to ${File(System.getProperty("user.home"), "ProjectForge")}. That's OK.\n")
             sb.append("To be sure, that this directory is found by the ProjectForge server, please refer log files or home page.\n\n")
         }
-        sb.append("Press 'Finish' for starting the intialization and for starting-up the server.")
+        sb.append("Press 'Finish' for starting the initialization and for starting-up the server.")
         return sb.toString()
     }
 

projectforge-application/src/main/kotlin/org/projectforge/setup/wizard/JdbcConnectionTest.kt

@@ -35,7 +35,7 @@ object JdbcConnectionTest {
             val saveLogLevelConnection = Logger.getLogger(ConnectionFactoryImpl::class.java.name).level
             val saveLogLevelDriver = Logger.getLogger("org.postgresql.Driver").level
             try {
-                // Will avoid logs on console (otherwise lanterna teminal window might be overlayed and results in crap).
+                // Will avoid logs on console (otherwise lanterna terminal window might be overlayed and results in crap).
                 Logger.getLogger(ConnectionFactoryImpl::class.java.name).level = Level.OFF
                 Logger.getLogger("org.postgresql.Driver").level = Level.OFF
                 val connection = DriverManager.getConnection(jdbcUrl, username, password)

projectforge-application/src/main/resources/logback-spring.xml

@@ -66,7 +66,7 @@
 
     <!-- For debugging Persistence calls, add to your projectforge.properties file: -->
     <!--
-         # Logs all persistance calls (without lazy loadings by hibernate, but gives you a good overview):
+         # Logs all persistence calls (without lazy loadings by hibernate, but gives you a good overview):
          logging.level.org.projectforge.framework.persistence.jpa.PfPersistenceContext=DEBUG
 
           # Extensive logging of Hibernate SQL statements:

projectforge-application/src/test/kotlin/org/projectforge/development/SortAndCheckI18nPropertiesMain.kt

@@ -279,7 +279,7 @@ object SortAndCheckI18nPropertiesMain {
   }
 
   /**
-   * Single apostrophs of i18n messages (containg params) will be replaced (if not used as escape chars).
+   * Single apostrophs of i18n messages (containing params) will be replaced (if not used as escape chars).
    * "Don't believe the hype." -> "Don't believe the hype."
    * "Don''t believe {0}." -> "Don't believe (0})."
    * "Don''t escape '{0}'." -> "Don''t escape '{0}'."

projectforge-common/src/main/java/org/projectforge/common/BeanHelper.java

@@ -31,7 +31,7 @@
 import java.util.*;
 
 /**
- * Some useful methods for determing and converting property, getter and setter names.
+ * Some useful methods for determining and converting property, getter and setter names.
  *
  * @author Kai Reinhard ([email protected])
  */

projectforge-common/src/main/java/org/projectforge/common/CSVParser.java

@@ -48,7 +48,7 @@ public class CSVParser
 
   public static final String ERROR_QUOTATIONMARK_MISSED_AT_END_OF_CELL = "Quotation \" missed at the end of cell.";
 
-  public static final String ERROR_DELIMITER_OR_NEW_LINE_EXPECTED_AFTER_QUOTATION_MARK = "Delimter or new line expected after quotation mark.";
+  public static final String ERROR_DELIMITER_OR_NEW_LINE_EXPECTED_AFTER_QUOTATION_MARK = "Delimiter or new line expected after quotation mark.";
 
   public static final String ERROR_UNEXPECTED_CHARACTER_AFTER_QUOTATION_MARK = "Unexpected character after quotation mark.";
 

projectforge-common/src/main/java/org/projectforge/common/CSVWriter.java

@@ -111,7 +111,7 @@ public CSVWriter write(Date value)
   }
 
   /**
-   * Appends the given value. The string will be encapsulated in quotation marks: " Any occurance of the quotation mark will be quoted by
+   * Appends the given value. The string will be encapsulated in quotation marks: " Any occurrence of the quotation mark will be quoted by
    * duplication. Example: hallo -> "hallo", hal"lo -> "hal""lo"
    *
    * @param s The value to append.

projectforge-common/src/main/java/org/projectforge/common/mgc/MGCClassUtils.java

@@ -107,7 +107,7 @@ public static Class<?> getGenericTypeArgument(Class<?> clazz, int index)
    */
   public static Class<?> findGenericTypeArgument(Type genericSuperclass, int index)
   {
-    // CHECKSTYLE.OFF SIMULIERTE_POLYMORPHIE Necesssary for technical reasons (low level handling).
+    // CHECKSTYLE.OFF SIMULIERTE_POLYMORPHIE Necessary for technical reasons (low level handling).
     while (genericSuperclass != null && !(ParameterizedType.class.isAssignableFrom(genericSuperclass.getClass()))) {
       genericSuperclass = ((Class) genericSuperclass).getGenericSuperclass();
     }
@@ -286,7 +286,7 @@ public static <T> void collectAllSuperImplementing(Class<?> clazz, Class<T> impl
   /**
    * Converts name of an enum to enum.
    *
-   * If empty or cannot be convertet, returns default.
+   * If empty or cannot be converted, returns default.
    *
    * @param <T> the generic type
    * @param defaultValue the default value

projectforge-common/src/main/java/org/projectforge/common/mgc/PrivateBeanUtils.java

@@ -51,7 +51,7 @@ public static class AccessibleScope
     private AccessibleObject object;
 
     /**
-     * The was accessable.
+     * The object was accessible.
      */
     private boolean wasAccessable = false;
 
@@ -224,7 +224,7 @@ public static Field findFieldFromGetter(Class<?> clazz, Method method)
   }
 
   /**
-   * Try find a field with given name. Goes throw class hierarchie.
+   * Try finding a field with given name. Goes through class hierarchy.
    *
    * @param cls the cls
    * @param fieldName the field name
@@ -427,7 +427,7 @@ public static Class<?> getFieldType(Object bean, String fieldName)
   }
 
   /**
-   * Wirte a bean field.
+   * Write a bean field.
    *
    * @param bean the bean
    * @param field the field
@@ -555,7 +555,7 @@ public static int getBeanSize(Object bean)
    * Gets the bean size.
    *
    * @param bean the bean
-   * @param classNameMatcher matches agains class name
+   * @param classNameMatcher matches against class name
    * @return the bean size
    */
   public static int getBeanSize(Object bean, Matcher<String> classNameMatcher)
@@ -568,7 +568,7 @@ public static int getBeanSize(Object bean, Matcher<String> classNameMatcher)
    *
    * @param bean the bean
    * @param classNameMatcher the class name matcher
-   * @param fieldNameMatcher matches agains (decl class name).fieldname
+   * @param fieldNameMatcher matches against (decl class name).fieldname
    * @return the bean size
    */
   public static int getBeanSize(Object bean, Matcher<String> classNameMatcher, Matcher<String> fieldNameMatcher)
@@ -795,7 +795,7 @@ public static Object invokeMethod(Object bean, String method, Object... args)
     Method m = findMethod(bean, bean.getClass(), method, args);
     if (m == null) {
       throw new RuntimeException(
-          "Canot find method to call: " + bean.getClass().getName() + "." + method + getArgsDescriptor(args));
+          "Cannot find method to call: " + bean.getClass().getName() + "." + method + getArgsDescriptor(args));
     }
     return invokeMethod(bean, m, args);
   }
@@ -841,7 +841,7 @@ public static Object invokeStaticMethod(Class<?> clazz, String method, Object...
     Method m = findMethod(null, clazz, method, args);
     if (m == null) {
       throw new RuntimeException(
-          "Canot find method to call: " + clazz.getName() + "." + method + getArgsDescriptor(args));
+          "Cannot find method to call: " + clazz.getName() + "." + method + getArgsDescriptor(args));
     }
     AccessibleScope ascope = new AccessibleScope(m);
     try {
@@ -917,7 +917,7 @@ public static <T> T createInstance(Class<T> clazz, Object... args)
   {
     Constructor<T> constr = findConstructor(clazz, args);
     if (constr == null) {
-      throw new RuntimeException("Canot find constructor to call: " + clazz.getName() + "." + getArgsDescriptor(args));
+      throw new RuntimeException("Cannot find constructor to call: " + clazz.getName() + "." + getArgsDescriptor(args));
     }
     AccessibleScope ascope = new AccessibleScope(constr);
     try {
@@ -958,7 +958,7 @@ public static <T> void copyInstanceProperties(T source, T target)
   }
 
   /**
-   * Copy all instance fiels from source to target. static fields are not copied.
+   * Copy all instance fields from source to target. static fields are not copied.
    *
    * @param <T> the generic type
    * @param targetClass the target class

projectforge-common/src/main/kotlin/org/projectforge/common/logging/LogLevel.kt

@@ -36,7 +36,7 @@ enum class LogLevel(val key: String) : I18nEnum {
 
     /**
      * @param threshold
-     * @return True, if this log level is equals or higher than given treshold. ERROR is the highest and TRACE the lowest.
+     * @return True, if this log level is equals or higher than given threshold. ERROR is the highest and TRACE the lowest.
      */
     fun matches(threshold: LogLevel?): Boolean {
         return threshold == null || ordinal <= threshold.ordinal

projectforge-common/src/test/java/org/projectforge/common/PriorityTest.java

@@ -66,7 +66,7 @@ public void testGetPriority()
     Assertions.assertEquals(Priority.getPriority("HIGH"), HIGH);
     Assertions.assertEquals(Priority.getPriority("HIGHEST"), HIGHEST);
     try {
-      Priority.getPriority("Extrordinary High");
+      Priority.getPriority("Extraordinary High");
     } catch (UnsupportedOperationException e) {
       Assertions.assertNotNull(e);
     }

projectforge-jcr/src/main/kotlin/org/projectforge/jcr/FileObject.kt

@@ -121,7 +121,7 @@ class FileObject() : FileInfo() {
     }
 
   /**
-   * An unique random alpha-numeric string. This id will internally also used as child node name of [RepoService.NODENAME_FILES].
+   * A unique random alphanumeric string. This id will internally also used as child node name of [RepoService.NODENAME_FILES].
    * Leave this id null for new files to store.
    */
   var fileId: String? = null

projectforge-jcr/src/main/kotlin/org/projectforge/jcr/JCRCheckSanityJob.kt

@@ -112,7 +112,7 @@ open class JCRCheckSanityJob {
                   FormatterUtils.format(
                     fileSize
                   )
-                } differs from reposity value ${FormatterUtils.format(repoSize)}!"
+                } differs from repository value ${FormatterUtils.format(repoSize)}!"
               errors.add(msg)
               log.error { msg }
             }

projectforge-jcr/src/main/kotlin/org/projectforge/jcr/RepoBackupService.kt

@@ -59,15 +59,15 @@ open class RepoBackupService {
   internal val listOfIgnoredNodePaths = mutableListOf<String>()
 
   /**
-   * These node pathes will be ignored by backup job. Data transfer files are ignored (plugin datatransfer).
+   * These node paths will be ignored by backup job. Data transfer files are ignored (plugin datatransfer).
    */
   fun registerNodePathToIgnore(nodePath: String) {
     log.info { "Adding path '$nodePath' as path to ignore for backup service." }
     listOfIgnoredNodePaths.add(nodePath)
   }
 
   /**
-   * Where to put the nigthly backups of the jcr as zip files?
+   * Where to put the nightly backups of the jcr as zip files?
    */
   var backupDirectory: File? = null
     private set

projectforge-jcr/src/main/kotlin/org/projectforge/jcr/RepoService.kt

@@ -514,7 +514,7 @@ open class RepoService {
       log.info { "Reading file from repository '${node.path}': $fileObject..." }
     }
     if (!useEncryptedFile && fileObject.aesEncrypted == true && password.isNullOrBlank()) {
-      log.error { "File is crypted, but no password given to decrypt in repository '${node.path}': $fileObject" }
+      log.error { "File is encrypted, but no password given to decrypt in repository '${node.path}': $fileObject" }
       return null
     }
     var binary: Binary? = null
@@ -542,7 +542,7 @@ open class RepoService {
   internal fun getFileSize(node: Node?, fileObject: FileObject, suppressLogInfo: Boolean = false): Long? {
     node ?: return null
     if (!suppressLogInfo) {
-      log.info { "Determing size of file from repository '${node.path}': '${fileObject.fileName}'..." }
+      log.info { "Determining size of file from repository '${node.path}': '${fileObject.fileName}'..." }
     }
     var binary: Binary? = null
     try {

projectforge-jcr/src/main/kotlin/org/projectforge/jcr/ZipMode.kt

@@ -42,12 +42,12 @@ enum class ZipMode(val key: String) : I18nEnum {
   ENCRYPTED_STANDARD("encryptedStandard"),
 
   /**
-   * AES-128 encrpyted (not supported by all clients)
+   * AES-128 encrypted (not supported by all clients)
    */
   ENCRYPTED_AES128("encrytpedAes128"),
 
   /**
-   * AES-256 encrpyted (not supported by all clients, highest security)
+   * AES-256 encrypted (not supported by all clients, highest security)
    */
   ENCRYPTED_AES256("encrytpedAes256");
 

projectforge-rest/src/main/kotlin/org/projectforge/rest/ChangePasswordPageRest.kt

@@ -105,7 +105,7 @@ class ChangePasswordPageRest : AbstractDynamicPageRest() {
     }
     val errorMsgKeys = changePassword(data, changeOwnPassword)
     processErrorKeys(errorMsgKeys)?.let {
-      return it // Error messages occured:
+      return it // Error messages occurred:
     }
     data.clear()
     val responseAction = UIToast.createToastResponseAction(

projectforge-rest/src/main/kotlin/org/projectforge/rest/TimesheetMultiSelectedPageRest.kt

@@ -148,7 +148,7 @@ class TimesheetMultiSelectedPageRest : AbstractMultiSelectedPage<TimesheetDO>()
             TaskServicesRest.createTask(taskId)?.let { task ->
                 ensureMassUpdateParam(massUpdateData, "task").id = taskId
                 variables["task"] = if (taskNode.isRootNode) {
-                    // Don't show. If task is null, the React page will not be updated from time to time (workarround)
+                    // Don't show. If task is null, the React page will not be updated from time to time (workaround)
                     TaskServicesRest.Task("")
                 } else {
                     task

projectforge-rest/src/main/kotlin/org/projectforge/rest/TimesheetPagesRest.kt

@@ -133,7 +133,7 @@ class TimesheetPagesRest : AbstractDTOPagesRest<TimesheetDO, Timesheet, Timeshee
         val timesheetDO = TimesheetDO()
         dto.copyTo(timesheetDO)
         if (timesheetDO.kost2 != null && baseDao.getKost2List(timesheetDO).isNullOrEmpty()) {
-            // Work arround: if kost 2 was selected in client before new task without kost2 assignments was chosen,
+            // Work around: if kost 2 was selected in client before new task without kost2 assignments was chosen,
             // the former kost2 selection will be sent by the client.
             timesheetDO.kost2 = null
         }
@@ -371,7 +371,7 @@ class TimesheetPagesRest : AbstractDTOPagesRest<TimesheetDO, Timesheet, Timeshee
     }
 
     /**
-     * @return The list fo recent edited time sheets of the current logged in user.
+     * @return The list of recent edited time sheets of the current logged in user.
      */
     @GetMapping("recentList")
     fun getRecentList(): RecentTimesheets {

projectforge-rest/src/main/kotlin/org/projectforge/rest/calendar/CalendarServicesRest.kt

@@ -353,7 +353,7 @@ class CalendarServicesRest {
     }
 
     /**
-     * Adjustes the range (start and end) to max 50 days and sets end date to start date + 1 day if not given.
+     * Adjusts the range (start and end) to max 50 days and sets end date to start date + 1 day if not given.
      */
     private fun adjustRange(range: DateTimeRange) {
         if (range.end != null) {

projectforge-rest/src/main/kotlin/org/projectforge/rest/calendar/TeamEventPagesRest.kt

@@ -196,7 +196,7 @@ class TeamEventPagesRest() : AbstractDTOPagesRest<TeamEventDO, TeamEvent, TeamEv
         }
         return transformFromDB(eventDO, editMode)
       } catch (ex: NumberFormatException) {
-        log.error("Can't get event of subscribed calendar. id must be of form {calId}-{uid} but is '$idString', a NumberFormatException occured.")
+        log.error("Can't get event of subscribed calendar. id must be of form {calId}-{uid} but is '$idString', a NumberFormatException occurred.")
         return TeamEvent()
       }
     }

projectforge-rest/src/main/kotlin/org/projectforge/rest/core/AbstractPagesRest.kt

@@ -153,7 +153,7 @@ constructor(
     private var _category: String? = null
 
     /**
-     * Category should be unique and is e. g. used as react path. At default it's the dir of the url definined in class annotation [RequestMapping].
+     * Category should be unique and is e. g. used as react path. At default it's the dir of the url defined in class annotation [RequestMapping].
      */
     open val category: String // open needed by Wicket's SpringBean for proxying.
         get() {
@@ -930,7 +930,7 @@ constructor(
             if (result.statusCode == HttpStatus.OK) {
                 return result
             }
-            // Validation errors or other errors occured, doesn't save. Proceed with editing.
+            // Validation errors or other errors occurred, doesn't save. Proceed with editing.
         }
         val formLayoutData = getItemAndLayout(request, clone, UILayout.UserAccess(history = false, insert = true))
         return ResponseEntity(
@@ -1237,7 +1237,7 @@ constructor(
             return responseAction
         }
         returnToCaller = afterOperationRedirectTo(obj, postData, event)
-                // Workarround to force reload to restore the AG Grid state (forceAGGridReload = true):
+                // Workaround to force reload to restore the AG Grid state (forceAGGridReload = true):
             ?: PagesResolver.getListPageUrl(
                 this::class.java,
                 absolute = true,
@@ -1276,7 +1276,7 @@ constructor(
      * jcr part will be set to '$prefix.${baseDao.identifier}', must be unique.
      * @param prefix Define a prefix for having uniqueness. At default 'org.projectforge' is used.
      * @param identifier Uses [BaseDao.identifier] at default value.
-     * @param supportedListIds Each entitiy may support multiple lists of attachments. This specifies the available lists in
+     * @param supportedListIds Each entity may support multiple lists of attachments. This specifies the available lists in
      * *addition* to [AttachmentsDaoAccessChecker.DEFAULT_LIST_OF_ATTACHMENTS].
      */
     @JvmOverloads

projectforge-rest/src/main/kotlin/org/projectforge/rest/core/ListFilterService.kt

@@ -48,7 +48,7 @@ class ListFilterService {
                 } catch (ex: ClassCastException) {
                     // No output needed, info message follows:
                 }
-                // Probably a new software release results in an incompability of old and new filter format.
+                // Probably a new software release results in an incompatibility of old and new filter format.
                 log.info(
                         "Could not restore filter from user prefs: (old) filter type "
                                 + filter.javaClass.getName()

projectforge-rest/src/main/kotlin/org/projectforge/rest/core/UserPrefRestService.kt

@@ -132,7 +132,7 @@ class UserPrefRestService {
             @Suppress("UNCHECKED_CAST")
             return entry as T
         }
-        // Probably a new software release results in an incompability of old and new object format.
+        // Probably a new software release results in an incompatibility of old and new object format.
         log.info("Could not get user preference entry: (old) type "
                 + entry.javaClass.name
                 + " is not assignable tox (new) required type "

projectforge-rest/src/main/kotlin/org/projectforge/rest/dto/BaseDTO.kt

@@ -72,7 +72,7 @@ open class BaseDTO<T : ExtendedBaseDO<Long>>(
   }
 
   /**
-   * Copy only minimal fields. Id at default, if not overridden. This method is usally used for embedded objects.
+   * Copy only minimal fields. Id at default, if not overridden. This method is usually used for embedded objects.
    */
   open fun copyFromMinimal(src: T) {
     id = src.id
@@ -180,7 +180,7 @@ open class BaseDTO<T : ExtendedBaseDO<Long>>(
             }
           } catch (ex: Exception) {
             log.error(
-              "Error while copiing field '${destField.name}' from $srcClazz to ${dest.javaClass}: ${ex.message}",
+              "Error while copying field '${destField.name}' from $srcClazz to ${dest.javaClass}: ${ex.message}",
               ex
             )
           }

projectforge-rest/src/main/kotlin/org/projectforge/rest/multiselect/AbstractMultiSelectedPage.kt

@@ -200,7 +200,7 @@ abstract class AbstractMultiSelectedPage<T> : AbstractDynamicPageRest() {
     }
 
     /**
-     * Field translation is used by Excel export. Returns translation of field from LayoutContext, if availabel in this
+     * Field translation is used by Excel export. Returns translation of field from LayoutContext, if available in this
      * class, or capitalized field name itself at default.
      * You may use [getFieldTranslation] with param [LayoutContext] for auto translation of known fields in your derived fun.
      */