Implement district features to Simantics platform

[simantics/district.git] / org.simantics.district.imports.ui / src / org / simantics / district / imports / ui / CSVImportWizardPage.java

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
index 85eeb942d13af1dd470deaf9795fc35e710f85ec..71017b321b90d9486974021f75d01ca4a764b517 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
@@ -44,6 +44,7 @@ public class CSVImportWizardPage extends WizardPage implements FileSelectionList
     private Combo delimiterCombo;\r
     private TableColumnLayout tableColumnLayout;\r
     private TableViewer tableViewer;\r
+    private Composite tableComposite;\r
 \r
     protected CSVImportWizardPage(CSVImportModel model) {\r
         super("Import CSV Data");\r
@@ -94,37 +95,15 @@ public class CSVImportWizardPage extends WizardPage implements FileSelectionList
         });\r
         \r
         \r
-        Composite tableComposite = new Composite(composite, SWT.BORDER);\r
-        TreeColumnLayout treeColumnLayout = new TreeColumnLayout();\r
-        tableComposite.setLayout(treeColumnLayout);\r
-        \r
-        tableViewer = new TableViewer(tableComposite, SWT.V_SCROLL | SWT.H_SCROLL);\r
-        ColumnViewerToolTipSupport.enableFor(tableViewer);\r
-        tableViewer.setContentProvider(new IContentProvider() {\r
-            \r
-            @Override\r
-            public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {\r
-                \r
-            }\r
-            \r
-            @Override\r
-            public void dispose() {\r
-                \r
-            }\r
-        });\r
-        \r
-        Table table = tableViewer.getTable();\r
-        table.setHeaderVisible(true);\r
-        table.setLinesVisible(true);\r
-        \r
-        headerTable = new Table(tableComposite, SWT.NONE);\r
-        headerTable.setHeaderVisible(true);\r
-        headerTable.setLinesVisible(true);\r
-        GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(tableComposite);\r
+        tableComposite = new Composite(composite, SWT.BORDER);\r
+        tableColumnLayout = new TableColumnLayout();\r
+        tableComposite.setLayout(tableColumnLayout);\r
+\r
+        updateHeaders();\r
         \r
         setControl(composite);\r
         \r
-        updateHeaders();\r
+        \r
         \r
         setPageComplete(false);\r
     }\r
@@ -147,7 +126,12 @@ public class CSVImportWizardPage extends WizardPage implements FileSelectionList
     }\r
 \r
     private void updateHeaders() {\r
-        headerTable.setRedraw(false);\r
+        if (headerTable != null)\r
+            headerTable.dispose();\r
+        headerTable = new Table(tableComposite, SWT.NONE);\r
+        headerTable.setHeaderVisible(true);\r
+        headerTable.setLinesVisible(true);\r
+        GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(tableComposite);\r
         for (int i = 0; i < headerTable.getColumns().length; i++) {\r
             TableColumn column = headerTable.getColumns()[i];\r
             column.dispose();\r
@@ -179,7 +163,6 @@ public class CSVImportWizardPage extends WizardPage implements FileSelectionList
         } catch (IOException e) {\r
             setErrorMessage(e.getMessage());\r
         }\r
-        headerTable.setRedraw(true);\r
     }\r
 \r
 }\r