aboutsummaryrefslogtreecommitdiff
path: root/juick-core/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-05-23 14:06:51 +0300
committerGravatar Vitaly Takmazov2017-05-23 15:50:31 +0300
commit4c6f3ba0d539f63a83c18e20ed4219bdef849b81 (patch)
tree184ad8afcaa21ec4eeb7b06bb4f751548e710028 /juick-core/src
parent237739950a305b13c9f29e3ca25c2e835d563a3f (diff)
drop ugnich json
Diffstat (limited to 'juick-core/src')
-rw-r--r--juick-core/src/main/java/com/juick/Message.java24
-rw-r--r--juick-core/src/main/java/com/juick/User.java17
2 files changed, 1 insertions, 40 deletions
diff --git a/juick-core/src/main/java/com/juick/Message.java b/juick-core/src/main/java/com/juick/Message.java
index 583f2570..6608f453 100644
--- a/juick-core/src/main/java/com/juick/Message.java
+++ b/juick-core/src/main/java/com/juick/Message.java
@@ -77,30 +77,6 @@ public class Message implements Comparable {
childs = new ArrayList<>();
}
- public Message(Message msg) {
- setMid(msg.getMid());
- setRid(msg.getRid());
- replyto = msg.replyto;
- setText(msg.getText());
- setUser(msg.getUser());
- tags = msg.tags;
- setDate(msg.getDate());
- TimeAgo = msg.TimeAgo;
- privacy = msg.privacy;
- FriendsOnly = msg.FriendsOnly;
- ReadOnly = msg.ReadOnly;
- Hidden = msg.Hidden;
- setReplies(msg.getReplies());
- attachmentType = msg.attachmentType;
- photo = msg.photo;
- Video = msg.Video;
- Place = msg.Place;
- setLikes(msg.getLikes());
- childs = msg.childs;
- PM = msg.PM;
- Recommendation = msg.Recommendation;
- }
-
public void parseTags(String strTags) {
if (StringUtils.isNotEmpty(strTags)) {
Set<Tag> tagSet = new TreeSet<>(tags);
diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java
index b44ea9e2..9a3d619c 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-core/src/main/java/com/juick/User.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.*;
* @author Ugnich Anton
*/
@XmlRootElement(name = "user", namespace = "http://juick.com/user")
-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+@XmlAccessorType()
public class User {
private int uid;
private String name;
@@ -41,21 +41,6 @@ public class User {
private String credentials;
private String lang;
- public User() {
- }
-
- public User(User u) {
- this.uid = u.getUid();
- this.name = u.getName();
- this.avatar = u.getAvatar();
- this.fullName = u.fullName;
- this.jid = u.getJid();
- this.messagesCount = u.getUnreadCount();
- this.authHash = u.getAuthHash();
- this.banned = u.isBanned();
- this.credentials = u.getCredentials();
- }
-
@Override
public boolean equals(Object obj) {
return obj == this ||