# HG changeset patch # User Jaroslav Tulach # Date 1392152357 -3600 # Node ID 1b1d3f5591966155cd3900c66703571a45cb7487 # Parent a714dd1682485d45eb056326a3c0dcfd2600fcba Separating initializaiton code into separate class diff -r a714dd168248 -r 1b1d3f559196 chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java --- a/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java Fri Feb 07 14:05:42 2014 +0100 +++ b/chat/client/src/main/java/org/apidesign/html/chatserver/client/ChatClient.java Tue Feb 11 21:59:17 2014 +0100 @@ -87,19 +87,4 @@ } m.updateMsgs("" + (now + 1)); } - - static { - ChatModel chm = new ChatModel(); - Message m = new Message(); - m.setComment("Waiting for messages from the server..."); - m.setUser("system"); - chm.getMsgs().add(m); - chm.applyBindings(); - try { - // XXX: this should not be in static initializer - - // XXX: prevents unit testing! - chm.initialRead(); - } catch (Throwable ex) { - } - } } diff -r a714dd168248 -r 1b1d3f559196 chat/client/src/main/java/org/apidesign/html/chatserver/client/Main.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chat/client/src/main/java/org/apidesign/html/chatserver/client/Main.java Tue Feb 11 21:59:17 2014 +0100 @@ -0,0 +1,45 @@ +/** + * The MIT License (MIT) + * + * Copyright (C) 2013 Jaroslav Tulach + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.apidesign.html.chatserver.client; + +import org.apidesign.html.chatserver.model.Message; + +/** + * + * @author Jaroslav Tulach + */ +public class Main { + private Main() { + } + + static { + ChatModel chm = new ChatModel(); + Message m = new Message(); + m.setComment("Waiting for messages from the server..."); + m.setUser("system"); + chm.getMsgs().add(m); + chm.applyBindings(); + chm.initialRead(); + } +} diff -r a714dd168248 -r 1b1d3f559196 chat/client/src/main/resources/org/apidesign/html/chatserver/client/chat.html --- a/chat/client/src/main/resources/org/apidesign/html/chatserver/client/chat.html Fri Feb 07 14:05:42 2014 +0100 +++ b/chat/client/src/main/resources/org/apidesign/html/chatserver/client/chat.html Tue Feb 11 21:59:17 2014 +0100 @@ -47,7 +47,7 @@