Commit: 576daed25801b1f0536b9c6391e7fdd6eed62b3f - moto_web_app (git)

moto web application

Commit MetaInfo

• Revision: 576daed25801b1f0536b9c6391e7fdd6eed62b3f (tree)
• Time: 2014-02-05 15:42:46
• Author: astoria-d <astoria-d@mail...>
• Commiter: astoria-d

Log Message

clean up

Change Summary

• modified: WEB-INF/classes/motoSample/ChatBean.java
• modified: secured/chat.xhtml

Incremental Difference

--- a/WEB-INF/classes/motoSample/ChatBean.java
+++ b/WEB-INF/classes/motoSample/ChatBean.java
@@ -46,7 +46,7 @@ public class ChatBean implements Serializable {
     //inject user bean
     @ManagedProperty("#{userBean}")
     private UserBean userBean;
-    
+    //all login members list
     @ManagedProperty("#{loginMemberBean}")
     private LoginMemberBean loginMemberBean;
     
@@ -54,8 +54,9 @@ public class ChatBean implements Serializable {
     private String chatRoom;
     private int oldestChatId;
     private ArrayList<ChatMessage> msgList;
+
+    //members that are associated with this chat room
     private MemberList memList;
-    private HtmlCommandLink loadLink;
     
     public final static int LIST_LOAD_SIZE = 10;
 
@@ -72,14 +73,6 @@ public class ChatBean implements Serializable {
     public String getChatRoom() {
         return chatRoom;
     }
-    public void setLoadLink(HtmlCommandLink loadLink) {
-        //log.info("setLoadLink");
-        this.loadLink = loadLink;
-    }
-    public HtmlCommandLink getLoadLink() {
-        //log.info("getLoadLink");
-        return loadLink;
-    }
 	public MemberList getMemList(){
 		return memList;
 	}
@@ -156,17 +149,6 @@ public class ChatBean implements Serializable {
 	}
 
     public ArrayList<ChatMessage> getMsgList(){
-//        log.info("getMsgList");
-//	    try {
-/*	    throw new Exception();
-	    }
-	    catch (Exception e) {
-        e.printStackTrace();
-	    }
-*/
-
-//	    if (msgList != null && msgList.size() > 0)
-//            log.info("getMsgList latest msg: " + msgList.get(msgList.size()-1).msg);
 		return msgList;
 	}
 
@@ -181,12 +163,6 @@ public class ChatBean implements Serializable {
         if (msg.equals(""))
             return;
         
-        /*
-        log.info("user = " + userBean.getUid());
-        log.info("chat room = " + chatRoom);
-        log.info("date = " + df.format(d));
-        */
-
         String dt = formatDate();
         try {
             Connection conn = Resources.getConnection();
@@ -256,21 +232,19 @@ public class ChatBean implements Serializable {
             rs.close();
             conn.close();
 
+            ExternalContext externalContext = context.getExternalContext();
+            externalContext.setResponseContentType("application/json");
+            externalContext.setResponseCharacterEncoding("UTF-8");
             if (load_cnt == 0) {
                 log.info("no more old msg...");
-                loadLink.setDisabled(true);
-                loadLink.setValue("no more old messages....");
             }
             else {
                 //output json object.
-                ExternalContext externalContext = context.getExternalContext();
-                externalContext.setResponseContentType("application/json");
-                externalContext.setResponseCharacterEncoding("UTF-8");
                 ObjectMapper mapper = new ObjectMapper();
                 String json = mapper.writeValueAsString(retList);
                 externalContext.getResponseOutputWriter().write(json);
-                context.responseComplete();
             }
+            context.responseComplete();
         }
         catch (SQLException se) {
             log.severe("sql err!!!");
@@ -281,11 +255,6 @@ public class ChatBean implements Serializable {
         
     }
     
-    void initLoadLink() {
-        loadLink.setDisabled(false);
-        loadLink.setValue("load old messages...");
-    }
-    
     void initMembers() {
         if (memList == null)
             memList = new MemberList();
@@ -299,15 +268,11 @@ public class ChatBean implements Serializable {
         chatRoom = e.getNewValue().toString();
         log.info("chat room changed: " + this.chatRoom);
         initMsgList();
-        initLoadLink();
         initMembers();
     }
 
     @PostConstruct
     public void postInit() {
-        //log.info("postInit @" + this.hashCode());
-        //log.info("PostConstruct userBean: " + userBean);
-        //log.info("PostConstruct getFlights: " + userBean.getFlights());
         ArrayList<SelectItem> flights = userBean.getFlights();
         if (flights != null) {
             chatRoom = flights.get(0).getValue().toString();
@@ -317,9 +282,6 @@ public class ChatBean implements Serializable {
                 log.info("get access. init chat list");
                 //in get access, the chat room is not selected..
                 initMsgList();
-                if (loadLink == null) 
-                    loadLink = new HtmlCommandLink();
-                initLoadLink();
                 initMembers();
             }
         }

--- a/secured/chat.xhtml
+++ b/secured/chat.xhtml
@@ -59,6 +59,12 @@
                         if (data.status == "complete") {
                             var msgList = document.getElementById("chatForm:msgList");
                             var messages = atmosphere.util.parseJSON(data.responseText);
+                            
+                            if (messages == null) {
+                                data.source.text = 'no more old message';
+                                $('#chatForm\\:msgList\\:loadOldMsg').removeAttr("href");
+                                return;
+                            }
                             //console.log(messages);
                             for (var i = 0; i < messages.length; i++) {
                                 //row #2 = the first table item. (#0,1 is header element.)
@@ -213,7 +219,7 @@ $(function () {
                         rendered="#{not empty chatBean.msgList}" border="0">
 
                         <f:facet name="header">
-                            <h:commandLink binding="#{chatBean.loadLink}" action="#{chatBean.loadOldMsg}" >
+                            <h:commandLink id= "loadOldMsg" value="load old messages" action="#{chatBean.loadOldMsg}">
                                 <!-- f:ajax render="msgList" / -->
                                 <f:ajax onevent="handleLoadOld" />
                             </h:commandLink>