You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/02 05:13:22 UTC

openmeetings git commit: no jira: whitespaces are fixed

Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 5a02e50f5 -> 6618c9388


no jira: whitespaces are fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6618c938
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6618c938
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6618c938

Branch: refs/heads/4.0.x
Commit: 6618c9388778180ec90cd68f14fcbe25f050801d
Parents: 5a02e50
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 2 12:13:14 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 2 12:13:14 2017 +0700

----------------------------------------------------------------------
 .../converter/InterviewConverterTask.java       |  1 -
 .../openmeetings/core/mail/MailHandler.java     |  2 +-
 .../db/dao/record/RecordingMetaDeltaDao.java    |  3 --
 .../db/dao/server/LdapConfigDao.java            |  1 -
 .../openmeetings/db/dao/server/OAuth2Dao.java   |  1 -
 .../db/dao/server/SOAPLoginDao.java             |  1 -
 .../db/entity/basic/Configuration.java          |  1 -
 .../db/entity/file/BaseFileItem.java            |  1 -
 .../db/entity/log/ConferenceLog.java            | 35 ++++++++++++--------
 .../db/entity/room/RoomPollAnswer.java          |  1 -
 .../db/entity/server/OAuthServer.java           |  1 -
 .../db/entity/user/UserContact.java             |  1 -
 .../service/quartz/scheduler/AbstractJob.java   |  2 +-
 .../service/quartz/scheduler/ReminderJob.java   |  4 +--
 .../service/room/InvitationManager.java         |  2 +-
 .../org/apache/openmeetings/util/DaoHelper.java |  1 +
 .../util/process/ProcessHelper.java             |  1 -
 .../web/pages/auth/ForgetPasswordDialog.java    |  1 -
 .../openmeetings/webservice/FileWebService.java |  1 -
 19 files changed, 27 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
index e033af9..42dc789 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
@@ -45,5 +45,4 @@ public class InterviewConverterTask {
 			log.error("[startConversionThread]", err);
 		}
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
index 811b312..86f6a3b 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
@@ -28,8 +28,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TIM
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TIMEOUT_CON;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TLS;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USER;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
index 2cc86fd..8718f81 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
@@ -46,8 +46,6 @@ public class RecordingMetaDeltaDao {
 		return em.createNamedQuery("getRecordingMetaDeltaByMetaDataId", RecordingMetaDelta.class).setParameter("metaDataId", metaDataId).getResultList();
 	}
 
