Author: solomax
Date: Tue Apr 5 06:54:27 2016
New Revision: 1737788
URL: http://svn.apache.org/viewvc?rev=1737788&view=rev
Log:
No jira: java warnings related to boxing/unboxing and null dereference are
partially fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Tue Apr 5 06:54:27 2016
@@ -170,7 +170,7 @@ public class ScopeApplicationAdapter ext
String parentSid = (String)map.get("parentSid");
parentClient =
sessionManager.getClientByPublicSID(parentSid, null);
if (parentClient == null) {
- rejectClient();
+ return rejectClient();
}
}
Client rcm =
sessionManager.addClientListItem(conn.getClient().getId(),
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Tue Apr 5 06:54:27 2016
@@ -278,10 +278,12 @@ public class LabelDao implements IDataPr
}
private static List<StringLabel> getLabels(Locale l, final String
search) {
- if (!labelCache.containsKey(l)) {
- labelCache.put(l, getLabels(l));
+ List<StringLabel> result = null;
+ if (labelCache.containsKey(l)) {
+ result = labelCache.get(l);
+ } else {
+ result = labelCache.putIfAbsent(l, getLabels(l));
}
- List<StringLabel> result = new
ArrayList<StringLabel>(labelCache.get(l));
if (!Strings.isEmpty(search)) {
CollectionUtils.filter(result, new
Predicate<StringLabel>() {
@Override
@@ -295,22 +297,22 @@ public class LabelDao implements IDataPr
@Override
public StringLabel get(long id) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public StringLabel get(Long id) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public List<StringLabel> get(int start, int count) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public List<StringLabel> get(String search, int start, int count,
String order) {
- return null;
+ throw new RuntimeException("Should not be used");
}
public List<StringLabel> get(Locale l, final String search, int start,
int count, final SortParam<String> sort) {
@@ -339,12 +341,12 @@ public class LabelDao implements IDataPr
@Override
public long count() {
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- return 0;
+ throw new RuntimeException("Should not be used");
}
public long count(Locale l, final String search) {
@@ -353,7 +355,7 @@ public class LabelDao implements IDataPr
@Override
public StringLabel update(StringLabel entity, Long userId) {
- return null;
+ throw new RuntimeException("Should not be used");
}
public StringLabel update(Locale l, StringLabel entity) throws
Exception {
@@ -368,6 +370,7 @@ public class LabelDao implements IDataPr
@Override
public void delete(StringLabel entity, Long userId) {
+ throw new RuntimeException("Should not be used");
}
public void delete(Locale l, StringLabel entity) throws Exception {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
Tue Apr 5 06:54:27 2016
@@ -68,10 +68,10 @@ public class OAuth2Dao implements IDataP
@Override
public List<OAuthServer> get(String search, int start, int count,
String order) {
- TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), Long.class);
+ TypedQuery<OAuthServer> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), OAuthServer.class);
q.setFirstResult(start);
q.setMaxResults(count);
- return null;
+ return q.getResultList();
}
@Override
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
Tue Apr 5 06:54:27 2016
@@ -182,24 +182,21 @@ public class PrivateMessageDao implement
@Override
public List<PrivateMessage> get(String search, int start, int count,
String order) {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count() {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public void delete(PrivateMessage entity, Long userId) {
- // TODO Auto-generated method stub
+ throw new RuntimeException("Should not be used");
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
Tue Apr 5 06:54:27 2016
@@ -126,20 +126,16 @@ public class PrivateMessageFolderDao imp
@Override
public List<PrivateMessageFolder> get(String search, int start, int
count, String order) {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count() {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
-
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Tue Apr 5 06:54:27 2016
@@ -92,12 +92,12 @@ public class InvitationDialog extends Ab
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final InvitationForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
- private final long roomId;
+ private final Long roomId;
private final IModel<String> subject = Model.of((String)null);
private final IModel<String> message = Model.of((String)null);
private final IModel<String> tzId = Model.of((String)null);
private final IModel<InviteeType> inviteeType =
Model.of(InviteeType.user);
- private Long lang;
+ private long lang;
private final TextField<String> url = new TextField<String>("url",
Model.of((String)null));
enum InviteeType {
user
@@ -150,7 +150,7 @@ public class InvitationDialog extends Ab
});
private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
- public InvitationDialog(String id, long roomId) {
+ public InvitationDialog(String id, Long roomId) {
super(id, Application.getString(214), new
CompoundPropertyModel<Invitation>(new Invitation()));
this.roomId = roomId;
add(form = new InvitationForm("form", getModel()));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Tue Apr 5 06:54:27 2016
@@ -78,7 +78,7 @@ public class RoomPanel extends BasePanel
private final VoteDialog vote;
private final PollResultsDialog pollResults;
private final StartSharingEventBehavior startSharing;
- private long roomId = 0;
+ private Long roomId = null;
public RoomPanel(String id) {
this(id, new PageParameters());
@@ -93,7 +93,7 @@ public class RoomPanel extends BasePanel
return pp.add("protocol", s.getProtocol()).add("host",
s.getAddress()).add("port", s.getPort()).add("context", s.getWebapp());
}
- public static PageParameters addServer(long roomId, boolean addBasic) {
+ public static PageParameters addServer(Long roomId, boolean addBasic) {
PageParameters pp = new PageParameters();
if (addBasic) {
pp.add("wicketsid", getSid()).add(WICKET_ROOM_ID,
roomId).add("language", getLanguage());
@@ -114,7 +114,7 @@ public class RoomPanel extends BasePanel
}
for (Map.Entry<Server, List<Long>> entry :
activeRoomsMap.entrySet()) {
List<Long> roomIds = entry.getValue();
- Long capacity =
getBean(RoomDao.class).getRoomsCapacityByIds(roomIds);
+ long capacity =
getBean(RoomDao.class).getRoomsCapacityByIds(roomIds);
if (minimum < 0 || capacity < minimum) {
minimum = capacity;
result = entry.getKey();
@@ -125,7 +125,7 @@ public class RoomPanel extends BasePanel
return result == null ? pp : addServer(pp, result);
}
- public RoomPanel(String id, long roomId) {
+ public RoomPanel(String id, Long roomId) {
this(id, addServer(roomId, true));
}
@@ -137,7 +137,7 @@ public class RoomPanel extends BasePanel
StringValue secureHash = pp.get(WebSession.SECURE_HASH);
StringValue invitationHash =
pp.get(WebSession.INVITATION_HASH);
if (!room.isEmpty()) {
- roomId = room.toLong();
+ roomId = room.toLongObject();
} else if (!secureHash.isEmpty()) {
if
(WebSession.get().signIn(secureHash.toString(), false)) {
SOAPLogin soapLogin =
getBean(SOAPLoginDao.class).get(secureHash.toString());
@@ -169,7 +169,7 @@ public class RoomPanel extends BasePanel
add(vote = new VoteDialog("vote", roomId));
add(pollResults = new PollResultsDialog("pollResults", roomId));
add(startSharing = new StartSharingEventBehavior(roomId));
- if (roomId > 0) {
+ if (roomId.longValue() > 0) {
add(new AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Tue Apr 5 06:54:27 2016
@@ -60,7 +60,7 @@ public class StartSharingEventBehavior e
private static final String CDATA_BEGIN = "<![CDATA[";
private static final String CDATA_END = "]]>";
private final AjaxDownload download;
- private final long roomId;
+ private final Long roomId;
private enum Protocol {
rtmp
, rtmpe
@@ -68,7 +68,7 @@ public class StartSharingEventBehavior e
, rtmpt
}
- public StartSharingEventBehavior(long _roomId) {
+ public StartSharingEventBehavior(Long _roomId) {
this.roomId = _roomId;
download = new AjaxDownload(true) {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
Tue Apr 5 06:54:27 2016
@@ -50,12 +50,12 @@ public class CreatePollDialog extends Ab
private static final long serialVersionUID = 1L;
private final DialogButton create = new DialogButton("create",
Application.getString(22));
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
- private final long roomId;
+ private final Long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private String publicSid = null;
- public CreatePollDialog(String id, long roomId) {
+ public CreatePollDialog(String id, Long roomId) {
super(id, Application.getString(18), new
CompoundPropertyModel<RoomPoll>(new RoomPoll()));
this.roomId = roomId;
add(form = new PollForm("form", getModel()));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Tue Apr 5 06:54:27 2016
@@ -69,7 +69,7 @@ import com.googlecode.wicket.jquery.ui.w
public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer chartDiv = new
WebMarkupContainer("chart");
- private final long roomId;
+ private final Long roomId;
private final PollSelectForm selForm;
private final PollResultsForm dispForm;
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
@@ -79,7 +79,7 @@ public class PollResultsDialog extends A
private final MessageDialog closeConfirm;
private final MessageDialog deleteConfirm;
- public PollResultsDialog(String id, long _roomId) {
+ public PollResultsDialog(String id, Long _roomId) {
super(id, Application.getString(37));
this.roomId = _roomId;
add(selForm = new PollSelectForm("selForm"));
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Tue Apr 5 06:54:27 2016
@@ -161,7 +161,7 @@ public class ScopeApplicationAdapter ext
String parentSid = (String)map.get("parentSid");
parentClient =
sessionManager.getClientByPublicSID(parentSid, null);
if (parentClient == null) {
- rejectClient();
+ return rejectClient();
}
}
Client rcm =
sessionManager.addClientListItem(conn.getClient().getId(),
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Tue Apr 5 06:54:27 2016
@@ -266,10 +266,12 @@ public class LabelDao implements IDataPr
}
private static List<StringLabel> getLabels(Locale l, final String
search) {
- if (!labelCache.containsKey(l)) {
- labelCache.put(l, getLabels(l));
+ List<StringLabel> result = null;
+ if (labelCache.containsKey(l)) {
+ result = labelCache.get(l);
+ } else {
+ result = labelCache.putIfAbsent(l, getLabels(l));
}
- List<StringLabel> result = new
ArrayList<StringLabel>(labelCache.get(l));
if (!Strings.isEmpty(search)) {
CollectionUtils.filter(result, new
Predicate<StringLabel>() {
@Override
@@ -283,22 +285,22 @@ public class LabelDao implements IDataPr
@Override
public StringLabel get(long id) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public StringLabel get(Long id) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public List<StringLabel> get(int start, int count) {
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public List<StringLabel> get(String search, int start, int count,
String order) {
- return null;
+ throw new RuntimeException("Should not be used");
}
public List<StringLabel> get(Locale l, final String search, int start,
int count, final SortParam<String> sort) {
@@ -327,12 +329,12 @@ public class LabelDao implements IDataPr
@Override
public long count() {
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- return 0;
+ throw new RuntimeException("Should not be used");
}
public long count(Locale l, final String search) {
@@ -341,7 +343,7 @@ public class LabelDao implements IDataPr
@Override
public StringLabel update(StringLabel entity, Long userId) {
- return null;
+ throw new RuntimeException("Should not be used");
}
public StringLabel update(Locale l, StringLabel entity) throws
Exception {
@@ -356,6 +358,7 @@ public class LabelDao implements IDataPr
@Override
public void delete(StringLabel entity, Long userId) {
+ throw new RuntimeException("Should not be used");
}
public void delete(Locale l, StringLabel entity) throws Exception {
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
Tue Apr 5 06:54:27 2016
@@ -68,10 +68,10 @@ public class OAuth2Dao implements IDataP
@Override
public List<OAuthServer> get(String search, int start, int count,
String order) {
- TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), Long.class);
+ TypedQuery<OAuthServer> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), OAuthServer.class);
q.setFirstResult(start);
q.setMaxResults(count);
- return null;
+ return q.getResultList();
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
Tue Apr 5 06:54:27 2016
@@ -182,24 +182,21 @@ public class PrivateMessageDao implement
@Override
public List<PrivateMessage> get(String search, int start, int count,
String order) {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count() {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public void delete(PrivateMessage entity, Long userId) {
- // TODO Auto-generated method stub
+ throw new RuntimeException("Should not be used");
}
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
Tue Apr 5 06:54:27 2016
@@ -126,20 +126,16 @@ public class PrivateMessageFolderDao imp
@Override
public List<PrivateMessageFolder> get(String search, int start, int
count, String order) {
- // TODO Auto-generated method stub
- return null;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count() {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
@Override
public long count(String search) {
- // TODO Auto-generated method stub
- return 0;
+ throw new RuntimeException("Should not be used");
}
-
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Tue Apr 5 06:54:27 2016
@@ -92,12 +92,12 @@ public class InvitationDialog extends Ab
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final InvitationForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
- private final long roomId;
+ private final Long roomId;
private final IModel<String> subject = Model.of((String)null);
private final IModel<String> message = Model.of((String)null);
private final IModel<String> tzId = Model.of((String)null);
private final IModel<InviteeType> inviteeType =
Model.of(InviteeType.user);
- private Long lang;
+ private long lang;
private final TextField<String> url = new TextField<String>("url",
Model.of((String)null));
enum InviteeType {
user
@@ -150,7 +150,7 @@ public class InvitationDialog extends Ab
});
private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
- public InvitationDialog(String id, long roomId) {
+ public InvitationDialog(String id, Long roomId) {
super(id, Application.getString(214), new
CompoundPropertyModel<Invitation>(new Invitation()));
this.roomId = roomId;
add(form = new InvitationForm("form", getModel()));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Tue Apr 5 06:54:27 2016
@@ -122,7 +122,7 @@ import com.googlecode.wicket.jquery.ui.w
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
- private long roomId;
+ private Long roomId;
private Client c;
private final WebMarkupContainer room = new
WebMarkupContainer("roomContainer");
private final StartSharingEventBehavior startSharing;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Tue Apr 5 06:54:27 2016
@@ -59,7 +59,7 @@ public class StartSharingEventBehavior e
public static final String PARAM_PUBLIC_SID = "publicSid";
public static final String PARAM_URL = "url";
private final AjaxDownload download;
- private final long roomId;
+ private final Long roomId;
private enum Protocol {
rtmp
, rtmpe
@@ -67,7 +67,7 @@ public class StartSharingEventBehavior e
, rtmpt
}
- public StartSharingEventBehavior(long _roomId) {
+ public StartSharingEventBehavior(Long _roomId) {
this.roomId = _roomId;
download = new AjaxDownload(true) {
private static final long serialVersionUID = 1L;
@@ -148,7 +148,7 @@ public class StartSharingEventBehavior e
return result.toString();
}
- private String addKeystore(String app, Protocol protocol) {
+ private static String addKeystore(String app, Protocol protocol) {
log.debug("RTMP Sharer Keystore :: start");
String keystore = "--dummy--", password = "--dummy--";
if (Protocol.rtmps == protocol) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
Tue Apr 5 06:54:27 2016
@@ -51,11 +51,11 @@ public class CreatePollDialog extends Ab
private static final long serialVersionUID = 1L;
private final DialogButton create = new DialogButton("create",
Application.getString(22));
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
- private final long roomId;
+ private final Long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
- public CreatePollDialog(String id, long roomId) {
+ public CreatePollDialog(String id, Long roomId) {
super(id, Application.getString(18), new
CompoundPropertyModel<RoomPoll>(new RoomPoll()));
this.roomId = roomId;
add(form = new PollForm("form", getModel()));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1737788&r1=1737787&r2=1737788&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Tue Apr 5 06:54:27 2016
@@ -72,7 +72,7 @@ import com.googlecode.wicket.jquery.ui.w
public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer chartDiv = new
WebMarkupContainer("chart");
- private final long roomId;
+ private final Long roomId;
private final PollSelectForm selForm;
private final PollResultsForm dispForm;
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
@@ -82,7 +82,7 @@ public class PollResultsDialog extends A
private final MessageDialog closeConfirm;
private final MessageDialog deleteConfirm;
- public PollResultsDialog(String id, long _roomId) {
+ public PollResultsDialog(String id, Long _roomId) {
super(id, Application.getString(37));
this.roomId = _roomId;
add(selForm = new PollSelectForm("selForm"));
