Fix bug for Variable that contains dot in the name and add a tooltip on

description cell

Author: katysaintin

app/pvtable/src/main/java/org/phoebus/applications/pvtable/model/PVTableItem.java

@@ -52,6 +52,7 @@ public class PVTableItem
 
     /** Value of the PV's description */
     private volatile String desc_value = "";
+    private volatile String desc_name = "";
 
     /** Saved (snapshot) value */
     private volatile Optional<SavedValue> saved = Optional.empty();
@@ -77,6 +78,9 @@ public class PVTableItem
 
     /** Listener to description PV */
     private volatile Disposable desc_flow;
+    
+    private static final String DESC_FIELD = "DESC";
+    private static final String DOT = ".";
 
     /** Initialize
      *
@@ -148,12 +152,23 @@ private void createPVs(final String name)
                name.startsWith("loc:")))
         {
             // Determine DESC field.
-            // If name already includes a field,
-            // replace it with DESC field.
-            final int sep = name.lastIndexOf('.');
-            final String desc_name = sep >= 0
-                    ? name.substring(0, sep) + ".DESC"
-                    : name + ".DESC";
+            //Bug when a pv name contains a . caracters
+            desc_name = name + DOT + DESC_FIELD;
+            if(!name.endsWith(DOT + DESC_FIELD) && name.contains(DOT)) {
+                // If name already includes a field
+                // It can be a EPICS fields such as .VAL .EGU ... 
+                // EPICS fields are always in Upper Case
+                // EPICS fields are 4 characters length max
+                final int sep = name.lastIndexOf('.');
+                String fieldVal = name.substring(sep + 1);
+                //System.out.println("fieldVal=" + fieldVal);
+                //Test if it in uppercase and max length 4
+                boolean isEpicsField = fieldVal.toUpperCase().equals(fieldVal) && fieldVal.length() < 5;
+                if(isEpicsField) {
+                    desc_name = name.replace(fieldVal, DESC_FIELD);
+                }
+            }
+            
             try
             {
                 final PV new_desc_pv = PVPool.getPV(desc_name);
@@ -244,6 +259,11 @@ public String getDescription()
     {
         return desc_value;
     }
+    
+    /** @return description pv name **/
+    public String getDescriptionName() {
+        return desc_name;
+    }
 
     /** @return Enum options for current value, <code>null</code> if not enumerated */
     public String[] getValueOptions()

app/pvtable/src/main/java/org/phoebus/applications/pvtable/ui/PVTable.java

@@ -83,8 +83,6 @@
 import javafx.scene.paint.Color;
 import javafx.util.converter.DefaultStringConverter;
 
-import static org.phoebus.ui.application.PhoebusApplication.logger;
-
 
 /** PV Table and its toolbar
  *  @author Kay Kasemir
@@ -164,6 +162,24 @@ protected void updateItem(final Boolean selected, final boolean empty)
             }
         }
     }
+    
+    private static class DescriptionTableCell extends TableCell<TableItemProxy, String>
+    {
+        @Override
+        protected void updateItem(final String item, final boolean empty)
+        {
+            super.updateItem(item, empty);
+            setText(item);
+            final int row = getIndex();
+            final List<TableItemProxy> items = getTableView().getItems();
+            if (! empty  &&  row >= 0  &&  row < items.size()) {
+                final TableItemProxy itemCell = items.get(row);
+                if(itemCell != null && itemCell.getItem() != null) {
+                    setTooltip(new Tooltip(itemCell.getItem().getDescriptionName()));
+                }
+            }
+        }
+    }
 
     /** Table cell for 'name' column, colors comments */
     private static class PVNameTableCell extends TextFieldTableCell<TableItemProxy, String>
@@ -784,6 +800,7 @@ private void createTableColumns()
         {
             col = new TableColumn<>(Messages.Description);
             col.setCellValueFactory(cell -> cell.getValue().desc_value);
+            col.setCellFactory(column -> new DescriptionTableCell());
             table.getColumns().add(col);
         }