-
-
 	public Long add(RecordingMetaDelta metaDelta) {
 		try {
 
@@ -73,5 +71,4 @@ public class RecordingMetaDeltaDao {
 
 		return metaDelta;
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
index 73c9742..77db419 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
@@ -162,5 +162,4 @@ public class LdapConfigDao implements IDataProviderDao<LdapConfig> {
 			em.merge(entity);
 		}
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
index b176960..1d3633b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
@@ -100,5 +100,4 @@ public class OAuth2Dao implements IDataProviderDao<OAuthServer> {
 		server.setDeleted(true);
 		update(server, userId);
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
index e69061d..9001a1b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
@@ -113,5 +113,4 @@ public class SOAPLoginDao {
 			log.error("[update]: ", ex2);
 		}
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index 3fc1448..eafea67 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -78,7 +78,6 @@ public class Configuration extends HistoricalEntity {
 	@Element(name = "value", data = true, required = false)
 	private String value;
 
-
 	@Lob
 	@Column(name = "comment", length = 2048)
 	@Element(data = true, required = false)

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
index 7461921..fddc2f6 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
@@ -382,5 +382,4 @@ public abstract class BaseFileItem extends HistoricalEntity {
 	public String toString() {
 		return "FileItem [id=" + id + ", name=" + name + ", room=" + roomId + ", type=" + type.name() + "]";
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
index 1557d61..a05912b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
@@ -37,52 +37,51 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity;
 @Table(name = "conference_log")
 @NamedQueries({
 	@NamedQuery(name = "getLogRecentRooms", query = "SELECT c FROM ConferenceLog c "
-			+ "WHERE c.roomId IS NOT NULL AND c.type = :roomEnter and c.userId = :userId ORDER BY c.inserted DESC")
+		+ "WHERE c.roomId IS NOT NULL AND c.type = :roomEnter and c.userId = :userId ORDER BY c.inserted DESC")
 })
 public class ConferenceLog implements IDataProviderEntity {
 	private static final long serialVersionUID = 1L;
+
 	public enum Type {
-		clientConnect
-		, roomEnter
-		, roomLeave
-		, nicknameEnter
+		clientConnect, roomEnter, roomLeave, nicknameEnter
 	}
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id")
+	@Column(name = "id")
 	private Long id;
 
 	@Enumerated(EnumType.STRING)
 	@Column(name = "type")
 	private Type type;
 
-	@Column(name="inserted")
+	@Column(name = "inserted")
 	private Date inserted;
 
-	@Column(name="insertedby")
+	@Column(name = "insertedby")
 	private long insertedby;
 
-	//NULL means its a Guest/Invited User
-	@Column(name="user_id")
+	// NULL means its a Guest/Invited User
+	@Column(name = "user_id")
 	private Long userId;
 
-	@Column(name="streamid")
+	@Column(name = "streamid")
 	private String streamid;
 
-	@Column(name="room_id")
+	@Column(name = "room_id")
 	private Long roomId;
 
-	@Column(name="userip")
+	@Column(name = "userip")
 	private String userip;
 
-	@Column(name="scopename")
+	@Column(name = "scopename")
 	private String scopeName;
 
 	@Override
 	public Long getId() {
 		return id;
 	}
+
 	@Override
 	public void setId(Long id) {
 		this.id = id;
@@ -91,6 +90,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public Type getType() {
 		return type;
 	}
+
 	public void setType(Type type) {
 		this.type = type;
 	}
@@ -98,6 +98,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public Date getInserted() {
 		return inserted;
 	}
+
 	public void setInserted(Date inserted) {
 		this.inserted = inserted;
 	}
@@ -105,6 +106,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public long getInsertedby() {
 		return insertedby;
 	}
+
 	public void setInsertedby(long insertedby) {
 		this.insertedby = insertedby;
 	}
@@ -112,6 +114,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public Long getUserId() {
 		return userId;
 	}
+
 	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
@@ -119,6 +122,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public String getStreamId() {
 		return streamid;
 	}
+
 	public void setStreamid(String streamid) {
 		this.streamid = streamid;
 	}
@@ -126,6 +130,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public Long getRoomId() {
 		return roomId;
 	}
+
 	public void setRoomId(Long roomId) {
 		this.roomId = roomId;
 	}
@@ -133,6 +138,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public String getUserip() {
 		return userip;
 	}
+
 	public void setUserip(String userip) {
 		this.userip = userip;
 	}
@@ -140,6 +146,7 @@ public class ConferenceLog implements IDataProviderEntity {
 	public String getScopeName() {
 		return scopeName;
 	}
+
 	public void setScopeName(String scopeName) {
 		this.scopeName = scopeName;
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
index 242440f..d8011ac 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
@@ -152,5 +152,4 @@ public class RoomPollAnswer implements IDataProviderEntity {
 	public void setRoomPoll(RoomPoll roomPoll) {
 		this.roomPoll = roomPoll;
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
index 6c45e50..160b770 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
@@ -253,5 +253,4 @@ public class OAuthServer extends HistoricalEntity {
 			return name;
 		}
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
index 60cdaf4..6f01a2a 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
@@ -142,5 +142,4 @@ public class UserContact implements Serializable {
 	public void setShareCalendar(boolean shareCalendar) {
 		this.shareCalendar = shareCalendar;
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java
index 49742ec..024b4d0 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openmeetings.service.quartz.scheduler;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
index 31f27e3..fb9516f 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
@@ -18,15 +18,15 @@
  */
 package org.apache.openmeetings.service.quartz.scheduler;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
 
 import org.apache.openmeetings.core.mail.MailHandler;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.service.calendar.AppointmentLogic;
-import org.apache.openmeetings.service.mail.template.subject.SubjectEmailTemplate;
 import org.apache.openmeetings.service.mail.template.subject.RecordingExpiringTemplate;
+import org.apache.openmeetings.service.mail.template.subject.SubjectEmailTemplate;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 9ba1f6a..0524c19 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -44,9 +44,9 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.entity.user.User.Type;
 import org.apache.openmeetings.db.util.TimezoneUtil;
 import org.apache.openmeetings.service.mail.template.InvitationTemplate;
-import org.apache.openmeetings.service.mail.template.subject.SubjectEmailTemplate;
 import org.apache.openmeetings.service.mail.template.subject.CanceledAppointmentTemplate;
 import org.apache.openmeetings.service.mail.template.subject.CreatedAppointmentTemplate;
+import org.apache.openmeetings.service.mail.template.subject.SubjectEmailTemplate;
 import org.apache.openmeetings.service.mail.template.subject.UpdatedAppointmentTemplate;
 import org.apache.openmeetings.util.crypt.CryptProvider;
 import org.apache.openmeetings.util.mail.IcalHandler;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
index 0197dd5..68bf791 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
@@ -29,6 +29,7 @@ public class DaoHelper {
 	public static String getSearchQuery(String table, String alias, String search, boolean filterDeleted, boolean count, String sort, String... fields) {
 		return getSearchQuery(table, alias, search, false, filterDeleted, count, sort, fields);
 	}
+
 	public static String getSearchQuery(String table, String alias, String search, boolean distinct, boolean filterDeleted, boolean count, String sort, String... fields) {
 		return getSearchQuery(table, alias, null, search, distinct, filterDeleted, count, null, sort, fields);
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
index d8c1e14..3996352 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
@@ -116,4 +116,3 @@ public class ProcessHelper {
 		return res;
 	}
 }
-

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 9aa945b..20b7107 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -270,5 +270,4 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
 
 		getBean(MailHandler.class).send(email, getString("517"), template);
 	}
-
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6618c938/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index 148ffa9..0d10816 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -293,5 +293,4 @@ public class FileWebService extends BaseWebService {
 			return f == null ? null : new FileItemDTO(f);
 		});
 	}
-
 }