Skip to content

Riina Antikainen / Moya

Go to a project
Commit 869263ed by jkj
Options

project specific formatting 

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@43 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent cf043a32
Expand all
Inline Side-by-side
Showing with 171 additions and 171 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/HelloBean.java
......@@ -19,30 +19,30 @@ import fi.insomnia.bortal.db.HelloTo;
@Stateless
public class HelloBean implements HelloBeanLocal {
private static final Logger logger = LoggerFactory
.getLogger(HelloBean.class);
@PersistenceContext
private EntityManager em;
/**
* Default constructor.
*/
public HelloBean() {
// TODO Auto-generated constructor stub
}
public String getHello(String name) {
HelloTo hello = new HelloTo();
hello.setName(name);
em.persist(hello);
return "Hello World from EJB for " + name + ".";
}
public List<HelloTo> getHelloHistory() {
List<HelloTo> ret = em.createQuery("select t from HelloTo t",
HelloTo.class).getResultList();
logger.info("Size: " + ret.size());
return ret;
}
private static final Logger logger = LoggerFactory
.getLogger(HelloBean.class);
@PersistenceContext
private EntityManager em;
/**
* Default constructor.
*/
public HelloBean() {
// TODO Auto-generated constructor stub
}
public String getHello(String name) {
HelloTo hello = new HelloTo();
hello.setName(name);
em.persist(hello);
return "Hello World from EJB for " + name + ".";
}
public List<HelloTo> getHelloHistory() {
List<HelloTo> ret = em.createQuery("select t from HelloTo t",
HelloTo.class).getResultList();
logger.info("Size: " + ret.size());
return ret;
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
......@@ -20,51 +20,51 @@ import fi.insomnia.bortal.db.User;
@Stateless
public class UserBean implements UserBeanLocal {
private static final Logger logger = LoggerFactory
.getLogger(UserBean.class);
/**
* Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin
* yhteydess�.
*/
@PersistenceContext
private EntityManager em;
private static final Logger logger = LoggerFactory
.getLogger(UserBean.class);
/**
* Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin
* yhteydess�.
*/
@PersistenceContext
private EntityManager em;
/**
* Default constructor.
*/
public UserBean() {
// TODO Auto-generated constructor stub
}
/**
* Default constructor.
*/
public UserBean() {
// TODO Auto-generated constructor stub
}
@Override
public User createNewUser(String nick, String password) {
User returnUser = new User();
returnUser.setNick(nick);
@Override
public User createNewUser(String nick, String password) {
User returnUser = new User();
returnUser.setNick(nick);
// TODO: Hash function....
returnUser.setPassword(password);
// TODO: Hash function....
returnUser.setPassword(password);
// Tallennetaan olio kantaan...
em.persist(returnUser);
return returnUser;
}
// Tallennetaan olio kantaan...
em.persist(returnUser);
return returnUser;
}
public List<User> getUsers() {
List<User> ret = em.createQuery("select u from User u", User.class)
.getResultList();
logger.info("Found {} users from database ", ret.size());
return ret;
}
public List<User> getUsers() {
List<User> ret = em.createQuery("select u from User u", User.class)
.getResultList();
logger.info("Found {} users from database ", ret.size());
return ret;
}
@Override
public void mergeChanges(User currentUser) {
em.merge(currentUser);
}
@Override
public void mergeChanges(User currentUser) {
em.merge(currentUser);
}
public User getUser(String nick) {
User ret = em.createQuery("select u from User u where u.nick = :name",
User.class).setParameter("name", nick).getSingleResult();
return ret;
}
public User getUser(String nick) {
User ret = em.createQuery("select u from User u where u.nick = :name",
User.class).setParameter("name", nick).getSingleResult();
return ret;
}
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/HelloBeanLocal.java
......@@ -9,7 +9,7 @@ import fi.insomnia.bortal.db.HelloTo;
@Local
public interface HelloBeanLocal {
String getHello(String name);
String getHello(String name);
List<HelloTo> getHelloHistory();
List<HelloTo> getHelloHistory();
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/UserBeanLocal.java
......@@ -9,12 +9,12 @@ import fi.insomnia.bortal.db.User;
@Local
public interface UserBeanLocal {
User createNewUser(String nick, String password);
User createNewUser(String nick, String password);
List<User> getUsers();
List<User> getUsers();
User getUser(String nick);
User getUser(String nick);
void mergeChanges(User currentUser);
void mergeChanges(User currentUser);
}
code/LanBortalWeb/src/fi/insomnia/bortal/HelloWorld.java
......@@ -13,65 +13,65 @@ import fi.insomnia.bortal.db.HelloTo;
@SessionScoped
public class HelloWorld {
/*
* Let's inject Hello bean instance to the variable with the @EJB annotation
*/
@EJB
private HelloBeanLocal helloBean;
/*
* Let's inject Hello bean instance to the variable with the @EJB annotation
*/
@EJB
private HelloBeanLocal helloBean;
private String name;
private String name;
private int size;
private int size;
private ListDataModel<HelloTo> items;
private ListDataModel<HelloTo> items;
private HelloTo detailItem;
private HelloTo detailItem;
public String sayHello() {
return helloBean.getHello(name);
public String sayHello() {
return helloBean.getHello(name);
}
}
public String getHello() {
return "Managed Bean says: Hello World!";
}
public String getHello() {
return "Managed Bean says: Hello World!";
}
public ListDataModel<HelloTo> getHelloedPeople() {
List<HelloTo> peopleList = helloBean.getHelloHistory();
items = new ListDataModel<HelloTo>(peopleList);
setSize(peopleList.size());
return items;
}
public ListDataModel<HelloTo> getHelloedPeople() {
List<HelloTo> peopleList = helloBean.getHelloHistory();
items = new ListDataModel<HelloTo>(peopleList);
setSize(peopleList.size());
return items;
}
public String getDetail() {
setDetailItem(items.getRowData());
return "detail";
}
public String getDetail() {
setDetailItem(items.getRowData());
return "detail";
}
/*
* Getter and setter for "name"
*/
public void setName(String name) {
this.name = name;
}
/*
* Getter and setter for "name"
*/
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public String getName() {
return name;
}
public void setSize(int size) {
this.size = size;
}
public void setSize(int size) {
this.size = size;
}
public int getSize() {
return size;
}
public int getSize() {
return size;
}
public void setDetailItem(HelloTo detailItem) {
this.detailItem = detailItem;
}
public void setDetailItem(HelloTo detailItem) {
this.detailItem = detailItem;
}
public HelloTo getDetailItem() {
return detailItem;
}
public HelloTo getDetailItem() {
return detailItem;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
......@@ -17,77 +17,77 @@ import fi.insomnia.bortal.db.User;
@SessionScoped
public class UserView {
@EJB
private UserBeanLocal userBean;
@EJB
private UserBeanLocal userBean;
private static final Logger logger = LoggerFactory
.getLogger(UserView.class);
private static final Logger logger = LoggerFactory
.getLogger(UserView.class);
private User user;
private User user;
private ListDataModel<User> items;
private ListDataModel<User> items;
private String nick;
private String nick;
private String password;
private String password;
public String edit() {
setUser(items.getRowData());
return "edit";
}
public String edit() {
setUser(items.getRowData());
return "edit";
}
public String createUser() {
logger.info("Saving user");
// Luodaan uusi k�ytt�j� UserBeanin funktiolla createNewUser jolle
// annetaan parametrina pakolliset tiedot ( nick ja salasana )
// Paluuarvona saadaan uusi uljas k�ytt�j�-olio.
setUser(userBean.createNewUser(nick, password));
nick = "";
password = "";
if (getUser() == null) {
logger.warn("Could not create user. function returned null!");
return "fault";
}
return "edit";
public String createUser() {
logger.info("Saving user");
// Luodaan uusi k�ytt�j� UserBeanin funktiolla createNewUser jolle
// annetaan parametrina pakolliset tiedot ( nick ja salasana )
// Paluuarvona saadaan uusi uljas k�ytt�j�-olio.
setUser(userBean.createNewUser(nick, password));
nick = "";
password = "";
if (getUser() == null) {
logger.warn("Could not create user. function returned null!");
return "fault";
}
public String saveUser() {
userBean.mergeChanges(getUser());
return "edit";
}
return "edit";
}
public ListDataModel<User> getUsers() {
List<User> users = userBean.getUsers();
items = new ListDataModel<User>(users);
logger.info("Fetching users. Found {}", items.getRowCount());
return items;
}
public String saveUser() {
userBean.mergeChanges(getUser());
return "edit";
}
// Getters and setters...
public ListDataModel<User> getUsers() {
List<User> users = userBean.getUsers();
items = new ListDataModel<User>(users);
logger.info("Fetching users. Found {}", items.getRowCount());
return items;
}
public String getNick() {
return nick;
}
// Getters and setters...
public void setNick(String nick) {
this.nick = nick;
}
public String getNick() {
return nick;
}
public String getPassword() {
return password;
}
public void setNick(String nick) {
this.nick = nick;
}
public void setPassword(String password) {
this.password = password;
}
public String getPassword() {
return password;
}
public void setUser(User user) {
this.user = user;
}
public void setPassword(String password) {
this.password = password;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public User getUser() {
return user;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!