Skip to content

Commit cc12431

Browse files
Refactor: Add more Java 17 features (switch expressions, more lambdas)
Co-authored-by: ChristianHoesel <[email protected]>
1 parent 4f0d5eb commit cc12431

File tree

3 files changed

+23
-35
lines changed
  • de.bitctrl.dav.toolset.appanalyzer/src/main/java/de/bitctrl/dav/toolset/appanalyzer
  • de.bitctrl.dav.toolset.kblister/src/main/java/de/bitctrl/dav/toolset/kblister
  • de.bitctrl.dav.toolset.parameter.klassufd/src/main/java/de/bitctrl/dav/toolset/parameter/klassufd

3 files changed

+23
-35
lines changed

de.bitctrl.dav.toolset.appanalyzer/src/main/java/de/bitctrl/dav/toolset/appanalyzer/MainView.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,12 @@ public void removeListDataListener(final ListDataListener l) {
9494

9595
final JButton exportButton = new JButton("Exportiere Anmeldungen");
9696
getContentPane().add(exportButton, BorderLayout.SOUTH);
97-
exportButton.addActionListener(new ActionListener() {
98-
99-
@Override
100-
public void actionPerformed(final ActionEvent e) {
101-
final JFileChooser fileChooser = new JFileChooser();
102-
if (fileChooser.showOpenDialog(MainView.this) == JFileChooser.APPROVE_OPTION) {
103-
final Exporter exporter = new Exporter(dav, applicationList, fileChooser.getSelectedFile(),
104-
onlySummary);
105-
exporter.start();
106-
}
97+
exportButton.addActionListener(e -> {
98+
var fileChooser = new JFileChooser();
99+
if (fileChooser.showOpenDialog(MainView.this) == JFileChooser.APPROVE_OPTION) {
100+
var exporter = new Exporter(dav, applicationList, fileChooser.getSelectedFile(),
101+
onlySummary);
102+
exporter.start();
107103
}
108104
});
109105
}

de.bitctrl.dav.toolset.kblister/src/main/java/de/bitctrl/dav/toolset/kblister/KbLister.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,21 @@ public void initialize(final ClientDavInterface connection) throws Exception {
7171

7272
final DataModel model = connection.getDataModel();
7373

74-
Set<ConfigurationArea> allKbSortedPerPid = new TreeSet<>(new Comparator<ConfigurationArea>() {
75-
76-
@Override
77-
public int compare(final ConfigurationArea o1, final ConfigurationArea o2) {
78-
return o1.getPid().compareTo(o2.getPid());
79-
}
80-
});
74+
var allKbSortedPerPid = new TreeSet<ConfigurationArea>(
75+
(o1, o2) -> o1.getPid().compareTo(o2.getPid()));
8176

8277
for (SystemObject obj : model.getTypeTypeObject().getElements()) {
83-
final SystemObjectType type = (SystemObjectType) obj;
84-
final TreeSet<ConfigurationArea> kbs = new TreeSet<>(new PidComparator());
78+
if (obj instanceof SystemObjectType type) {
79+
var kbs = new TreeSet<ConfigurationArea>(new PidComparator());
8580

86-
for (SystemObject element : type.getElements()) {
87-
final ConfigurationArea configurationArea = element.getConfigurationArea();
88-
kbs.add(configurationArea);
89-
allKbSortedPerPid.add(configurationArea);
90-
}
81+
for (SystemObject element : type.getElements()) {
82+
var configurationArea = element.getConfigurationArea();
83+
kbs.add(configurationArea);
84+
allKbSortedPerPid.add(configurationArea);
85+
}
9186

92-
results.put(type, kbs);
87+
results.put(type, kbs);
88+
}
9389
}
9490

9591
for (Entry<SystemObjectType, Set<ConfigurationArea>> result : results.entrySet()) {

de.bitctrl.dav.toolset.parameter.klassufd/src/main/java/de/bitctrl/dav/toolset/parameter/klassufd/UfdsSensorType.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,11 @@ public String getAttName() {
8787
* @return das Array
8888
*/
8989
public double[][] getDefaultStufen() {
90-
switch (this) {
91-
case NI:
92-
return UfdsSensorType.NI_STUFEN;
93-
case SW:
94-
return UfdsSensorType.SW_STUFEN;
95-
case WFD:
96-
return UfdsSensorType.WFD_STUFEN;
97-
default:
98-
return UfdsSensorType.EMPTY;
99-
}
90+
return switch (this) {
91+
case NI -> NI_STUFEN;
92+
case SW -> SW_STUFEN;
93+
case WFD -> WFD_STUFEN;
94+
default -> EMPTY;
95+
};
10096
}
10197
}

0 commit comments

Comments
 (0)