ERD actions fix.

PlainText presentation preferences

Former-commit-id: 4661f1e7

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java

@@ -106,4 +106,6 @@ public final class DBeaverPreferences
     public static final String RESULT_SET_DOUBLE_CLICK = "resultset.behavior.doubleClick"; //$NON-NLS-1$
     public static final String RESULT_SET_PRESENTATION = "resultset.presentation.active"; //$NON-NLS-1$
 
+    public static final String RESULT_TEXT_MAX_COLUMN_SIZE = "resultset.text.max.column.size"; //$NON-NLS-1$
+
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java

@@ -139,6 +139,7 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
       PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_SHOW_CELL_ICONS, true);
       PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_DOUBLE_CLICK, Spreadsheet.DoubleClickBehavior.INLINE_EDITOR.name());
       PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_AUTO_SWITCH_MODE, false);
+      PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_TEXT_MAX_COLUMN_SIZE, 255);
 
       // QM
       PrefUtils.setDefaultPreferenceValue(store, QMConstants.PROP_HISTORY_DAYS, 90);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java

@@ -55,7 +55,6 @@ import java.util.List;
  */
 public class PlainTextPresentation extends AbstractPresentation implements IAdaptable {
 
-    public static final int MAX_COLUMN_WIDTH = 255;
     public static final int FIRST_ROW_LINE = 2;
 
     private StyledText text;
@@ -191,6 +190,7 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
     }
 
     private void printGrid(boolean append) {
+        int maxColumnSize = getController().getPreferenceStore().getInt(DBeaverPreferences.RESULT_TEXT_MAX_COLUMN_SIZE);
         StringBuilder grid = new StringBuilder(512);
         ResultSetModel model = controller.getModel();
         List<DBDAttributeBinding> attrs = model.getVisibleAttributes();
@@ -210,8 +210,8 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
             }
             for (int i = 0; i < colWidths.length; i++) {
                 colWidths[i]++;
-                if (colWidths[i] > MAX_COLUMN_WIDTH) {
-                    colWidths[i] = MAX_COLUMN_WIDTH;
+                if (colWidths[i] > maxColumnSize) {
+                    colWidths[i] = maxColumnSize;
                 }
             }
         }

plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/action/ERDHandlerSaveImage.java

@@ -37,7 +37,7 @@ public class ERDHandlerSaveImage extends AbstractHandler {
         if (control != null) {
             ERDEditorPart editor = ERDEditorAdapter.getEditor(control);
             if (editor != null) {
-                editor.saveDiagramAsImage();
+                editor.saveDiagramAs();
             }
         }
         return null;

plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java

@@ -87,7 +87,6 @@ import org.jkiss.dbeaver.ui.controls.itemlist.ObjectSearcher;
 import org.jkiss.dbeaver.ui.dialogs.DialogUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;
-import org.jkiss.utils.xml.XMLBuilder;
 
 import java.io.FileOutputStream;
 import java.util.*;
@@ -256,7 +255,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
     @Override
     public void doSaveAs()
     {
-        saveDiagramAsImage();
+        saveDiagramAs();
     }
 
     /**
@@ -642,7 +641,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
         refreshDiagram();
     }
 
-    public void saveDiagramAsImage()
+    public void saveDiagramAs()
     {
         final Shell shell = getSite().getShell();
         FileDialog saveDialog = new FileDialog(shell, SWT.SAVE);
@@ -915,7 +914,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
                 toolBarManager.add(ActionUtils.makeCommandContribution(
                         getSite(),
                         IWorkbenchCommandConstants.FILE_SAVE_AS,
-                        "Save diagram as image",
+                        "Save diagram in external format",
                         UIIcon.PICTURE_SAVE));
                 toolBarManager.add(ActionUtils.makeCommandContribution(
                         getSite(),