Skip to content

Commit 1f66ac6

Browse files
author
Tom Gottfried
committed
Proper typing of lists
Leverages compile time checks to avoid arbitrary objects in lists.
1 parent ceadacd commit 1f66ac6

File tree

3 files changed

+50
-49
lines changed

3 files changed

+50
-49
lines changed

‎src/de/bielefeld/umweltamt/aui/module/KlaerschlammAuswertung.java‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -681,14 +681,14 @@ else if (this.tabbedPane.getSelectedIndex() == 1)
681681
}
682682
}
683683

684-
private JList klaeranlagen;
684+
private JList<Klaeranlage> klaeranlagen;
685685
private JComboBox<Probeart> artBox;
686686
private JDateChooser vonDateChooser;
687687
private JDateChooser bisDateChooser;
688688

689689
private JPanel parameterPanel;
690-
private JList rightList;
691-
private JList leftList;
690+
private JList<Parameter> rightList;
691+
private JList<Parameter> leftList;
692692
private JButton submitButton;
693693

694694
private JComboBox<Parameter> parameterBox;
@@ -878,7 +878,7 @@ private TimeSeriesCollection createDataset(String axis)
878878

879879
// int parameterAnzahl;
880880
Einheiten einheit;
881-
JList paramList;
881+
JList<Parameter> paramList;
882882
String analyseVon;
883883
if (axis.equals(LEFT))
884884
{
@@ -922,7 +922,7 @@ private TimeSeriesCollection createDataset(String axis)
922922
}
923923

