Author: sebawagner
Date: Sun Jul 14 01:28:56 2013
New Revision: 1502925
URL: http://svn.apache.org/r1502925
Log:
Further some clean up of code warnings (now even useful :))
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/test/regexp.jsp
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
Modified: openmeetings/trunk/singlewebapp/WebContent/src/test/regexp.jsp
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/test/regexp.jsp?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/test/regexp.jsp (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/test/regexp.jsp Sun Jul 14
01:28:56 2013
@@ -55,7 +55,7 @@
}
</script>
</head>
-<body align="center" valign="middle" align="center" onLoad="focusSWF()">
+<body onLoad="focusSWF()">
<div id="flashcontent">
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
Sun Jul 14 01:28:56 2013
@@ -34,7 +34,6 @@ import javax.persistence.criteria.Root;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
@@ -76,8 +75,6 @@ public class RoomManager {
private AuthLevelUtil authLevelUtil;
@Autowired
private ISessionManager sessionManager;
- @Autowired
- private ConfigurationDao configurationDao;
@Autowired
private FieldManager fieldManager;
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
Sun Jul 14 01:28:56 2013
@@ -21,9 +21,6 @@ package org.apache.openmeetings.data.use
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.templates.RegisterUserTemplate;
@@ -43,9 +40,6 @@ import org.springframework.transaction.a
public class EmailManager {
private static final Logger log =
Red5LoggerFactory.getLogger(EmailManager.class, webAppRootKey);
- @PersistenceContext
- private EntityManager em;
-
@Autowired
private ConfigurationDao configurationDao;
@Autowired
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java
Sun Jul 14 01:28:56 2013
@@ -40,4 +40,28 @@ public class WhiteboardItem {
@Column(name = "value")
private String value;
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
Sun Jul 14 01:28:56 2013
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.conference.dao.ClientDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.room.Client;
@@ -35,9 +34,6 @@ public class DatabaseStore implements IC
@Autowired
private ClientDao clientDao;
- @Autowired
- private ServerDao serverDao;
-
public void clearCache() {
//List<Server> serverList = serverDao.getActiveServers();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1502925&r1=1502924&r2=1502925&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
Sun Jul 14 01:28:56 2013
@@ -29,7 +29,6 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
@@ -57,8 +56,6 @@ public class TestOldBackups extends Abst
private AppointmentDao appointmentDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
- @Autowired
- private FileExplorerItemDao fileExplorerItemDao;
@Test
public void importOldVersions() {
