MainForm 2.3.0, Application 1.5.1: игнорирование пустых исходящих соо…

…бщений.
M61Shaforostov · Dec 16, 2015 · 4c4fa35 · 4c4fa35
1 parent bd0c14e
commit 4c4fa35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Application.java b/src/Application.java
@@ -246,7 +246,6 @@ public void sendMessage(String text) {
 	if (currentSuccessConnection == ConnectionStatus.AS_CLIENT) {
 	  outcomingConnection.sendMessage(text);
       }
-      addMessage(localNick, text);
     } catch (IOException e1) {
       e1.printStackTrace();
     }
@@ -312,7 +311,7 @@ public void makeOutcomingCall(String remoteIP) {
     }
   }
 
-  private void addMessage(String nick, String msgText) {
+  public void addMessage(String nick, String msgText) {
     if (msgText != null) {
       messageContainer.addMessage(nick, new Date(System.currentTimeMillis()), msgText);
     }

diff --git a/src/MainForm.java b/src/MainForm.java
@@ -87,8 +87,12 @@ public void actionPerformed(ActionEvent e) {
 	sendButton.addActionListener(new ActionListener() {
 	  @Override
 	  public void actionPerformed(ActionEvent e) {
-	    logicModel.sendMessage(myText.getText());
-	    myText.setText("");
+	    String text = myText.getText();
+	    if (! text.isEmpty()) {
+	      logicModel.sendMessage(text);
+	      logicModel.addMessage(logicModel.getLocalNick(), text);
+	      myText.setText("");
+	    }
 	  }
 	});