diff --git a/src/main/java/info/istlab/ServerTester/JTAConsole.java b/src/main/java/info/istlab/ServerTester/JTAConsole.java index 9e9954d..1bf1fc8 100644 --- a/src/main/java/info/istlab/ServerTester/JTAConsole.java +++ b/src/main/java/info/istlab/ServerTester/JTAConsole.java @@ -37,21 +37,15 @@ StringBuilder originalContent; String mainSrc; - // ProcessBuilder pb; - - // public JTAConsole(ProcessBuilder prob) { public JTAConsole(String title) { this(title, 200); } public JTAConsole(String title, int win_height) { - // pb = prob; - frame = new JFrame(title); frame.getContentPane().add(new JScrollPane(this)); frame.setSize(500, win_height); - frame.setVisible(true); frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); frame.addWindowListener(this); if (winStack.size() > 0) { @@ -66,15 +60,10 @@ addKeyListener(this); addMouseListener(this); - // if (lastActivePoint != null){ - // frame.setLocation(lastActivePoint.x+500, lastActivePoint.y); - // } else if (lastWindow != null && lastWindow.isVisible()){ - // Point lastFrameP = lastWindow.frame.getLocationOnScreen(); - // frame.setLocation(lastFrameP.x+500, lastFrameP.y); - // } - // lastWindow = this; winStack.push(this); originalContent = new StringBuilder(); + + frame.setVisible(true); // 表示を遅らせないと、RSJTextAreaでエラーが出る } public void Systemoutprintln(String s) { @@ -92,16 +81,9 @@ } catch (UnsupportedEncodingException e1) { e1.printStackTrace(); } - // isreader = new InputStreamReader(proc.getInputStream()); outstream = process.getOutputStream(); String line; try { - // while(true){ - // if (isreader.ready()){ - // char[] buf = new char[1000]; - // isreader.read(buf); - // } - // } while ((line = reader.readLine()) != null) { Systemoutprintln(line); } diff --git a/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java b/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java index 0dff3ca..21de6e7 100644 --- a/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java +++ b/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java @@ -164,6 +164,7 @@ // new WhiteBoardClient(info[1], target); } }); + button.setToolTipText("接続先IPアドレス:"+hostip); add(panel); } } diff --git a/src/main/java/info/istlab/ServerTester/ServerPanel.java b/src/main/java/info/istlab/ServerTester/ServerPanel.java index 0635e49..1979fd5 100644 --- a/src/main/java/info/istlab/ServerTester/ServerPanel.java +++ b/src/main/java/info/istlab/ServerTester/ServerPanel.java @@ -51,12 +51,14 @@ stopButton = new JButton("Start"); add(stopButton); + stopButton.setToolTipText("Server UniqueID: "+server.hashCode()); stopButton.addActionListener(e -> { if (server.isClosed()) { server.restart(); } else { server.close(); } + stopButton.setToolTipText("Server UniqueID: "+server.hashCode()); repaint(); host.pack(); }); @@ -73,6 +75,7 @@ clientButton = new JButton("Client"); add(clientButton); + clientButton.setToolTipText("接続IPアドレス: "+server.getBindAddress().substring(1)); clientButton.addActionListener(e -> { if (name.startsWith("Web")) { // open web browser diff --git a/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java b/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java index 8f661de..19dc79d 100644 --- a/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java +++ b/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java @@ -54,12 +54,14 @@ stopButton = new JButton("Start"); add(stopButton); + stopButton.setToolTipText("Server UniqueID: "+server.hashCode()); stopButton.addActionListener(e -> { if (server.isClosed()) { server = new SimpleWebSocketServer(server.getExpectedPort(), server.getExpectedAddress()); } else { server.stop(); } + stopButton.setToolTipText("Server UniqueID: "+server.hashCode()); repaint(); host.pack(); }); diff --git a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java index b0abf7c..e7758a6 100644 --- a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java +++ b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java @@ -28,8 +28,8 @@ while (thread != null) { try { Socket socket = serverSocket.accept(); - System.out.println("[TES] ---\nConnection from: " + socket); - new RequestHandler4TES(socket); + System.out.println("[TES "+hashCode()+"] Connection from: " + socket); + new RequestHandler4TES(socket, this); } catch(SocketException sx){ thread = null; } catch (IOException e) { @@ -45,9 +45,11 @@ class RequestHandler4TES implements Runnable { Socket sock; Thread thread; + ThreadEchoServer server; - RequestHandler4TES(Socket s) { + RequestHandler4TES(Socket s, ThreadEchoServer server) { sock = s; + this.server = server; thread = new Thread(this); thread.start(); } @@ -56,20 +58,20 @@ PrintStream os; BufferedReader br; String line; - System.out.println("[TES] accept"); + System.out.println("[TES "+server.hashCode()+"] accept (BindAddr: "+server.getBindAddress()+")"); try { br = new BufferedReader(new InputStreamReader(sock.getInputStream())); os = new PrintStream(sock.getOutputStream()); // クライアントからのメッセージを待ち、受け取ったメッセージをそのまま返す while ((line = br.readLine()) != null) { - System.out.println("[TES] (Server received) " + line); + System.out.println("[TES "+server.hashCode()+"] (Server received) " + line); os.println(line); } } catch (IOException e) { // os.close(); System.out.println(e); } finally { - System.out.println("[TES] disconnected " + sock.toString()); + System.out.println("[TES "+server.hashCode()+"] disconnected " + sock.toString()); } } } \ No newline at end of file