Commit f7a6dfb562244c06e100604820ae63e9e2e7de62
1 parent
94e1b3b5
Exists in
master
bugFix on VOTableCtrl
Showing
1 changed file
with
6 additions
and
5 deletions
Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java
@@ -24,11 +24,11 @@ import java.util.logging.Logger; | @@ -24,11 +24,11 @@ import java.util.logging.Logger; | ||
24 | 24 | ||
25 | import eu.omp.irap.vespa.epntapclient.votable.Consts; | 25 | import eu.omp.irap.vespa.epntapclient.votable.Consts; |
26 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException; | 26 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException; |
27 | -import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException; | ||
28 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.CantModifyVOTableException; | 27 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.CantModifyVOTableException; |
29 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.ErrorMessageInVOTableException; | 28 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.ErrorMessageInVOTableException; |
30 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.SeveralResourcesException; | 29 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.SeveralResourcesException; |
31 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.SeveralTablesException; | 30 | import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException.SeveralTablesException; |
31 | +import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException; | ||
32 | import eu.omp.irap.vespa.epntapclient.votable.data.VOTableDataCtrl; | 32 | import eu.omp.irap.vespa.epntapclient.votable.data.VOTableDataCtrl; |
33 | import eu.omp.irap.vespa.epntapclient.votable.model.Table; | 33 | import eu.omp.irap.vespa.epntapclient.votable.model.Table; |
34 | import eu.omp.irap.vespa.epntapclient.votable.model.VOTABLE; | 34 | import eu.omp.irap.vespa.epntapclient.votable.model.VOTABLE; |
@@ -114,11 +114,12 @@ public class VOTableController implements VOTableViewListener { | @@ -114,11 +114,12 @@ public class VOTableController implements VOTableViewListener { | ||
114 | 114 | ||
115 | Table table = (Table) voTable.getRESOURCE().get(0).getLINKAndTABLEOrRESOURCE().get(0); | 115 | Table table = (Table) voTable.getRESOURCE().get(0).getLINKAndTABLEOrRESOURCE().get(0); |
116 | 116 | ||
117 | - VOTableDataCtrl dataParser; | 117 | + VOTableDataCtrl dataCtrl; |
118 | try { | 118 | try { |
119 | - dataParser = new VOTableDataCtrl(table); | ||
120 | - voTableColumns = dataParser.getData().getColumnsName(); | ||
121 | - voTableData = dataParser.getData().getData(); | 119 | + dataCtrl = new VOTableDataCtrl(table); |
120 | + dataCtrl.parseData(); | ||
121 | + voTableColumns = dataCtrl.getData().getColumnsName(); | ||
122 | + voTableData = dataCtrl.getData().getData(); | ||
122 | } catch (IOException e) { | 123 | } catch (IOException e) { |
123 | throw new CantModifyVOTableException(voTablePath, e); | 124 | throw new CantModifyVOTableException(voTablePath, e); |
124 | } | 125 | } |