Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
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 5e768953
authored
Jan 31, 2015
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
optimize imports
1 parent
a2aad16d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
62 deletions
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowUserContainer.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/flowShopView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
View file @
5e76895
...
...
@@ -18,14 +18,17 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
fi.codecrew.moya.beans.*
;
import
fi.codecrew.moya.enums.CardState
;
import
fi.codecrew.moya.enums.apps.TerminalPermission
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.PlaceGroupBeanLocal
;
import
fi.codecrew.moya.beans.ProductBeanLocal
;
import
fi.codecrew.moya.beans.TicketBeanLocal
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
fi.codecrew.moya.web.helpers.ProductSummaryWrapper
;
...
...
@@ -40,9 +43,6 @@ import javax.faces.context.FacesContext;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.json.JsonObject
;
import
javax.smartcardio.CardPermission
;
import
java.security.acl.Group
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
View file @
5e76895
...
...
@@ -18,26 +18,22 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.model.FoodWave
;
import
org.primefaces.event.SelectEvent
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView
;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveView
;
import
fi.codecrew.moya.web.cdiview.shop.ProductShopView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
@Named
@ConversationScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowUserContainer.java
View file @
5e76895
...
...
@@ -18,11 +18,11 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
javax.enterprise.context.SessionScoped
;
import
javax.inject.Named
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
/**
* Place to store userid between pageloads
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
View file @
5e76895
...
...
@@ -18,7 +18,18 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
java.util.ArrayList
;
import
fi.codecrew.moya.beans.*
;
import
fi.codecrew.moya.enums.CardState
;
import
fi.codecrew.moya.enums.apps.TerminalPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
...
...
@@ -28,24 +39,7 @@ import javax.faces.model.ListDataModel;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.json.JsonObject
;
import
fi.codecrew.moya.beans.*
;
import
fi.codecrew.moya.enums.apps.TerminalPermission
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.enums.CardState
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.CardCode
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
java.util.ArrayList
;
@Named
@ConversationScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
View file @
5e76895
...
...
@@ -18,18 +18,6 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.context.FacesContext
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.servlet.http.HttpServletRequest
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.ReaderEvent
;
...
...
@@ -38,6 +26,14 @@ import fi.codecrew.moya.utilities.SearchResult;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
java.util.List
;
@Named
@ConversationScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/flowShopView.java
View file @
5e76895
...
...
@@ -18,15 +18,6 @@
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
org.primefaces.event.SelectEvent
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.ReaderEvent
;
...
...
@@ -34,6 +25,14 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.shop.ProductShopView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.primefaces.event.SelectEvent
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
@Named
@ConversationScoped
...
...
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