Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Mon Apr 4 10:49:25 2016 @@ -211,6 +211,7 @@ public class RoomPoll implements IDataPr /** * @return the id */ + @Override public Long getId() { return id; } @@ -219,6 +220,7 @@ public class RoomPoll implements IDataPr * @param id * the id to set */ + @Override public void setId(Long id) { this.id = id; }
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Mon Apr 4 10:49:25 2016 @@ -75,10 +75,12 @@ public class RoomPollAnswer implements I @JoinColumn(name = "poll_id") private RoomPoll roomPoll; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java Mon Apr 4 10:49:25 2016 @@ -66,10 +66,12 @@ public class Whiteboard implements IData @ForeignKey(enabled = true) private Collection<WhiteboardItem> roomItems; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java Mon Apr 4 10:49:25 2016 @@ -43,10 +43,12 @@ public class WhiteboardItem implements I @Column(name = "value") private String value; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Mon Apr 4 10:49:25 2016 @@ -99,10 +99,12 @@ public class LdapConfig implements IData @Element(data = true, required = false) private String comment; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Mon Apr 4 10:49:25 2016 @@ -111,10 +111,12 @@ public class OAuthServer implements IDat @Element(data = true) private boolean deleted; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Mon Apr 4 10:49:25 2016 @@ -59,14 +59,13 @@ import org.simpleframework.xml.Root; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class Server implements IDataProviderEntity { - private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(data = true) - private long id = 0; + private Long id; @Column(name = "name") @Element(data = true) @@ -129,10 +128,12 @@ public class Server implements IDataProv @Element(data = true) private boolean deleted = false; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Mon Apr 4 10:49:25 2016 @@ -68,7 +68,7 @@ public class Sessiondata implements Seri private boolean permanent; @Column(name = "language_id") - private Long languageId; + private long languageId; @Column(name = "group_id") private Long groupId; @@ -132,11 +132,11 @@ public class Sessiondata implements Seri this.permanent = permanent; } - public Long getLanguageId() { + public long getLanguageId() { return languageId; } - public void setLanguageId(Long languageId) { + public void setLanguageId(long languageId) { this.languageId = languageId; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Mon Apr 4 10:49:25 2016 @@ -98,10 +98,12 @@ public class Address implements IDataPro this.additionalname = additionalname; } + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java Mon Apr 4 10:49:25 2016 @@ -89,9 +89,11 @@ public class Group implements IDataProvi this.name = name; } + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java Mon Apr 4 10:49:25 2016 @@ -93,10 +93,12 @@ public class GroupUser implements IDataP this.group = group; } + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Mon Apr 4 10:49:25 2016 @@ -53,9 +53,9 @@ import org.simpleframework.xml.Root; @Root(name = "privatemessage") public class PrivateMessage implements IDataProviderEntity { private static final long serialVersionUID = 1L; - public final static long INBOX_FOLDER_ID = 0; - public final static long SENT_FOLDER_ID = -1; - public final static long TRASH_FOLDER_ID = -2; + public final static Long INBOX_FOLDER_ID = Long.valueOf(0); + public final static Long SENT_FOLDER_ID = Long.valueOf(-1); + public final static Long TRASH_FOLDER_ID = Long.valueOf(-2); @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -145,10 +145,12 @@ public class PrivateMessage implements I userContactId = copy.userContactId; } + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -245,19 +247,19 @@ public class PrivateMessage implements I this.folderId = folderId; } - public Boolean getIsRead() { + public boolean getIsRead() { return isRead; } - public void setIsRead(Boolean isRead) { + public void setIsRead(boolean isRead) { this.isRead = isRead; } - public Boolean getIsContactRequest() { + public boolean getIsContactRequest() { return isContactRequest; } - public void setIsContactRequest(Boolean isContactRequest) { + public void setIsContactRequest(boolean isContactRequest) { this.isContactRequest = isContactRequest; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java Mon Apr 4 10:49:25 2016 @@ -56,9 +56,11 @@ public class PrivateMessageFolder implem @Column(name="updated") private Date updated; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Mon Apr 4 10:49:25 2016 @@ -233,7 +233,7 @@ public class User implements IDataProvid @Column(name = "language_id") @Element(name = "language_id", data = true, required = false) - private Long languageId; + private long languageId; @Column(name = "resethash") @Element(data = true, required = false) @@ -281,7 +281,7 @@ public class User implements IDataProvid @Column(name = "forceTimeZoneCheck") @Element(data = true, required = false) - private Boolean forceTimeZoneCheck; + private boolean forceTimeZoneCheck; @Column(name = "sendSMS") @Element(data = false, required = false) @@ -323,10 +323,12 @@ public class User implements IDataProvid @Element(data = true, required = false) private Long domainId; // LDAP config id for LDAP, OAuth server id for OAuth + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -472,11 +474,11 @@ public class User implements IDataProvid this.pictureuri = pictureuri; } - public Long getLanguageId() { + public long getLanguageId() { return languageId; } - public void setLanguageId(Long languageId) { + public void setLanguageId(long languageId) { this.languageId = languageId; } @@ -548,11 +550,11 @@ public class User implements IDataProvid this.timeZoneId = timeZoneId; } - public Boolean getForceTimeZoneCheck() { + public boolean getForceTimeZoneCheck() { return forceTimeZoneCheck; } - public void setForceTimeZoneCheck(Boolean forceTimeZoneCheck) { + public void setForceTimeZoneCheck(boolean forceTimeZoneCheck) { this.forceTimeZoneCheck = forceTimeZoneCheck; } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java Mon Apr 4 10:49:25 2016 @@ -38,14 +38,16 @@ public class AppointmentConverter extend this.idMap = idMap; } + @Override public Appointment read(InputNode node) throws Exception { long oldId = getLong(node); - long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; + Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; Appointment a = appointmentDao.getAny(newId); return a == null ? new Appointment() : a; } + @Override public void write(OutputNode node, Appointment value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java Mon Apr 4 10:49:25 2016 @@ -26,10 +26,12 @@ public class AppointmentReminderTypeConv public AppointmentReminderTypeConverter() { } + @Override public Reminder read(InputNode node) throws Exception { return Reminder.get(getInt(node)); } + @Override public void write(OutputNode node, Reminder value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Mon Apr 4 10:49:25 2016 @@ -173,7 +173,7 @@ public class BackupImport { USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS }; - private File validate(String zipname, File intended) throws IOException { + private static File validate(String zipname, File intended) throws IOException { final String intendedPath = intended.getCanonicalPath(); if (File.pathSeparatorChar != '\\' && zipname.indexOf('\\') > -1) { zipname = zipname.replace('\\', '/'); @@ -189,7 +189,7 @@ public class BackupImport { } } - private File unzip(InputStream is) throws IOException { + private static File unzip(InputStream is) throws IOException { File f = OmFileHelper.getNewDir(OmFileHelper.getUploadImportDir(), "import_" + CalendarPatterns.getTimeForStreamId(new Date())); log.debug("##### EXTRACTING BACKUP TO: " + f); @@ -272,7 +272,7 @@ public class BackupImport { { List<Group> list = readList(simpleSerializer, f, "organizations.xml", "organisations", Group.class); for (Group o : list) { - long oldId = o.getId(); + Long oldId = o.getId(); o.setId(null); o = groupDao.update(o, null); groupMap.put(oldId, o.getId()); @@ -334,7 +334,7 @@ public class BackupImport { } u.setInserted(new Date()); - long userId = u.getId(); + Long userId = u.getId(); u.setId(null); if (u.getSipUser() != null && u.getSipUser().getId() != 0) { u.getSipUser().setId(0); @@ -350,7 +350,7 @@ public class BackupImport { if (!Strings.isEmpty(u.getExternalType())) { u.setType(User.Type.external); } - userDao.update(u, -1L); + userDao.update(u, Long.valueOf(-1)); usersMap.put(userId, u.getId()); } } @@ -570,7 +570,7 @@ public class BackupImport { List<PrivateMessage> list = readList(serializer, f, "privateMessages.xml", "privatemessages", PrivateMessage.class, true); boolean oldBackup = true; for (PrivateMessage p : list) { - if (p.getFolderId() < 0) { + if (p.getFolderId() == null || p.getFolderId().longValue() < 0) { oldBackup = false; break; } @@ -616,7 +616,7 @@ public class BackupImport { if (file.getOwnerId() != null) { file.setOwnerId(usersMap.get(file.getOwnerId())); } - if (file.getParentId() != null && file.getParentId() <= 0L) { + if (file.getParentId() != null && file.getParentId().longValue() <= 0L) { file.setParentId(null); } fileExplorerItemDao.update(file); @@ -669,11 +669,11 @@ public class BackupImport { FileHelper.removeRec(f); } - private <T> List<T> readList(Serializer ser, File baseDir, String fileName, String listNodeName, Class<T> clazz) throws Exception { + private static <T> List<T> readList(Serializer ser, File baseDir, String fileName, String listNodeName, Class<T> clazz) throws Exception { return readList(ser, baseDir, fileName, listNodeName, clazz, false); } - private <T> List<T> readList(Serializer ser, File baseDir, String fileName, String listNodeName, Class<T> clazz, boolean notThow) throws Exception { + private static <T> List<T> readList(Serializer ser, File baseDir, String fileName, String listNodeName, Class<T> clazz, boolean notThow) throws Exception { List<T> list = new ArrayList<T>(); File xml = new File(baseDir, fileName); if (!xml.exists()) { @@ -698,7 +698,7 @@ public class BackupImport { return list; } - private Node getNode(Node doc, String name) { + private static Node getNode(Node doc, String name) { if (doc != null) { NodeList nl = doc.getChildNodes(); for (int i = 0; i < nl.getLength(); ++i) { @@ -940,7 +940,7 @@ public class BackupImport { if (u.getAddress() == null || u.getAddress().getEmail() == null || User.Type.user != u.getType()) { continue; } - userEmailMap.put(u.getAddress().getEmail(), -1); + userEmailMap.put(u.getAddress().getEmail(), Integer.valueOf(-1)); } Node nList = getNode(getNode(doc, "root"), listNodeName); if (nList != null) { @@ -1031,7 +1031,7 @@ public class BackupImport { String updateEmail = "modified_by_import_<" + list.size() + ">" + u.getAddress().getEmail(); u.getAddress().setEmail(updateEmail); } - userEmailMap.put(u.getAddress().getEmail(), userEmailMap.size()); + userEmailMap.put(u.getAddress().getEmail(), Integer.valueOf(userEmailMap.size())); } // check old stateId if (!Strings.isEmpty(stateId)) { @@ -1050,7 +1050,7 @@ public class BackupImport { return list; } - private Long getProfileId(File f) { + private static Long getProfileId(File f) { String n = f.getName(); if (n.indexOf(profilesPrefix) > -1) { return importLongType(n.substring(profilesPrefix.length())); @@ -1104,7 +1104,7 @@ public class BackupImport { } } - private Long importLongType(String value) { + private static Long importLongType(String value) { Long val = null; try { val = Long.valueOf(value); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java Mon Apr 4 10:49:25 2016 @@ -26,11 +26,13 @@ import org.simpleframework.xml.stream.In import org.simpleframework.xml.stream.OutputNode; public class DateConverter implements Converter<Date> { + @Override public Date read(InputNode node) throws Exception { String val = node.getValue(); return val == null || "null".equals(val) ? new Date() : CalendarPatterns.parseImportDate(val); } + @Override public void write(OutputNode node, Date value) throws Exception { node.setAttribute("class", "java.util.Date"); node.setData(true); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java Mon Apr 4 10:49:25 2016 @@ -38,6 +38,7 @@ public class GroupConverter extends OmCo this.idMap = idMap; } + @Override public Group read(InputNode node) throws Exception { long oldId = getLong(node); long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; @@ -46,6 +47,7 @@ public class GroupConverter extends OmCo return o == null ? new Group() : o; } + @Override public void write(OutputNode node, Group value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java Mon Apr 4 10:49:25 2016 @@ -21,10 +21,12 @@ package org.apache.openmeetings.backup; import org.simpleframework.xml.transform.Transform; public class IntegerTransform implements Transform<Integer>{ + @Override public Integer read(String value) throws Exception { return OmConverter.getInt(value, 0); } + @Override public String write(Integer value) throws Exception { return "" + value; } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LongTransform.java Mon Apr 4 10:49:25 2016 @@ -21,12 +21,13 @@ package org.apache.openmeetings.backup; import org.simpleframework.xml.transform.Transform; public class LongTransform implements Transform<Long>{ + @Override public Long read(String value) throws Exception { return OmConverter.getLong(value); } + @Override public String write(Long value) throws Exception { return "" + value; } - } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java Mon Apr 4 10:49:25 2016 @@ -25,10 +25,12 @@ import org.simpleframework.xml.stream.Ou public class PollTypeConverter extends OmConverter<RoomPoll.Type> { public PollTypeConverter() {} + @Override public RoomPoll.Type read(InputNode node) throws Exception { return RoomPoll.Type.get(getLong(node)); } + @Override public void write(OutputNode node, RoomPoll.Type value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java Mon Apr 4 10:49:25 2016 @@ -38,6 +38,7 @@ public class RoomConverter extends OmCon this.idMap = idMap; } + @Override public Room read(InputNode node) throws Exception { long oldId = getLong(node); long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; @@ -46,6 +47,7 @@ public class RoomConverter extends OmCon return r == null ? new Room() : r; } + @Override public void write(OutputNode node, Room value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java Mon Apr 4 10:49:25 2016 @@ -25,10 +25,12 @@ import org.simpleframework.xml.stream.Ou public class RoomTypeConverter extends OmConverter<Type> { public RoomTypeConverter() {} + @Override public Type read(InputNode node) throws Exception { return Type.get(getInt(node)); } + @Override public void write(OutputNode node, Type value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java Mon Apr 4 10:49:25 2016 @@ -23,10 +23,12 @@ import org.simpleframework.xml.stream.In import org.simpleframework.xml.stream.OutputNode; public class SalutationConverter extends OmConverter<Salutation> { + @Override public Salutation read(InputNode node) throws Exception { return Salutation.get(getInt(node)); } + @Override public void write(OutputNode node, Salutation value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java Mon Apr 4 10:49:25 2016 @@ -38,14 +38,16 @@ public class UserConverter extends OmCon this.idMap = idMap; } + @Override public User read(InputNode node) throws Exception { long oldId = getLong(node); - long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; + Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; User u = userDao.get(newId); return u == null ? new User() : u; } + @Override public void write(OutputNode node, User value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java Mon Apr 4 10:49:25 2016 @@ -470,7 +470,7 @@ public class Admin { System.exit(0); } - private long cleanUpFile(long invalid, boolean cleanup, File f) { + private static long cleanUpFile(long invalid, boolean cleanup, File f) { if (f.exists()) { if (cleanup) { FileHelper.removeRec(f); @@ -480,7 +480,7 @@ public class Admin { } return invalid; } - private void checkRecordingFile(File hibernateDir, String name, boolean deleted, long[] params, boolean cleanup) { + private static void checkRecordingFile(File hibernateDir, String name, boolean deleted, long[] params, boolean cleanup) { File flv = name != null ? new File(hibernateDir, name) : null; if (flv != null) { if (flv.exists() && flv.isFile()) { @@ -496,7 +496,7 @@ public class Admin { } } - private long getUserIdByProfile(String name) { + private static long getUserIdByProfile(String name) { long result = -1; if (name.startsWith(OmFileHelper.profilesPrefix)) { try { Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java Mon Apr 4 10:49:25 2016 @@ -38,7 +38,7 @@ public class OmHelpFormatter extends Hel private int maxPrefixLength = 0; @SuppressWarnings("unchecked") - private List<OmOption> getReqOptions(Options opts) { + private static List<OmOption> getReqOptions(Options opts) { //suppose we have only 1 group (for now) OptionGroup g = ((List<OptionGroup>)opts.getRequiredOptions()).get(0); List<OmOption> result = new ArrayList<OmOption>(); @@ -46,6 +46,7 @@ public class OmHelpFormatter extends Hel result.add((OmOption)o); } Collections.sort(result, new Comparator<OmOption>() { + @Override public int compare(OmOption o1, OmOption o2) { return o1.getOrder() - o2.getOrder(); } @@ -118,6 +119,7 @@ public class OmHelpFormatter extends Hel final String key = me.getKey(); List<OmOption> options = me.getValue(); Collections.sort(options, new Comparator<OmOption>(){ + @Override public int compare(OmOption o1, OmOption o2) { boolean o1opt = !o1.isOptional(key); boolean o2opt = !o2.isOptional(key); @@ -132,7 +134,7 @@ public class OmHelpFormatter extends Hel return map; } - private StringBuilder getReqOptionsString(Options opts) { + private static StringBuilder getReqOptionsString(Options opts) { String delim = ""; StringBuilder result = new StringBuilder(); for (Option o : getReqOptions(opts)) { @@ -203,7 +205,8 @@ public class OmHelpFormatter extends Hel printWrapped(pw, width, footer); } } - + + @Override public void printUsage(PrintWriter pw, int width, String app, Options opts) { pw.println(String.format("usage: %1$s [%2$s] [options]", app, getReqOptionsString(opts))); } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Mon Apr 4 10:49:25 2016 @@ -434,7 +434,7 @@ public class ImportInitvalues { u.getAddress().setEmail(cfg.email); u.getGroupUsers().add(new GroupUser(org)); - u = userDao.update(u, cfg.password, -1); + u = userDao.update(u, cfg.password, -1L); log.debug("Installation - User Added user-Id " + u.getId()); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java Mon Apr 4 10:49:25 2016 @@ -32,13 +32,13 @@ import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; public class InstallationDocumentHandler { - public static void createDocument(Integer stepNo) throws Exception { + public static void createDocument(int stepNo) throws Exception { Document document = DocumentHelper.createDocument(); Element root = document.addElement("install"); Element step = root.addElement("step"); - step.addElement("stepnumber").addText(stepNo.toString()); + step.addElement("stepnumber").addText("" + stepNo); step.addElement("stepname").addText("Step " + stepNo); try (OutputStream os = new FileOutputStream(OmFileHelper.getInstallFile())) { Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/AudioTone.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/AudioTone.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/AudioTone.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/AudioTone.java Mon Apr 4 10:49:25 2016 @@ -29,26 +29,17 @@ public class AudioTone { public static void play() { byte[] buf = new byte[1]; - SourceDataLine sdl = null; - try { AudioFormat af = new AudioFormat(SAMPLE_RATE, 8, 1, true, false); - sdl = AudioSystem.getSourceDataLine(af); - sdl = AudioSystem.getSourceDataLine(af); - sdl.open(af); - sdl.start(); - for (int i = 0; i < (int)SAMPLE_RATE; ++i) { - double angle = i / (SAMPLE_RATE / 440) * 2.0 * Math.PI; - buf[0] = (byte) (Math.sin(angle) * 128); - sdl.write(buf, 0, 1); - } + try (SourceDataLine sdl = AudioSystem.getSourceDataLine(af)) { + sdl.open(af); + sdl.start(); + for (int i = 0; i < (int)SAMPLE_RATE; ++i) { + double angle = i / (SAMPLE_RATE / 440) * 2.0 * Math.PI; + buf[0] = (byte) (Math.sin(angle) * 128); + sdl.write(buf, 0, 1); + } } catch (LineUnavailableException e) { //no-op - } finally { - if (sdl != null) { - sdl.drain(); - sdl.stop(); - sdl.close(); - } } } } Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java Mon Apr 4 10:49:25 2016 @@ -113,6 +113,7 @@ class CaptureScreen extends Thread { timeCaptureStarted = 0; } + @Override public void run() { try { while (active && !core.isReadyToRecord()) { Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Mon Apr 4 10:49:25 2016 @@ -408,15 +408,15 @@ public class CoreScreenShare implements } } - private boolean bool(Object b) { + private static boolean bool(Object b) { return TRUE.equals(Boolean.valueOf("" + b)); } - private int getInt(Map<String, Object> returnMap, String key) { + private static int getInt(Map<String, Object> returnMap, String key) { return Integer.valueOf(returnMap.get(key).toString()).intValue(); } - private float getFloat(Map<String, Object> returnMap, String key) { + private static float getFloat(Map<String, Object> returnMap, String key) { return Float.valueOf(returnMap.get(key).toString()).floatValue(); } @@ -595,7 +595,7 @@ public class CoreScreenShare implements return ""; } - private void pressSequence(Robot robot, long delay, int... codes) throws InterruptedException { + private static void pressSequence(Robot robot, long delay, int... codes) throws InterruptedException { for (int i = 0; i < codes.length; ++i) { robot.keyPress(codes[i]); Thread.sleep(delay); @@ -622,7 +622,7 @@ public class CoreScreenShare implements return ""; } - private void pressSpecialSign(String charValue, Robot robot) { + private static void pressSpecialSign(String charValue, Robot robot) { Clipboard clippy = getDefaultToolkit().getSystemClipboard(); try { Transferable transferableText = new StringSelection(charValue); Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java Mon Apr 4 10:49:25 2016 @@ -78,6 +78,7 @@ class RTMPClientPublish extends RTMPClie super.onCommand(conn, channel, source, command); } + @Override public void resultReceived(IPendingServiceCall call) { String method = call == null ? null : call.getServiceMethodName(); logger.trace("call ### get Method Name " + method); @@ -95,6 +96,8 @@ class RTMPClientPublish extends RTMPClie } } + @Override public void onStreamEvent(Notify notify) { + //no-op } } \ No newline at end of file Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java Mon Apr 4 10:49:25 2016 @@ -28,6 +28,7 @@ public class NumberSpinner extends JSpin super(new SpinnerNumberModel(value, min, max, step)); } + @Override public Integer getValue() { return (Integer)super.getValue(); } Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java Mon Apr 4 10:49:25 2016 @@ -32,23 +32,28 @@ public class ScreenHeightMouseListener e this.frame = frame; } + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR)); } + @Override public void mouseExited(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } + @Override public void mousePressed(MouseEvent e) { frame.setShowWarning(false); y = e.getY(); } + @Override public void mouseReleased(MouseEvent e) { frame.setShowWarning(true); } + @Override public void mouseDragged(MouseEvent e) { if (!((Component)e.getSource()).isEnabled()) { return; Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java Mon Apr 4 10:49:25 2016 @@ -27,14 +27,17 @@ import org.slf4j.LoggerFactory; public class ScreenKeyListener implements KeyListener { private static final Logger logger = LoggerFactory.getLogger(ScreenKeyListener.class); + @Override public void keyPressed(KeyEvent kEvent) { logger.debug("keyPressed :Code: " + kEvent.getKeyCode()); } + @Override public void keyReleased(KeyEvent kEvent) { logger.debug("keyReleased :Code: " + kEvent.getKeyCode()); } + @Override public void keyTyped(KeyEvent arg0) { } } Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java Mon Apr 4 10:49:25 2016 @@ -33,24 +33,29 @@ public class ScreenMouseListener extends this.frame = frame; } + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } + @Override public void mouseExited(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } + @Override public void mousePressed(MouseEvent e) { frame.setShowWarning(false); this.x = e.getX(); this.y = e.getY(); } + @Override public void mouseReleased(MouseEvent e) { frame.setShowWarning(true); } + @Override public void mouseDragged(MouseEvent e) { if (!((Component)e.getSource()).isEnabled()) { return; Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Mon Apr 4 10:49:25 2016 @@ -120,14 +120,17 @@ public class ScreenSharerFrame extends J PublishTextField() { getDocument().addDocumentListener( new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { updatePublishURL(); } + @Override public void removeUpdate(DocumentEvent e) { updatePublishURL(); } + @Override public void insertUpdate(DocumentEvent e) { updatePublishURL(); } @@ -216,7 +219,7 @@ public class ScreenSharerFrame extends J } } - private String getTextLabel(String[] textLabels, int idx) { + private static String getTextLabel(String[] textLabels, int idx) { return textLabels != null && idx < textLabels.length ? textLabels[idx] : "#STAB#"; } @@ -265,6 +268,7 @@ public class ScreenSharerFrame extends J btnStartStopSharing.setIcon(startIcon); btnStartStopSharing.setSize(200, 32); btnStartStopSharing.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { if (sharingStarted) { if (!sharingActionRequested) { @@ -290,6 +294,7 @@ public class ScreenSharerFrame extends J audioNotify.setBackground(Color.WHITE); audioNotify.setSelected(core.isAudioNotify()); audioNotify.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { core.setAudioNotify(audioNotify.isSelected()); } @@ -384,6 +389,7 @@ public class ScreenSharerFrame extends J spinnerWidth = new NumberSpinner(ScreenDimensions.spinnerWidth, 0, ScreenDimensions.widthMax, 1); spinnerWidth.setBounds(400, 20, 60, 24); spinnerWidth.addChangeListener( new ChangeListener(){ + @Override public void stateChanged(ChangeEvent arg0) { calcNewValueWidthSpin(); } @@ -399,6 +405,7 @@ public class ScreenSharerFrame extends J spinnerHeight = new NumberSpinner(ScreenDimensions.spinnerHeight, 0, ScreenDimensions.heightMax, 1); spinnerHeight.setBounds(400, 50, 60, 24); spinnerHeight.addChangeListener( new ChangeListener(){ + @Override public void stateChanged(ChangeEvent arg0) { calcNewValueHeightSpin(); } @@ -414,6 +421,7 @@ public class ScreenSharerFrame extends J spinnerX = new NumberSpinner(ScreenDimensions.spinnerX, 0, ScreenDimensions.widthMax, 1); spinnerX.setBounds(400, 80, 60, 24); spinnerX.addChangeListener( new ChangeListener(){ + @Override public void stateChanged(ChangeEvent arg0) { calcNewValueXSpin(); } @@ -429,6 +437,7 @@ public class ScreenSharerFrame extends J spinnerY = new NumberSpinner(ScreenDimensions.spinnerY, 0, ScreenDimensions.heightMax, 1); spinnerY.setBounds(400, 110, 60, 24); spinnerY.addChangeListener( new ChangeListener(){ + @Override public void stateChanged(ChangeEvent arg0) { calcNewValueYSpin(); } @@ -448,6 +457,7 @@ public class ScreenSharerFrame extends J comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093 comboQuality.setBounds(250, 170, 130, 24); comboQuality.addActionListener(new ActionListener() { + @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { ScreenDimensions.quality = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue(); @@ -465,6 +475,7 @@ public class ScreenSharerFrame extends J comboFPS.addItem(new KeyValue<Integer>("25 FPS", 25)); comboFPS.addItem(new KeyValue<Integer>("30 FPS", 30)); comboFPS.addActionListener(new ActionListener() { + @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue(); @@ -504,6 +515,7 @@ public class ScreenSharerFrame extends J btnStartStopRecording.setIcon(startIcon); btnStartStopRecording.setBounds(10, 82, 200, 32); btnStartStopRecording.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { if (recordingStarted) { if (!recordingActionRequested) { @@ -571,6 +583,7 @@ public class ScreenSharerFrame extends J btnStartStopPublish.setIcon(startIcon); btnStartStopPublish.setBounds(10, 86, 200, 32); btnStartStopPublish.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { if (publishStarted) { if (!publishingActionRequested) { @@ -602,6 +615,7 @@ public class ScreenSharerFrame extends J remoteEnabled.setBounds(10, 10, 450, 24); remoteEnabled.setEnabled(core.allowRemote); remoteEnabled.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { core.setRemoteEnabled(remoteEnabled.isSelected()); } Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java Mon Apr 4 10:49:25 2016 @@ -32,23 +32,28 @@ public class ScreenWidthMouseListener ex this.frame = frame; } + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR)); } + @Override public void mouseExited(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } + @Override public void mousePressed(MouseEvent e) { frame.setShowWarning(false); this.x = e.getX(); } + @Override public void mouseReleased(MouseEvent e) { frame.setShowWarning(true); } + @Override public void mouseDragged(MouseEvent e) { if (!((Component)e.getSource()).isEnabled()) { return; Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java Mon Apr 4 10:49:25 2016 @@ -32,23 +32,28 @@ public class ScreenXMouseListener extend this.frame = frame; } + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR)); } + @Override public void mouseExited(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } + @Override public void mousePressed(MouseEvent e) { frame.setShowWarning(false); this.x = e.getX(); } + @Override public void mouseReleased(MouseEvent e) { frame.setShowWarning(true); } + @Override public void mouseDragged(MouseEvent e) { if (!((Component)e.getSource()).isEnabled()) { return; Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java (original) +++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java Mon Apr 4 10:49:25 2016 @@ -32,23 +32,28 @@ public class ScreenYMouseListener extend this.frame = frame; } + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR)); } + @Override public void mouseExited(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } + @Override public void mousePressed(MouseEvent e) { frame.setShowWarning(false); this.y = e.getY(); } + @Override public void mouseReleased(MouseEvent e) { frame.setShowWarning(true); } + @Override public void mouseDragged(MouseEvent e) { if (!((Component)e.getSource()).isEnabled()) { return; Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml Mon Apr 4 10:49:25 2016 @@ -65,6 +65,12 @@ <td> Dashboard: ATOM-Feed URL for the dashboard RSS Tab </td> </tr> <tr> + <td> ldap_default_id </td> + <td> 0 </td> + <td> Ldap domain selected by default in the login screen </td> + <td> 1.9.x </td> + </tr> + <tr> <td> user.login.minimum.length </td> <td> 4 </td> <td> minimum chars required for the login to create a user </td> Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java (original) +++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java Mon Apr 4 10:49:25 2016 @@ -103,6 +103,7 @@ public abstract class AbstractTemplatePa private static final long serialVersionUID = 1L; public static final String COMP_ID = "template"; + @Override public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass) { return new StringResourceStream("<wicket:container wicket:id='" + COMP_ID + "'></wicket:container>"); } Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java (original) +++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java Mon Apr 4 10:49:25 2016 @@ -43,6 +43,7 @@ public class TestSetupCleanupJob { for (File folder : folders) { if (folder.isDirectory()) { File[] files = folder.listFiles(new FileFilter() { + @Override public boolean accept(File file) { return file.getName().startsWith("TEST_SETUP_"); } Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original) +++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Mon Apr 4 10:49:25 2016 @@ -111,6 +111,7 @@ public class InvitationManager implement sendInvitionLink(mm.getInvitation(), type, t.getSubject(), t.getEmail(), ical); } + @Override public void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception { String invitation_link = type == MessageType.Cancel ? null : ((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(), i); //TODO check for exceptions User owner = i.getInvitedBy(); @@ -159,6 +160,7 @@ public class InvitationManager implement * @param subject * @return */ + @Override public boolean sendInvitationReminderSMS(String phone, String subject, long languageId) { if (!Strings.isEmpty(phone)) { log.debug("sendInvitationReminderSMS to " + phone + ": " + subject); @@ -177,6 +179,7 @@ public class InvitationManager implement * @param hidePass * @return */ + @Override public Object getInvitationByHashCode(String hashCode, boolean hidePass) { try { log.debug("Invitation was requested by hashcode: " + hashCode); @@ -249,6 +252,7 @@ public class InvitationManager implement * @param pass * @return */ + @Override public Object checkInvitationPass(String hashCode, String pass) { try { Object obj = getInvitationByHashCode(hashCode, false); @@ -276,10 +280,12 @@ public class InvitationManager implement * @param member * @param a */ + @Override public void processInvitation(Appointment a, MeetingMember member, MessageType type) { processInvitation(a, member, type, true); } + @Override public void processInvitation(Appointment a, MeetingMember mm, MessageType type, boolean sendMail) { Reminder reminder = a.getReminder(); if (reminder == null) { @@ -305,6 +311,7 @@ public class InvitationManager implement } } + @Override public Invitation getInvitation(Invitation _invitation, User inveetee, Room room , boolean isPasswordProtected, String invitationpass, Valid valid, User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd @@ -350,6 +357,7 @@ public class InvitationManager implement return invitation; } + @Override public Invitation getInvitation(User inveetee, Room room, boolean isPasswordProtected, String invitationpass, Valid valid, User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd, Appointment appointment) { Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original) +++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Mon Apr 4 10:49:25 2016 @@ -163,11 +163,13 @@ public class UserManager implements IUse return null; } + @Override public Long logout(String SID, long userId) { - sessiondataDao.updateUser(SID, 0, false, null); + sessiondataDao.updateUser(SID, null, false, 0); return -12L; } + @Override public List<Userdata> getUserdataDashBoard(Long userId) { if (userId != null && userId.longValue() > 0) { try { @@ -557,7 +559,7 @@ public class UserManager implements IUse } //TODO FIXME should we update fields on login ???? u.setLastlogin(new Date()); - u = userDao.update(u, pass, -1); + u = userDao.update(u, pass, Long.valueOf(-1)); return u; } Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java Mon Apr 4 10:49:25 2016 @@ -35,21 +35,25 @@ public class CalendarPatterns { private static final Logger log = Red5LoggerFactory.getLogger(CalendarPatterns.class, webAppRootKey); public static ThreadLocal<SimpleDateFormat> dateFormat__ddMMyyyyHHmmss = new ThreadLocal<SimpleDateFormat>() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); }; }; public static ThreadLocal<SimpleDateFormat> dateFormat__ddMMyyyy = new ThreadLocal<SimpleDateFormat>() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("dd.MM.yyyy"); }; }; public static ThreadLocal<SimpleDateFormat> dateFormat__ddMMyyyyBySeparator = new ThreadLocal<SimpleDateFormat>() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("dd-MM-yyyy"); }; }; public static ThreadLocal<SimpleDateFormat> dateFormat__yyyyMMddHHmmss = new ThreadLocal<SimpleDateFormat>() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); }; Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/Logger.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/Logger.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/Logger.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/Logger.java Mon Apr 4 10:49:25 2016 @@ -29,7 +29,7 @@ public class Logger { OpenmeetingsVariables.webAppRootKey); } - private String getMethodMessage() { + private static String getMethodMessage() { StackTraceElement ste = Thread.currentThread().getStackTrace()[2]; return "In the method " + ste.getMethodName(); } Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java Mon Apr 4 10:49:25 2016 @@ -24,10 +24,12 @@ import org.red5.logging.ContextLoggingLi public class OMContextListener extends ContextLoggingListener { + @Override public void contextDestroyed(ServletContextEvent event) { super.contextDestroyed(event); } + @Override public void contextInitialized(ServletContextEvent event) { OpenmeetingsVariables.webAppRootKey = pathToName(event); OpenmeetingsVariables.webAppRootPath = "/" + OpenmeetingsVariables.webAppRootKey; @@ -37,7 +39,7 @@ public class OMContextListener extends C super.contextInitialized(event); } - private String pathToName(ServletContextEvent event) { + private static String pathToName(ServletContextEvent event) { String contextName = event.getServletContext().getContextPath().replaceAll("/", ""); if ("".equals(contextName)) { contextName = "root"; Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java Mon Apr 4 10:49:25 2016 @@ -26,8 +26,8 @@ public class OmException extends Excepti super(msg); } - public OmException(Long code) { - this.code = code; + public OmException(long code) { + this.code = Long.valueOf(code); } public OmException(Throwable cause) { Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICryptString.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICryptString.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICryptString.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/ICryptString.java Mon Apr 4 10:49:25 2016 @@ -43,6 +43,6 @@ public interface ICryptString { * @param passwdFromDb * @return */ - public Boolean verifyPassword(String passGiven, String passwdFromDb); + public boolean verifyPassword(String passGiven, String passwdFromDb); } Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java Mon Apr 4 10:49:25 2016 @@ -48,7 +48,7 @@ public class MD5CryptImplementation impl * @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String) */ @Override - public Boolean verifyPassword(String passGiven, String passwdFromDb) { + public boolean verifyPassword(String passGiven, String passwdFromDb) { boolean validPassword = false; String salt = passwdFromDb.split("\\$")[2]; Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java Mon Apr 4 10:49:25 2016 @@ -48,7 +48,7 @@ public class MD5Implementation implement * @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String) */ @Override - public Boolean verifyPassword(String passGiven, String passwdFromDb) { + public boolean verifyPassword(String passGiven, String passwdFromDb) { return (passwdFromDb.equals(createPassPhrase(passGiven))); } Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java Mon Apr 4 10:49:25 2016 @@ -50,6 +50,7 @@ public class GeomPoint extends Point { return gPoint; } + @Override public GeomPoint clone() { GeomPoint p = new GeomPoint(); p.setLocation(this.getX(), this.getY()); @@ -80,6 +81,7 @@ public class GeomPoint extends Point { return Math.sqrt( this.getX()*this.getX() + this.getY()*this.getY() ); } + @Override public String toString() { return getClass().getName() + "[x=" + this.getX() + ",y=" + this.getY() + "]"; } Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java (original) +++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java Mon Apr 4 10:49:25 2016 @@ -44,7 +44,7 @@ public class StringComparer { return t.toString(); } - private boolean compareChars(char inputChar){ + private static boolean compareChars(char inputChar){ return Character.isLetterOrDigit(inputChar); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java Mon Apr 4 10:49:25 2016 @@ -89,6 +89,7 @@ public abstract class AdminSavePanel<T> /** * Hide the new record text */ + @Override public void hideNewRecord() { newRecord.setVisible(false); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Mon Apr 4 10:49:25 2016 @@ -221,6 +221,7 @@ public class BackupPanel extends AdminPa th = null; } + @Override public void run() { try { backup.performExport(backupFile, backupDir, includeFiles, progressHolder); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Mon Apr 4 10:49:25 2016 @@ -63,6 +63,7 @@ public class ConfigForm extends AdminBas add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){ private static final long serialVersionUID = 1L; + @Override public void validate(IValidatable<String> validatable) { Configuration c = getBean(ConfigurationDao.class).forceGet(validatable.getValue()); if (c != null && !c.isDeleted() && !c.getId().equals(ConfigForm.this.getModelObject().getId())) { Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Mon Apr 4 10:49:25 2016 @@ -67,6 +67,7 @@ public class ConfigsPanel extends AdminP item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.hideNewRecord(); form.setModelObject(c); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Mon Apr 4 10:49:25 2016 @@ -120,14 +120,17 @@ public class GroupUsersPanel extends Pan super(GroupUserDao.class); } + @Override protected GroupUserDao getDao() { return (GroupUserDao)super.getDao(); } + @Override public long size() { return users2add.size() + (search == null ? getDao().count(groupId) : getDao().count(groupId, search)); } + @Override public java.util.Iterator<? extends GroupUser> iterator(long first, long count) { List<GroupUser> list = new ArrayList<GroupUser>(); list.addAll(users2add); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Mon Apr 4 10:49:25 2016 @@ -72,6 +72,7 @@ public class GroupsPanel extends AdminPa item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.hideNewRecord(); form.setModelObject(o); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java Mon Apr 4 10:49:25 2016 @@ -46,7 +46,7 @@ public class LangForm extends Form<Void> private static final long serialVersionUID = 1L; private DropDownChoice<Map.Entry<Long, Locale>> languages; - private List<Map.Entry<Long, Locale>> getLanguages() { + private static List<Map.Entry<Long, Locale>> getLanguages() { List<Map.Entry<Long, Locale>> list = new ArrayList<Map.Entry<Long, Locale>>(); for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet()) { list.add(new AbstractMap.SimpleEntry<Long,Locale>(e.getKey(), e.getValue()));
