diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1429a1b..9d84663 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,6 +6,13 @@
"configurations": [
{
"type": "java",
+ "name": "ServerTesterApp",
+ "request": "launch",
+ "mainClass": "info.istlab.ServerTester.ServerTesterApp",
+ "projectName": "KisoServerTester"
+ },
+ {
+ "type": "java",
"name": "ListNetworkInterfaces",
"request": "launch",
"mainClass": "info.istlab.ServerTester.ListNetworkInterfaces",
diff --git a/README.md b/README.md
index 0cb5b9a..838d483 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
## 実行方法
-ターミナルで ```mvn compile exec:java``` をすると、コンパイルして実行します。
+ターミナルで ```mvn compile exec:exec``` をすると、コンパイルして実行します。
### 最初に起動するサーバ群のカスタマイズ
diff --git a/pom.xml b/pom.xml
index 56d0f8d..06bbb9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,10 +51,31 @@
org.codehaus.mojo
exec-maven-plugin
3.0.0
+
+
+
+ exec
+
+
+
+
+ java
+
+ -cp
+
+ info.istlab.ServerTester.ServerTesterApp
+
+
+
+
+
maven-assembly-plugin
@@ -73,7 +94,7 @@
- info.istlab.ServerTester.App
+ info.istlab.ServerTester.ServerTesterApp
all-permissions
diff --git a/src/main/java/info/istlab/ServerTester/Host.java b/src/main/java/info/istlab/ServerTester/Host.java
index f4a1285..0e3b53f 100644
--- a/src/main/java/info/istlab/ServerTester/Host.java
+++ b/src/main/java/info/istlab/ServerTester/Host.java
@@ -1,6 +1,7 @@
package info.istlab.ServerTester;
import java.awt.BorderLayout;
+import java.awt.Point;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
@@ -17,13 +18,13 @@
public MulticastReceiver multicastReceiver;
public Host() {
- setTitle("サーバ管理ウィンドウ "+App.primaryInterface.getDisplayName() + " " + App.primaryInetAddr.getHostAddress());
+ setTitle("サーバ管理ウィンドウ " + App.primaryInterface.getDisplayName() + " " + App.primaryInetAddr.getHostAddress());
setSize(300, 200);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new java.awt.event.WindowAdapter() {
@Override
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
- if (multicastReceiver != null){
+ if (multicastReceiver != null) {
multicastReceiver.sender.sendnofity();
}
System.exit(0);
@@ -67,14 +68,15 @@
e1.printStackTrace();
}
}
- multicastReceiver = new MulticastReceiver(54320 + Integer.parseInt(item.getText())); // 54320 + 班の番号 のポート番号で待つ
+ multicastReceiver = new MulticastReceiver(54320 + Integer.parseInt(item.getText())); // 54320 + 班の番号
+ // のポート番号で待つ
});
}
// JMenuItem sendItem = new JMenuItem("このホストのサーバ情報をブロードキャストで送信");
// menu.add(sendItem);
// sendItem.addActionListener(e -> {
- // new UDPClient(mainPanel, udpServer.port);
+ // new UDPClient(mainPanel, udpServer.port);
// });
JMenuItem showItem = new JMenuItem("RemoteHosts ウィンドウを表示");
@@ -101,4 +103,8 @@
new Host();
}
+ public Point nextTo(int dx, int dy) {
+ return new Point(getLocation().x + getWidth() + dx, getLocation().y + dy);
+ }
+
}
diff --git a/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java b/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java
index 4512ccc..381cee5 100644
--- a/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java
+++ b/src/main/java/info/istlab/ServerTester/RemoteHostsWindow.java
@@ -42,10 +42,9 @@
tabbedPane.add(addr, rhp);
panels.put(addr, rhp);
}
- frame.setLocation(50, 400);
+ frame.setLocation(Host.mainhost.nextTo(10,10));
frame.pack();
frame.setVisible(true);
-
}
public void updateData(String addr, String value) {
diff --git a/src/main/java/info/istlab/ServerTester/ServerTesterApp.java b/src/main/java/info/istlab/ServerTester/ServerTesterApp.java
new file mode 100644
index 0000000..08a9869
--- /dev/null
+++ b/src/main/java/info/istlab/ServerTester/ServerTesterApp.java
@@ -0,0 +1,7 @@
+package info.istlab.ServerTester;
+
+public class ServerTesterApp {
+ public static void main(String[] args) {
+ App.main(args);
+ }
+}