Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 041f6e04
authored
Aug 06, 2016
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No functional changes! Only cleanup
1 parent
ecbd924c
Hide whitespace changes
Inline
Side-by-side
Showing
139 changed files
with
334 additions
and
563 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ActionLogBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/DiscountBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/LectureBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ReaderBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/StatisticsBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/TicketBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/map/QueueBeanLocal.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/CheckoutBank.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/DiscountBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/HelpBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/NetworkAssociationBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/OrgRoleBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ProductBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SessionMgmtBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SitePageBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/TicketBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VipBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/IrcBotMoyaEventTopicListener.java
code/moya-beans/ejbModule/fi/codecrew/moya/beanutil/DecimalXMLAdapter.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardObjectDataFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardTextDataFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventMapFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GameIDFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextHistoryFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LanEventFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LogEntryTypeFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/OrgRoleFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/RoleFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/SitePageFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentGameFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentParticipantFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentRuleFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentTeamMemberFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductDeliveryFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductFacade.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/OrderCallback.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillFilterPredicate.java
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillOrderPredicate.java
code/moya-database/src/main/java/fi/codecrew/moya/model/ActionLogMessageTag.java
code/moya-database/src/main/java/fi/codecrew/moya/model/DBModel.java
code/moya-database/src/main/java/fi/codecrew/moya/model/FoodWave.java
code/moya-database/src/main/java/fi/codecrew/moya/model/GenericEntity.java
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java
code/moya-database/src/main/java/fi/codecrew/moya/model/LanEvent.java
code/moya-database/src/main/java/fi/codecrew/moya/model/LectureGroup.java
code/moya-database/src/main/java/fi/codecrew/moya/model/PrintedCard.java
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentGame.java
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentRule.java
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentTeamMember.java
code/moya-database/src/main/java/fi/codecrew/moya/model/User.java
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueue.java
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueueEntry.java
code/moya-utils/src/test/java/fi/codecrew/moya/utilities/StringUtilsTest.java
code/moya-web/src/main/java/fi/codecrew/moya/cmdline/ICommandlineCommand.java
code/moya-web/src/main/java/fi/codecrew/moya/management/ReplServlet.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/AccountEventRestView.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/JsonpRestFilter.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/PojoUtils.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/ReaderRestView.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/EventInfoV1.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/InstancesV1.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/placemap/v1/PlacemapRestViewV1.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/PojoFactoryV2.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/VipRestView.java
code/moya-web/src/main/java/fi/codecrew/moya/servlet/BortalCommand.java
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java
code/moya-web/src/main/java/fi/codecrew/moya/web/ConversationKeepaliveView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/ErrorPageView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/LocaleSelectorView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/TestDataView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogCreateView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogMessageView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardMassPrintView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataEditView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/help/HelpView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapManageView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/MenuView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/networkassociation/NetworkAssociationView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/RfidListenerView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/AddInventoryView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/FoodWaveView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteAcceptView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentAddTeamView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentEditRulesView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/AuthView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/ImportView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleRequestView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserGameIDView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/EventUserConverter.java
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/MenuNavigationConverter.java
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentGameConverter.java
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentRuleConverter.java
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/IncomingPlaceshopView.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/UserMapSearchView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/ProductShopItemHelper.java
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/BortalApplicationWrapper.java
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/ProductShopItem.java
code/moya-web/src/main/java/fi/codecrew/moya/web/lecture/LectureGroupView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/reports/BasicStatisticsView.java
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ActionLogBeanLocal.java
View file @
041f6e0
...
@@ -17,15 +17,14 @@
...
@@ -17,15 +17,14 @@
*
*
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
import
fi.codecrew.moya.enums.ActionLogMessageState
;
import
fi.codecrew.moya.enums.ActionLogMessageState
;
import
fi.codecrew.moya.model.ActionLogMessage
;
import
fi.codecrew.moya.model.ActionLogMessage
;
import
fi.codecrew.moya.model.ActionLogMessageResponse
;
import
fi.codecrew.moya.model.ActionLogMessageResponse
;
import
fi.codecrew.moya.model.ActionLogMessageTag
;
import
fi.codecrew.moya.model.ActionLogMessageTag
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
@Local
@Local
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/DiscountBeanLocal.java
View file @
041f6e0
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/LectureBeanLocal.java
View file @
041f6e0
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
import
javax.faces.model.ListDataModel
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.Lecture
;
import
fi.codecrew.moya.model.Lecture
;
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ReaderBeanLocal.java
View file @
041f6e0
...
@@ -22,7 +22,6 @@ import java.util.List;
...
@@ -22,7 +22,6 @@ import java.util.List;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.Reader
;
import
fi.codecrew.moya.model.Reader
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.model.ReaderEvent
;
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/StatisticsBeanLocal.java
View file @
041f6e0
...
@@ -24,7 +24,6 @@ import java.util.Map;
...
@@ -24,7 +24,6 @@ import java.util.Map;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
import
fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.Product
;
@Local
@Local
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/TicketBeanLocal.java
View file @
041f6e0
...
@@ -18,13 +18,12 @@
...
@@ -18,13 +18,12 @@
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
fi.codecrew.moya.model.EventUser
;
import
java.util.List
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.PlaceGroup
;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
import
java.io.OutputStream
;
import
java.util.List
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
@Local
@Local
public
interface
TicketBeanLocal
{
public
interface
TicketBeanLocal
{
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/map/QueueBeanLocal.java
View file @
041f6e0
...
@@ -2,10 +2,6 @@ package fi.codecrew.moya.beans.map;
...
@@ -2,10 +2,6 @@ package fi.codecrew.moya.beans.map;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentSkipListSet
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
javax.ejb.Local
;
import
javax.ejb.Local
;
...
...
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/CheckoutBank.java
View file @
041f6e0
...
@@ -34,6 +34,7 @@ public class CheckoutBank {
...
@@ -34,6 +34,7 @@ public class CheckoutBank {
private
final
String
icon
;
private
final
String
icon
;
private
final
String
name
;
private
final
String
name
;
private
final
List
<
Valuepair
>
postParams
=
new
ArrayList
<
Valuepair
>();
private
final
List
<
Valuepair
>
postParams
=
new
ArrayList
<
Valuepair
>();
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CheckoutBank
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CheckoutBank
.
class
);
public
CheckoutBank
(
Node
bank
)
{
public
CheckoutBank
(
Node
bank
)
{
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
View file @
041f6e0
...
@@ -18,6 +18,13 @@
...
@@ -18,6 +18,13 @@
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.util.Calendar
;
import
javax.ejb.EJB
;
import
javax.ejb.EJBAccessException
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Singleton
;
import
fi.codecrew.moya.facade.ApiApplicationFacade
;
import
fi.codecrew.moya.facade.ApiApplicationFacade
;
import
fi.codecrew.moya.facade.ApiApplicationInstanceFacade
;
import
fi.codecrew.moya.facade.ApiApplicationInstanceFacade
;
import
fi.codecrew.moya.model.ApiApplication
;
import
fi.codecrew.moya.model.ApiApplication
;
...
@@ -25,14 +32,6 @@ import fi.codecrew.moya.model.ApiApplicationInstance;
...
@@ -25,14 +32,6 @@ import fi.codecrew.moya.model.ApiApplicationInstance;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.utilities.PasswordFunctions
;
import
fi.codecrew.moya.utilities.PasswordFunctions
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.Resource
;
import
javax.ejb.*
;
import
java.util.*
;
import
java.util.Map.Entry
;
/**
/**
* Session Bean implementation class RestAuthBean
* Session Bean implementation class RestAuthBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
View file @
041f6e0
...
@@ -18,56 +18,54 @@
...
@@ -18,56 +18,54 @@
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.awt.Color
;
import
java.awt.Color
;
import
java.awt.Font
;
import
java.awt.Font
;
import
java.awt.Graphics2D
;
import
java.awt.Graphics2D
;
import
java.awt.geom.AffineTransform
;
import
java.awt.image.BufferedImage
;
import
java.awt.image.BufferedImage
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.imageio.IIOImage
;
import
javax.imageio.IIOImage
;
import
javax.imageio.ImageIO
;
import
javax.imageio.ImageIO
;
import
javax.imageio.ImageTypeSpecifier
;
import
javax.imageio.ImageTypeSpecifier
;
import
javax.imageio.ImageWriteParam
;
import
javax.imageio.ImageWriteParam
;
import
javax.imageio.ImageWriter
;
import
javax.imageio.ImageWriter
;
import
javax.imageio.metadata.IIOInvalidTreeException
;
import
javax.imageio.metadata.IIOInvalidTreeException
;
import
javax.imageio.metadata.IIOMetadata
;
import
javax.imageio.metadata.IIOMetadata
;
import
javax.imageio.metadata.IIOMetadataNode
;
import
javax.imageio.metadata.IIOMetadataNode
;
import
javax.imageio.stream.ImageOutputStream
;
import
javax.imageio.stream.ImageOutputStream
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
com.pdfjet.CoreFont
;
import
com.pdfjet.CoreFont
;
import
com.pdfjet.Image
;
import
com.pdfjet.Image
;
import
com.pdfjet.ImageType
;
import
com.pdfjet.ImageType
;
import
com.pdfjet.PDF
;
import
com.pdfjet.PDF
;
import
com.pdfjet.Page
;
import
com.pdfjet.Page
;
import
com.pdfjet.TextLine
;
import
com.pdfjet.TextLine
;
import
fi.codecrew.moya.enums.CardObjectDataType
;
import
fi.codecrew.moya.enums.CardObjectDataType
;
import
fi.codecrew.moya.enums.CardTextAlignment
;
import
fi.codecrew.moya.enums.CardTextAlignment
;
import
fi.codecrew.moya.enums.CardTextDataType
;
import
fi.codecrew.moya.enums.CardTextDataType
;
import
fi.codecrew.moya.enums.CardTextStyle
;
import
fi.codecrew.moya.enums.CardTextStyle
;
import
fi.codecrew.moya.facade.CardTemplateFacade
;
import
fi.codecrew.moya.facade.CardTemplateFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.PrintedCardFacade
;
import
fi.codecrew.moya.facade.PrintedCardFacade
;
import
fi.codecrew.moya.model.CardObjectData
;
import
fi.codecrew.moya.facade.UserFacade
;
import
fi.codecrew.moya.model.CardTemplate
;
import
fi.codecrew.moya.model.CardObjectData
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.CardTemplate
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.GenericEntity
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.GenericEntity
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.util.MassPrintResult
;
import
fi.codecrew.moya.util.MassPrintResult
;
/**
/**
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/DiscountBean.java
View file @
041f6e0
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java
View file @
041f6e0
...
@@ -50,7 +50,6 @@ import fi.codecrew.moya.model.LanEventPrivateProperty;
...
@@ -50,7 +50,6 @@ import fi.codecrew.moya.model.LanEventPrivateProperty;
import
fi.codecrew.moya.model.LanEventPrivatePropertyKey
;
import
fi.codecrew.moya.model.LanEventPrivatePropertyKey
;
import
fi.codecrew.moya.model.LanEventProperty
;
import
fi.codecrew.moya.model.LanEventProperty
;
import
fi.codecrew.moya.model.LanEventPropertyKey
;
import
fi.codecrew.moya.model.LanEventPropertyKey
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
/**
/**
* Session Bean implementation class EventBean
* Session Bean implementation class EventBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/HelpBean.java
View file @
041f6e0
...
@@ -18,8 +18,15 @@
...
@@ -18,8 +18,15 @@
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.util.Calendar
;
import
java.util.Locale
;
import
javax.annotation.security.RolesAllowed
;
import
javax.ejb.EJB
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.enums.apps.SpecialPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.facade.HelpFacade
;
import
fi.codecrew.moya.facade.HelpFacade
;
import
fi.codecrew.moya.facade.HelpTextFacade
;
import
fi.codecrew.moya.facade.HelpTextFacade
;
...
@@ -28,13 +35,6 @@ import fi.codecrew.moya.model.Help;
...
@@ -28,13 +35,6 @@ import fi.codecrew.moya.model.Help;
import
fi.codecrew.moya.model.HelpText
;
import
fi.codecrew.moya.model.HelpText
;
import
fi.codecrew.moya.model.HelpTextHistory
;
import
fi.codecrew.moya.model.HelpTextHistory
;
import
javax.annotation.security.RolesAllowed
;
import
javax.ejb.EJB
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
java.util.Calendar
;
import
java.util.Locale
;
/**
/**
* Session Bean implementation class SitePageBean
* Session Bean implementation class SitePageBean
*/
*/
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
View file @
041f6e0
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
javax.annotation.security.DeclareRoles
;
import
javax.annotation.security.DeclareRoles
;
import
javax.annotation.security.RolesAllowed
;
import
javax.annotation.security.RolesAllowed
;
...
@@ -31,7 +30,6 @@ import org.slf4j.Logger;
...
@@ -31,7 +30,6 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.enums.apps.LecturePermission
;
import
fi.codecrew.moya.enums.apps.LecturePermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.LectureFacade
;
import
fi.codecrew.moya.facade.LectureFacade
;
import
fi.codecrew.moya.facade.LectureGroupFacade
;
import
fi.codecrew.moya.facade.LectureGroupFacade
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/NetworkAssociationBean.java
View file @
041f6e0
...
@@ -37,7 +37,6 @@ import fi.codecrew.moya.model.EventUser;
...
@@ -37,7 +37,6 @@ import fi.codecrew.moya.model.EventUser;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.NetworkAssociation
;
import
fi.codecrew.moya.model.NetworkAssociation
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
/**
/**
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/OrgRoleBean.java
View file @
041f6e0
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.OrgRole;
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.OrgRole;
import
fi.codecrew.moya.model.OrgRoleRequest
;
import
fi.codecrew.moya.model.OrgRoleRequest
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.utilities.jpa.GenericFacade
;
/**
/**
* Session Bean implementation class OrgRoleBean
* Session Bean implementation class OrgRoleBean
...
@@ -55,6 +54,7 @@ import fi.codecrew.moya.utilities.jpa.GenericFacade;
...
@@ -55,6 +54,7 @@ import fi.codecrew.moya.utilities.jpa.GenericFacade;
})
})
public
class
OrgRoleBean
implements
OrgRoleBeanLocal
{
public
class
OrgRoleBean
implements
OrgRoleBeanLocal
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OrgRoleBean
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OrgRoleBean
.
class
);
@EJB
@EJB
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
View file @
041f6e0
...
@@ -110,6 +110,7 @@ import fi.codecrew.moya.model.User;
...
@@ -110,6 +110,7 @@ import fi.codecrew.moya.model.User;
@LocalBean
@LocalBean
public
class
PermissionBean
implements
PermissionBeanLocal
{
public
class
PermissionBean
implements
PermissionBeanLocal
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PermissionBean
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PermissionBean
.
class
);
@Resource
@Resource
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
View file @
041f6e0
...
@@ -49,8 +49,6 @@ import javax.ejb.Stateless;
...
@@ -49,8 +49,6 @@ import javax.ejb.Stateless;
import
javax.ejb.Timeout
;
import
javax.ejb.Timeout
;
import
javax.ejb.Timer
;
import
javax.ejb.Timer
;
import
javax.ejb.TimerService
;
import
javax.ejb.TimerService
;
import
javax.xml.registry.infomodel.Slot
;
import
fi.codecrew.moya.facade.*
;
import
fi.codecrew.moya.facade.*
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.*
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
View file @
041f6e0
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.List
;
import
java.util.List
;
...
@@ -29,8 +28,6 @@ import javax.ejb.EJB;
...
@@ -29,8 +28,6 @@ import javax.ejb.EJB;
import
javax.ejb.EJBAccessException
;
import
javax.ejb.EJBAccessException
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
fi.codecrew.moya.model.*
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -48,6 +45,11 @@ import fi.codecrew.moya.enums.apps.SpecialPermission;
...
@@ -48,6 +45,11 @@ import fi.codecrew.moya.enums.apps.SpecialPermission;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.GroupMembershipFacade
;
import
fi.codecrew.moya.facade.GroupMembershipFacade
;
import
fi.codecrew.moya.facade.PlaceGroupFacade
;
import
fi.codecrew.moya.facade.PlaceGroupFacade
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.LanEventPropertyKey
;
import
fi.codecrew.moya.model.PlaceGroup
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.utilities.BarcodeUtils
;
import
fi.codecrew.moya.utilities.BarcodeUtils
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ProductBean.java
View file @
041f6e0
...
@@ -57,7 +57,6 @@ import fi.codecrew.moya.facade.PlaceSlotFacade;
...
@@ -57,7 +57,6 @@ import fi.codecrew.moya.facade.PlaceSlotFacade;
import
fi.codecrew.moya.facade.ProductFacade
;
import
fi.codecrew.moya.facade.ProductFacade
;
import
fi.codecrew.moya.facade.UserFacade
;
import
fi.codecrew.moya.facade.UserFacade
;
import
fi.codecrew.moya.model.AccountEvent
;
import
fi.codecrew.moya.model.AccountEvent
;
import
fi.codecrew.moya.model.Bill
;
import
fi.codecrew.moya.model.Discount
;
import
fi.codecrew.moya.model.Discount
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.InventoryEvent
;
import
fi.codecrew.moya.model.InventoryEvent
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
View file @
041f6e0
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.regex.Pattern
;
import
java.util.regex.Pattern
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SessionMgmtBean.java
View file @
041f6e0
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentSkipListMap
;
import
javax.annotation.security.DeclareRoles
;
import
javax.annotation.security.DeclareRoles
;
import
javax.annotation.security.RolesAllowed
;
import
javax.annotation.security.RolesAllowed
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SitePageBean.java
View file @
041f6e0
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.LanEvent;
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.LanEvent;
import
fi.codecrew.moya.model.PageContent
;
import
fi.codecrew.moya.model.PageContent
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.SitePage
;
import
fi.codecrew.moya.model.SitePage
;
import
fi.codecrew.moya.utilities.jpa.GenericFacade
;
/**
/**
* Session Bean implementation class SitePageBean
* Session Bean implementation class SitePageBean
...
@@ -74,7 +73,6 @@ public class SitePageBean implements SitePageBeanLocal {
...
@@ -74,7 +73,6 @@ public class SitePageBean implements SitePageBeanLocal {
@EJB
@EJB
private
UserBean
userbean
;
private
UserBean
userbean
;
@SuppressWarnings
(
"unused"
)
private
Logger
logger
=
LoggerFactory
.
getLogger
(
SitePageBean
.
class
);
private
Logger
logger
=
LoggerFactory
.
getLogger
(
SitePageBean
.
class
);
@EJB
@EJB
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/TicketBean.java
View file @
041f6e0
...
@@ -19,36 +19,39 @@
...
@@ -19,36 +19,39 @@
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
com.pdfjet.*
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.text.MessageFormat
;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.annotation.security.DeclareRoles
;
import
javax.ejb.EJB
;
import
javax.ejb.Stateless
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.pdfjet.A5
;
import
com.pdfjet.CoreFont
;
import
com.pdfjet.Font
;
import
com.pdfjet.Image
;
import
com.pdfjet.PDF
;
import
com.pdfjet.Page
;
import
com.pdfjet.TextLine
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.SpecialPermission
;
import
fi.codecrew.moya.enums.apps.SpecialPermission
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.GroupMembershipFacade
;
import
fi.codecrew.moya.facade.GroupMembershipFacade
;
import
fi.codecrew.moya.facade.PlaceGroupFacade
;
import
fi.codecrew.moya.facade.PlaceGroupFacade
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.LanEventPropertyKey
;
import
fi.codecrew.moya.util.MailMessage
;
import
fi.codecrew.moya.util.MailMessage
;
import
fi.codecrew.moya.util.MailMessageAttachment
;
import
fi.codecrew.moya.util.MailMessageAttachment
;
import
fi.codecrew.moya.utilities.BarcodeUtils
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
net.glxn.qrgen.*
;
import
net.glxn.qrgen.QRCode
;
import
net.glxn.qrgen.QRCode
;
import
net.glxn.qrgen.image.ImageType
;
import
net.glxn.qrgen.image.ImageType
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.annotation.security.DeclareRoles
;
import
javax.annotation.security.RolesAllowed
;
import
javax.ejb.EJB
;
import
javax.ejb.EJBAccessException
;
import
javax.ejb.Stateless
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.OutputStream
;
import
java.security.acl.Group
;
import
java.text.MessageFormat
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.List
;
/**
/**
* Session Bean implementation class PlaceGroupBean
* Session Bean implementation class PlaceGroupBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java
View file @
041f6e0
...
@@ -18,13 +18,10 @@
...
@@ -18,13 +18,10 @@
*/
*/
package
fi
.
codecrew
.
moya
.
beans
;
package
fi
.
codecrew
.
moya
.
beans
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.io.InputStreamReader
;
import
java.io.StringWriter
;
import
java.io.StringWriter
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Arrays
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -46,14 +43,11 @@ import javax.xml.parsers.ParserConfigurationException;
...
@@ -46,14 +43,11 @@ import javax.xml.parsers.ParserConfigurationException;
import
org.apache.http.HttpResponse
;
import
org.apache.http.HttpResponse
;
import
org.apache.http.auth.AuthScope
;
import
org.apache.http.auth.AuthScope
;
import
org.apache.http.auth.UsernamePasswordCredentials
;
import
org.apache.http.auth.UsernamePasswordCredentials
;
import
org.apache.http.auth.params.AuthPNames
;
import
org.apache.http.client.CredentialsProvider
;
import
org.apache.http.client.CredentialsProvider
;
import
org.apache.http.client.methods.HttpPost
;
import
org.apache.http.client.methods.HttpPost
;
import
org.apache.http.client.params.AuthPolicy
;
import
org.apache.http.entity.StringEntity
;
import
org.apache.http.entity.StringEntity
;
import
org.apache.http.impl.client.BasicCredentialsProvider
;
import
org.apache.http.impl.client.BasicCredentialsProvider
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.DefaultHttpClient
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VipBean.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@ import fi.codecrew.moya.enums.apps.VipPermission;
...
@@ -18,7 +18,6 @@ import fi.codecrew.moya.enums.apps.VipPermission;
import
fi.codecrew.moya.facade.VipFacade
;
import
fi.codecrew.moya.facade.VipFacade
;
import
fi.codecrew.moya.facade.VipProductDeliveryFacade
;
import
fi.codecrew.moya.facade.VipProductDeliveryFacade
;
import
fi.codecrew.moya.facade.VipProductFacade
;
import
fi.codecrew.moya.facade.VipProductFacade
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.VipProductDelivery
;
import
fi.codecrew.moya.model.VipProductDelivery
;
...
@@ -30,6 +29,7 @@ import fi.codecrew.moya.utilities.SearchResult;
...
@@ -30,6 +29,7 @@ import fi.codecrew.moya.utilities.SearchResult;
@DeclareRoles
({
VipPermission
.
S_VIEW
,
VipPermission
.
S_USAGE
,
VipPermission
.
S_EDIT
})
@DeclareRoles
({
VipPermission
.
S_VIEW
,
VipPermission
.
S_USAGE
,
VipPermission
.
S_EDIT
})
public
class
VipBean
implements
VipBeanLocal
{
public
class
VipBean
implements
VipBeanLocal
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
VipBean
.
class
);
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
VipBean
.
class
);
// @EJB
// @EJB
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/IrcBotMoyaEventTopicListener.java
View file @
041f6e0
...
@@ -2,26 +2,13 @@ package fi.codecrew.moya.beans.moyamessage;
...
@@ -2,26 +2,13 @@ package fi.codecrew.moya.beans.moyamessage;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.ejb.MessageDriven
;
import
javax.ejb.MessageDriven
;
import
javax.jms.JMSException
;
import
javax.jms.Message
;
import
javax.jms.Message
;
import
javax.jms.MessageListener
;
import
javax.jms.MessageListener
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.BotBean
;
import
fi.codecrew.moya.beans.BotBean
;
import
fi.codecrew.moya.facade.EventFacade
;
import
fi.codecrew.moya.facade.EventUserFacade
;
import
fi.codecrew.moya.facade.UserFacade
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventMessage
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
/**
/**
* Message-Driven Bean implementation class for: IrcBotTopicListener
* Message-Driven Bean implementation class for: IrcBotTopicListener
...
@@ -29,6 +16,7 @@ import java.util.List;
...
@@ -29,6 +16,7 @@ import java.util.List;
@MessageDriven
(
mappedName
=
MoyaEventSender
.
MOYA_EVENT_SENDER_TOPIC
)
@MessageDriven
(
mappedName
=
MoyaEventSender
.
MOYA_EVENT_SENDER_TOPIC
)
public
class
IrcBotMoyaEventTopicListener
implements
MessageListener
{
public
class
IrcBotMoyaEventTopicListener
implements
MessageListener
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
IrcBotMoyaEventTopicListener
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
IrcBotMoyaEventTopicListener
.
class
);
@EJB
@EJB
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beanutil/DecimalXMLAdapter.java
View file @
041f6e0
...
@@ -20,8 +20,6 @@ package fi.codecrew.moya.beanutil;
...
@@ -20,8 +20,6 @@ package fi.codecrew.moya.beanutil;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.math.RoundingMode
;
import
java.text.NumberFormat
;
import
java.util.Locale
;
import
javax.xml.bind.annotation.adapters.XmlAdapter
;
import
javax.xml.bind.annotation.adapters.XmlAdapter
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardObjectDataFacade.java
View file @
041f6e0
...
@@ -27,13 +27,10 @@ import javax.persistence.criteria.CriteriaBuilder;
...
@@ -27,13 +27,10 @@ import javax.persistence.criteria.CriteriaBuilder;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.model.CardObjectData
;
import
fi.codecrew.moya.model.CardObjectData_
;
import
fi.codecrew.moya.model.CardTemplate_
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.CardTextData_
;
import
fi.codecrew.moya.beans.CardTemplateBeanLocal
;
import
fi.codecrew.moya.beans.CardTemplateBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.model.CardObjectData
;
import
fi.codecrew.moya.model.CardObjectData_
;
import
fi.codecrew.moya.model.CardTemplate
;
import
fi.codecrew.moya.model.CardTemplate
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardTextDataFacade.java
View file @
041f6e0
...
@@ -27,12 +27,11 @@ import javax.persistence.criteria.CriteriaBuilder;
...
@@ -27,12 +27,11 @@ import javax.persistence.criteria.CriteriaBuilder;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.model.CardTemplate_
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.CardTextData_
;
import
fi.codecrew.moya.beans.CardTemplateBeanLocal
;
import
fi.codecrew.moya.beans.CardTemplateBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.model.CardTemplate
;
import
fi.codecrew.moya.model.CardTemplate
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.CardTextData_
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventMapFacade.java
View file @
041f6e0
...
@@ -34,7 +34,6 @@ import fi.codecrew.moya.enums.apps.MapPermission;
...
@@ -34,7 +34,6 @@ import fi.codecrew.moya.enums.apps.MapPermission;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.EventMap_
;
import
fi.codecrew.moya.model.EventMap_
;
import
fi.codecrew.moya.model.EventOrganiser
;
import
fi.codecrew.moya.model.EventOrganiser
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent_
;
import
fi.codecrew.moya.model.LanEvent_
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GameIDFacade.java
View file @
041f6e0
...
@@ -18,29 +18,16 @@
...
@@ -18,29 +18,16 @@
*/
*/
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.List
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.enums.TournamentStatus
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GameID
;
import
fi.codecrew.moya.model.GameID
;
import
fi.codecrew.moya.model.GameID_
;
import
fi.codecrew.moya.model.GameID_
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentParticipant
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule_
;
import
fi.codecrew.moya.model.Tournament_
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User_
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.List
;
import
java.util.List
;
...
@@ -40,7 +39,6 @@ import fi.codecrew.moya.model.GroupMembership_;
...
@@ -40,7 +39,6 @@ import fi.codecrew.moya.model.GroupMembership_;
import
fi.codecrew.moya.model.PlaceGroup
;
import
fi.codecrew.moya.model.PlaceGroup
;
import
fi.codecrew.moya.model.PlaceGroup_
;
import
fi.codecrew.moya.model.PlaceGroup_
;
import
fi.codecrew.moya.model.Place_
;
import
fi.codecrew.moya.model.Place_
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.utilities.PasswordFunctions
;
import
fi.codecrew.moya.utilities.PasswordFunctions
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextFacade.java
View file @
041f6e0
...
@@ -19,19 +19,21 @@
...
@@ -19,19 +19,21 @@
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.model.*
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.TypedQuery
;
import
javax.persistence.TypedQuery
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Path
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.model.HelpText
;
import
fi.codecrew.moya.model.HelpText_
;
import
fi.codecrew.moya.model.Help_
;
/**
/**
* Created by tuukka on 19/12/15.
* Created by tuukka on 19/12/15.
*/
*/
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextHistoryFacade.java
View file @
041f6e0
...
@@ -19,13 +19,13 @@
...
@@ -19,13 +19,13 @@
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
fi.codecrew.moya.model.HelpText
;
import
javax.ejb.LocalBean
;
import
fi.codecrew.moya.model.HelpTextHistory
;
import
javax.ejb.Stateless
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.LocalBean
;
import
fi.codecrew.moya.model.HelpTextHistory
;
import
javax.ejb.Stateless
;
/**
/**
* Created by tuukka on 19/12/15.
* Created by tuukka on 19/12/15.
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LanEventFacade.java
View file @
041f6e0
...
@@ -20,16 +20,8 @@ package fi.codecrew.moya.facade;
...
@@ -20,16 +20,8 @@ package fi.codecrew.moya.facade;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.TypedQuery
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Path
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEventDomain_
;
import
fi.codecrew.moya.model.LanEvent_
;
import
fi.codecrew.moya.model.LanEventDomain
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LogEntryTypeFacade.java
View file @
041f6e0
...
@@ -22,7 +22,6 @@ import javax.ejb.LocalBean;
...
@@ -22,7 +22,6 @@ import javax.ejb.LocalBean;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.TypedQuery
;
import
javax.persistence.TypedQuery
;
import
fi.codecrew.moya.beans.SecurityLogType
;
import
fi.codecrew.moya.model.LogEntryType
;
import
fi.codecrew.moya.model.LogEntryType
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/OrgRoleFacade.java
View file @
041f6e0
...
@@ -18,8 +18,6 @@
...
@@ -18,8 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
...
@@ -29,7 +27,6 @@ import javax.persistence.criteria.CriteriaBuilder;
...
@@ -29,7 +27,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.ListJoin
;
import
javax.persistence.criteria.ListJoin
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Subquery
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -54,6 +51,7 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> {
...
@@ -54,6 +51,7 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> {
@EJB
@EJB
private
EventBeanLocal
eventBean
;
private
EventBeanLocal
eventBean
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OrgRoleFacade
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OrgRoleFacade
.
class
);
public
OrgRoleFacade
()
{
public
OrgRoleFacade
()
{
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
View file @
041f6e0
...
@@ -34,7 +34,6 @@ import fi.codecrew.moya.model.*;
...
@@ -34,7 +34,6 @@ import fi.codecrew.moya.model.*;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.LoggingBeanLocal
;
import
fi.codecrew.moya.beans.LoggingBeanLocal
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
import
fi.codecrew.moya.utilities.moyamessage.MoyaEventType
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java
View file @
041f6e0
...
@@ -52,6 +52,7 @@ import fi.codecrew.moya.model.Product_;
...
@@ -52,6 +52,7 @@ import fi.codecrew.moya.model.Product_;
@LocalBean
@LocalBean
public
class
PlaceSlotFacade
extends
IntegerPkGenericFacade
<
PlaceSlot
>
{
public
class
PlaceSlotFacade
extends
IntegerPkGenericFacade
<
PlaceSlot
>
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PlaceSlotFacade
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PlaceSlotFacade
.
class
);
@EJB
@EJB
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java
View file @
041f6e0
...
@@ -38,8 +38,6 @@ import fi.codecrew.moya.model.CardCode;
...
@@ -38,8 +38,6 @@ import fi.codecrew.moya.model.CardCode;
import
fi.codecrew.moya.model.CardCode_
;
import
fi.codecrew.moya.model.CardCode_
;
import
fi.codecrew.moya.model.CardTemplate_
;
import
fi.codecrew.moya.model.CardTemplate_
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.GroupMembership_
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.PrintedCard_
;
import
fi.codecrew.moya.model.PrintedCard_
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/RoleFacade.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/SitePageFacade.java
View file @
041f6e0
...
@@ -51,6 +51,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
...
@@ -51,6 +51,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
@EJB
@EJB
private
EventBeanLocal
eventbean
;
private
EventBeanLocal
eventbean
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
SitePageFacade
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
SitePageFacade
.
class
);
public
SitePageFacade
()
{
public
SitePageFacade
()
{
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java
View file @
041f6e0
...
@@ -18,8 +18,6 @@
...
@@ -18,8 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
...
@@ -29,13 +27,9 @@ import javax.persistence.criteria.CriteriaQuery;
...
@@ -29,13 +27,9 @@ import javax.persistence.criteria.CriteriaQuery;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.enums.TournamentStatus
;
import
fi.codecrew.moya.enums.TournamentStatus
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.TournamentParticipant
;
import
fi.codecrew.moya.model.Tournament_
;
import
fi.codecrew.moya.model.Tournament_
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User_
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentGameFacade.java
View file @
041f6e0
...
@@ -30,8 +30,6 @@ import javax.persistence.criteria.Root;
...
@@ -30,8 +30,6 @@ import javax.persistence.criteria.Root;
import
fi.codecrew.moya.beans.EventBean
;
import
fi.codecrew.moya.beans.EventBean
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame_
;
import
fi.codecrew.moya.model.TournamentGame_
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule_
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentParticipantFacade.java
View file @
041f6e0
...
@@ -27,8 +27,6 @@ import javax.persistence.criteria.CriteriaQuery;
...
@@ -27,8 +27,6 @@ import javax.persistence.criteria.CriteriaQuery;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame_
;
import
fi.codecrew.moya.model.TournamentParticipant
;
import
fi.codecrew.moya.model.TournamentParticipant
;
import
fi.codecrew.moya.model.TournamentParticipant_
;
import
fi.codecrew.moya.model.TournamentParticipant_
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentRuleFacade.java
View file @
041f6e0
...
@@ -20,16 +20,12 @@ package fi.codecrew.moya.facade;
...
@@ -20,16 +20,12 @@ package fi.codecrew.moya.facade;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.beans.EventBean
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role_
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule_
;
import
fi.codecrew.moya.model.TournamentRule_
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentTeamMemberFacade.java
View file @
041f6e0
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.facade;
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.facade;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
fi.codecrew.moya.model.TournamentMatchResult
;
import
fi.codecrew.moya.model.TournamentTeamMember
;
import
fi.codecrew.moya.model.TournamentTeamMember
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserFacade.java
View file @
041f6e0
...
@@ -30,7 +30,6 @@ import javax.persistence.criteria.CriteriaQuery;
...
@@ -30,7 +30,6 @@ import javax.persistence.criteria.CriteriaQuery;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
javax.persistence.metamodel.SingularAttribute
;
import
javax.persistence.metamodel.SingularAttribute
;
import
fi.codecrew.moya.model.EventUser
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipFacade.java
View file @
041f6e0
...
@@ -15,19 +15,12 @@ import javax.persistence.criteria.Root;
...
@@ -15,19 +15,12 @@ import javax.persistence.criteria.Root;
import
javax.persistence.metamodel.SingularAttribute
;
import
javax.persistence.metamodel.SingularAttribute
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.facade.callbacks.EventLimiter
;
import
fi.codecrew.moya.facade.callbacks.OrderCallback
;
import
fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator
;
import
fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser_
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User_
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.Vip_
;
import
fi.codecrew.moya.model.Vip_
;
import
fi.codecrew.moya.utilities.SearchQuery
;
import
fi.codecrew.moya.utilities.SearchQuery
;
import
fi.codecrew.moya.utilities.SearchResult
;
import
fi.codecrew.moya.utilities.SearchResult
;
import
fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder
;
import
fi.codecrew.moya.utilities.jpa.FacadeCallback
;
import
fi.codecrew.moya.utilities.jpa.FacadeCallback
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductDeliveryFacade.java
View file @
041f6e0
...
@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade;
...
@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.VipProductDelivery
;
import
fi.codecrew.moya.model.VipProductDelivery
;
@Stateless
@Stateless
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductFacade.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
facade
;
package
fi
.
codecrew
.
moya
.
facade
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.LocalBean
;
import
javax.ejb.LocalBean
;
import
javax.ejb.Stateless
;
import
javax.ejb.Stateless
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.Vip_
;
@Stateless
@Stateless
@LocalBean
@LocalBean
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/OrderCallback.java
View file @
041f6e0
...
@@ -52,6 +52,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
...
@@ -52,6 +52,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
}
}
@SuppressWarnings
(
"unchecked"
)
@Override
@Override
public
void
exec
(
CriteriaBuilder
cb
,
CriteriaQuery
<?>
cq
,
Path
<
T
>
root
,
List
<
Predicate
>
predicates
,
boolean
isFullQuery
)
{
public
void
exec
(
CriteriaBuilder
cb
,
CriteriaQuery
<?>
cq
,
Path
<
T
>
root
,
List
<
Predicate
>
predicates
,
boolean
isFullQuery
)
{
if
(!
isFullQuery
)
if
(!
isFullQuery
)
...
@@ -79,6 +80,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
...
@@ -79,6 +80,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
if
(
path
==
null
)
{
if
(
path
==
null
)
{
return
;
return
;
}
}
// Unchecked error comes from this line, which is actually checked...
if
(
path
.
getJavaType
().
equals
(
String
.
class
))
{
if
(
path
.
getJavaType
().
equals
(
String
.
class
))
{
path
=
cb
.
lower
((
Expression
<
String
>)
path
);
path
=
cb
.
lower
((
Expression
<
String
>)
path
);
}
}
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillFilterPredicate.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate;
...
@@ -18,7 +18,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate;
import
fi.codecrew.moya.model.Bill
;
import
fi.codecrew.moya.model.Bill
;
import
fi.codecrew.moya.model.Bill_
;
import
fi.codecrew.moya.model.Bill_
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.utilities.jpa.FacadeCallback
;
public
class
BillFilterPredicate
extends
GenericBillPredicate
{
public
class
BillFilterPredicate
extends
GenericBillPredicate
{
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillOrderPredicate.java
View file @
041f6e0
...
@@ -16,7 +16,6 @@ import fi.codecrew.moya.entitysearch.BillSearchQuery;
...
@@ -16,7 +16,6 @@ import fi.codecrew.moya.entitysearch.BillSearchQuery;
import
fi.codecrew.moya.model.Bill
;
import
fi.codecrew.moya.model.Bill
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser_
;
import
fi.codecrew.moya.model.EventUser_
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User_
;
import
fi.codecrew.moya.model.User_
;
import
fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder
;
import
fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/ActionLogMessageTag.java
View file @
041f6e0
...
@@ -23,8 +23,6 @@ import javax.persistence.Entity;
...
@@ -23,8 +23,6 @@ import javax.persistence.Entity;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
import
org.eclipse.persistence.annotations.PrivateOwned
;
@Entity
@Entity
@Table
(
name
=
"actionlog_message_tags"
)
@Table
(
name
=
"actionlog_message_tags"
)
public
class
ActionLogMessageTag
extends
GenericEntity
{
public
class
ActionLogMessageTag
extends
GenericEntity
{
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/DBModel.java
View file @
041f6e0
...
@@ -22,8 +22,6 @@ import java.util.Date;
...
@@ -22,8 +22,6 @@ import java.util.Date;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.GenerationType
;
import
javax.persistence.Id
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.Temporal
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/FoodWave.java
View file @
041f6e0
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
package
fi
.
codecrew
.
moya
.
model
;
package
fi
.
codecrew
.
moya
.
model
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/GenericEntity.java
View file @
041f6e0
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.model;
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.model;
import
javax.json.Json
;
import
javax.json.Json
;
import
javax.json.JsonObject
;
import
javax.json.JsonObject
;
import
javax.json.JsonObjectBuilder
;
import
javax.json.JsonObjectBuilder
;
import
javax.json.JsonValue
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Id
;
import
javax.persistence.Id
;
import
javax.persistence.MappedSuperclass
;
import
javax.persistence.MappedSuperclass
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java
View file @
041f6e0
...
@@ -22,12 +22,19 @@
...
@@ -22,12 +22,19 @@
*/
*/
package
fi
.
codecrew
.
moya
.
model
;
package
fi
.
codecrew
.
moya
.
model
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
javax.persistence.*
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.Locale
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.EnumType
;
import
javax.persistence.Enumerated
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
fi.codecrew.moya.enums.ValidLocale
;
/**
/**
* Group for lectures, so you can set limits how many of these the user can
* Group for lectures, so you can set limits how many of these the user can
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/LanEvent.java
View file @
041f6e0
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.model;
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.model;
import
java.beans.Transient
;
import
java.beans.Transient
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/LectureGroup.java
View file @
041f6e0
...
@@ -27,7 +27,6 @@ import java.util.List;
...
@@ -27,7 +27,6 @@ import java.util.List;
import
javax.persistence.CascadeType
;
import
javax.persistence.CascadeType
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.FetchType
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.Lob
;
import
javax.persistence.Lob
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.ManyToOne
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/PrintedCard.java
View file @
041f6e0
...
@@ -25,10 +25,8 @@ package fi.codecrew.moya.model;
...
@@ -25,10 +25,8 @@ package fi.codecrew.moya.model;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.List
;
import
javax.faces.model.ListDataModel
;
import
javax.persistence.CascadeType
;
import
javax.persistence.CascadeType
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -40,7 +38,6 @@ import javax.persistence.OneToMany;
...
@@ -40,7 +38,6 @@ import javax.persistence.OneToMany;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.persistence.TemporalType
;
import
javax.persistence.Transient
;
import
javax.persistence.UniqueConstraint
;
import
javax.persistence.UniqueConstraint
;
import
fi.codecrew.moya.enums.CardState
;
import
fi.codecrew.moya.enums.CardState
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
View file @
041f6e0
...
@@ -23,12 +23,26 @@
...
@@ -23,12 +23,26 @@
package
fi
.
codecrew
.
moya
.
model
;
package
fi
.
codecrew
.
moya
.
model
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
javax.persistence.*
;
import
javax.persistence.CascadeType
;
import
javax.persistence.CollectionTable
;
import
javax.persistence.Column
;
import
javax.persistence.ElementCollection
;
import
javax.persistence.Entity
;
import
javax.persistence.EnumType
;
import
javax.persistence.Enumerated
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinTable
;
import
javax.persistence.Lob
;
import
javax.persistence.ManyToMany
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.OneToMany
;
import
javax.persistence.Table
;
import
javax.persistence.Transient
;
import
javax.persistence.UniqueConstraint
;
import
org.eclipse.persistence.annotations.PrivateOwned
;
import
org.eclipse.persistence.annotations.PrivateOwned
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentGame.java
View file @
041f6e0
...
@@ -19,13 +19,17 @@
...
@@ -19,13 +19,17 @@
package
fi
.
codecrew
.
moya
.
model
;
package
fi
.
codecrew
.
moya
.
model
;
import
static
javax
.
persistence
.
FetchType
.
LAZY
;
import
static
javax
.
persistence
.
FetchType
.
LAZY
;
import
fi.codecrew.moya.enums.TournamentType
;
import
fi.codecrew.moya.model.GenericEntity
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
javax.persistence.*
;
import
javax.persistence.Basic
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.Lob
;
import
javax.persistence.OneToMany
;
import
javax.persistence.Table
;
/**
/**
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentRule.java
View file @
041f6e0
...
@@ -18,14 +18,14 @@
...
@@ -18,14 +18,14 @@
*/
*/
package
fi
.
codecrew
.
moya
.
model
;
package
fi
.
codecrew
.
moya
.
model
;
import
static
javax
.
persistence
.
FetchType
.
LAZY
;
import
fi.codecrew.moya.enums.TournamentType
;
import
fi.codecrew.moya.model.GenericEntity
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
import
javax.persistence.*
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.Lob
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.Table
;
/**
/**
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentTeamMember.java
View file @
041f6e0
...
@@ -25,7 +25,6 @@ import javax.persistence.Entity;
...
@@ -25,7 +25,6 @@ import javax.persistence.Entity;
import
javax.persistence.EnumType
;
import
javax.persistence.EnumType
;
import
javax.persistence.Enumerated
;
import
javax.persistence.Enumerated
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
import
fi.codecrew.moya.enums.TournamentTeamMemberRole
;
import
fi.codecrew.moya.enums.TournamentTeamMemberRole
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/User.java
View file @
041f6e0
...
@@ -24,8 +24,6 @@ import java.util.Calendar;
...
@@ -24,8 +24,6 @@ import java.util.Calendar;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
javax.json.Json
;
import
javax.json.JsonValue
;
import
javax.persistence.CascadeType
;
import
javax.persistence.CascadeType
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueue.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
model
.
map
;
package
fi
.
codecrew
.
moya
.
model
.
map
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.persistence.TemporalType
;
...
...
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueueEntry.java
View file @
041f6e0
...
@@ -3,11 +3,8 @@ package fi.codecrew.moya.model.map;
...
@@ -3,11 +3,8 @@ package fi.codecrew.moya.model.map;
import
java.util.Date
;
import
java.util.Date
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.OneToOne
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.persistence.TemporalType
;
import
javax.persistence.Transient
;
import
javax.persistence.Transient
;
...
@@ -31,6 +28,7 @@ public class MapReservationQueueEntry extends GenericEntity implements Comparabl
...
@@ -31,6 +28,7 @@ public class MapReservationQueueEntry extends GenericEntity implements Comparabl
*
*
*/
*/
private
static
final
long
serialVersionUID
=
-
1529588850152306791L
;
private
static
final
long
serialVersionUID
=
-
1529588850152306791L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MapReservationQueueEntry
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MapReservationQueueEntry
.
class
);
@Column
()
@Column
()
...
...
code/moya-utils/src/test/java/fi/codecrew/moya/utilities/StringUtilsTest.java
View file @
041f6e0
...
@@ -7,6 +7,7 @@ import org.testng.annotations.Test;
...
@@ -7,6 +7,7 @@ import org.testng.annotations.Test;
public
class
StringUtilsTest
{
public
class
StringUtilsTest
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
StringUtilsTest
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
StringUtilsTest
.
class
);
@Test
@Test
...
...
code/moya-web/src/main/java/fi/codecrew/moya/cmdline/ICommandlineCommand.java
View file @
041f6e0
...
@@ -18,8 +18,7 @@
...
@@ -18,8 +18,7 @@
*/
*/
package
fi
.
codecrew
.
moya
.
cmdline
;
package
fi
.
codecrew
.
moya
.
cmdline
;
import
java.io.InputStreamReader
;
import
java.io.InputStreamReader
;
import
java.io.OutputStream
;
import
java.io.OutputStreamWriter
;
import
java.io.OutputStreamWriter
;
public
interface
ICommandlineCommand
{
public
interface
ICommandlineCommand
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/management/ReplServlet.java
View file @
041f6e0
...
@@ -2,7 +2,6 @@ package fi.codecrew.moya.management;
...
@@ -2,7 +2,6 @@ package fi.codecrew.moya.management;
import
java.io.IOException
;
import
java.io.IOException
;
import
javax.servlet.Servlet
;
import
javax.servlet.ServletConfig
;
import
javax.servlet.ServletConfig
;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletRequest
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/AccountEventRestView.java
View file @
041f6e0
...
@@ -89,7 +89,6 @@ public class AccountEventRestView {
...
@@ -89,7 +89,6 @@ public class AccountEventRestView {
monthMap
.
put
(
day
,
dayValue
+=
p
.
getQuantity
().
intValueExact
());
monthMap
.
put
(
day
,
dayValue
+=
p
.
getQuantity
().
intValueExact
());
}
}
boolean
empty
=
true
;
HcSeries
data1
=
new
HcSeries
(
"Daily"
);
HcSeries
data1
=
new
HcSeries
(
"Daily"
);
HcSeries
data2
=
new
HcSeries
(
"Stacked"
);
HcSeries
data2
=
new
HcSeries
(
"Stacked"
);
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/JsonpRestFilter.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
rest
;
package
fi
.
codecrew
.
moya
.
rest
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
javax.servlet.Filter
;
import
javax.servlet.Filter
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/PojoUtils.java
View file @
041f6e0
...
@@ -4,8 +4,6 @@ import java.math.BigDecimal;
...
@@ -4,8 +4,6 @@ import java.math.BigDecimal;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlElement
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.EventPojo
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.EventPojo
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/ReaderRestView.java
View file @
041f6e0
...
@@ -36,11 +36,8 @@ import fi.codecrew.moya.beans.ReaderBeanLocal;
...
@@ -36,11 +36,8 @@ import fi.codecrew.moya.beans.ReaderBeanLocal;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestPojo
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestRoot
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestRoot
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestPojo
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestRoot
;
import
fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestRoot
;
import
fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo
;
import
fi.codecrew.moya.rest.pojo.userinfo.v1.UserPermissionRestPojo
;
import
fi.codecrew.moya.rest.pojo.userinfo.v1.UserPermissionRestPojo
;
@RequestScoped
@RequestScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/EventInfoV1.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
rest
.
appconfig
.
v1
;
package
fi
.
codecrew
.
moya
.
rest
.
appconfig
.
v1
;
import
com.wordnik.swagger.annotations.Api
;
import
com.wordnik.swagger.annotations.ApiOperation
;
import
com.wordnik.swagger.annotations.ApiResponse
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.SessionMgmtBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.rest.PojoUtils
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.EventRoot
;
import
fi.codecrew.moya.rest.pojo.map.v1.MapRoot
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.ejb.SessionBean
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.GET
;
...
@@ -21,7 +8,15 @@ import javax.ws.rs.Path;
...
@@ -21,7 +8,15 @@ import javax.ws.rs.Path;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
import
java.util.List
;
import
com.wordnik.swagger.annotations.Api
;
import
com.wordnik.swagger.annotations.ApiOperation
;
import
com.wordnik.swagger.annotations.ApiResponse
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.rest.PojoUtils
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.EventRoot
;
/**
/**
* Created by tuukka on 28.3.2015.
* Created by tuukka on 28.3.2015.
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/InstancesV1.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
rest
.
appconfig
.
v1
;
package
fi
.
codecrew
.
moya
.
rest
.
appconfig
.
v1
;
import
com.wordnik.swagger.annotations.Api
;
import
java.security.Principal
;
import
com.wordnik.swagger.annotations.ApiOperation
;
import
com.wordnik.swagger.annotations.ApiResponse
;
import
fi.codecrew.moya.beans.ApiApplicationBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.model.ApiApplicationInstance
;
import
fi.codecrew.moya.rest.PojoUtils
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo
;
import
fi.codecrew.moya.rest.pojo.map.v1.MapRoot
;
import
org.primefaces.push.PrimeAtmosphereHandler
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletException
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.*
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.FormParam
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
import
java.security.Principal
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.wordnik.swagger.annotations.Api
;
import
com.wordnik.swagger.annotations.ApiOperation
;
import
com.wordnik.swagger.annotations.ApiResponse
;
import
fi.codecrew.moya.beans.ApiApplicationBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.model.ApiApplicationInstance
;
import
fi.codecrew.moya.rest.PojoUtils
;
import
fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo
;
/**
/**
* Created by tuukka on 28.3.2015.
* Created by tuukka on 28.3.2015.
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/placemap/v1/PlacemapRestViewV1.java
View file @
041f6e0
...
@@ -2,9 +2,7 @@ package fi.codecrew.moya.rest.placemap.v1;
...
@@ -2,9 +2,7 @@ package fi.codecrew.moya.rest.placemap.v1;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/PojoFactoryV2.java
View file @
041f6e0
...
@@ -12,7 +12,12 @@ import java.io.Serializable;
...
@@ -12,7 +12,12 @@ import java.io.Serializable;
*/
*/
public
class
PojoFactoryV2
implements
Serializable
{
public
class
PojoFactoryV2
implements
Serializable
{
public
UserPojo
createUserPojo
(
EventUser
eventUser
)
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
public
UserPojo
createUserPojo
(
EventUser
eventUser
)
{
User
user
=
eventUser
.
getUser
();
User
user
=
eventUser
.
getUser
();
UserPojo
pojo
=
new
UserPojo
();
UserPojo
pojo
=
new
UserPojo
();
pojo
.
eventuserId
=
eventUser
.
getId
();
pojo
.
eventuserId
=
eventUser
.
getId
();
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java
View file @
041f6e0
...
@@ -16,7 +16,6 @@ import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
...
@@ -16,7 +16,6 @@ import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
import
fi.codecrew.moya.rest.v2.pojo.UserPojo
;
import
fi.codecrew.moya.rest.v2.pojo.UserPojo
;
import
org.glassfish.jersey.media.multipart.FormDataBodyPart
;
import
org.glassfish.jersey.media.multipart.FormDataBodyPart
;
import
org.glassfish.jersey.media.multipart.FormDataContentDisposition
;
import
org.glassfish.jersey.media.multipart.FormDataContentDisposition
;
import
org.glassfish.jersey.media.multipart.FormDataMultiPart
;
import
org.glassfish.jersey.media.multipart.FormDataParam
;
import
org.glassfish.jersey.media.multipart.FormDataParam
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory;
...
@@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.servlet.ServletException
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.Part
;
import
javax.ws.rs.*
;
import
javax.ws.rs.*
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/VipRestView.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
rest
.
v2
;
package
fi
.
codecrew
.
moya
.
rest
.
v2
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.DELETE
;
import
javax.ws.rs.DELETE
;
import
javax.ws.rs.FormParam
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.QueryParam
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
...
@@ -26,11 +21,9 @@ import fi.codecrew.moya.beans.PermissionBeanLocal;
...
@@ -26,11 +21,9 @@ import fi.codecrew.moya.beans.PermissionBeanLocal;
import
fi.codecrew.moya.beans.ProductBeanLocal
;
import
fi.codecrew.moya.beans.ProductBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.VipBeanLocal
;
import
fi.codecrew.moya.beans.VipBeanLocal
;
import
fi.codecrew.moya.model.AccountEvent
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.Vip
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.model.VipProduct
;
import
fi.codecrew.moya.rest.v2.pojo.ProductPojo
;
import
fi.codecrew.moya.rest.v2.pojo.VipProductPojo
;
import
fi.codecrew.moya.rest.v2.pojo.VipProductPojo
;
import
fi.codecrew.moya.rest.v2.pojo.VipRestPojo
;
import
fi.codecrew.moya.rest.v2.pojo.VipRestPojo
;
import
fi.codecrew.moya.utilities.SearchQuery
;
import
fi.codecrew.moya.utilities.SearchQuery
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/servlet/BortalCommand.java
View file @
041f6e0
...
@@ -26,9 +26,6 @@ import java.io.OutputStreamWriter;
...
@@ -26,9 +26,6 @@ import java.io.OutputStreamWriter;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
javax.annotation.PostConstruct
;
import
javax.security.auth.login.LoginException
;
import
org.apache.sshd.server.Command
;
import
org.apache.sshd.server.Command
;
import
org.apache.sshd.server.Environment
;
import
org.apache.sshd.server.Environment
;
import
org.apache.sshd.server.ExitCallback
;
import
org.apache.sshd.server.ExitCallback
;
...
@@ -36,7 +33,6 @@ import org.slf4j.Logger;
...
@@ -36,7 +33,6 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.clientutils.BortalLocalContextHolder
;
import
fi.codecrew.moya.clientutils.BortalLocalContextHolder
;
import
fi.codecrew.moya.cmdline.Hello
;
import
fi.codecrew.moya.cmdline.ICommandlineCommand
;
import
fi.codecrew.moya.cmdline.ICommandlineCommand
;
public
class
BortalCommand
implements
Command
,
Runnable
{
public
class
BortalCommand
implements
Command
,
Runnable
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java
View file @
041f6e0
...
@@ -29,7 +29,6 @@ import java.awt.image.BufferedImage;
...
@@ -29,7 +29,6 @@ import java.awt.image.BufferedImage;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -44,12 +43,14 @@ import javax.servlet.http.HttpServlet;
...
@@ -44,12 +43,14 @@ import javax.servlet.http.HttpServlet;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
fi.codecrew.moya.beans.*
;
import
fi.codecrew.moya.model.User
;
import
org.primefaces.component.barcode.Barcode
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.BarcodeBeanLocal
;
import
fi.codecrew.moya.beans.LoggingBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/ConversationKeepaliveView.java
View file @
041f6e0
...
@@ -38,6 +38,7 @@ public class ConversationKeepaliveView implements Serializable {
...
@@ -38,6 +38,7 @@ public class ConversationKeepaliveView implements Serializable {
private
int
value
=
0
;
private
int
value
=
0
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ConversationKeepaliveView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ConversationKeepaliveView
.
class
);
public
int
ping
()
{
public
int
ping
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/ErrorPageView.java
View file @
041f6e0
...
@@ -49,15 +49,13 @@ public class ErrorPageView implements Serializable {
...
@@ -49,15 +49,13 @@ public class ErrorPageView implements Serializable {
// @Inject
// @Inject
// private transient FacesContext context;
// private transient FacesContext context;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ErrorPageView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ErrorPageView
.
class
);
public
String
getStackTrace
()
{
public
String
getStackTrace
()
{
FacesContext
context
=
FacesContext
.
getCurrentInstance
();
FacesContext
context
=
FacesContext
.
getCurrentInstance
();
Map
requestMap
=
context
.
getExternalContext
().
getRequestMap
();
Map
<
String
,
Object
>
requestMap
=
context
.
getExternalContext
().
getRequestMap
();
Throwable
ex
=
Throwable
ex
=
(
Throwable
)
requestMap
.
get
(
"javax.servlet.error.exception"
);
(
Throwable
)
requestMap
.
get
(
"javax.servlet.error.exception"
);
StringWriter
sw
=
new
StringWriter
();
StringWriter
sw
=
new
StringWriter
();
PrintWriter
pw
=
new
PrintWriter
(
sw
);
PrintWriter
pw
=
new
PrintWriter
(
sw
);
...
@@ -70,7 +68,7 @@ public class ErrorPageView implements Serializable {
...
@@ -70,7 +68,7 @@ public class ErrorPageView implements Serializable {
public
String
getMessage
()
{
public
String
getMessage
()
{
FacesContext
context
=
FacesContext
.
getCurrentInstance
();
FacesContext
context
=
FacesContext
.
getCurrentInstance
();
Map
requestMap
=
context
.
getExternalContext
().
getRequestMap
();
Map
<
String
,
Object
>
requestMap
=
context
.
getExternalContext
().
getRequestMap
();
Throwable
ex
=
(
Throwable
)
requestMap
.
get
(
"javax.servlet.error.exception"
);
Throwable
ex
=
(
Throwable
)
requestMap
.
get
(
"javax.servlet.error.exception"
);
return
ex
.
getMessage
();
return
ex
.
getMessage
();
}
}
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/LocaleSelectorView.java
View file @
041f6e0
...
@@ -32,6 +32,7 @@ import fi.codecrew.moya.handler.SessionStore;
...
@@ -32,6 +32,7 @@ import fi.codecrew.moya.handler.SessionStore;
@RequestScoped
@RequestScoped
public
class
LocaleSelectorView
{
public
class
LocaleSelectorView
{
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
LocaleSelectorView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
LocaleSelectorView
.
class
);
@Inject
@Inject
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/TestDataView.java
View file @
041f6e0
...
@@ -30,14 +30,26 @@ import javax.enterprise.context.RequestScoped;
...
@@ -30,14 +30,26 @@ import javax.enterprise.context.RequestScoped;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.*
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.CardTemplateBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.MenuBeanLocal
;
import
fi.codecrew.moya.beans.PollBeanLocal
;
import
fi.codecrew.moya.beans.RoleBeanLocal
;
import
fi.codecrew.moya.beans.TestDataBeanLocal
;
import
fi.codecrew.moya.beans.TicketBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserUtilBeanLocal
;
import
fi.codecrew.moya.enums.apps.EventPermission
;
import
fi.codecrew.moya.enums.apps.EventPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Poll
;
import
fi.codecrew.moya.model.PollQuestion
;
import
fi.codecrew.moya.model.PossibleAnswer
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.eticket.EticketView
;
import
fi.codecrew.moya.web.cdiview.eticket.EticketView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
/**
*
*
...
@@ -47,6 +59,11 @@ import org.slf4j.LoggerFactory;
...
@@ -47,6 +59,11 @@ import org.slf4j.LoggerFactory;
@RequestScoped
@RequestScoped
public
class
TestDataView
extends
GenericCDIView
{
public
class
TestDataView
extends
GenericCDIView
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
Logger
logger
=
LoggerFactory
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
TestDataView
.
class
);
.
getLogger
(
TestDataView
.
class
);
...
@@ -287,7 +304,6 @@ public class TestDataView extends GenericCDIView {
...
@@ -287,7 +304,6 @@ public class TestDataView extends GenericCDIView {
logger
.
info
(
"Generating poll data!"
);
logger
.
info
(
"Generating poll data!"
);
LanEvent
ev
=
eventbean
.
getCurrentEvent
();
Poll
poll
=
new
Poll
();
Poll
poll
=
new
Poll
();
poll
.
setName
(
"Tapahtumakysely"
);
poll
.
setName
(
"Tapahtumakysely"
);
Calendar
end
=
Calendar
.
getInstance
();
Calendar
end
=
Calendar
.
getInstance
();
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogCreateView.java
View file @
041f6e0
...
@@ -18,15 +18,12 @@
...
@@ -18,15 +18,12 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
actionlog
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
actionlog
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
fi.codecrew.moya.beans.ActionLogBeanLocal
;
import
fi.codecrew.moya.beans.ActionLogBeanLocal
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogMessageView.java
View file @
041f6e0
...
@@ -18,13 +18,11 @@
...
@@ -18,13 +18,11 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
actionlog
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
actionlog
;
import
java.awt.event.ActionEvent
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
org.primefaces.event.SelectEvent
;
import
org.primefaces.event.SelectEvent
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardMassPrintView.java
View file @
041f6e0
...
@@ -55,6 +55,7 @@ public class CardMassPrintView extends GenericCDIView implements Serializable {
...
@@ -55,6 +55,7 @@ public class CardMassPrintView extends GenericCDIView implements Serializable {
private
MassPrintResult
mpr
=
null
;
private
MassPrintResult
mpr
=
null
;
private
boolean
waitForAcceptance
=
true
;
private
boolean
waitForAcceptance
=
true
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CardMassPrintView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CardMassPrintView
.
class
);
public
CardMassPrintView
()
{
public
CardMassPrintView
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataEditView.java
View file @
041f6e0
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.CardTemplate;
...
@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.CardTemplate;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.model.CardTextData
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
@Named
@Named
@ConversationScoped
@ConversationScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
View file @
041f6e0
...
@@ -18,13 +18,11 @@
...
@@ -18,13 +18,11 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
card
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
card
;
import
java.lang.reflect.Array
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
javax.json.Json
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
View file @
041f6e0
...
@@ -18,16 +18,7 @@
...
@@ -18,16 +18,7 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
eticket
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
eticket
;
import
fi.codecrew.moya.beans.*
;
import
java.util.List
;
import
fi.codecrew.moya.enums.apps.BillPermission
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.PlaceGroup
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.shop.InviteView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
...
@@ -36,15 +27,26 @@ import javax.faces.context.FacesContext;
...
@@ -36,15 +27,26 @@ import javax.faces.context.FacesContext;
import
javax.faces.model.ListDataModel
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
java.util.HashMap
;
import
java.util.List
;
import
org.slf4j.Logger
;
import
java.util.Map
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.BarcodeBeanLocal
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.PlaceGroupBeanLocal
;
import
fi.codecrew.moya.beans.TicketBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.enums.apps.BillPermission
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
@Named
@Named
@ConversationScoped
@ConversationScoped
public
class
EticketView
extends
GenericCDIView
{
public
class
EticketView
extends
GenericCDIView
{
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EticketView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EticketView
.
class
);
// @Inject
// @Inject
...
@@ -64,23 +66,13 @@ public class EticketView extends GenericCDIView {
...
@@ -64,23 +66,13 @@ public class EticketView extends GenericCDIView {
UserBeanLocal
userBean
;
UserBeanLocal
userBean
;
@EJB
@EJB
PlaceBeanLocal
placeBean
;
private
PlaceBeanLocal
placeBean
;
@EJB
@EJB
TicketBeanLocal
ticketBean
;
private
TicketBeanLocal
ticketBean
;
@Inject
private
InviteView
inviteView
;
private
Place
place
;
private
PlaceGroup
group
;
private
transient
ListDataModel
<
PlaceGroup
>
placegroups
;
private
transient
ListDataModel
<
Place
>
placelist
;
private
transient
ListDataModel
<
GroupMembership
>
memberlist
;
private
transient
ListDataModel
<
GroupMembership
>
memberlist
;
private
Map
<
Integer
,
String
>
inviteMails
=
new
HashMap
<>();
public
String
getUserTextCode
()
{
public
String
getUserTextCode
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java
View file @
041f6e0
...
@@ -18,32 +18,29 @@
...
@@ -18,32 +18,29 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
eticket
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
eticket
;
import
fi.codecrew.moya.beans.*
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.PlaceGroup
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.shop.InviteView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.context.ExternalContext
;
import
javax.faces.context.FacesContext
;
import
javax.faces.model.ListDataModel
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.BarcodeBeanLocal
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.PlaceGroupBeanLocal
;
import
fi.codecrew.moya.beans.TicketBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
@Named
@Named
@ConversationScoped
@ConversationScoped
public
class
StandaloneEticketView
extends
GenericCDIView
{
public
class
StandaloneEticketView
extends
GenericCDIView
{
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
StandaloneEticketView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
StandaloneEticketView
.
class
);
// @Inject
// @Inject
...
@@ -60,34 +57,19 @@ public class StandaloneEticketView extends GenericCDIView {
...
@@ -60,34 +57,19 @@ public class StandaloneEticketView extends GenericCDIView {
private
PlaceGroupBeanLocal
placegroupBean
;
private
PlaceGroupBeanLocal
placegroupBean
;
@EJB
@EJB
UserBeanLocal
userBean
;
private
UserBeanLocal
userBean
;
@EJB
@EJB
PlaceBeanLocal
placeBean
;
private
PlaceBeanLocal
placeBean
;
@EJB
@EJB
TicketBeanLocal
ticketBean
;
private
TicketBeanLocal
ticketBean
;
@Inject
private
InviteView
inviteView
;
private
Place
place
;
private
PlaceGroup
group
;
private
transient
ListDataModel
<
PlaceGroup
>
placegroups
;
private
transient
ListDataModel
<
Place
>
placelist
;
private
transient
ListDataModel
<
GroupMembership
>
memberlist
;
private
transient
ListDataModel
<
GroupMembership
>
memberlist
;
private
Map
<
Integer
,
String
>
inviteMails
=
new
HashMap
<>();
private
boolean
mapVisible
=
false
;
private
boolean
mapVisible
=
false
;
public
void
initView
()
{
public
void
initView
()
{
if
(
token
==
null
)
if
(
token
==
null
)
throw
new
RuntimeException
(
"todo"
);
throw
new
RuntimeException
(
"todo"
);
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/help/HelpView.java
View file @
041f6e0
...
@@ -18,21 +18,19 @@
...
@@ -18,21 +18,19 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
help
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
help
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.HelpBeanLocal
;
import
fi.codecrew.moya.beans.HelpBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.enums.ValidLocale
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.handler.SessionStore
;
import
fi.codecrew.moya.handler.SessionStore
;
import
fi.codecrew.moya.model.Help
;
import
fi.codecrew.moya.model.HelpText
;
import
fi.codecrew.moya.model.HelpText
;
import
fi.codecrew.moya.web.helper.LayoutView
;
import
fi.codecrew.moya.web.helper.LayoutView
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
/**
/**
* Created by tuukka on 19/12/15.
* Created by tuukka on 19/12/15.
*/
*/
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapManageView.java
View file @
041f6e0
...
@@ -45,7 +45,6 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
...
@@ -45,7 +45,6 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
View file @
041f6e0
...
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
...
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
public
class
PlacegroupView
extends
GenericCDIView
{
public
class
PlacegroupView
extends
GenericCDIView
{
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
private
static
final
long
serialVersionUID
=
-
3934253910818396155L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PlacegroupView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PlacegroupView
.
class
);
// @Inject
// @Inject
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/MenuView.java
View file @
041f6e0
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
menu
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
menu
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
@@ -45,11 +46,10 @@ import fi.codecrew.moya.web.helper.LayoutView;
...
@@ -45,11 +46,10 @@ import fi.codecrew.moya.web.helper.LayoutView;
@Named
@Named
@RequestScoped
@RequestScoped
public
class
MenuView
{
public
class
MenuView
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
5720164797157054213L
;
private
static
final
long
serialVersionUID
=
-
5720164797157054213L
;
private
String
pagename
;
@Inject
@Inject
protected
NavigationHandler
navihandler
;
protected
NavigationHandler
navihandler
;
...
@@ -72,6 +72,7 @@ public class MenuView {
...
@@ -72,6 +72,7 @@ public class MenuView {
private
String
menuChange
;
private
String
menuChange
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MenuView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MenuView
.
class
);
public
List
<
PageContent
>
getPagecontent
(
String
pagekey
)
public
List
<
PageContent
>
getPagecontent
(
String
pagekey
)
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
View file @
041f6e0
...
@@ -115,7 +115,6 @@ public class PrimeMenuView extends GenericCDIView {
...
@@ -115,7 +115,6 @@ public class PrimeMenuView extends GenericCDIView {
if
(
selectedTop
==
null
)
{
if
(
selectedTop
==
null
)
{
return
null
;
return
null
;
}
}
int
testid
=
3
;
for
(
MenuNavigation
m
:
selectedTop
.
getChildren
())
{
for
(
MenuNavigation
m
:
selectedTop
.
getChildren
())
{
if
(
m
.
getItem
()
!=
null
&&
m
.
getChildren
().
isEmpty
())
{
if
(
m
.
getItem
()
!=
null
&&
m
.
getChildren
().
isEmpty
())
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/networkassociation/NetworkAssociationView.java
View file @
041f6e0
...
@@ -29,19 +29,20 @@ import javax.faces.component.UIComponent;
...
@@ -29,19 +29,20 @@ import javax.faces.component.UIComponent;
import
javax.faces.context.FacesContext
;
import
javax.faces.context.FacesContext
;
import
javax.faces.validator.ValidatorException
;
import
javax.faces.validator.ValidatorException
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
javax.mail.internet.InternetAddress
;
import
fi.codecrew.moya.beans.NetworkAssociationBeanLocal
;
import
fi.codecrew.moya.beans.NetworkAssociationBeanLocal
;
import
fi.codecrew.moya.enums.apps.NetworkAssociationPermission
;
import
fi.codecrew.moya.enums.apps.NetworkAssociationPermission
;
import
fi.codecrew.moya.enums.apps.TournamentPermission
;
import
fi.codecrew.moya.model.NetworkAssociation
;
import
fi.codecrew.moya.model.NetworkAssociation
;
import
fi.codecrew.moya.utilities.jsf.MessageHelper
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
@Named
@Named
@RequestScoped
@RequestScoped
public
class
NetworkAssociationView
extends
GenericCDIView
{
public
class
NetworkAssociationView
extends
GenericCDIView
{
/**
*
*/
private
static
final
long
serialVersionUID
=
-
1803866295536400232L
;
private
String
ipAddress
;
private
String
ipAddress
;
private
String
macAddress
;
private
String
macAddress
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java
View file @
041f6e0
...
@@ -57,6 +57,7 @@ public class EventOrgView extends GenericCDIView {
...
@@ -57,6 +57,7 @@ public class EventOrgView extends GenericCDIView {
@EJB
@EJB
private
SitePageBeanLocal
sitepagebean
;
private
SitePageBeanLocal
sitepagebean
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EventOrgView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EventOrgView
.
class
);
@LoggedIn
@LoggedIn
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java
View file @
041f6e0
...
@@ -41,6 +41,7 @@ public class ReaderNameContainer implements Serializable {
...
@@ -41,6 +41,7 @@ public class ReaderNameContainer implements Serializable {
private
boolean
autopoll
=
false
;
private
boolean
autopoll
=
false
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ReaderNameContainer
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ReaderNameContainer
.
class
);
/**
/**
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
View file @
041f6e0
...
@@ -22,7 +22,6 @@ import java.util.ArrayList;
...
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.SessionScoped
;
import
javax.enterprise.context.SessionScoped
;
import
javax.faces.model.ListDataModel
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
...
@@ -36,17 +35,12 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
...
@@ -36,17 +35,12 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import
fi.codecrew.moya.beans.ReaderBeanLocal
;
import
fi.codecrew.moya.beans.ReaderBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.PrintedCard
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.Reader
;
import
fi.codecrew.moya.model.Reader
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.model.ReaderType
;
import
fi.codecrew.moya.model.ReaderType
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.utilities.SearchQuery
;
import
fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.shop.UserCardWrapper
;
import
fi.codecrew.moya.web.cdiview.shop.UserCardWrapper
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
...
@@ -78,6 +72,7 @@ public class ReaderView extends GenericCDIView {
...
@@ -78,6 +72,7 @@ public class ReaderView extends GenericCDIView {
// private UserCardWrapper neighborUser;
// private UserCardWrapper neighborUser;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ReaderView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ReaderView
.
class
);
private
Integer
readerid
;
private
Integer
readerid
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/RfidListenerView.java
View file @
041f6e0
...
@@ -28,6 +28,10 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
...
@@ -28,6 +28,10 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@Named
@ConversationScoped
@ConversationScoped
public
class
RfidListenerView
extends
GenericCDIView
{
public
class
RfidListenerView
extends
GenericCDIView
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
@EJB
@EJB
private
ReaderBeanLocal
readerbean
;
private
ReaderBeanLocal
readerbean
;
private
String
reader
;
private
String
reader
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/AddInventoryView.java
View file @
041f6e0
...
@@ -18,12 +18,10 @@
...
@@ -18,12 +18,10 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
shop
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
shop
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/FoodWaveView.java
View file @
041f6e0
...
@@ -30,7 +30,6 @@ import java.util.TreeSet;
...
@@ -30,7 +30,6 @@ import java.util.TreeSet;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.model.ListDataModel
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -61,9 +60,6 @@ public class FoodWaveView extends GenericCDIView {
...
@@ -61,9 +60,6 @@ public class FoodWaveView extends GenericCDIView {
@EJB
@EJB
private
FoodWaveBeanLocal
foodWaveBean
;
private
FoodWaveBeanLocal
foodWaveBean
;
@Inject
private
FoodWaveFoodView
foodWaveFoodView
;
private
FoodWaveTemplate
template
;
private
FoodWaveTemplate
template
;
private
Integer
templateId
;
private
Integer
templateId
;
@EJB
@EJB
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteAcceptView.java
View file @
041f6e0
...
@@ -24,7 +24,6 @@ import javax.faces.context.ExternalContext;
...
@@ -24,7 +24,6 @@ import javax.faces.context.ExternalContext;
import
javax.faces.context.FacesContext
;
import
javax.faces.context.FacesContext
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
javax.servlet.ServletException
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
fi.codecrew.moya.web.cdiview.user.AuthView
;
import
fi.codecrew.moya.web.cdiview.user.AuthView
;
...
@@ -62,6 +61,7 @@ public class InviteAcceptView extends GenericCDIView {
...
@@ -62,6 +61,7 @@ public class InviteAcceptView extends GenericCDIView {
private
GroupMembership
membership
;
private
GroupMembership
membership
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
InviteAcceptView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
InviteAcceptView
.
class
);
private
boolean
placeGroupMembership
=
false
;
private
boolean
placeGroupMembership
=
false
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteView.java
View file @
041f6e0
...
@@ -46,6 +46,7 @@ public class InviteView extends GenericCDIView {
...
@@ -46,6 +46,7 @@ public class InviteView extends GenericCDIView {
@EJB
@EJB
private
transient
UserBeanLocal
userbean
;
private
transient
UserBeanLocal
userbean
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
InviteView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
InviteView
.
class
);
public
void
initView
()
{
public
void
initView
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductView.java
View file @
041f6e0
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.web.cdiview.shop;
...
@@ -21,7 +21,6 @@ package fi.codecrew.moya.web.cdiview.shop;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
...
@@ -56,8 +55,6 @@ public class ProductView extends GenericCDIView {
...
@@ -56,8 +55,6 @@ public class ProductView extends GenericCDIView {
private
Integer
productId
;
private
Integer
productId
;
private
Set
<
ProductFlag
>
productFlags
;
private
transient
ListDataModel
<
Discount
>
productDiscounts
;
private
transient
ListDataModel
<
Discount
>
productDiscounts
;
private
ProductLimitation
limit
;
private
ProductLimitation
limit
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentAddTeamView.java
View file @
041f6e0
...
@@ -22,14 +22,7 @@ import java.io.Serializable;
...
@@ -22,14 +22,7 @@ import java.io.Serializable;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.event.ActionEvent
;
import
javax.inject.Named
;
import
javax.inject.Named
;
@Named
@Named
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentEditRulesView.java
View file @
041f6e0
...
@@ -18,21 +18,14 @@
...
@@ -18,21 +18,14 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
tournaments
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
tournaments
;
import
java.io.IOException
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.faces.context.FacesContext
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.enums.TournamentType
;
import
fi.codecrew.moya.enums.apps.TournamentPermission
;
import
fi.codecrew.moya.enums.apps.TournamentPermission
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.utilities.jsf.MessageHelper
;
import
fi.codecrew.moya.utilities.jsf.MessageHelper
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java
View file @
041f6e0
...
@@ -23,7 +23,6 @@ import java.util.HashMap;
...
@@ -23,7 +23,6 @@ import java.util.HashMap;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.event.ActionEvent
;
import
javax.faces.event.ActionEvent
;
import
javax.faces.event.ActionListener
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/AuthView.java
View file @
041f6e0
...
@@ -29,16 +29,14 @@ import javax.inject.Named;
...
@@ -29,16 +29,14 @@ import javax.inject.Named;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletException
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.BootstrapBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.handler.NavigationHandler
;
import
fi.codecrew.moya.handler.NavigationHandler
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
@Named
@Named
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/ImportView.java
View file @
041f6e0
...
@@ -58,6 +58,7 @@ public class ImportView extends GenericCDIView {
...
@@ -58,6 +58,7 @@ public class ImportView extends GenericCDIView {
private
UploadedFile
file
;
private
UploadedFile
file
;
private
ArrayList
<
ImportWrapper
>
users
;
private
ArrayList
<
ImportWrapper
>
users
;
private
static
final
Charset
UTF8
=
Charset
.
forName
(
"UTF8"
);
private
static
final
Charset
UTF8
=
Charset
.
forName
(
"UTF8"
);
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ImportView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ImportView
.
class
);
//
//
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleRequestView.java
View file @
041f6e0
...
@@ -4,7 +4,6 @@ import java.util.List;
...
@@ -4,7 +4,6 @@ import java.util.List;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.OrgRoleBeanLocal
;
import
fi.codecrew.moya.beans.OrgRoleBeanLocal
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
user
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
user
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
...
@@ -34,7 +33,6 @@ import fi.codecrew.moya.beans.RoleBeanLocal;
...
@@ -34,7 +33,6 @@ import fi.codecrew.moya.beans.RoleBeanLocal;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.entitysearch.UserSearchQuery
;
import
fi.codecrew.moya.entitysearch.UserSearchQuery
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.OrgRole
;
import
fi.codecrew.moya.model.OrgRole
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.Role
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.model.User
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordView.java
View file @
041f6e0
...
@@ -51,6 +51,7 @@ public class PasswordView extends GenericCDIView {
...
@@ -51,6 +51,7 @@ public class PasswordView extends GenericCDIView {
private
String
password
;
private
String
password
;
private
String
passwordcheck
;
private
String
passwordcheck
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PasswordView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PasswordView
.
class
);
public
String
changePassword
()
{
public
String
changePassword
()
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java
View file @
041f6e0
...
@@ -34,7 +34,6 @@ import org.primefaces.model.StreamedContent;
...
@@ -34,7 +34,6 @@ import org.primefaces.model.StreamedContent;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.GroupMembership
;
import
fi.codecrew.moya.model.LanEvent
;
import
fi.codecrew.moya.model.LanEvent
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserGameIDView.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
user
;
package
fi
.
codecrew
.
moya
.
web
.
cdiview
.
user
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
...
@@ -32,9 +31,7 @@ import fi.codecrew.moya.enums.apps.TournamentPermission;
...
@@ -32,9 +31,7 @@ import fi.codecrew.moya.enums.apps.TournamentPermission;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.GameID
;
import
fi.codecrew.moya.model.GameID
;
import
fi.codecrew.moya.model.Tournament
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.User
;
import
fi.codecrew.moya.utilities.jsf.MessageHelper
;
import
fi.codecrew.moya.utilities.jsf.MessageHelper
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
View file @
041f6e0
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.web.cdiview.user;
...
@@ -20,7 +20,6 @@ package fi.codecrew.moya.web.cdiview.user;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
...
@@ -29,7 +28,6 @@ import javax.enterprise.context.ConversationScoped;
...
@@ -29,7 +28,6 @@ import javax.enterprise.context.ConversationScoped;
import
javax.enterprise.inject.Produces
;
import
javax.enterprise.inject.Produces
;
import
javax.faces.application.FacesMessage
;
import
javax.faces.application.FacesMessage
;
import
javax.faces.context.FacesContext
;
import
javax.faces.context.FacesContext
;
import
javax.faces.event.ActionEvent
;
import
javax.faces.event.ValueChangeEvent
;
import
javax.faces.event.ValueChangeEvent
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
...
@@ -305,7 +303,6 @@ public class UserView extends GenericCDIView {
...
@@ -305,7 +303,6 @@ public class UserView extends GenericCDIView {
super
.
addFaceMessage
(
"user.imageUpload.imageNotFound"
);
super
.
addFaceMessage
(
"user.imageUpload.imageNotFound"
);
}
else
{
}
else
{
InputStream
istr
=
getImage
().
getInputstream
();
UserImage
userimage
=
userbean
.
uploadImage
(
user
,
getImage
().
getContentType
(),
getImage
().
getInputstream
(),
UserImage
userimage
=
userbean
.
uploadImage
(
user
,
getImage
().
getContentType
(),
getImage
().
getInputstream
(),
getImage
().
getFileName
(),
""
);
getImage
().
getFileName
(),
""
);
user
=
userbean
.
getEventUser
(
userimage
.
getUser
(),
false
);
user
=
userbean
.
getEventUser
(
userimage
.
getUser
(),
false
);
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipView.java
View file @
041f6e0
...
@@ -6,7 +6,6 @@ import java.util.List;
...
@@ -6,7 +6,6 @@ import java.util.List;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.model.ListDataModel
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/EventUserConverter.java
View file @
041f6e0
...
@@ -25,8 +25,6 @@ import javax.inject.Named;
...
@@ -25,8 +25,6 @@ import javax.inject.Named;
import
fi.codecrew.moya.beans.ReaderBeanLocal
;
import
fi.codecrew.moya.beans.ReaderBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.ReaderEvent
;
import
fi.codecrew.moya.utilities.jsf.GenericEntityFinderConverter
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
@Named
@Named
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/MenuNavigationConverter.java
View file @
041f6e0
...
@@ -22,9 +22,7 @@ import javax.ejb.EJB;
...
@@ -22,9 +22,7 @@ import javax.ejb.EJB;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.EventMapBeanLocal
;
import
fi.codecrew.moya.beans.MenuBeanLocal
;
import
fi.codecrew.moya.beans.MenuBeanLocal
;
import
fi.codecrew.moya.model.EventMap
;
import
fi.codecrew.moya.model.MenuNavigation
;
import
fi.codecrew.moya.model.MenuNavigation
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentGameConverter.java
View file @
041f6e0
...
@@ -23,8 +23,6 @@ import javax.enterprise.context.RequestScoped;
...
@@ -23,8 +23,6 @@ import javax.enterprise.context.RequestScoped;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentRuleConverter.java
View file @
041f6e0
...
@@ -23,9 +23,6 @@ import javax.enterprise.context.RequestScoped;
...
@@ -23,9 +23,6 @@ import javax.enterprise.context.RequestScoped;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.TournamentBeanLocal
;
import
fi.codecrew.moya.beans.UserBeanLocal
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.TournamentGame
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.model.TournamentRule
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
import
fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
View file @
041f6e0
...
@@ -52,6 +52,7 @@ public class CardlessIncomingView extends GenericCDIView {
...
@@ -52,6 +52,7 @@ public class CardlessIncomingView extends GenericCDIView {
private
static
final
long
serialVersionUID
=
-
715517L
;
private
static
final
long
serialVersionUID
=
-
715517L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CardlessIncomingView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CardlessIncomingView
.
class
);
@Inject
@Inject
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
View file @
041f6e0
...
@@ -18,6 +18,14 @@
...
@@ -18,6 +18,14 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
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.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.enums.apps.ShopPermission
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
...
@@ -27,13 +35,6 @@ import fi.codecrew.moya.web.cdiview.reader.ReaderView;
...
@@ -27,13 +35,6 @@ import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView
;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView
;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveView
;
import
fi.codecrew.moya.web.cdiview.shop.FoodWaveView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
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
@Named
@ConversationScoped
@ConversationScoped
...
@@ -61,9 +62,6 @@ public class FlowFoodwaveView extends GenericCDIView {
...
@@ -61,9 +62,6 @@ public class FlowFoodwaveView extends GenericCDIView {
private
UserView
userView
;
private
UserView
userView
;
@Inject
@Inject
private
InfoView
infoView
;
@Inject
private
ReaderView
readerView
;
private
ReaderView
readerView
;
@Inject
@Inject
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingPlaceshopView.java
View file @
041f6e0
package
fi
.
codecrew
.
moya
.
web
.
flow
;
package
fi
.
codecrew
.
moya
.
web
.
flow
;
import
java.util.ArrayList
;
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
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PermissionBeanLocal
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.PlaceBeanLocal
;
import
fi.codecrew.moya.beans.map.QueueBeanLocal
;
import
fi.codecrew.moya.beans.map.QueueBeanLocal
;
import
fi.codecrew.moya.beans.map.QueueBeanLocal.MapQueueI
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.MapPermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.Place
;
import
fi.codecrew.moya.exceptions.BortalCatchableException
;
import
fi.codecrew.moya.model.*
;
import
fi.codecrew.moya.model.map.MapReservationQueueEntry
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
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.enterprise.context.RequestScoped
;
import
javax.enterprise.context.SessionScoped
;
import
javax.faces.context.FacesContext
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
java.util.*
;
@Named
@Named
@ConversationScoped
@ConversationScoped
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
View file @
041f6e0
...
@@ -60,9 +60,6 @@ public class IncomingView extends GenericCDIView {
...
@@ -60,9 +60,6 @@ public class IncomingView extends GenericCDIView {
private
ReaderView
readerView
;
private
ReaderView
readerView
;
@Inject
@Inject
private
InfoView
infoView
;
@Inject
private
ReaderNameContainer
namecontainer
;
private
ReaderNameContainer
namecontainer
;
@Inject
@Inject
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
View file @
041f6e0
...
@@ -53,12 +53,9 @@ public class InfoView extends GenericCDIView {
...
@@ -53,12 +53,9 @@ public class InfoView extends GenericCDIView {
@Inject
@Inject
private
ReaderView
readerView
;
private
ReaderView
readerView
;
@EJB
@EJB
private
UserBeanLocal
userbean
;
private
UserBeanLocal
userbean
;
private
String
currentPage
;
public
void
initView
()
{
public
void
initView
()
{
super
.
beginConversation
();
super
.
beginConversation
();
}
}
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/UserMapSearchView.java
View file @
041f6e0
...
@@ -18,33 +18,15 @@
...
@@ -18,33 +18,15 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
flow
;
package
fi
.
codecrew
.
moya
.
web
.
flow
;
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.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.map.AjaxMapView
;
import
fi.codecrew.moya.web.cdiview.reader.ReaderView
;
import
fi.codecrew.moya.web.cdiview.user.UserView
;
import
fi.codecrew.moya.web.helpers.ProductSummaryWrapper
;
import
org.primefaces.event.SelectEvent
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.faces.application.FacesMessage
;
import
javax.faces.context.FacesContext
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.map.AjaxMapView
;
@Named
@Named
@ConversationScoped
@ConversationScoped
...
@@ -52,21 +34,16 @@ public class UserMapSearchView extends GenericCDIView {
...
@@ -52,21 +34,16 @@ public class UserMapSearchView extends GenericCDIView {
private
static
final
long
serialVersionUID
=
-
715517L
;
private
static
final
long
serialVersionUID
=
-
715517L
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
UserMapSearchView
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
UserMapSearchView
.
class
);
@Inject
@Inject
private
UserView
userview
;
@Inject
private
InfoView
infoView
;
@Inject
private
AjaxMapView
ajaxMapView
;
private
AjaxMapView
ajaxMapView
;
boolean
initialized
=
false
;
boolean
initialized
=
false
;
public
void
initView
()
{
public
void
initView
()
{
if
(!
initialized
)
{
if
(!
initialized
)
{
super
.
beginConversation
();
super
.
beginConversation
();
initialized
=
true
;
initialized
=
true
;
}
}
...
@@ -74,7 +51,4 @@ public class UserMapSearchView extends GenericCDIView {
...
@@ -74,7 +51,4 @@ public class UserMapSearchView extends GenericCDIView {
ajaxMapView
.
initViewMap
();
ajaxMapView
.
initViewMap
();
}
}
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java
View file @
041f6e0
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
*/
*/
package
fi
.
codecrew
.
moya
.
web
.
helper
;
package
fi
.
codecrew
.
moya
.
web
.
helper
;
import
java.io.ByteArrayInputStream
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
@@ -34,8 +33,6 @@ import javax.inject.Inject;
...
@@ -34,8 +33,6 @@ import javax.inject.Inject;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
org.primefaces.model.DefaultStreamedContent
;
import
org.primefaces.model.StreamedContent
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/ProductShopItemHelper.java
View file @
041f6e0
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
package
fi
.
codecrew
.
moya
.
web
.
helper
;
package
fi
.
codecrew
.
moya
.
web
.
helper
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/BortalApplicationWrapper.java
View file @
041f6e0
...
@@ -38,6 +38,7 @@ public class BortalApplicationWrapper implements Serializable {
...
@@ -38,6 +38,7 @@ public class BortalApplicationWrapper implements Serializable {
private
final
ArrayList
<
IAppPermission
>
permissions
;
private
final
ArrayList
<
IAppPermission
>
permissions
;
private
Set
<
String
>
selected
=
new
HashSet
<
String
>();
private
Set
<
String
>
selected
=
new
HashSet
<
String
>();
private
final
BortalApplication
app
;
private
final
BortalApplication
app
;
@SuppressWarnings
(
"unused"
)
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
BortalApplicationWrapper
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
BortalApplicationWrapper
.
class
);
public
BortalApplicationWrapper
(
BortalApplication
bApp
,
Set
<
IAppPermission
>
set
)
{
public
BortalApplicationWrapper
(
BortalApplication
bApp
,
Set
<
IAppPermission
>
set
)
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/ProductShopItem.java
View file @
041f6e0
...
@@ -19,19 +19,17 @@
...
@@ -19,19 +19,17 @@
package
fi
.
codecrew
.
moya
.
web
.
helpers
;
package
fi
.
codecrew
.
moya
.
web
.
helpers
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
fi.codecrew.moya.model.ProductFlag
;
import
fi.codecrew.moya.web.helper.ProductShopItemHelper
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
fi.codecrew.moya.model.Discount
;
import
fi.codecrew.moya.model.Discount
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.EventUser
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.Product
;
import
fi.codecrew.moya.model.ProductFlag
;
public
class
ProductShopItem
{
public
class
ProductShopItem
{
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/lecture/LectureGroupView.java
View file @
041f6e0
...
@@ -28,7 +28,6 @@ import javax.inject.Named;
...
@@ -28,7 +28,6 @@ import javax.inject.Named;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.LectureBeanLocal
;
import
fi.codecrew.moya.beans.LectureBeanLocal
;
import
fi.codecrew.moya.enums.apps.LecturePermission
;
import
fi.codecrew.moya.enums.apps.LecturePermission
;
import
fi.codecrew.moya.enums.apps.UserPermission
;
import
fi.codecrew.moya.model.LectureGroup
;
import
fi.codecrew.moya.model.LectureGroup
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/reports/BasicStatisticsView.java
View file @
041f6e0
...
@@ -21,21 +21,11 @@ package fi.codecrew.moya.web.reports;
...
@@ -21,21 +21,11 @@ package fi.codecrew.moya.web.reports;
import
java.util.List
;
import
java.util.List
;
import
javax.ejb.EJB
;
import
javax.ejb.EJB
;
import
javax.enterprise.context.ConversationScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.enterprise.context.RequestScoped
;
import
javax.faces.application.FacesMessage
;
import
javax.faces.context.FacesContext
;
import
javax.faces.model.ListDataModel
;
import
javax.inject.Named
;
import
javax.inject.Named
;
import
fi.codecrew.moya.beans.EventBeanLocal
;
import
fi.codecrew.moya.beans.LectureBeanLocal
;
import
fi.codecrew.moya.beans.StatisticsBeanLocal
;
import
fi.codecrew.moya.beans.StatisticsBeanLocal
;
import
fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover
;
import
fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover
;
import
fi.codecrew.moya.enums.apps.LecturePermission
;
import
fi.codecrew.moya.model.Lecture
;
import
fi.codecrew.moya.model.LectureGroup
;
import
fi.codecrew.moya.utilities.I18n
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
import
fi.codecrew.moya.web.cdiview.GenericCDIView
;
@Named
@Named
...
...
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