Author: solomax
Date: Tue Oct 20 06:36:24 2015
New Revision: 1709517
URL: http://svn.apache.org/viewvc?rev=1709517&view=rev
Log:
Code clean-up
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.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/PollType.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
Tue Oct 20 06:36:24 2015
@@ -142,14 +142,14 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[getPollListBackup]", err);
}
return null;
}
public List<RoomPoll> getArchivedPollList(Long room_id) {
try {
- log.debug(" :: getPoll :: " + room_id);
+ log.debug(" :: getArchivedPollList :: " + room_id);
TypedQuery<RoomPoll> q =
em.createNamedQuery("getArchivedPollList",RoomPoll.class);
q.setParameter("room_id", room_id);
q.setParameter("archived", true);
@@ -157,7 +157,7 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[getArchivedPollList]", err);
}
return null;
}
@@ -172,7 +172,7 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[hasPoll]", err);
}
return false;
}
@@ -189,7 +189,7 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[hasVoted]", err);
}
return false;
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Tue Oct 20 06:36:24 2015
@@ -81,7 +81,7 @@ public class UserSearchPanel extends Use
add(new TextField<String>("text", new
PropertyModel<String>(UserSearchPanel.this, "text")));
add(new TextField<String>("offer", new
PropertyModel<String>(UserSearchPanel.this, "offer")));
add(new TextField<String>("search", new
PropertyModel<String>(UserSearchPanel.this, "search")));
- add(new AjaxFormSubmitBehavior(this,
"onsubmit") {
+ add(new AjaxFormSubmitBehavior(this, "submit") {
private static final long
serialVersionUID = 1L;
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Tue Oct 20 06:36:24 2015
@@ -329,13 +329,13 @@ public class RoomManager {
* get List of RoomGroup by group and roomtype
*
* @param groupId
- * @param roomtypesId
+ * @param typeId
* @return
*/
- public List<RoomGroup> getRoomGroupByGroupIdAndRoomType(long groupId,
long roomtypesId) {
+ public List<RoomGroup> getRoomGroupByGroupIdAndRoomType(long groupId,
long typeId) {
try {
TypedQuery<RoomGroup> q =
em.createNamedQuery("getRoomGroupByGroupIdAndRoomType", RoomGroup.class);
- q.setParameter("types", Room.Type.get(roomtypesId));
+ q.setParameter("type", Room.Type.get(typeId));
q.setParameter("groupId", groupId);
return q.getResultList();
} catch (Exception ex2) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Tue Oct 20 06:36:24 2015
@@ -146,17 +146,17 @@ public class ConferenceService {
* get a List of all public availible rooms (non-appointments)
*
* @param SID
- * @param roomtypesId
+ * @param typeId
* @return - public rooms with given type, null in case of the error
*/
- public List<Room> getRoomsPublic(String SID, Long roomtypesId) {
+ public List<Room> getRoomsPublic(String SID, Long typeId) {
try {
log.debug("getRoomsPublic");
Long userId = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<Room> roomList =
roomDao.getPublicRooms(Room.Type.get(roomtypesId));
+ List<Room> roomList =
roomDao.getPublicRooms(Room.Type.get(typeId));
// Filter : no appointed meetings
List<Room> filtered = new ArrayList<Room>();
@@ -165,8 +165,7 @@ public class ConferenceService {
Room rooms = iter.next();
if (!rooms.isAppointment()) {
-
rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms
- .getId()));
+
rooms.setCurrentusers(getRoomClientsListByRoomId(rooms.getId()));
filtered.add(rooms);
}
}
@@ -426,10 +425,10 @@ public class ConferenceService {
return null;
}
- public Room getRoomByOwnerAndType(String SID, Long roomtypesId, String
roomName) {
+ public Room getRoomByOwnerAndType(String SID, Long typeId, String
roomName) {
Long userId = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomDao.getUserRoom(userId,
Room.Type.get(roomtypesId), roomName);
+ return roomDao.getUserRoom(userId,
Room.Type.get(typeId), roomName);
}
return null;
}
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=1709517&r1=1709516&r2=1709517&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
Tue Oct 20 06:36:24 2015
@@ -60,7 +60,7 @@ public class PollDao {
public PollType getType(Long typeId) {
TypedQuery<PollType> q = em.createNamedQuery("getPollType",
PollType.class);
- q.setParameter("pollTypesId", typeId);
+ q.setParameter("typeId", typeId);
return q.getSingleResult();
}
@@ -76,13 +76,13 @@ public class PollDao {
public boolean close(Long roomId){
try {
- log.debug(" :: closePoll :: ");
+ log.debug(" :: close :: ");
Query q = em.createNamedQuery("closePoll");
q.setParameter("roomId", roomId);
q.setParameter("archived", true);
return q.executeUpdate() > 0;
} catch (Exception err) {
- log.error("[closePoll]", err);
+ log.error("[close]", err);
}
return false;
}
@@ -94,7 +94,7 @@ public class PollDao {
q.setParameter("id", p.getId());
return q.executeUpdate() > 0;
} catch (Exception err) {
- log.error("[deletePoll]", err);
+ log.error("[delete]", err);
}
return false;
}
@@ -126,14 +126,14 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[get]", err);
}
return null;
}
public List<RoomPoll> getArchived(Long roomId) {
try {
- log.debug(" :: getPoll :: " + roomId);
+ log.debug(" :: getArchived :: " + roomId);
TypedQuery<RoomPoll> q =
em.createNamedQuery("getArchivedPollList",RoomPoll.class);
q.setParameter("roomId", roomId);
q.setParameter("archived", true);
@@ -141,7 +141,7 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[getArchived]", err);
}
return null;
}
@@ -156,7 +156,7 @@ public class PollDao {
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPoll]", err);
+ log.error("[hasPoll]", err);
}
return false;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
Tue Oct 20 06:36:24 2015
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
@NamedQuery(name = "getPollTypes", query = "SELECT pt FROM PollType
pt"),
- @NamedQuery(name = "getPollType", query = "SELECT pt FROM PollType pt
WHERE pt.id = :pollTypesId")
+ @NamedQuery(name = "getPollType", query = "SELECT pt FROM PollType pt
WHERE pt.id = :typeId")
})
@Table(name = "poll_type")
public class PollType implements IDataProviderEntity {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
Tue Oct 20 06:36:24 2015
@@ -24,8 +24,8 @@
<table style="width: 100%; height: 100%">
<tr>
<td rowspan="2">
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:message key="143" />
</legend>
<form wicket:id="general"></form>
@@ -37,8 +37,8 @@
</tr>
<tr>
<td>
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:message key="1159" />
</legend>
<form wicket:id="comunity"></form>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1709517&r1=1709516&r2=1709517&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Tue Oct 20 06:36:24 2015
@@ -81,7 +81,7 @@ public class UserSearchPanel extends Use
add(new TextField<String>("text", new
PropertyModel<String>(UserSearchPanel.this, "text")));
add(new TextField<String>("offer", new
PropertyModel<String>(UserSearchPanel.this, "offer")));
add(new TextField<String>("search", new
PropertyModel<String>(UserSearchPanel.this, "search")));
- add(new AjaxFormSubmitBehavior(this,
"onsubmit") {
+ add(new AjaxFormSubmitBehavior(this, "submit") {
private static final long
serialVersionUID = 1L;
@Override
