Commit 0942632a by Tuukka Kivilahti

mergerequestfixes

1 parent ed108d3b
......@@ -32,27 +32,27 @@ import javax.persistence.Table;
*/
@Entity
@Table(name = "helps")
public class Help extends GenericEntity {
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) {
this.path = path;
}
public Help(String path) {
this.path = path;
}
public Help() {
public Help() {
}
}
public String getPath() {
return path;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public void setPath(String path) {
this.path = path;
}
}
......@@ -21,31 +21,31 @@ package fi.codecrew.moya.enums;
import java.util.Locale;
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) {
for (ValidLocale l : values()) {
if (l.getLocale().equals(locale)) {
return l;
}
}
public static ValidLocale findFromLocale(Locale locale) {
for (ValidLocale l : values()) {
if (l.getLocale().equals(locale)) {
return l;
}
}
return ValidLocale.getDefaultLocale();
}
return ValidLocale.getDefaultLocale();
}
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!