Skip to content

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