From 686853d6c946d73a593999c312bbe24de4588028 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Fri, 29 May 2015 15:03:37 +0000
Subject: [PATCH] Plain text attribute names fix. Show column scale/precision.

Former-commit-id: d67b37b021258ac32bd815db9ed00f50abe5dec5
---
 .../model/impl/struct/AbstractAttribute.java   |  4 ++--
 .../plaintext/PlainTextPresentation.java       | 18 +++++++++++++-----
 .../resultset/spreadsheet/Spreadsheet.java     |  1 -
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/AbstractAttribute.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/AbstractAttribute.java
index 3eb41362bb..596455bdf5 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/AbstractAttribute.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/AbstractAttribute.java
@@ -146,7 +146,7 @@ public abstract class AbstractAttribute implements DBSAttributeBase
     }
 
     @Override
-    @Property(viewable = false, order = 60)
+    @Property(viewable = true, order = 60)
     public int getScale()
     {
         return scale;
@@ -158,7 +158,7 @@ public abstract class AbstractAttribute implements DBSAttributeBase
     }
 
     @Override
-    @Property(viewable = false, order = 61)
+    @Property(viewable = true, order = 61)
     public int getPrecision()
     {
         return precision;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
index ea5e7436a1..49739e4b93 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
@@ -202,7 +202,7 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
 
             for (int i = 0; i < attrs.size(); i++) {
                 DBDAttributeBinding attr = attrs.get(i);
-                colWidths[i] = attr.getName().length();
+                colWidths[i] = getAttributeName(attr).length();
                 for (ResultSetRow row : allRows) {
                     String displayString = getCellString(model, attr, row);
                     colWidths[i] = Math.max(colWidths[i], displayString.length());
@@ -220,7 +220,7 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
             // Print header
             for (int i = 0; i < attrs.size(); i++) {
                 DBDAttributeBinding attr = attrs.get(i);
-                String attrName = attr.getName();
+                String attrName = getAttributeName(attr);
                 grid.append(attrName);
                 for (int k = colWidths[i] - attrName.length(); k > 0; k--) {
                     grid.append(" ");
@@ -272,6 +272,14 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
         totalRows = allRows.size();
     }
 
+    private static String getAttributeName(DBDAttributeBinding attr) {
+        if (CommonUtils.isEmpty(attr.getLabel())) {
+            return attr.getName();
+        } else {
+            return attr.getLabel();
+        }
+    }
+
     private String getCellString(ResultSetModel model, DBDAttributeBinding attr, ResultSetRow row) {
         String displayString = attr.getValueHandler().getValueDisplayString(attr, model.getCellValue(attr, row), DBDDisplayFormat.EDIT);
         return TextUtils.getSingleLineString(displayString);
@@ -284,11 +292,11 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
         String[] values = new String[attrs.size()];
         ResultSetRow currentRow = controller.getCurrentRow();
 
-            // Calculate column widths
+        // Calculate column widths
         int nameWidth = 4, valueWidth = 5;
         for (int i = 0; i < attrs.size(); i++) {
             DBDAttributeBinding attr = attrs.get(i);
-            nameWidth = Math.max(nameWidth, attr.getName().length());
+            nameWidth = Math.max(nameWidth, getAttributeName(attr).length());
             values[i] = attr.getValueHandler().getValueDisplayString(attr, model.getCellValue(attr, currentRow), DBDDisplayFormat.EDIT);
             valueWidth = Math.max(valueWidth, values[i].length());
         }
@@ -307,7 +315,7 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
         // Values
         for (int i = 0; i < attrs.size(); i++) {
             DBDAttributeBinding attr = attrs.get(i);
-            String name = attr.getName();
+            String name = getAttributeName(attr);
             grid.append(name);
             for (int j = nameWidth - name.length(); j > 0; j--) {
                 grid.append(" ");
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java
index feb99b11f6..2db1da0b5c 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java
@@ -32,7 +32,6 @@ import org.eclipse.ui.IWorkbenchPartSite;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBeaverPreferences;
-import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.lightgrid.*;
 
 /**
-- 
GitLab