Elimination of compiler warnings.

[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 0035f6b7b5d9d2761e09e5d6865793f49483ba3c..3d121e7aca9d3889fad99e64c9db4ac861d4e70f 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
@@ -12,7 +12,6 @@ import org.eclipse.jface.dialogs.IPageChangeProvider;
 import org.eclipse.jface.dialogs.IPageChangedListener;
 import org.eclipse.jface.dialogs.PageChangedEvent;
 import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.wizard.IWizardContainer;
@@ -53,7 +52,6 @@ public class CSVImportWizardPage extends WizardPage {
     // Common for vertex and edge
     private DynamicComboFieldEditor componentMappingSelector;
     private DynamicComboFieldEditor idSelector;
-    private DynamicComboFieldEditor labelSelector;
     
     // For vertex import
     private DynamicComboFieldEditor xCoordSelector;
@@ -78,6 +76,8 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor flowAreaSelector;
     private DynamicComboFieldEditor nominalPressureLossSelector;
     private DynamicComboFieldEditor valvePositionSelector;
+    private DynamicComboFieldEditor addressSelector;
+    private DynamicComboFieldEditor lengthSelector;
 
     // For edge import
     private DynamicComboFieldEditor startXCoordSelector;
@@ -86,6 +86,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor endXCoordSelector;
     private DynamicComboFieldEditor endYCoordSelector;
     private DynamicComboFieldEditor endZValueSelector;
+    private DynamicComboFieldEditor detailedGeometrySelector;
 
     private Text edgeConnectionPadding;
     
@@ -298,7 +299,7 @@ public class CSVImportWizardPage extends WizardPage {
                 @Override
                 public void modifyText(ModifyEvent e) {
                     try {
-                        double padding = Double.parseDouble("");
+                        double padding = Double.parseDouble(edgeConnectionPadding.getText());
                         model.setEdgePapping(padding);
                     } catch (NumberFormatException ee) {
                         // ignore
@@ -639,6 +640,22 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        addressSelector = new DynamicComboFieldEditor("addressValue", "addressSelector", parent);
+        addressSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setAddressIndex(Integer.parseInt(addressSelector.getValue()));
+                validatePageComplete();
+            }
+        });
+        
+
     }
 
     private void createEdgeIndexMappingField(Group parent) {
@@ -733,6 +750,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        detailedGeometrySelector = new DynamicComboFieldEditor("detailedGeometryValue", "Geometry", parent);
+        detailedGeometrySelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.detailedGeometryIndex(Integer.parseInt(detailedGeometrySelector.getValue()));
+                validatePageComplete();
+            }
+        });
         diameterSelector = new DynamicComboFieldEditor("diameterValue", "Diameter value", parent);
         diameterSelector.addComboListener(new SelectionListener() {
 
@@ -831,6 +862,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        lengthSelector = new DynamicComboFieldEditor("lengthValue", "lengthSelector", parent);
+        lengthSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setLengthIndex(Integer.parseInt(lengthSelector.getValue()));
+                validatePageComplete();
+            }
+        });
     }
 
     private void updateCombos() {
@@ -864,6 +909,7 @@ public class CSVImportWizardPage extends WizardPage {
         endYCoordSelector.updateCombo(namesAndValues);
         startZValueSelector.updateCombo(namesAndValues);
         endZValueSelector.updateCombo(namesAndValues);
+        detailedGeometrySelector.updateCombo(namesAndValues);
         diameterSelector.updateCombo(namesAndValues);
         outerDiameterSelector.updateCombo(namesAndValues);
         nominalMassFlowSelector.updateCombo(namesAndValues);
@@ -871,6 +917,7 @@ public class CSVImportWizardPage extends WizardPage {
         kReturnSelector.updateCombo(namesAndValues);
         kSupplySelector.updateCombo(namesAndValues);
         tGroundSelector.updateCombo(namesAndValues);
+        lengthSelector.updateCombo(namesAndValues);
     }
 
     private void updateVertexCombos(String[][] namesAndValues) {
@@ -895,6 +942,7 @@ public class CSVImportWizardPage extends WizardPage {
         velocitySelector.updateCombo(namesAndValues);              
         flowAreaSelector.updateCombo(namesAndValues);              
         nominalPressureLossSelector.updateCombo(namesAndValues);   
+        addressSelector.updateCombo(namesAndValues);
     }
     
     
@@ -918,7 +966,7 @@ public class CSVImportWizardPage extends WizardPage {
         headerIndexAndValues.clear();
 
         try {
-            List<CSVRecord> rows = model.getRows(5);
+            List<CSVRecord> rows = model.getRows(5, false);
 
             for (int k = 0; k < rows.size(); k++) {
                 CSVRecord row = rows.get(k);