Commit: 22 - hunton_client (svn)

密猟オンラインクライアントプログラム JAVAベース

Commit MetaInfo

• Revision: 22 (tree)
• Time: 2016-12-29 17:00:19
• Author: manjihq

Log Message

システムメッセージでリスト表示が必要そうなものをリスト表示ウィンドウへ表示するようにした

Change Summary

• modified: trunk/src/hunton/Hunt.java
• added: trunk/src/hunton/HuntListView.java
• modified: trunk/src/hunton/RecvTask.java

Incremental Difference

--- trunk/src/hunton/Hunt.java	(revision 21)
+++ trunk/src/hunton/Hunt.java	(revision 22)
@@ -148,10 +148,12 @@
     static Component mainView;
     static Component statusView;
     static Component messageView;
+    static HuntListView listViewWnd;
 
     static Rectangle mainWndBounds;
     static Rectangle statusViewBounds;
     static Rectangle messageViewBounds;
+    static Rectangle listViewBounds;
 
     static pktio session;
     static RecvTask rtask;
@@ -606,6 +608,19 @@
         }
     }
 
+    public static void kick_listview(String s) {
+        if (listViewWnd == null) {
+            listViewWnd = new HuntListView();
+            if (listViewBounds == null) {
+                listViewWnd.setBounds(0, 0, 400, 300);
+            } else {
+                listViewWnd.setBounds(listViewBounds);
+            }
+            listViewWnd.setVisible(true);
+        }
+        listViewWnd.add_message(s);
+    }
+
     public static void set_effect(int n, long nspan) {
         if (messageView != null) {
             HuntMainView hview = (HuntMainView) mainView;
@@ -796,6 +811,7 @@
         messageView.setVisible(true);
 
         mainWnd.setVisible(true);
+        mainWnd.toFront();
     }
 
     /* try to login server */
@@ -860,6 +876,7 @@
                 save_rect(ofile, mainWndBounds);
                 save_rect(ofile, statusViewBounds);
                 save_rect(ofile, messageViewBounds);
+                save_rect(ofile, listViewBounds);
             }
         } catch (IOException e) {
             System.out.println("fail to save setup-file!"); //NOI18N
@@ -911,6 +928,7 @@
         mainWndBounds = null;
         statusViewBounds = null;
         messageViewBounds = null;
+        listViewBounds = null;
         try {
             try (BufferedReader ifile
                     = new BufferedReader(new FileReader("hunt_setup.def"))) { //NOI18N
@@ -930,6 +948,7 @@
                 mainWndBounds = load_rect(ifile);
                 statusViewBounds = load_rect(ifile);
                 messageViewBounds = load_rect(ifile);
+                listViewBounds = load_rect(ifile);
             }
         } catch (IOException e) {
         }
@@ -948,6 +967,10 @@
             statusViewBounds = wnd.getBounds();
             wnd.dispose();
         }
+        if (listViewWnd != null) {
+            listViewBounds = listViewWnd.getBounds();
+            listViewWnd.dispose();
+        }
         if (mainWnd != null) {
             mainWndBounds = mainWnd.getBounds();
             mainWnd.dispose();

--- trunk/src/hunton/HuntListView.java	(nonexistent)
+++ trunk/src/hunton/HuntListView.java	(revision 22)
@@ -0,0 +1,86 @@
+package hunton;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+
+/**
+ * List view window
+ *
+ * @author terry
+ */
+public class HuntListView extends Frame {
+
+    List plist;
+    ArrayList<String> mesg;
+    ArrayList<Integer> fieldWidth;
+
+    HuntListView() {
+        super();
+        mesg = new ArrayList<>();
+        fieldWidth = new ArrayList<>();
+        ScrollPane scpane = new ScrollPane();
+        plist = new List();
+        plist.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
+        scpane.add(plist);
+        add(scpane);
+        addWindowListener(new HuntListViewEvent());
+        pack();
+    }
+
+    int add_mesg_fields(String s) {
+        String fields[] = s.split(":");
+        int i;
+        for (i = 0; i < fields.length; i++) {
+            int n = Hunt.countStringWidth(fields[i]);
+            if (i < fieldWidth.size()) {
+                if (n > fieldWidth.get(i)) {
+                    fieldWidth.set(i, n);
+                }
+            } else {
+                fieldWidth.add(n);
+            }
+        }
+        mesg.add(s);
+        return i;
+    }
+
+    String format_message_line(String s) {
+        int i;
+        StringBuilder wk = new StringBuilder();
+        String fields[] = s.split(":");
+        for (i = 0; i < fields.length; i++) {
+            wk.append(Hunt.formatStringWidth(fields[i], fieldWidth.get(i)));
+            wk.append(":");
+        }
+        if (i > 0) {
+            //remove last separator
+            wk.deleteCharAt(wk.length() - 1);
+        }
+        return wk.toString();
+    }
+
+    public void add_message(String s) {
+        if (add_mesg_fields(s) == 1) {
+            //found last message mark
+            //update list view
+            int i;
+            plist.removeAll();
+            for (i = 0; i < mesg.size(); i++) {
+                plist.add(format_message_line(mesg.get(i)));
+            }
+            mesg.clear();
+        }
+    }
+
+}
+
+class HuntListViewEvent extends WindowAdapter {
+
+    @Override
+    public void windowClosing(WindowEvent e) {
+    }
+
+}
+
+/* EOF */

--- trunk/src/hunton/RecvTask.java	(revision 21)
+++ trunk/src/hunton/RecvTask.java	(revision 22)
@@ -100,7 +100,11 @@
             } catch (UnsupportedEncodingException e) {
                 message = "?"; //NOI18N
             }
-            Hunt.display_message(message);
+            if (message.length() > 1 && message.charAt(0) == '<') {
+                Hunt.kick_listview(message);
+            } else {
+                Hunt.display_message(message);
+            }
         }
     }