Fix IceGridGUI scale cell render editor

1 files changed, 6 insertions, 10 deletions

diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
index 6c2b5b80432..a9fdb990489 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
@@ -315,15 +315,8 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato
                 @Override
                 public String getToolTipText(java.awt.event.MouseEvent e)
                 {
-                    if(convertColumnIndexToModel(columnAtPoint(e.getPoint())) == 6)
-                    {
-                        return _legendModel.getRows(new int[]{rowAtPoint(e.getPoint())})[0].cell.getField().
-                            getColumnToolTip();
-                    }
-                    else
-                    {
-                        return null;
-                    }
+                    return _legendModel.getRows(new int[]{rowAtPoint(e.getPoint())})[0].cell.getField().
+                        getColumnToolTip();
                 }
             };
 
@@ -476,7 +469,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato
         //
         JComboBox<Double> scales = new JComboBox<>(_scales);
         scales.setRenderer(new DecimalRenderer(scales.getRenderer()));
-        _legendTable.getColumnModel().getColumn(7).setCellEditor(new DefaultCellEditor(scales));
+        _legendTable.getColumnModel().getColumn(ScaleColumnNumber).setCellEditor(new DefaultCellEditor(scales));
 
         //
         // Set default renderer and editor for Color.class column.
@@ -1763,6 +1756,9 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato
                                                   10000000.0d,
                                                   100000000.0d,
                                                   1000000000.0d};
+    //
+    // This s
+    private static final int ScaleColumnNumber = 6;
 
     private final java.util.concurrent.Semaphore _sem = new java.util.concurrent.Semaphore(0);
     private final java.util.concurrent.ExecutorService _queue = java.util.concurrent.Executors.newSingleThreadExecutor(