Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit ed108d3b
authored
Feb 21, 2016
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mergerequest fixes
1 parent
dd17005a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
26 deletions
code/moya-database/src/main/java/fi/codecrew/moya/model/Help.java
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpTextHistory.java
code/moya-utils/src/main/java/fi/codecrew/moya/enums/ValidLocale.java
code/moya-database/src/main/java/fi/codecrew/moya/model/Help.java
View file @
ed108d3
...
...
@@ -32,26 +32,27 @@ import javax.persistence.Table;
*/
@Entity
@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
)
{
this
.
path
=
path
;
}
public
Help
()
{
}
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
View file @
ed108d3
...
...
@@ -35,7 +35,7 @@ import java.util.Locale;
*/
@Entity
@Table
(
name
=
"help_texts"
)
public
class
HelpText
extends
GenericEntity
implements
Cloneable
{
public
class
HelpText
extends
GenericEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpTextHistory.java
View file @
ed108d3
...
...
@@ -31,7 +31,7 @@ import java.util.Date;
*/
@Entity
@Table
(
name
=
"help_text_histories"
)
public
class
HelpTextHistory
extends
GenericEntity
implements
Cloneable
{
public
class
HelpTextHistory
extends
GenericEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
code/moya-utils/src/main/java/fi/codecrew/moya/enums/ValidLocale.java
View file @
ed108d3
...
...
@@ -21,27 +21,26 @@ 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
))
{
for
(
ValidLocale
l
:
values
())
{
if
(
l
.
getLocale
().
equals
(
locale
))
{
return
l
;
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment