QoS3 코드머지

CM/.classpath

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="mysql-connector-java-5.1.31-bin.jar"/>
-	<classpathentry kind="lib" path="commons-math3-3.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/zulu1.8.0_181">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="mysql-connector-java-5.1.31-bin.jar"/>
+	<classpathentry kind="lib" path="commons-math3-3.5.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/zulu1.8.0_181">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

CM/src/CMClientApp.java

@@ -1,11 +1,25 @@
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.Console;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.InputMismatchException;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Scanner;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
 
@@ -37,7 +51,6 @@
 import kr.ac.konkuk.ccslab.cm.manager.CMFileTransferManager;
 import kr.ac.konkuk.ccslab.cm.manager.CMMqttManager;
 import kr.ac.konkuk.ccslab.cm.stub.CMClientStub;
-import kr.ac.konkuk.ccslab.cm.util.CMUtil;
 
 
 public class CMClientApp {
@@ -3143,6 +3156,8 @@ public void testMqttPublish()
 		byte qos = (byte)0;
 		boolean bDupFlag = false;
 		boolean bRetainFlag = false;
+		String strReceiver = "";
+		int nMinNumWaitedEvents = 1;
 
 		boolean bDetail = false;
 		System.out.print("Need all parameters? (\"y\" or \"n\", Enter for no): ");
@@ -3157,14 +3172,25 @@ public void testMqttPublish()
 
 		if(bDetail)
 		{
-			System.out.print("QoS (0,1, or 2, Enter for 0): ");
+			System.out.print("QoS (0,1,2 or 3, Enter for 0): ");
 			String strQoS = m_scan.nextLine().trim();
 			if(strQoS.contentEquals("1") || strQoS.contentEquals("2"))
 				qos = Byte.parseByte(strQoS);
+			else if(strQoS.contentEquals("3")) {
+				qos = Byte.parseByte(strQoS);
+				System.out.print("Appointed receiver (Enter for non-receiver): ");
+				strReceiver=m_scan.nextLine().trim();
+				System.out.print("Minimum waited events (Enter for 1): ");
+				String strMinNumWaitedEvents = m_scan.nextLine().trim();
+				if(!strMinNumWaitedEvents.isEmpty()) {
+					nMinNumWaitedEvents = Integer.parseInt(strMinNumWaitedEvents);
+				}
+			}
 			else if(!strQoS.contentEquals("0") && !strQoS.isEmpty())
 			{
 				System.err.println("Wrong QoS! QoS is set to 0!");
 			}
+
 			System.out.print("DUP Flag (\"true\" or \"false\", Enter for false): ");
 			String strDupFlag = m_scan.nextLine().trim();
 			if(strDupFlag.contentEquals("true"))
@@ -3184,7 +3210,11 @@ else if(!strQoS.contentEquals("0") && !strQoS.isEmpty())
 
 		if(bDetail)
 		{
-			mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag);			
+			if(qos==3) {
+				mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag, strReceiver, nMinNumWaitedEvents);
+			}else {
+				mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag);
+			}
 		}
 		else
 		{
@@ -3202,8 +3232,9 @@ public void testMqttSubscribe()
 		System.out.print("Topic Filter: ");
 		strTopicFilter = m_scan.nextLine().trim();
 		String strQoS = null;
+		System.out.print("QoS (0,1,2 or 3, Enter for 0): ");
 		strQoS = m_scan.nextLine().trim();
-		if(strQoS.contentEquals("1") || strQoS.contentEquals("2"))
+		if(strQoS.contentEquals("1") || strQoS.contentEquals("2") || strQoS.contentEquals("3"))
 			qos = Byte.parseByte(strQoS);
 		else if(!strQoS.contentEquals("0") && !strQoS.isEmpty())
 		{

CM/src/CMWinClient.java

@@ -1,6 +1,15 @@
-import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Desktop;
+import java.awt.FlowLayout;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -13,11 +22,36 @@
 import java.nio.channels.SocketChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Random;
-
-import javax.swing.*;
-import javax.swing.text.*;
+import java.util.Set;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.KeyStroke;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Style;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyleContext;
+import javax.swing.text.StyledDocument;
 
 import kr.ac.konkuk.ccslab.cm.entity.CMGroup;
 import kr.ac.konkuk.ccslab.cm.entity.CMGroupInfo;
@@ -3785,17 +3819,22 @@ public void testMqttPublish()
 		printMessage("========== MQTT publish\n");
 		JTextField topicTextField = new JTextField();
 		JTextField messageTextField = new JTextField();
-		String[] qosArray = {"0", "1", "2"};
+		String[] qosArray = {"0", "1", "2", "3"}; //::::::::::::::::::::::::::
 		JComboBox<String> qosComboBox = new JComboBox<String>(qosArray);
 		JCheckBox dupFlagBox = new JCheckBox();
 		JCheckBox retainFlagBox = new JCheckBox();
+		JTextField strReceiverField = new JTextField();
+		JTextField nMinNumWaitedEventsField = new JTextField();
 		Object[] msg = {
 				"topic", topicTextField,
 				"message", messageTextField,
 				"QoS", qosComboBox,
 				"dup flag", dupFlagBox,
-				"retain flag", retainFlagBox
+				"retain flag", retainFlagBox,
+				"strReceiver", strReceiverField,
+				"nMinNumWaitedEvents", nMinNumWaitedEventsField
 		};
+
 		int nRet = JOptionPane.showConfirmDialog(null, msg, "MQTT publish", 
 				JOptionPane.OK_CANCEL_OPTION);
 		if(nRet != JOptionPane.OK_OPTION) return;
@@ -3805,6 +3844,12 @@ public void testMqttPublish()
 		byte qos = (byte) qosComboBox.getSelectedIndex();
 		boolean bDupFlag = dupFlagBox.isSelected();
 		boolean bRetainFlag = retainFlagBox.isSelected();
+		String strReceiver = strReceiverField.getText().trim();
+		String strMinNumWaitedEvents = nMinNumWaitedEventsField.getText().trim();
+		int nMinNumWaitedEvents = 0;
+		if(!strMinNumWaitedEvents.isEmpty()) {
+			nMinNumWaitedEvents = Integer.parseInt(strMinNumWaitedEvents);
+		}
 
 		CMMqttManager mqttManager = (CMMqttManager)m_clientStub.findServiceManager(CMInfo.CM_MQTT_MANAGER);
 		if(mqttManager == null)
@@ -3813,14 +3858,18 @@ public void testMqttPublish()
 			return;
 		}
 		//mqttManager.publish(1, "/CM/test", "This is a test message.", (byte)1);
-		mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag);
+		if(qos==3) {
+			mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag, strReceiver, nMinNumWaitedEvents);
+		}else {
+			mqttManager.publish(strTopic, strMessage, qos, bDupFlag, bRetainFlag);
+		}
 	}
 
 	public void testMqttSubscribe()
 	{
 		printMessage("========== MQTT subscribe\n");
 		JTextField topicFilterTextField = new JTextField();
-		String[] qosArray = {"0", "1", "2"};
+		String[] qosArray = {"0", "1", "2", "3"}; //::::::::::::::::::
 		JComboBox<String> qosComboBox = new JComboBox<String>(qosArray);
 		Object[] msg = {
 				"topic filter", topicFilterTextField,

CM/src/CMWinClientEventHandler.java

@@ -1,11 +1,13 @@
+import java.awt.Desktop;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import javax.swing.JOptionPane;
 
-import java.io.*;
-import java.awt.*;
-
 import kr.ac.konkuk.ccslab.cm.entity.CMServerInfo;
 import kr.ac.konkuk.ccslab.cm.entity.CMSessionInfo;
 import kr.ac.konkuk.ccslab.cm.event.CMDataEvent;

CM/src/CMWinServerEventHandler.java

@@ -1,7 +1,11 @@
-import java.util.Iterator;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SocketChannel;
+import java.util.Iterator;
 
 import kr.ac.konkuk.ccslab.cm.event.CMDummyEvent;
 import kr.ac.konkuk.ccslab.cm.event.CMEvent;