Browse Source

installation node: store ip address

Martin Kunz 4 years ago
parent
commit
4637ccf820

+ 41 - 19
src/main/java/uraxis/MyDaemonInstallationNodeContribution.java

@@ -16,10 +16,11 @@ import java.util.TimerTask;
 
 public class MyDaemonInstallationNodeContribution implements InstallationNodeContribution {
 	private static final String POPUPTITLE_KEY = "popuptitle";
-
 	private static final String XMLRPC_VARIABLE = "my_daemon";
 	private static final String ENABLED_KEY = "enabled";
 	private static final String DEFAULT_VALUE = "HelloWorld";
+	private static final String IP = "ip";
+	private static final String PORT = "port";
 
 	private DataModel model;
 	// private final MyDaemonDaemonService daemonService;
@@ -28,7 +29,6 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 	private Timer uiTimer;
 	private Timer statusTimer;
 
-
 	public MyDaemonInstallationNodeContribution(MyDaemonDaemonService daemonService, DataModel model) {
 		// this.daemonService = daemonService;
 		this.model = model;
@@ -117,6 +117,7 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 		enableDaemonButton.setText("Start Daemon");
 		disableDaemonButton.setText("Stop daemon");
 		popupTitleField.setText(getPopupTitle());
+		refTextIP.setText(getIP());
 
 		//UI updates from non-GUI threads must use EventQueue.invokeLater (or SwingUtilities.invokeLater)
 		uiTimer = new Timer(true);
@@ -132,23 +133,23 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 			}
 		}, 0, 1000);
 
-		statusTimer = new Timer(true);
-		statusTimer.schedule(new TimerTask() {
-			@Override
-			public void run() {
-				EventQueue.invokeLater(new Runnable() {
-					@Override
-					public void run() {
-						try {
-							Object res = getDaemonInterface().client.execute("status", new String[]{});
-							refLblStatus.setText("<html>"+res.toString()+"</html>");
-							System.out.println(res);
-						} catch (XmlRpcException e) {
-							e.printStackTrace();
-						}
-					}
-				});
-		}},0,1000);
+//		statusTimer = new Timer(true);
+//		statusTimer.schedule(new TimerTask() {
+//			@Override
+//			public void run() {
+//				EventQueue.invokeLater(new Runnable() {
+//					@Override
+//					public void run() {
+//						try {
+//							Object res = getDaemonInterface().client.execute("status", new String[]{});
+//							refLblStatus.setText("<html>"+res.toString()+"</html>");
+//							System.out.println(res);
+//						} catch (XmlRpcException e) {
+//							e.printStackTrace();
+//						}
+//					}
+//				});
+//		}},0,1000);
 	}
 
 	private void updateUI() {
@@ -182,6 +183,9 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 		if (uiTimer != null) {
 			uiTimer.cancel();
 		}
+
+		setIP(refTextIP.getText());
+		setPort(refTextPort.getText());
 	}
 
 	@Override
@@ -196,6 +200,7 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 		return model.get(POPUPTITLE_KEY, DEFAULT_VALUE);
 	}
 
+
 	private void setPopupTitle(String title) {
 		if ("".equals(title)) {
 			resetToDefaultValue();
@@ -207,6 +212,23 @@ public class MyDaemonInstallationNodeContribution implements InstallationNodeCon
 		}
 	}
 
+	public String getIP() {
+		return  model.get(IP, "127.0.0.1");
+	}
+
+	public void setIP(String ip) {
+		model.set(IP, ip);
+	}
+
+	public String getPort() {
+		return  model.get(PORT, "127.0.0.1");
+	}
+
+	public void setPort(String ip) {
+		model.set(PORT, ip);
+	}
+
+
 	private void resetToDefaultValue() {
 		popupTitleField.setText(DEFAULT_VALUE);
 		model.set(POPUPTITLE_KEY, DEFAULT_VALUE);

+ 1 - 1
src/main/java/uraxis/MyDaemonInstallationNodeService.java

@@ -23,7 +23,7 @@ public class MyDaemonInstallationNodeService implements InstallationNodeService
 
 	@Override
 	public String getTitle() {
-		return "My Daemon";
+		return "Festo Axis";
 	}
 
 	@Override