mergerequest fixes

code/moya-database/src/main/java/fi/codecrew/moya/model/Help.java

@@ -32,26 +32,27 @@ import javax.persistence.Table;
  */
  */
 @Entity
 @Entity
 @Table(name = "helps")
 @Table(name = "helps")
-public class Help extends GenericEntity implements Cloneable {
+public class Help extends GenericEntity  {
 
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
-	@Column(name = "path")
-	private String path;
+    @Column(name = "path")
+    private String path;
 
 
     public Help(String path) {
     public Help(String path) {
         this.path = path;
         this.path = path;
     }
     }
+
     public Help() {
     public Help() {
 
 
     }
     }
 
 
 
 
     public String getPath() {
     public String getPath() {
-		return path;
-	}
+        return path;
+    }
 
 
-	public void setPath(String path) {
-		this.path = path;
-	}
+    public void setPath(String path) {
+        this.path = path;
+    }
 }
 }

code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java

@@ -35,7 +35,7 @@ import java.util.Locale;
  */
  */
 @Entity
 @Entity
 @Table(name = "help_texts")
 @Table(name = "help_texts")
-public class HelpText extends GenericEntity implements Cloneable {
+public class HelpText extends GenericEntity {
 
 
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 

code/moya-database/src/main/java/fi/codecrew/moya/model/HelpTextHistory.java

@@ -31,7 +31,7 @@ import java.util.Date;
  */
  */
 @Entity
 @Entity
 @Table(name = "help_text_histories")
 @Table(name = "help_text_histories")
-public class HelpTextHistory extends GenericEntity implements Cloneable {
+public class HelpTextHistory extends GenericEntity {
 
 
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 

code/moya-utils/src/main/java/fi/codecrew/moya/enums/ValidLocale.java

@@ -21,27 +21,26 @@ package fi.codecrew.moya.enums;
 import java.util.Locale;
 import java.util.Locale;
 
 
 public enum ValidLocale {
 public enum ValidLocale {
-	FINNISH(new Locale("fi")),
-	ENGLISH(new Locale("en"));
+    FINNISH(new Locale("fi")),
+    ENGLISH(new Locale("en"));
 
 
-	private final Locale locale;
+    private final Locale locale;
 
 
-	ValidLocale(Locale l)
-	{
-		this.locale = l;
-	}
+    ValidLocale(Locale l) {
+        this.locale = l;
+    }
 
 
-	public Locale getLocale() {
-		return locale;
-	}
+    public Locale getLocale() {
+        return locale;
+    }
 
 
-	public static ValidLocale getDefaultLocale() {
-		return ValidLocale.ENGLISH;
-	}
+    public static ValidLocale getDefaultLocale() {
+        return ValidLocale.ENGLISH;
+    }
 
 
     public static ValidLocale findFromLocale(Locale locale) {
     public static ValidLocale findFromLocale(Locale locale) {
-        for(ValidLocale l : values()) {
-            if(l.getLocale().equals(locale)) {
+        for (ValidLocale l : values()) {
+            if (l.getLocale().equals(locale)) {
                 return l;
                 return l;
             }
             }
         }
         }