924924
private void createSeries(Probeart art, Klaeranlage ka,
925-
Einheiten einheit, JList paramList, String analyseVon,
925+
Einheiten einheit, JList<Parameter> paramList, String analyseVon,
926926
Date vonDate, Date bisDate, TimeSeriesCollection col)
927927
{
928928

@@ -932,8 +932,7 @@ private void createSeries(Probeart art, Klaeranlage ka,
932932
{
933933
for (int i = 0; i < paramList.getModel().getSize(); i++)
934934
{
935-
Parameter param = (Parameter) paramList.getModel()
936-
.getElementAt(i);
935+
Parameter param = paramList.getModel().getElementAt(i);
937936

938937
this.frame.changeStatus("Erzeuge Datenreihe für " + param + ", "
939938
+ ka);
@@ -969,14 +968,13 @@ private JDateChooser getBisDateChooser()
969968
return this.bisDateChooser;
970969
}
971970

972-
private JList getKlaeranlagen()
971+
private JList<Klaeranlage> getKlaeranlagen()
973972
{
974973
if (this.klaeranlagen == null)
975974
{
976975
List<Klaeranlage> all = Klaeranlage.getAll();
977-
DefaultListModel model = new DefaultListModel();
978-
this.klaeranlagen = new JList(model);
979-
this.klaeranlagen.setPrototypeCellValue("test");
976+
DefaultListModel<Klaeranlage> model = new DefaultListModel<>();
977+
this.klaeranlagen = new JList<>(model);
980978
this.klaeranlagen.setSelectionMode(
981979
ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
982980
for (Klaeranlage element : all)
@@ -1072,8 +1070,8 @@ private JPanel getParameterPanel()
10721070
builder.add(new JLabel("Erste Y-Achse"), cc.xy(1, 1));
10731071
builder.add(new JLabel("Zweite Y-Achse"), cc.xy(9, 1));
10741072

1075-
JList lList = getLeftList();
1076-
JList rList = getRightList();
1073+
JList<Parameter> lList = getLeftList();
1074+
JList<Parameter> rList = getRightList();
10771075
builder.add(new JScrollPane(lList),
10781076
cc.xywh(1, 3, 1, 15, "fill, fill"));
10791077
builder.add(new JScrollPane(rList),
@@ -1124,28 +1122,25 @@ private JPanel getParameterPanel()
11241122
return this.parameterPanel;
11251123
}
11261124

1127-
private JList getRightList()
1125+
private JList<Parameter> getRightList()
11281126
{
11291127
if (this.rightList == null)
11301128
{
1131-
DefaultListModel listModel = new DefaultListModel();
1132-
this.rightList = new JList(listModel);
1133-
this.rightList.setPrototypeCellValue("Abcdefghij (Ab)");
1134-
1129+
DefaultListModel<Parameter> listModel = new DefaultListModel<>();
1130+
this.rightList = new JList<>(listModel);
11351131
this.rightList
11361132
.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
11371133
}
11381134

11391135
return this.rightList;
11401136
}
11411137

1142-
private JList getLeftList()
1138+
private JList<Parameter> getLeftList()
11431139
{
11441140
if (this.leftList == null)
11451141
{
1146-
DefaultListModel listModel = new DefaultListModel();
1147-
this.leftList = new JList(listModel);
1148-
this.leftList.setPrototypeCellValue("Abcdefghij (Ab)");
1142+
DefaultListModel<Parameter> listModel = new DefaultListModel<>();
1143+
this.leftList = new JList<>(listModel);
11491144

11501145
this.leftList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
11511146
}
@@ -1177,8 +1172,9 @@ private JButton getLeftDeleteButton()
11771172
public void actionPerformed(ActionEvent e)
11781173
{
11791174
int index = getLeftList().getSelectedIndex();
1180-
DefaultListModel leftModel = ((DefaultListModel) getLeftList()
1181-
.getModel());
1175+
DefaultListModel<Parameter> leftModel
1176+
= (DefaultListModel<Parameter>) getLeftList()
1177+
.getModel();
11821178

11831179
if (index != -1)
11841180
{
@@ -1222,8 +1218,9 @@ private JButton getRightDeleteButton()
12221218
public void actionPerformed(ActionEvent e)
12231219
{
12241220
int index = getRightList().getSelectedIndex();
1225-
DefaultListModel rightModel = ((DefaultListModel) getRightList()
1226-
.getModel());
1221+
DefaultListModel<Parameter> rightModel
1222+
= (DefaultListModel<Parameter>) getRightList()
1223+
.getModel();
12271224

12281225
if (index != -1)
12291226
{
@@ -1361,9 +1358,11 @@ public void actionPerformed(ActionEvent e)
13611358

13621359
if (param != null)
13631360
{
1364-
DefaultListModel leftModel = (DefaultListModel) getLeftList()
1361+
DefaultListModel<Parameter> leftModel
1362+
= (DefaultListModel<Parameter>) getLeftList()
13651363
.getModel();
1366-
DefaultListModel rightModel = (DefaultListModel) getRightList()
1364+
DefaultListModel<Parameter> rightModel
1365+
= (DefaultListModel<Parameter>) getRightList()
13671366
.getModel();
13681367

13691368
if (direction.equals(LEFT))

‎src/de/bielefeld/umweltamt/aui/module/objektpanels/AbaVerfahrenPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void completeObjekt() {
162162

163163
}
164164

165-
private JList getLeftList()
165+
private JList<Abaverfahren> getLeftList()
166166
{
167167
if (this.leftList == null)
168168
{

‎src/de/bielefeld/umweltamt/aui/module/objektpanels/ProbepktAuswPanel.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ public class ProbepktAuswPanel extends JPanel {
116116
private static final String RIGHT = "right";
117117

118118
// Widgets
119-
private JList leftList;
120-
private JList rightList;
119+
private JList<Parameter> leftList;
120+
private JList<Parameter> rightList;
121121
private JButton submitButton;
122122

123123
private JButton leftDeleteButton;
@@ -189,8 +189,8 @@ public ProbepktAuswPanel(BasisObjektBearbeiten hauptModul) {
189189
builder.add(new JLabel("Erste Y-Achse"), cc.xyw(1, 7, 7));
190190
builder.add(new JLabel("Zweite Y-Achse"), cc.xy(15, 7));
191191

192-
JList lList = getLeftList();
193-
JList rList = getRightList();
192+
JList<Parameter> lList = getLeftList();
193+
JList<Parameter> rList = getRightList();
194194
builder.add(new JScrollPane(lList), cc.xywh(1, 9, 7, 15, "fill, fill"));
195195
builder
196196
.add(new JScrollPane(rList), cc.xywh(15, 9, 1, 15, "fill, fill"));
@@ -785,7 +785,7 @@ private TimeSeriesCollection createDataset(String axis) {
785785

786786
// int parameterAnzahl;
787787
Einheiten einheit;
788-
JList paramList;
788+
JList<Parameter> paramList;
789789
if (axis.equals(LEFT)) {
790790
// parameterAnzahl = getLeftList().getModel().getSize();
791791
einheit = (Einheiten) getLeftEinheitenBox().getSelectedItem();
@@ -815,7 +815,7 @@ private TimeSeriesCollection createDataset(String axis) {
815815
return col;
816816
}
817817

818-
private void createSeries(JList paramList, Messstelle pkt,
818+
private void createSeries(JList<Parameter> paramList, Messstelle pkt,
819819
Einheiten einheit, Date vonDate, Date bisDate,
820820
String analyseVon, TimeSeriesCollection col) {
821821

@@ -873,23 +873,21 @@ private JComboBox<String> getAnalyseVonBox() {
873873
return this.analyseVonBox;
874874
}
875875

876-
private JList getLeftList() {
876+
private JList<Parameter> getLeftList() {
877877
if (this.leftList == null) {
878-
DefaultListModel listModel = new DefaultListModel();
879-
this.leftList = new JList(listModel);
880-
this.leftList.setPrototypeCellValue("Abcdefghij (Ab)");
878+
DefaultListModel<Parameter> listModel = new DefaultListModel<>();
879+
this.leftList = new JList<>(listModel);
881880

882881
this.leftList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
883882
}
884883

885884
return this.leftList;
886885
}
887886

888-
private JList getRightList() {
887+
private JList<Parameter> getRightList() {
889888
if (this.rightList == null) {
890-
DefaultListModel listModel = new DefaultListModel();
891-
this.rightList = new JList(listModel);
892-
this.rightList.setPrototypeCellValue("Abcdefghij (Ab)");
889+
DefaultListModel<Parameter> listModel = new DefaultListModel<>();
890+
this.rightList = new JList<>(listModel);
893891

894892
this.rightList
895893
.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -932,8 +930,9 @@ private JButton getLeftDeleteButton() {
932930
@Override
933931
public void actionPerformed(ActionEvent e) {
934932
int index = getLeftList().getSelectedIndex();
935-
DefaultListModel leftModel = ((DefaultListModel) getLeftList()
936-
.getModel());
933+
DefaultListModel<Parameter> leftModel
934+
= (DefaultListModel<Parameter>) getLeftList()
935+
.getModel();
937936

938937
if (index != -1) {
939938
leftModel.remove(index);
@@ -968,8 +967,9 @@ private JButton getRightDeleteButton() {
968967
@Override
969968
public void actionPerformed(ActionEvent e) {
970969
int index = getRightList().getSelectedIndex();
971-
DefaultListModel rightModel = ((DefaultListModel) getRightList()
972-
.getModel());
970+
DefaultListModel<Parameter> rightModel
971+
= (DefaultListModel<Parameter>) getRightList()
972+
.getModel();
973973

974974
if (index != -1) {
975975
rightModel.remove(index);
@@ -1016,9 +1016,11 @@ public void actionPerformed(ActionEvent e) {
10161016
}
10171017

10181018
if (param != null) {
1019-
DefaultListModel leftModel = (DefaultListModel) getLeftList()
1019+
DefaultListModel<Parameter> leftModel
1020+
= (DefaultListModel<Parameter>) getLeftList()
10201021
.getModel();
1021-
DefaultListModel rightModel = (DefaultListModel) getRightList()
1022+
DefaultListModel<Parameter> rightModel
1023+
= (DefaultListModel<Parameter>) getRightList()
10221024
.getModel();
10231025

10241026
if (direction.equals(LEFT)) {

0 commit comments

Comments
 (0)