feat: improving UX by utilizing ColumnLabelProvider

Author: sigmaaa

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/nvs/dialog/NvsCsvEditorPage.java

@@ -276,6 +276,10 @@ public boolean getSaveAction()
 	 */
 	public void markDirty()
 	{
+		@SuppressWarnings("unchecked")
+		List<NvsTableBean> beansToSave = (List<NvsTableBean>) tableViewer.getInput();
+		validateBeansBeforeSaving(beansToSave);
+		updateErrorMessage();
 		dirtyStateListener.accept(true);
 	}
 
@@ -534,6 +538,17 @@ public String getColumnText(NvsTableBean bean)
 			{
 				return bean.getKey();
 			}
+
+			@Override
+			public String getToolTipText(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+
+					return Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg;
+				}
+				return super.getToolTipText(element);
+			}
 		});
 		colKey.setEditingSupport(new EditingSupport(tableViewer)
 		{
@@ -577,6 +592,28 @@ public String getColumnText(NvsTableBean bean)
 			{
 				return bean.getType();
 			}
+
+			@Override
+			public String getToolTipText(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+
+					return Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg;
+				}
+				return super.getToolTipText(element);
+			}
+
+			@Override
+			public Color getBackground(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+					return Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
+				}
+				return null;
+			}
+
 		});
 		colType.setEditingSupport(new EditingSupport(tableViewer)
 		{
@@ -587,11 +624,6 @@ protected CellEditor getCellEditor(Object element)
 
 			protected boolean canEdit(Object element)
 			{
-				if (tableViewer.getElementAt(0).equals(element))
-				{
-					setMessage(Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg, IMessageProvider.INFORMATION);
-					return false;
-				}
 				return true;
 			}
 
@@ -646,6 +678,27 @@ public String getColumnText(NvsTableBean bean)
 			{
 				return bean.getEncoding();
 			}
+
+			@Override
+			public String getToolTipText(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+
+					return Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg;
+				}
+				return super.getToolTipText(element);
+			}
+
+			@Override
+			public Color getBackground(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+					return Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
+				}
+				return null;
+			}
 		});
 		colEncoding.setEditingSupport(new EditingSupport(tableViewer)
 		{
@@ -658,18 +711,7 @@ protected CellEditor getCellEditor(Object element)
 
 			protected boolean canEdit(Object element)
 			{
-				if (tableViewer.getElementAt(0).equals(element))
-				{
-					setMessage(Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg, IMessageProvider.INFORMATION);
-					return false;
-				}
-				NvsTableBean bean = (NvsTableBean) element;
-				boolean isCellEditable = !bean.getType().contentEquals("namespace"); //$NON-NLS-1$
-				if (!isCellEditable)
-				{
-					setMessage(Messages.NvsEditorDialog_NamespaceEditLimitationInfoMsg, IMessageProvider.INFORMATION);
-				}
-				return isCellEditable;
+				return true;
 			}
 
 			protected Object getValue(Object element)
@@ -715,6 +757,27 @@ public String getColumnText(NvsTableBean bean)
 			{
 				return bean.getValue();
 			}
+
+			@Override
+			public String getToolTipText(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+
+					return Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg;
+				}
+				return super.getToolTipText(element);
+			}
+
+			@Override
+			public Color getBackground(Object element)
+			{
+				if (tableViewer.getElementAt(0).equals(element))
+				{
+					return Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
+				}
+				return null;
+			}
 		});
 		colValue.setEditingSupport(new EditingSupport(tableViewer)
 		{
@@ -725,18 +788,7 @@ protected CellEditor getCellEditor(Object element)
 
 			protected boolean canEdit(Object element)
 			{
-				if (tableViewer.getElementAt(0).equals(element))
-				{
-					setMessage(Messages.NvsEditorDialog_FirstRowIsFixedInfoMsg, IMessageProvider.INFORMATION);
-					return false;
-				}
-				NvsTableBean bean = (NvsTableBean) element;
-				boolean isCellEditable = !bean.getType().contentEquals("namespace"); //$NON-NLS-1$
-				if (!isCellEditable)
-				{
-					setMessage(Messages.NvsEditorDialog_NamespaceEditLimitationInfoMsg, IMessageProvider.INFORMATION);
-				}
-				return isCellEditable;
+				return true;
 			}
 
 			protected Object getValue(Object element)

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/nvs/dialog/NvsTableEditorLabelProvider.java

@@ -2,15 +2,15 @@
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.CellLabelProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 
 import com.espressif.idf.core.build.NvsTableBean;
 import com.espressif.idf.core.util.NvsBeanValidator;
 
-public abstract class NvsTableEditorLabelProvider extends CellLabelProvider
+public abstract class NvsTableEditorLabelProvider extends ColumnLabelProvider
 {
 
 	protected NvsBeanValidator validator = new NvsBeanValidator();
@@ -45,7 +45,8 @@ public void update(ViewerCell cell)
 			cell.setForeground(null);
 			cell.setImage(null);
 		}
-		cell.setBackground(null);
+
+		cell.setBackground(getBackground(bean));
 	}
 
 	/**