Connection edit wizard pages reorg

Former-commit-id: f38fb5f5

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java

@@ -61,7 +61,7 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
     @Nullable
     private DataSourceDescriptor dataSource;
     private final Set<DataSourceDescriptor> activated = new HashSet<DataSourceDescriptor>();
-    private IDialogPage[] subPages;
+    private IDialogPage[] subPages, extraPages;
 
     /**
      * Constructor for ConnectionPageSettings
@@ -282,10 +282,20 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
                     }
                 }
             }
+            if (extraPages != null) {
+                subPages = ArrayUtils.concatArrays(subPages, extraPages);
+            }
             return subPages;
         } else {
             return null;
         }
     }
 
+    public void addSubPage(IDialogPage page) {
+        if (extraPages == null) {
+            extraPages = new IDialogPage[] { page };
+        } else {
+            extraPages = ArrayUtils.concatArrays(extraPages, new IDialogPage[] { page });
+        }
+    }
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java

@@ -98,9 +98,9 @@ public class EditConnectionWizard extends ConnectionWizard
 
         addPage(pageGeneral);
         if (!embedded) {
-            addPage(pageNetwork);
+            pageSettings.addSubPage(pageNetwork);
         }
-        addPage(pageEvents);
+        pageSettings.addSubPage(pageEvents);
 
         addPreferencePage(new PrefPageMetaData(), "Metadata", "Metadata reading preferences");
         WizardPrefPage rsPage = addPreferencePage(new PrefPageResultSetMain(), "Result Sets", "Result Set preferences");

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

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2)
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.jkiss.dbeaver.ext.erd.editor;
+
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.ext.erd.model.EntityDiagram;
+import org.jkiss.dbeaver.ext.erd.part.DiagramPart;
+
+/**
+ * SVG exporter
+ */
+public class ERDExportSVG
+{
+    static final Log log = Log.getLog(ERDExportSVG.class);
+
+    private final EntityDiagram diagram;
+    private final DiagramPart diagramPart;
+
+    public ERDExportSVG(EntityDiagram diagram, DiagramPart diagramPart) {
+        this.diagram = diagram;
+        this.diagramPart = diagramPart;
+    }
+
+
+    public void exportToSVG(String filePath) {
+
+    }
+}