Use CommState for comm link renderer states

Author: DougLau

src/us/mn/state/dot/tms/client/comm/CommCellRenderer.java

@@ -1,6 +1,6 @@
 /*
  * IRIS -- Intelligent Roadway Information System
- * Copyright (C) 2008-2014  Minnesota Department of Transportation
+ * Copyright (C) 2008-2026  Minnesota Department of Transportation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,6 +14,7 @@
  */
 package us.mn.state.dot.tms.client.comm;
 
+import java.awt.Color;
 import java.awt.Component;
 import javax.swing.JLabel;
 import javax.swing.JTable;
@@ -32,13 +33,12 @@ public Component getTableCellRendererComponent(JTable table,
 		Object value, boolean isSelected, boolean hasFocus,
 		int row, int col)
 	{
-		JLabel lbl = (JLabel)super.getTableCellRendererComponent(table,
-			"", isSelected, hasFocus, row, col);
-		if (value instanceof CommState) {
-			CommState cs = (CommState)value;
-			lbl.setIcon(cs.icon);
-		} else
-			lbl.setIcon(null);
+		JLabel lbl = (JLabel) super.getTableCellRendererComponent(
+			table, "", isSelected, hasFocus, row, col);
+		Color c = Color.BLACK;
+		if (value instanceof CommState)
+			c = ((CommState) value).color;
+		lbl.setIcon(new ControllerIcon(c));
 		return lbl;
 	}
 }

src/us/mn/state/dot/tms/client/comm/CommLinkModel.java

@@ -78,6 +78,21 @@ static private Object getCommConfigLabel(Object value) {
 			return value;
 	}
 
+	/** Get a comm link state */
+	static private CommState getCommState(CommLink cl) {
+		if (cl == null || !cl.getPollEnabled())
+			return CommState.INACTIVE;
+		CommConfig cc = cl.getCommConfig();
+		if (cc == null)
+			return CommState.INACTIVE;
+		if (cc.getPollinator())
+			return CommState.POLLINATOR;
+		if (cl.getConnected())
+			return CommState.OK;
+		else
+			return CommState.OFFLINE;
+	}
+
 	/** Create a proxy descriptor */
 	static public ProxyDescriptor<CommLink> descriptor(Session s) {
 		return new ProxyDescriptor<CommLink>(
@@ -132,13 +147,11 @@ public void setValueAt(CommLink cl, Object value) {
 					cl.setPollEnabled((Boolean) value);
 			}
 		});
-		cols.add(new ProxyColumn<CommLink>("comm.link.connected", 50) {
+		cols.add(new ProxyColumn<CommLink>("comm.link.connected", 50,
+			CommState.class)
+		{
 			public Object getValueAt(CommLink cl) {
-				CommConfig cc = cl.getCommConfig();
-				if (cc != null && cc.getPollinator())
-					return null;
-				else
-					return cl.getConnected();
+				return getCommState(cl);
 			}
 			protected TableCellRenderer createCellRenderer() {
 				return new ConnectedCellRenderer();

src/us/mn/state/dot/tms/client/comm/CommListRenderer.java

@@ -1,6 +1,6 @@
 /*
  * IRIS -- Intelligent Roadway Information System
- * Copyright (C) 2014-2020  Minnesota Department of Transportation
+ * Copyright (C) 2014-2026  Minnesota Department of Transportation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,6 +14,7 @@
  */
 package us.mn.state.dot.tms.client.comm;
 
+import java.awt.Color;
 import java.awt.Component;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JLabel;
@@ -39,13 +40,12 @@ static private String valueText(Object value) {
 	public Component getListCellRendererComponent(JList list, Object value,
 		int index, boolean isSelected, boolean hasFocus)
 	{
-		JLabel lbl = (JLabel)super.getListCellRendererComponent(list,
+		JLabel lbl = (JLabel) super.getListCellRendererComponent(list,
 			valueText(value), index, isSelected, hasFocus);
-		if (value instanceof CommState) {
-			CommState cs = (CommState)value;
-			lbl.setIcon(cs.icon);
-		} else
-			lbl.setIcon(null);
+		Color c = Color.BLACK;
+		if (value instanceof CommState)
+			c = ((CommState) value).color;
+		lbl.setIcon(new ControllerIcon(c));
 		return lbl;
 	}
 }

src/us/mn/state/dot/tms/client/comm/CommState.java

@@ -1,6 +1,6 @@
 /*
  * IRIS -- Intelligent Roadway Information System
- * Copyright (C) 2014-2025  Minnesota Department of Transportation
+ * Copyright (C) 2014-2026  Minnesota Department of Transportation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,12 +28,12 @@ public enum CommState {
 	OFFLINE    (ProxyTheme.COLOR_OFFLINE),
 	POLLINATOR (ProxyTheme.COLOR_POLLINATOR);
 
-	/** Icon for the comm state */
-	public final ControllerIcon icon;
+	/** Color for the comm state */
+	public final Color color;
 
 	/** Create a comm state */
 	private CommState(Color c) {
-		icon = new ControllerIcon(c);
+		color = c;
 	}
 
 	/** Get values with null as first */

src/us/mn/state/dot/tms/client/comm/ConnectedCellRenderer.java

@@ -14,48 +14,32 @@
  */
 package us.mn.state.dot.tms.client.comm;
 
+import java.awt.Color;
 import java.awt.Component;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import us.mn.state.dot.tms.client.proxy.ProxyTheme;
 
 /**
  * Renderer for connected status in a table cell.
  *
- * NOTE: Null indicates the comm link is handled by `pollinator`.
- *
  * @author Douglas Lau
  */
 public class ConnectedCellRenderer extends DefaultTableCellRenderer {
 
-	/** Icon for OK status */
-	static private final Icon OK = new CommLinkIcon(
-		ProxyTheme.COLOR_AVAILABLE);
-
-	/** Icon for FAIL status */
-	static private final Icon FAIL = new CommLinkIcon(
-		ProxyTheme.COLOR_OFFLINE);
-
-	/** Icon for POLLINATOR status */
-	static private final Icon POLLINATOR = new CommLinkIcon(
-		ProxyTheme.COLOR_POLLINATOR);
-
 	/** Get the renderer component */
 	@Override
 	public Component getTableCellRendererComponent(JTable table,
 		Object value, boolean isSelected, boolean hasFocus,
 		int row, int column)
 	{
-		JLabel label = (JLabel) super.getTableCellRendererComponent(
+		JLabel lbl = (JLabel) super.getTableCellRendererComponent(
 			table, "", isSelected, hasFocus, row, column);
-		if (value == null)
-			label.setIcon(POLLINATOR);
-		else if (Boolean.TRUE.equals(value))
-			label.setIcon(OK);
-		else
-			label.setIcon(FAIL);
-		return label;
+		Color c = Color.BLACK;
+		if (value instanceof CommState)
+			c = ((CommState) value).color;
+		lbl.setIcon(new CommLinkIcon(c));
+		return lbl;
 	}
 }

src/us/mn/state/dot/tms/client/comm/ControllerTableModel.java

@@ -14,7 +14,6 @@
  */
 package us.mn.state.dot.tms.client.comm;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.util.ArrayList;
 import java.util.Comparator;