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 2013/08/06 10:47:17 UTC
svn commit: r1510884 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
persistence/beans/chat/ChatMessage.java
web/user/profile/MessagesContactsPanel.html
Author: solomax
Date: Tue Aug 6 08:47:16 2013
New Revision: 1510884
URL: http://svn.apache.org/r1510884
Log:
Redundant fields are removed from ChatMessage;
Minor fix in M&C
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java?rev=1510884&r1=1510883&r2=1510884&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java Tue Aug 6 08:47:16 2013
@@ -61,15 +61,6 @@ public class ChatMessage implements Seri
@ForeignKey(enabled = true)
private User fromUser;
- // necessary to hold messages from external guests enters by invitation hash
- @Column(name = "from_email")
- @Element(name = "fromEmail", data = true, required = false)
- private String fromEmail;
-
- @Column(name = "from_name")
- @Element(name = "fromName", data = true, required = false)
- private String fromName;
-
@ManyToOne
@JoinColumn(name = "to_room_id")
@Element(name = "toRoomId", data = true, required = false)
@@ -82,15 +73,6 @@ public class ChatMessage implements Seri
@ForeignKey(enabled = true)
private User toUser;
- // necessary to hold messages to external guests enters by invitation hash
- @Column(name = "to_email")
- @Element(name = "toEmail", data = true, required = false)
- private String toEmail;
-
- @Column(name = "to_name")
- @Element(name = "toName", data = true, required = false)
- private String toName;
-
@Column(name = "message")
@Element(name = "message", data = true, required = false)
private String message;
@@ -115,22 +97,6 @@ public class ChatMessage implements Seri
this.fromUser = fromUser;
}
- public String getFromEmail() {
- return fromEmail;
- }
-
- public void setFromEmail(String fromEmail) {
- this.fromEmail = fromEmail;
- }
-
- public String getFromName() {
- return fromName;
- }
-
- public void setFromName(String fromName) {
- this.fromName = fromName;
- }
-
public Room getToRoom() {
return toRoom;
}
@@ -147,22 +113,6 @@ public class ChatMessage implements Seri
this.toUser = toUser;
}
- public String getToEmail() {
- return toEmail;
- }
-
- public void setToEmail(String toEmail) {
- this.toEmail = toEmail;
- }
-
- public String getToName() {
- return toName;
- }
-
- public void setToName(String toName) {
- this.toName = toName;
- }
-
public String getMessage() {
return message;
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1510884&r1=1510883&r2=1510884&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html Tue Aug 6 08:47:16 2013
@@ -89,7 +89,7 @@
<table>
<tr>
<th><wicket:ommessage key="1180"/></th>
- <th><wicket:ommessage key="1186"/></th>
+ <th><wicket:ommessage key="1185"/></th>
</tr>
</table>
</td>