You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/09/28 14:34:08 UTC
svn commit: r1705674 - in /openmeetings/trunk/singlewebapp:
openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/
openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/
openmeetings-web/src/main/java/org/apache/openmeetings/...
Author: solomax
Date: Mon Sep 28 12:34:08 2015
New Revision: 1705674
URL: http://svn.apache.org/viewvc?rev=1705674&view=rev
Log:
[OPENMEETINGS-1245] code clean-up in invitation/poll
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java?rev=1705674&r1=1705673&r2=1705674&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java Mon Sep 28 12:34:08 2015
@@ -54,7 +54,7 @@ public class InvitationDao {
try {
TypedQuery<Invitation> query = em.createNamedQuery("getInvitationbyId", Invitation.class);
- query.setParameter("invid", invId);
+ query.setParameter("id", invId);
try {
return query.getSingleResult();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1705674&r1=1705673&r2=1705674&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Mon Sep 28 12:34:08 2015
@@ -54,7 +54,7 @@ public class PollDao {
return pt.getId();
}
- public List<PollType> getTypes(long langId) {
+ public List<PollType> getTypes() {
return em.createNamedQuery("getPollTypes", PollType.class).getResultList();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1705674&r1=1705673&r2=1705674&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Mon Sep 28 12:34:08 2015
@@ -42,12 +42,9 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
- @NamedQuery(name = "getInvitationbyId", query = "SELECT i FROM Invitation i "
- + "WHERE i.deleted = false AND i.id = :invid"),
- @NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM Invitation i "
- + "where i.hash LIKE :hashCode AND i.deleted = false"),
- @NamedQuery(name = "getInvitationByAppointment", query = "SELECT i FROM Invitation i "
- + "WHERE i.appointment.id = :appointmentId ")
+ @NamedQuery(name = "getInvitationbyId", query = "SELECT i FROM Invitation i WHERE i.deleted = false AND i.id = :id"),
+ @NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM Invitation i where i.hash LIKE :hashCode AND i.deleted = false"),
+ @NamedQuery(name = "getInvitationByAppointment", query = "SELECT i FROM Invitation i WHERE i.appointment.id = :appointmentId ")
})
@Table(name = "invitation")
public class Invitation implements IDataProviderEntity {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1705674&r1=1705673&r2=1705674&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Mon Sep 28 12:34:08 2015
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.room.poll;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.util.Arrays;
@@ -68,7 +67,7 @@ public class CreatePollDialog extends Ab
User u = getBean(UserDao.class).get(getUserId());
p.setCreator(u);
p.setRoom(getBean(RoomDao.class).get(roomId));
- p.setType(getBean(PollDao.class).getTypes(getLanguage()).get(0));
+ p.setType(getBean(PollDao.class).getTypes().get(0));
form.setModelObject(p);
target.add(form);
}
@@ -107,7 +106,7 @@ public class CreatePollDialog extends Ab
super(id, model);
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410))));
add(new TextArea<String>("question"));
- add(new DropDownChoice<PollType>("type", getBean(PollDao.class).getTypes(getLanguage())
+ add(new DropDownChoice<PollType>("type", getBean(PollDao.class).getTypes()
, new IChoiceRenderer<PollType>() {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java?rev=1705674&r1=1705673&r2=1705674&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java Mon Sep 28 12:34:08 2015
@@ -33,7 +33,7 @@ public class TestPollManagement extends
@Test
public void addPollType() {
long maxId = 1;
- for (PollType pt : pollManager.getTypes(1)) {
+ for (PollType pt : pollManager.getTypes()) {
maxId = Math.max(maxId, pt.getId());
}
assertNotNull("Poll created is null", pollManager.addPollType(26L, false));