Commit aa2a59baa903072cbe2f79b3465290993a9a06da
1 parent
5105d11b
Exists in
master
[coding style] 2 blank lines before class constructors.
Showing
19 changed files
with
99 additions
and
0 deletions
Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java
... | ... | @@ -29,9 +29,11 @@ import eu.omp.irap.vespa.epntapclient.controller.EpnTapController; |
29 | 29 | * @author N. Jourdane |
30 | 30 | */ |
31 | 31 | public class EpnTapMainApp { |
32 | + | |
32 | 33 | /** The logger for the class EpnTapMainApp. */ |
33 | 34 | static final Logger logger = Logger.getLogger(EpnTapMainApp.class.getName()); |
34 | 35 | |
36 | + | |
35 | 37 | /** Constructor to hide the implicit public one. */ |
36 | 38 | private EpnTapMainApp() { |
37 | 39 | } |
... | ... | @@ -43,6 +45,7 @@ public class EpnTapMainApp { |
43 | 45 | */ |
44 | 46 | public static void main(final String[] args) { |
45 | 47 | SwingUtilities.invokeLater(new Runnable() { |
48 | + | |
46 | 49 | @Override |
47 | 50 | public void run() { |
48 | 51 | EpnTapMainApp.logger.info("Lauching EPN-TAP application..."); | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java
... | ... | @@ -35,6 +35,7 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Const; |
35 | 35 | * @author N. Jourdane |
36 | 36 | */ |
37 | 37 | public class EpnTapController implements MainViewListener { |
38 | + | |
38 | 39 | /** The logger for the class EpnTapController. */ |
39 | 40 | private Logger logger = Logger.getLogger(EpnTapController.class.getName()); |
40 | 41 | |
... | ... | @@ -58,6 +59,7 @@ public class EpnTapController implements MainViewListener { |
58 | 59 | */ |
59 | 60 | private Map<String, Object> paramValues = new HashMap<>(); |
60 | 61 | |
62 | + | |
61 | 63 | /** |
62 | 64 | * Method constructor, which initialize servicesController, resultsController and mainView. |
63 | 65 | */ | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Queries.java
... | ... | @@ -29,6 +29,7 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils.StringJoiner; |
29 | 29 | * @author N. Jourdane |
30 | 30 | */ |
31 | 31 | public final class Queries { |
32 | + | |
32 | 33 | /** The logger for the class Queries. */ |
33 | 34 | @SuppressWarnings("unused") |
34 | 35 | private Logger logger = Logger.getLogger(Queries.class.getName()); |
... | ... | @@ -47,6 +48,7 @@ public final class Queries { |
47 | 48 | + "1=ivo_nocasematch(detail_value, 'ivo://vopdc.obspm/std/EpnCore%') " |
48 | 49 | + "ORDER BY short_name, table_name"; |
49 | 50 | |
51 | + | |
50 | 52 | /** Constructor to hide the implicit public one. */ |
51 | 53 | private Queries() { |
52 | 54 | } | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/Dim.java
... | ... | @@ -22,24 +22,32 @@ package eu.omp.irap.vespa.epntapclient.view; |
22 | 22 | * @author N. Jourdane |
23 | 23 | */ |
24 | 24 | public class Dim { |
25 | + | |
25 | 26 | /** The width of the left panel (services view). */ |
26 | 27 | public static final int LEFT_PANEL_WIDTH = 400; |
28 | + | |
27 | 29 | /** The minimum width of the left panel (services view). */ |
28 | 30 | public static final int LEFT_PANEL_MIN_WIDTH = 150; |
31 | + | |
29 | 32 | /** The width of the right panel (request view). */ |
30 | 33 | public static final int RIGHT_PANEL_WIDTH = 400; |
34 | + | |
31 | 35 | /** The minimum width of the right panel (request view). */ |
32 | 36 | public static final int RIGHT_PANEL_MIN_WIDTH = 220; |
33 | 37 | |
34 | 38 | /** The height of the top panel (request view and services view). */ |
35 | 39 | public static final int TOP_PANEL_HEIGHT = 250; |
40 | + | |
36 | 41 | /** The minimum height of the top panel (request view and services view). */ |
37 | 42 | public static final int TOP_PANEL_MIN_HEIGHT = 190; |
43 | + | |
38 | 44 | /** The height of the bottom panel (result view). */ |
39 | 45 | public static final int BOTTOM_PANEL_HEIGHT = 150; |
46 | + | |
40 | 47 | /** The minimum height of the bottom panel (result view). */ |
41 | 48 | public static final int BOTTOM_PANEL_MIN_HEIGHT = 100; |
42 | 49 | |
50 | + | |
43 | 51 | /** Private constructor to hide the implicit public one. */ |
44 | 52 | private Dim() { |
45 | 53 | } | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/EpnTapMainView.java
... | ... | @@ -35,6 +35,7 @@ import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView; |
35 | 35 | * @author N. Jourdane |
36 | 36 | */ |
37 | 37 | public class EpnTapMainView extends JPanel { |
38 | + | |
38 | 39 | /** The logger for the class EpnTapMainView. */ |
39 | 40 | @SuppressWarnings("unused") |
40 | 41 | private static final Logger logger = Logger.getLogger(EpnTapMainView.class.getName()); |
... | ... | @@ -57,6 +58,7 @@ public class EpnTapMainView extends JPanel { |
57 | 58 | /** The listener of the EpnTapMainView (usually the main controller) */ |
58 | 59 | private MainViewListener mainViewListener; |
59 | 60 | |
61 | + | |
60 | 62 | /** |
61 | 63 | * The interface for the main view listener, which listen for events. |
62 | 64 | * |
... | ... | @@ -73,6 +75,7 @@ public class EpnTapMainView extends JPanel { |
73 | 75 | void event(Event event, Object... args); |
74 | 76 | } |
75 | 77 | |
78 | + | |
76 | 79 | /** |
77 | 80 | * The main view constructor, which create all the panels. |
78 | 81 | * | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java
... | ... | @@ -54,6 +54,7 @@ import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSe |
54 | 54 | * @author N. Jourdane |
55 | 55 | */ |
56 | 56 | public abstract class ParamField extends JPanel { |
57 | + | |
57 | 58 | /** The serial version UID. */ |
58 | 59 | private static final long serialVersionUID = 1L; |
59 | 60 | |
... | ... | @@ -93,6 +94,7 @@ public abstract class ParamField extends JPanel { |
93 | 94 | /** The parameter name of the field */ |
94 | 95 | protected String paramName; |
95 | 96 | |
97 | + | |
96 | 98 | /** |
97 | 99 | * Method constructor for the parameter field abstract class, which do all common action for all |
98 | 100 | * type of field, such as displaying the name of the parameter. |
... | ... | @@ -115,6 +117,7 @@ public abstract class ParamField extends JPanel { |
115 | 117 | // TODO: Add tooltip text based on rr.table_column.column_description |
116 | 118 | } |
117 | 119 | |
120 | + | |
118 | 121 | /** |
119 | 122 | * The string field is used for parameter with a `String` class. It is a simple JTextField with |
120 | 123 | * no verification. The parameter is sent to the controller each time it is modified. |
... | ... | @@ -122,12 +125,14 @@ public abstract class ParamField extends JPanel { |
122 | 125 | * @author N. Jourdane |
123 | 126 | */ |
124 | 127 | public static class StringField extends ParamField implements TextFieldListener { |
128 | + | |
125 | 129 | /** The serial version UID. */ |
126 | 130 | private static final long serialVersionUID = 1L; |
127 | 131 | |
128 | 132 | /** The JTextField used to put the parameter value. */ |
129 | 133 | JTextField field; |
130 | 134 | |
135 | + | |
131 | 136 | /** |
132 | 137 | * Method constructor for the string field. |
133 | 138 | * |
... | ... | @@ -162,12 +167,14 @@ public abstract class ParamField extends JPanel { |
162 | 167 | * @author N. Jourdane |
163 | 168 | */ |
164 | 169 | public static class FloatField extends ParamField implements TextFieldListener { |
170 | + | |
165 | 171 | /** The serial version UID. */ |
166 | 172 | private static final long serialVersionUID = 1L; |
167 | 173 | |
168 | 174 | /** The JTextField used to put the parameter value. */ |
169 | 175 | JTextField field; |
170 | 176 | |
177 | + | |
171 | 178 | /** |
172 | 179 | * Method constructor |
173 | 180 | * |
... | ... | @@ -210,6 +217,7 @@ public abstract class ParamField extends JPanel { |
210 | 217 | * @author N. Jourdane |
211 | 218 | */ |
212 | 219 | public static class DateRangeField extends ParamField implements TextFieldListener { |
220 | + | |
213 | 221 | /** The serial version UID. */ |
214 | 222 | private static final long serialVersionUID = 1L; |
215 | 223 | |
... | ... | @@ -219,6 +227,7 @@ public abstract class ParamField extends JPanel { |
219 | 227 | /** The JTextField used to put the parameter maximum value of the range. */ |
220 | 228 | JTextField fieldMax; |
221 | 229 | |
230 | + | |
222 | 231 | /** |
223 | 232 | * Method constructor |
224 | 233 | * |
... | ... | @@ -277,6 +286,7 @@ public abstract class ParamField extends JPanel { |
277 | 286 | * @author N. Jourdane |
278 | 287 | */ |
279 | 288 | public static class FloatRangeField extends ParamField implements TextFieldListener { |
289 | + | |
280 | 290 | /** The serial version UID. */ |
281 | 291 | private static final long serialVersionUID = 1L; |
282 | 292 | |
... | ... | @@ -286,6 +296,7 @@ public abstract class ParamField extends JPanel { |
286 | 296 | /** The JTextField used to put the parameter maximum value of the range. */ |
287 | 297 | JTextField fieldMax; |
288 | 298 | |
299 | + | |
289 | 300 | /** |
290 | 301 | * Method constructor |
291 | 302 | * |
... | ... | @@ -334,6 +345,7 @@ public abstract class ParamField extends JPanel { |
334 | 345 | * @author N. Jourdane |
335 | 346 | */ |
336 | 347 | public static class TargetNameField extends ParamField implements TextFieldListener { |
348 | + | |
337 | 349 | /** The serial version UID. */ |
338 | 350 | private static final long serialVersionUID = 1L; |
339 | 351 | |
... | ... | @@ -355,6 +367,7 @@ public abstract class ParamField extends JPanel { |
355 | 367 | * impossible to modify the comboBox from a DocumentEvent. |
356 | 368 | */ |
357 | 369 | Runnable updateComboBox = new Runnable() { |
370 | + | |
358 | 371 | @Override |
359 | 372 | public void run() { |
360 | 373 | String content = field.getText(); |
... | ... | @@ -381,6 +394,7 @@ public abstract class ParamField extends JPanel { |
381 | 394 | } |
382 | 395 | }; |
383 | 396 | |
397 | + | |
384 | 398 | /** |
385 | 399 | * Method constructor |
386 | 400 | * |
... | ... | @@ -441,12 +455,14 @@ public abstract class ParamField extends JPanel { |
441 | 455 | * @author N. Jourdane |
442 | 456 | */ |
443 | 457 | public static class DataProductTypeField extends ParamField { |
458 | + | |
444 | 459 | /** The serial version UID. */ |
445 | 460 | private static final long serialVersionUID = 1L; |
446 | 461 | |
447 | 462 | /** The comboBox used to select the data product type. */ |
448 | 463 | JComboBox<DataProductType> comboBox; |
449 | 464 | |
465 | + | |
450 | 466 | /** |
451 | 467 | * An enumeration of all available data product types. Each values comes with an id because |
452 | 468 | * EPN-TAP table can possibly be filled with the id instead of the name, so the query have |
... | ... | @@ -469,6 +485,7 @@ public abstract class ParamField extends JPanel { |
469 | 485 | /** The id of the data product type, such as `ds`. */ |
470 | 486 | private String id = ""; |
471 | 487 | |
488 | + | |
472 | 489 | /** |
473 | 490 | * Method constructor for the enumeration. |
474 | 491 | * |
... | ... | @@ -498,6 +515,7 @@ public abstract class ParamField extends JPanel { |
498 | 515 | } |
499 | 516 | } |
500 | 517 | |
518 | + | |
501 | 519 | /** |
502 | 520 | * Method constructor |
503 | 521 | * |
... | ... | @@ -511,6 +529,7 @@ public abstract class ParamField extends JPanel { |
511 | 529 | comboBox.setPreferredSize( |
512 | 530 | new Dimension(ParamField.MIN_FIELD_WIDTH, ParamField.FIELD_HEIGHT)); |
513 | 531 | comboBox.addActionListener(new ActionListener() { |
532 | + | |
514 | 533 | @Override |
515 | 534 | public void actionPerformed(ActionEvent e) { |
516 | 535 | update(); |
... | ... | @@ -542,12 +561,14 @@ public abstract class ParamField extends JPanel { |
542 | 561 | * @author N. Jourdane |
543 | 562 | */ |
544 | 563 | public static class TargetClassField extends ParamField { |
564 | + | |
545 | 565 | /** The serial version UID. */ |
546 | 566 | private static final long serialVersionUID = 1L; |
547 | 567 | |
548 | 568 | /** The comboBox used to select the target class. */ |
549 | 569 | JComboBox<TargetClass> comboBox; |
550 | 570 | |
571 | + | |
551 | 572 | /** |
552 | 573 | * An enumeration of all available target classes. |
553 | 574 | * |
... | ... | @@ -564,6 +585,7 @@ public abstract class ParamField extends JPanel { |
564 | 585 | /** The name of the target class. */ |
565 | 586 | String name; |
566 | 587 | |
588 | + | |
567 | 589 | /** |
568 | 590 | * Method constructor for the enumeration. |
569 | 591 | * |
... | ... | @@ -581,6 +603,7 @@ public abstract class ParamField extends JPanel { |
581 | 603 | } |
582 | 604 | } |
583 | 605 | |
606 | + | |
584 | 607 | /** |
585 | 608 | * Method constructor |
586 | 609 | * |
... | ... | @@ -593,6 +616,7 @@ public abstract class ParamField extends JPanel { |
593 | 616 | comboBox.setPreferredSize( |
594 | 617 | new Dimension(ParamField.MIN_FIELD_WIDTH, ParamField.FIELD_HEIGHT)); |
595 | 618 | comboBox.addActionListener(new ActionListener() { |
619 | + | |
596 | 620 | @Override |
597 | 621 | public void actionPerformed(ActionEvent e) { |
598 | 622 | update(); |
... | ... | @@ -622,6 +646,7 @@ public abstract class ParamField extends JPanel { |
622 | 646 | * @author N. Jourdane |
623 | 647 | */ |
624 | 648 | interface TextFieldListener { |
649 | + | |
625 | 650 | /** |
626 | 651 | * When the content of the JTextField is updated. |
627 | 652 | * |
... | ... | @@ -631,6 +656,7 @@ public abstract class ParamField extends JPanel { |
631 | 656 | void update(JTextField field); |
632 | 657 | } |
633 | 658 | |
659 | + | |
634 | 660 | /** |
635 | 661 | * To add the listener. @see TextFieldListener |
636 | 662 | * |
... | ... | @@ -639,6 +665,7 @@ public abstract class ParamField extends JPanel { |
639 | 665 | */ |
640 | 666 | static void addChangeListener(final TextFieldListener changeListener, final JTextField field) { |
641 | 667 | field.getDocument().addDocumentListener(new DocumentListener() { |
668 | + | |
642 | 669 | @Override |
643 | 670 | public void removeUpdate(DocumentEvent de) { |
644 | 671 | changeListener.update(field); | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/BottomBarPanel.java
... | ... | @@ -29,6 +29,7 @@ import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView; |
29 | 29 | * @author N. Jourdane |
30 | 30 | */ |
31 | 31 | public class BottomBarPanel extends JPanel { |
32 | + | |
32 | 33 | /** The serial version UID. */ |
33 | 34 | private static final long serialVersionUID = 1L; |
34 | 35 | |
... | ... | @@ -39,6 +40,7 @@ public class BottomBarPanel extends JPanel { |
39 | 40 | /** A label to display several informations (aka. status bar). */ |
40 | 41 | private JLabel infoLabel; |
41 | 42 | |
43 | + | |
42 | 44 | /** |
43 | 45 | * Method constructor for the bottom bar panel. |
44 | 46 | * | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java
... | ... | @@ -45,6 +45,7 @@ import eu.omp.irap.vespa.epntapclient.view.ParamField.TargetNameField; |
45 | 45 | * @author N. Jourdane |
46 | 46 | */ |
47 | 47 | public class RequestPanel extends JPanel implements ActionListener { |
48 | + | |
48 | 49 | /** The logger for the class RequestView. */ |
49 | 50 | @SuppressWarnings("unused") |
50 | 51 | private static final Logger logger = Logger.getLogger(RequestPanel.class.getName()); |
... | ... | @@ -69,6 +70,7 @@ public class RequestPanel extends JPanel implements ActionListener { |
69 | 70 | /** The height of the buttons panel. */ |
70 | 71 | private static final int BUTTON_PANEL_HEIGHT = 20; |
71 | 72 | |
73 | + | |
72 | 74 | /** |
73 | 75 | * Method constructor |
74 | 76 | * | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ResultsPanel.java
... | ... | @@ -30,6 +30,7 @@ import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView; |
30 | 30 | * @author N. Jourdane |
31 | 31 | */ |
32 | 32 | public class ResultsPanel extends JPanel { |
33 | + | |
33 | 34 | /** */ |
34 | 35 | private static final long serialVersionUID = -3387526562625069156L; |
35 | 36 | |
... | ... | @@ -37,6 +38,7 @@ public class ResultsPanel extends JPanel { |
37 | 38 | @SuppressWarnings("unused") |
38 | 39 | private static final Logger logger = Logger.getLogger(ResultsPanel.class.getName()); |
39 | 40 | |
41 | + | |
40 | 42 | /** |
41 | 43 | * Method constructor which customize the result panel, but don't build it from scratch since |
42 | 44 | * VOTableView is already created by ResultController. | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java
... | ... | @@ -33,6 +33,7 @@ import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView; |
33 | 33 | * @author N. Jourdane |
34 | 34 | */ |
35 | 35 | public class ServicesPanel extends JPanel { |
36 | + | |
36 | 37 | /** The serial version UID. */ |
37 | 38 | private static final long serialVersionUID = 1L; |
38 | 39 | |
... | ... | @@ -43,6 +44,7 @@ public class ServicesPanel extends JPanel { |
43 | 44 | /** The generic view of the VOTable panel. */ |
44 | 45 | private VOTableView voTableView; |
45 | 46 | |
47 | + | |
46 | 48 | /** |
47 | 49 | * Method constructor which customize the services panel, but don't build it from scratch since |
48 | 50 | * VOTableView is already created by ServicesController. Add also the JTable listener. |
... | ... | @@ -62,6 +64,7 @@ public class ServicesPanel extends JPanel { |
62 | 64 | // TODO: Support multi-selection |
63 | 65 | this.voTableView.getTable().getSelectionModel() |
64 | 66 | .addListSelectionListener(new ListSelectionListener() { |
67 | + | |
65 | 68 | @Override |
66 | 69 | public void valueChanged(ListSelectionEvent evt) { |
67 | 70 | mainView.event(Event.SERVICE_SELECTED, | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java
... | ... | @@ -33,9 +33,11 @@ import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException; |
33 | 33 | * @author N. Jourdane |
34 | 34 | */ |
35 | 35 | public class VOTableApp { |
36 | + | |
36 | 37 | /** The logger for the class VOTableApp. */ |
37 | 38 | static final Logger logger = Logger.getLogger(VOTableApp.class.getName()); |
38 | 39 | |
40 | + | |
39 | 41 | /** Private constructor to hide the implicit public one. */ |
40 | 42 | private VOTableApp() { |
41 | 43 | } |
... | ... | @@ -59,6 +61,7 @@ public class VOTableApp { |
59 | 61 | */ |
60 | 62 | public static void main(final String[] args) { |
61 | 63 | SwingUtilities.invokeLater(new Runnable() { |
64 | + | |
62 | 65 | @Override |
63 | 66 | public void run() { |
64 | 67 | // TODO: Add option to export to CSV and HTML in CLI. | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableConnection.java
... | ... | @@ -44,12 +44,14 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Const; |
44 | 44 | * @author N. Jourdane |
45 | 45 | */ |
46 | 46 | public final class VOTableConnection { |
47 | + | |
47 | 48 | /** The logger for the class VOTableConnection. */ |
48 | 49 | private static final Logger logger = Logger.getLogger(VOTableConnection.class.getName()); |
49 | 50 | |
50 | 51 | /** The user agent used for the requests. */ |
51 | 52 | private static final String USER_AGENT = "Mozilla/5.0"; |
52 | 53 | |
54 | + | |
53 | 55 | /** Constructor to hide the implicit public one. */ |
54 | 56 | private VOTableConnection() { |
55 | 57 | } | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java
... | ... | @@ -33,6 +33,7 @@ import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView; |
33 | 33 | * @author N. Jourdane |
34 | 34 | */ |
35 | 35 | public class VOTableController { |
36 | + | |
36 | 37 | /** The logger for the class VOTableController. */ |
37 | 38 | private static final Logger logger = Logger.getLogger(VOTableController.class.getName()); |
38 | 39 | |
... | ... | @@ -42,6 +43,7 @@ public class VOTableController { |
42 | 43 | /** The VOTable model */ |
43 | 44 | VOTABLE voTable; |
44 | 45 | |
46 | + | |
45 | 47 | /** |
46 | 48 | * Method constructor |
47 | 49 | */ | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
... | ... | @@ -39,6 +39,7 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils; |
39 | 39 | * @author N. Jourdane |
40 | 40 | */ |
41 | 41 | public class VOTableDataParser { |
42 | + | |
42 | 43 | /** The logger for the class VOTableDataParser. */ |
43 | 44 | private static final Logger logger = Logger.getLogger(VOTableDataParser.class.getName()); |
44 | 45 | |
... | ... | @@ -57,6 +58,7 @@ public class VOTableDataParser { |
57 | 58 | /** The index of the current position in the bytes array. */ |
58 | 59 | private int cursor; |
59 | 60 | |
61 | + | |
60 | 62 | /** |
61 | 63 | * In VOTables, data can be stored in 4 different serializations: BINARY, BINARY2, TABLEDATA and |
62 | 64 | * FITS. This class aims to provide a unique way to get the data table, regardless of its | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableException.java
... | ... | @@ -25,9 +25,11 @@ import java.io.IOException; |
25 | 25 | * @author N. Jourdane |
26 | 26 | */ |
27 | 27 | public abstract class VOTableException extends Exception { |
28 | + | |
28 | 29 | /** The serial version UID. */ |
29 | 30 | private static final long serialVersionUID = 1L; |
30 | 31 | |
32 | + | |
31 | 33 | /** |
32 | 34 | * @param message The message describing the exception displayed in the error dialog. |
33 | 35 | */ |
... | ... | @@ -43,12 +45,14 @@ public abstract class VOTableException extends Exception { |
43 | 45 | super(message, e); |
44 | 46 | } |
45 | 47 | |
48 | + | |
46 | 49 | /** Abstract exception for when the application can not send the query. */ |
47 | 50 | public abstract static class CantSendQueryException extends VOTableException { |
48 | 51 | |
49 | 52 | /** */ |
50 | 53 | private static final long serialVersionUID = 1L; |
51 | 54 | |
55 | + | |
52 | 56 | /** |
53 | 57 | * @param message The message describing the exception displayed in the error dialog. |
54 | 58 | */ |
... | ... | @@ -64,12 +68,14 @@ public abstract class VOTableException extends Exception { |
64 | 68 | super(message, e); |
65 | 69 | } |
66 | 70 | |
71 | + | |
67 | 72 | /** The URL is not correctly formated. */ |
68 | 73 | public static class MalformedURLException extends CantSendQueryException { |
69 | 74 | |
70 | 75 | /** */ |
71 | 76 | private static final long serialVersionUID = 1L; |
72 | 77 | |
78 | + | |
73 | 79 | /** |
74 | 80 | * @param uri The URI sent to the server. |
75 | 81 | * @param e The exception thrown. |
... | ... | @@ -85,6 +91,7 @@ public abstract class VOTableException extends Exception { |
85 | 91 | /** */ |
86 | 92 | private static final long serialVersionUID = 1L; |
87 | 93 | |
94 | + | |
88 | 95 | /** |
89 | 96 | * @param resultFilePath The path of the file where the query results should be stored. |
90 | 97 | * @param e The exception thrown. |
... | ... | @@ -100,6 +107,7 @@ public abstract class VOTableException extends Exception { |
100 | 107 | /** */ |
101 | 108 | private static final long serialVersionUID = 1L; |
102 | 109 | |
110 | + | |
103 | 111 | /** |
104 | 112 | * @param uri The URI sent to the server. |
105 | 113 | * @param e The exception thrown. |
... | ... | @@ -115,6 +123,7 @@ public abstract class VOTableException extends Exception { |
115 | 123 | /** */ |
116 | 124 | private static final long serialVersionUID = 1L; |
117 | 125 | |
126 | + | |
118 | 127 | /** |
119 | 128 | * @param uri The URI sent to the server. |
120 | 129 | * @param e The exception thrown. |
... | ... | @@ -130,6 +139,7 @@ public abstract class VOTableException extends Exception { |
130 | 139 | /** */ |
131 | 140 | private static final long serialVersionUID = 1L; |
132 | 141 | |
142 | + | |
133 | 143 | /** |
134 | 144 | * @param uri The URI sent to the server. |
135 | 145 | * @param responseCode The HTTP GET response code, which is bad. |
... | ... | @@ -146,6 +156,7 @@ public abstract class VOTableException extends Exception { |
146 | 156 | /** */ |
147 | 157 | private static final long serialVersionUID = 1L; |
148 | 158 | |
159 | + | |
149 | 160 | /** |
150 | 161 | * @param uri The URI sent to the server. |
151 | 162 | * @param e The exception thrown. |
... | ... | @@ -164,6 +175,7 @@ public abstract class VOTableException extends Exception { |
164 | 175 | /** */ |
165 | 176 | private static final long serialVersionUID = 1L; |
166 | 177 | |
178 | + | |
167 | 179 | /** |
168 | 180 | * @param message The message describing the exception displayed in the error dialog. |
169 | 181 | * @param e The exception thrown. |
... | ... | @@ -179,12 +191,14 @@ public abstract class VOTableException extends Exception { |
179 | 191 | super(message); |
180 | 192 | } |
181 | 193 | |
194 | + | |
182 | 195 | /** Can not parse the VOTable because it doesn't match with the VOTable schema. */ |
183 | 196 | public static class VOTableIsNotValidException extends CantDisplayVOTableException { |
184 | 197 | |
185 | 198 | /** */ |
186 | 199 | private static final long serialVersionUID = 1L; |
187 | 200 | |
201 | + | |
188 | 202 | /** |
189 | 203 | * @param voTablePath The path of the VOTable. |
190 | 204 | * @param e The exception thrown. |
... | ... | @@ -201,6 +215,7 @@ public abstract class VOTableException extends Exception { |
201 | 215 | /** */ |
202 | 216 | private static final long serialVersionUID = 1L; |
203 | 217 | |
218 | + | |
204 | 219 | /** |
205 | 220 | * @param voTablePath The path of the VOTable. |
206 | 221 | */ |
... | ... | @@ -216,6 +231,7 @@ public abstract class VOTableException extends Exception { |
216 | 231 | /** */ |
217 | 232 | private static final long serialVersionUID = 1L; |
218 | 233 | |
234 | + | |
219 | 235 | /** |
220 | 236 | * @param voTablePath The path of the VOTable. |
221 | 237 | */ |
... | ... | @@ -227,9 +243,11 @@ public abstract class VOTableException extends Exception { |
227 | 243 | |
228 | 244 | /** Can not change schema location on the VOTable file. */ |
229 | 245 | public static class CantModifyVOTableException extends CantDisplayVOTableException { |
246 | + | |
230 | 247 | /** */ |
231 | 248 | private static final long serialVersionUID = 1L; |
232 | 249 | |
250 | + | |
233 | 251 | /** |
234 | 252 | * @param voTablePath The path of the VOTable. |
235 | 253 | * @param e The exception thrown. |
... | ... | @@ -241,9 +259,11 @@ public abstract class VOTableException extends Exception { |
241 | 259 | |
242 | 260 | /** There is an error in the VOTable. */ |
243 | 261 | public static class ErrorMessageInVOTableException extends CantDisplayVOTableException { |
262 | + | |
244 | 263 | /** */ |
245 | 264 | private static final long serialVersionUID = 1L; |
246 | 265 | |
266 | + | |
247 | 267 | /** |
248 | 268 | * @param errorInfo The information about the error, which comes from the VOTable itself |
249 | 269 | * from the "INFO" node. | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java
... | ... | @@ -45,6 +45,7 @@ import eu.omp.irap.vespa.epntapclient.votable.model.VOTABLE; |
45 | 45 | * @author N. Jourdane |
46 | 46 | */ |
47 | 47 | public final class VOTableParser { |
48 | + | |
48 | 49 | /** The logger for the class VOTableParser. */ |
49 | 50 | private static final Logger logger = Logger.getLogger(VOTableParser.class.getName()); |
50 | 51 | |
... | ... | @@ -60,6 +61,7 @@ public final class VOTableParser { |
60 | 61 | /** The VOTable package where are the generated .java which represents the VOTable model. */ |
61 | 62 | private static final String VOTABLE_MODEL_PACKAGE = "eu.omp.irap.vespa.epntapclient.votable.model"; |
62 | 63 | |
64 | + | |
63 | 65 | /** Constructor to hide the implicit public one. */ |
64 | 66 | private VOTableParser() { |
65 | 67 | } | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Const.java
... | ... | @@ -22,6 +22,7 @@ package eu.omp.irap.vespa.epntapclient.votable.utils; |
22 | 22 | * @author N. Jourdane |
23 | 23 | */ |
24 | 24 | public class Const { |
25 | + | |
25 | 26 | /** The character set used (for http requests, writing in files, etc.). */ |
26 | 27 | public static final String CHARACTER_SET = "UTF-8"; |
27 | 28 | |
... | ... | @@ -35,6 +36,7 @@ public class Const { |
35 | 36 | // http://gavo.aip.de/tap |
36 | 37 | // http://voparis-cdpp.obspm.fr/tap |
37 | 38 | |
39 | + | |
38 | 40 | /** Constructor to hide the implicit public one. */ |
39 | 41 | private Const() { |
40 | 42 | } | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Utils.java
... | ... | @@ -29,13 +29,16 @@ import com.google.gson.GsonBuilder; |
29 | 29 | * @author N. Jourdane |
30 | 30 | */ |
31 | 31 | public class Utils { |
32 | + | |
32 | 33 | /** The logger for the class Utils. */ |
33 | 34 | private static final Logger logger = Logger.getLogger(Utils.class.getName()); |
34 | 35 | |
36 | + | |
35 | 37 | /** Private constructor to hide the implicit public one. */ |
36 | 38 | private Utils() { |
37 | 39 | } |
38 | 40 | |
41 | + | |
39 | 42 | /** |
40 | 43 | * StringJoiner has the same purpose of Java 8 StringJoiner, it has been rewritten for Java7 |
41 | 44 | * compatibility. |
... | ... | @@ -43,13 +46,17 @@ public class Utils { |
43 | 46 | * @author N. Jourdane |
44 | 47 | */ |
45 | 48 | public static class StringJoiner { |
49 | + | |
46 | 50 | /** A list of words to join, ie. ["foo", "bar"]. */ |
47 | 51 | List<String> list; |
52 | + | |
48 | 53 | /** The string joiner separator to put between each word, ie. ';'. */ |
49 | 54 | String separator; |
55 | + | |
50 | 56 | /** The resulting string, ie. "foo;bar". */ |
51 | 57 | String string; |
52 | 58 | |
59 | + | |
53 | 60 | /** |
54 | 61 | * Method constructor for the String joiner. |
55 | 62 | * |
... | ... | @@ -80,6 +87,7 @@ public class Utils { |
80 | 87 | } |
81 | 88 | } |
82 | 89 | |
90 | + | |
83 | 91 | /** |
84 | 92 | * Print the specified object in JSON format in a file on the temporary directory. |
85 | 93 | * | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java
... | ... | @@ -36,6 +36,7 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils; |
36 | 36 | * @author N. Jourdane |
37 | 37 | */ |
38 | 38 | public class VOTableView extends JPanel implements TableModelListener { |
39 | + | |
39 | 40 | /** The logger for the class VOTableView. */ |
40 | 41 | static final Logger logger = Logger.getLogger(VOTableView.class.getName()); |
41 | 42 | |
... | ... | @@ -49,14 +50,17 @@ public class VOTableView extends JPanel implements TableModelListener { |
49 | 50 | /** The DataModel representing the VOTable data in the JTable element. */ |
50 | 51 | private DefaultTableModel tableData; |
51 | 52 | |
53 | + | |
52 | 54 | /** |
53 | 55 | * Method constructor |
54 | 56 | */ |
55 | 57 | public VOTableView() { |
56 | 58 | tableData = new DefaultTableModel() { |
59 | + | |
57 | 60 | /** The serial version UID. */ |
58 | 61 | private static final long serialVersionUID = 1L; |
59 | 62 | |
63 | + | |
60 | 64 | @Override |
61 | 65 | public boolean isCellEditable(int row, int column) { |
62 | 66 | return false; | ... | ... |