Skip to content

Commit 5b6779b

Browse files
author
Bin Wang
committed
.
1 parent 783f3bb commit 5b6779b

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

src/main/java/emoji_manager/msg/Sender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static boolean sendUDPMsg(int msgType, String uname, String friendIP, int
4141
dSocket.close();
4242
} catch (Exception e) {
4343
e.printStackTrace();
44-
err_msg = "System error";
44+
err_msg = "system error";
4545
return false;
4646
}
4747
return true;

src/main/java/screens/chat_screen/ChatView.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
public class ChatView extends JFrame implements ActionListener{
4343
//use Contrroller
4444

45+
4546
private ChatController controller;
4647

4748
//Use Jframes, butttons, labels ,textfileds, Jpannels,JMenuBar for UI.
@@ -55,6 +56,11 @@ public class ChatView extends JFrame implements ActionListener{
5556
final JMenuBar menubar;
5657
final JPanel panel;
5758

59+
60+
61+
62+
63+
5864
final JPanel conversationHistoryPanel;
5965

6066
private JPanel messagePanel;

src/main/java/use_cases/emoji_manager/ChatEmo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.use_cases.emoji_manager;
1+
package use_cases.emoji_manager;
22

33
import javax.swing.*;
44
import java.net.URL;

src/main/java/use_cases/emoji_manager/ChatFrame.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.use_cases.emoji_manager;
1+
package use_cases.emoji_manager;
22

33
import main.java.emoji_manager.msg.MsgType;
44
import main.java.emoji_manager.msg.Sender;
@@ -45,7 +45,7 @@ public class ChatFrame extends JFrame implements MouseListener, Runnable {
4545
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
4646
FontAndText dateFont = new FontAndText("", "Song", 20, Color.BLACK);
4747
/**
48-
* 插入图片
48+
* insert emoji
4949
*
5050
*/
5151
int pos1;
@@ -268,7 +268,7 @@ public void mouseReleased(MouseEvent e) {
268268
public void sendShake() {
269269
String uname = Sender.localIP + ":" + Sender.SendPort;
270270
if (!Sender.sendUDPMsg(MsgType.SHAKE, uname, Sender.localIP, Sender.SendPort, "shake")) {
271-
error_tip.setText("Send Fail!");
271+
error_tip.setText("");
272272
error_tip.setVisible(true);
273273
}
274274
insert("You " + uname + " Send a Shake");
@@ -281,7 +281,7 @@ public void sendShake() {
281281
public void shake(String uname) {
282282
setExtendedState(Frame.NORMAL);
283283
setVisible(true);
284-
insert(uname + " Send a Shake!");
284+
insert(uname + " ");
285285
new Thread() {
286286
final long begin = System.currentTimeMillis();
287287
long end = System.currentTimeMillis();
@@ -312,7 +312,7 @@ public void sendMsg() {
312312
return;
313313
}
314314
if (message.length() > 100) {
315-
error_tip.setText("Message Maximum" + message.length() + "Words!");
315+
error_tip.setText("Message Maximum" + message.length() + "");
316316
error_tip.setVisible(true);
317317
return;
318318
}
@@ -324,7 +324,7 @@ public void sendMsg() {
324324
addMeg(uname);
325325
this.jpMsg.setText("");
326326
} else {
327-
error_tip.setText("Send Fail!");
327+
error_tip.setText("");
328328
error_tip.setVisible(true);
329329
}
330330
}
@@ -348,7 +348,6 @@ public void addRecMsg(String uname, String message) {
348348
int index = message.lastIndexOf("*");
349349

350350
System.out.println("index=" + index);
351-
/*It is very important to record the starting position of the chat area to insert the chat message,*/
352351
pos1 = jpChat.getCaretPosition();
353352
if (index > 0 && index < message.length() - 1) { /*There is expression information*/
354353
FontAndText attr = getReceiveFont(message.substring(0, index));
@@ -387,7 +386,6 @@ public void receivedEmoInfo(String picInfos) {
387386
/**
388387
* Reorganize sent emoticons
389388
*
390-
* @return The format of the reorganized information string is position|code+position|code+…
391389
*/
392390
private String buildEmoInfo() {
393391
StringBuilder sb = new StringBuilder();
@@ -545,7 +543,7 @@ public void run() {
545543
chatSoc = new DatagramSocket(Sender.chatPort);
546544
} catch (SocketException e) {
547545
e.printStackTrace();
548-
JOptionPane.showMessageDialog(this, "SYSTEM RUN ERROR!");
546+
JOptionPane.showMessageDialog(this, "");
549547
System.exit(1);
550548
}
551549
while (true) {
@@ -561,7 +559,7 @@ public void run() {
561559
}
562560
});
563561
} catch (Exception e) {
564-
JOptionPane.showMessageDialog(this, "SYSTEM RUN ERROR!");
562+
JOptionPane.showMessageDialog(this, "");
565563
e.printStackTrace();
566564
}
567565
}

src/main/java/use_cases/emoji_manager/EmosWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.use_cases.emoji_manager;
1+
package use_cases.emoji_manager;
22

33
import javax.swing.*;
44
import java.awt.*;

src/main/java/use_cases/emoji_manager/ToolAndTips.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.use_cases.emoji_manager;
1+
package use_cases.emoji_manager;
22

33
import javax.swing.*;
44
import javax.swing.border.EmptyBorder;

0 commit comments

Comments
 (0)