Fix to Setup4j

Author: C4J

c4j_commander4j/commander4j.jar

@@ -14,6 +14,7 @@ public class JTextArea4j extends JTextArea {
 
     private static final long serialVersionUID = 1L;
     private static final Border EMPTY_BORDER = new LineBorder(Color.GRAY);
+    private boolean hasFocus = false;
 
 	private void init()
 	{
@@ -25,19 +26,40 @@ public JTextArea4j() {
         super();
         init();
         initFocusBehavior();
+        updateColors();
     }
 
 	public JTextArea4j(String text) {
 		super(text);
 		init();
         initFocusBehavior();
+        updateColors();
 	}
 
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        updateColors();
+    }
+
+    @Override
+    public void setEditable(boolean editable) {
+        super.setEditable(editable);
+        updateColors();
+    }
+    
+    @Override
+    public void updateUI() {
+        super.updateUI();
+        setDisabledTextColor(Common.color_textfield_foreground_disabled);
+        updateColors();
+    }
 
     private void initFocusBehavior() {
         addFocusListener(new FocusAdapter() {
             @Override
             public void focusGained(FocusEvent e) {
+            	hasFocus = true;
             	if (isEditable())
             	{
                     setBackground(Common.color_textfield_background_focus_color);
@@ -47,13 +69,32 @@ public void focusGained(FocusEvent e) {
 
             @Override
             public void focusLost(FocusEvent e) {
+            	hasFocus = false;
             	if (isEditable())
             	{
                 setBackground(Common.color_textfield_background_nofocus_color);
             	}
             }
         });
     }
+    
+    private void updateColors() {
+        if (!isEnabled()) {
+            setBackground(Common.color_textfield_background_disabled);
+            setForeground(Common.color_textfield_foreground_disabled);
+        } else if (!isEditable()) {
+            setBackground(Common.color_textfield_background_disabled);
+            setForeground(Common.color_textfield_foreground_disabled);
+        } else if (hasFocus){
+            setBackground(Common.color_textfield_background_focus_color);
+            setForeground(Common.color_textfield_foreground_focus_color);
+        } else
+        {
+            setBackground(Common.color_textfield_background_nofocus_color);
+            setForeground(Common.color_textfield_forground_nofocus_color);	
+        }
+        
+    }
 
 }
 

c4j_commander4j/src/com/commander4j/cfg/JFrameHostAdmin.java

@@ -1,5 +1,7 @@
 package com.commander4j.sys;
 
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
@@ -101,20 +103,24 @@ public static void main(String[] args)
 				}
 				catch (Exception e)
 				{
-
+					logger.debug("Waiting for exclusive runtime");
 				}
 
 				if (exclusive == false)
 				{
 					try
 					{
-						logger.debug("Requesting other Commander4j instances close.");
+						logger.debug("Requesting other AutoLab instances close.");
 						Socket clientSocket = new Socket("localhost", Common.singleInstancePort);
+						
+			            PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true);
+
+			            out.println("shutdown requested");
 						clientSocket.close();
 					}
-					catch (Exception e)
+					catch (IOException e)
 					{
-	
+
 					}
 				}
 				JWait.milliSec(500);

c4j_commander4j/src/com/commander4j/gui/JTextArea4j.java

@@ -1,8 +1,11 @@
 package com.commander4j.watchdog;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 
 import org.apache.logging.log4j.Logger;
 
@@ -51,6 +54,7 @@ public void run()
 			try
 			{
 				serverSocket = new ServerSocket(port, 1);
+             	logger.debug("WatchDog listening on port " + " : " + String.valueOf(port));
 
 				while (true)
 				{
@@ -59,13 +63,54 @@ public void run()
 
 					clientSocket = serverSocket.accept();
 
-					clientSocket.close();
+					String clientIP = clientSocket.getInetAddress().getHostAddress();
 
-					logger.debug("WatchDog shutdown request detected.");
+					try
+					{
+						clientSocket.setSoTimeout(5000);
 
-					System.exit(0);
+						BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+						String message = in.readLine();
 
-					run = false;
+						if ("shutdown requested".equalsIgnoreCase(message))
+						{
+
+
+							if (run)
+							{
+
+								logger.debug("WatchDog shutdown request detected.");
+
+								System.exit(0);
+					
+
+								run = false;
+							}
+						}
+						else
+						{
+							System.out.println("Unexpected message: " + message);
+						}
+					}
+					catch (SocketTimeoutException e)
+					{
+
+					}
+					catch (IOException e)
+					{
+						System.out.println("I/O error with " + clientIP + ": " + e.getMessage());
+					}
+					finally
+					{
+						try
+						{
+							clientSocket.close();
+						}
+						catch (IOException e)
+						{
+							// Ignore
+						}
+					}
 				}
 			}
 			catch (IOException e1)