Reorganize project layout

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/juick/server/CommandsManager.java b/src/main/java/com/juick/server/CommandsManager.java
index 82076e3c..494094eb 100644
--- a/src/main/java/com/juick/server/CommandsManager.java
+++ b/src/main/java/com/juick/server/CommandsManager.java
@@ -17,9 +17,9 @@
 
 package com.juick.server;
 
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
+import com.juick.model.Message;
+import com.juick.model.Tag;
+import com.juick.model.User;
 import com.juick.formatters.PlainTextFormatter;
 import com.juick.model.CommandResult;
 import com.juick.model.TagStats;
@@ -182,7 +182,7 @@ public class CommandsManager {
         if (!user_to.isAnonymous()) {
             if (!userService.isInBLAny(user_to.getUid(), user_from.getUid())) {
                 if (pmQueriesService.createPM(user_from.getUid(), user_to.getUid(), body)) {
-                    com.juick.Message jmsg = new com.juick.Message();
+                    Message jmsg = new Message();
                     jmsg.setUser(user_from);
                     jmsg.setTo(user_to);
                     jmsg.setText(body);
@@ -313,7 +313,7 @@ public class CommandsManager {
     public CommandResult commandRecommend(User user, URI attachment, String... arguments) {
         int mid = NumberUtils.toInt(arguments[0], 0);
         if (mid > 0) {
-            Optional<com.juick.Message> msg = messagesService.getMessage(mid);
+            Optional<Message> msg = messagesService.getMessage(mid);
             if (msg.isPresent()) {
                 if (msg.get().getUser() == user) {
                     return CommandResult.fromString("You can't recommend your own messages.");
@@ -432,10 +432,10 @@ public class CommandsManager {
         if (mid == 0) {
             return CommandResult.fromString("Error");
         }
-        Optional<com.juick.Message> msg = messagesService.getMessage(mid);
+        Optional<Message> msg = messagesService.getMessage(mid);
         if (msg.isPresent()) {
             if (showReplies) {
-                List<com.juick.Message> replies = messagesService.getReplies(user, mid);
+                List<Message> replies = messagesService.getReplies(user, mid);
                 applicationEventPublisher.publishEvent(
                         new SystemEvent(this, SystemActivity.read(user, msg.get())));
                 replies.add(0, msg.get());
@@ -450,7 +450,7 @@ public class CommandsManager {
     public CommandResult commandShowReply(User user, URI attachment, String... arguments) {
         int mid = NumberUtils.toInt(arguments[0], 0);
         int rid = NumberUtils.toInt(arguments[1], 0);
-        com.juick.Message reply = messagesService.getReply(mid, rid);
+        Message reply = messagesService.getReply(mid, rid);
         if (reply != null) {
             return CommandResult.fromString(PlainTextFormatter.formatPost(reply));
         }