Skip to content

Commit

Permalink
More Java 17 conversions
Browse files Browse the repository at this point in the history 
Signed-off-by: Taylor Smock <[email protected]>
  • Loading branch information
@tsmock
tsmock committed Jul 31, 2023
1 parent e096e6b commit e5e6a6a
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 62 deletions.
39 changes: 26 additions & 13 deletions src/org/openstreetmap/josm/plugins/todo/TodoDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import static org.openstreetmap.josm.tools.I18n.tr;

import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.Serial;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -65,6 +66,7 @@
*/
public class TodoDialog extends ToggleDialog implements PropertyChangeListener, LayerChangeListener {

@Serial
private static final long serialVersionUID = 3590739974800809827L;

private final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
Expand Down Expand Up @@ -109,35 +111,35 @@ protected void buildContentPanel() {
lstPrimitives.setTransferHandler(null);

// the select action
SideButton selectButton = new SideButton(actSelect);
final var selectButton = new SideButton(actSelect);
lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
actSelect.updateEnabledState();

// the add button
SideButton addButton = new SideButton(actAdd);
final var addButton = new SideButton(actAdd);
actAdd.updateEnabledState();

// the clear and add button
addButton.createArrow(l -> showPopupMenu(addButton, actClearAndAdd), true);

// the pass button
SideButton passButton = new SideButton(actPass);
final var passButton = new SideButton(actPass);
lstPrimitives.getSelectionModel().addListSelectionListener(actPass);

// the mark button
SideButton markButton = new SideButton(actMark);
final var markButton = new SideButton(actMark);
lstPrimitives.getSelectionModel().addListSelectionListener(actMark);

// the mark from map button
SideButton markSelectedButton = new SideButton(actMarkSelected);
final var markSelectedButton = new SideButton(actMarkSelected);

createLayout(lstPrimitives, true, Arrays.asList(selectButton, addButton, passButton, markButton, markSelectedButton));
}

private static void showPopupMenu(Component parent, Object... menuItems) {
final JPopupMenu menu = new JPopupMenu();
final Rectangle box = parent.getBounds();
for (Object item : menuItems) {
final var menu = new JPopupMenu();
final var box = parent.getBounds();
for (var item : menuItems) {
if (item instanceof Action) {
menu.add((Action) item);
} else {
Expand All @@ -160,13 +162,13 @@ private static void zoom(Layer layer) {
}
}

protected static void selectAndZoom(TodoListItem object) {
static void selectAndZoom(TodoListItem object) {
if (object == null) return;
object.layer().getDataSet().setSelected(object.primitive());
zoom(object.layer());
}

protected static void selectAndZoom(Collection<TodoListItem> object) {
static void selectAndZoom(Collection<TodoListItem> object) {
if (object == null || object.isEmpty()) return;
Map<AbstractOsmDataLayer, Set<IPrimitive>> sorted = object.stream()
.collect(Collectors.groupingBy(TodoListItem::layer, Collectors.mapping(TodoListItem::primitive, Collectors.toSet())));
Expand Down Expand Up @@ -209,10 +211,10 @@ public void hideNotify() {
SelectionEventManager.getInstance().removeSelectionListener(actMarkSelected);
}

protected Collection<TodoListItem> getItems() {
Collection<TodoListItem> getItems() {
OsmDataLayer layer = MainApplication.getLayerManager().getActiveDataLayer();
if (layer == null)
return null;
return Collections.emptyList();

return layer.getDataSet().getSelected().stream().map(primitive -> new TodoListItem(layer, primitive)).collect(Collectors.toList());
}
Expand All @@ -227,6 +229,7 @@ private void runWithPrototype(Runnable runnable) {
}

private static class SelectAction extends JosmAction implements ListSelectionListener {
@Serial
private static final long serialVersionUID = -1857091860257862231L;
private final TodoListModel model;

Expand Down Expand Up @@ -263,6 +266,7 @@ public void valueChanged(ListSelectionEvent e) {
}

private static class SelectUnmarkedAction extends JosmAction implements ListSelectionListener {
@Serial
private static final long serialVersionUID = -6464592606894190151L;
private final TodoListModel model;

Expand Down Expand Up @@ -299,6 +303,7 @@ public void valueChanged(ListSelectionEvent e) {
}

private class PassAction extends JosmAction implements ListSelectionListener {
@Serial
private static final long serialVersionUID = -8398150189560976351L;
private final TodoListModel model;

Expand Down Expand Up @@ -336,6 +341,7 @@ public void valueChanged(ListSelectionEvent e) {
}

private class AddAction extends JosmAction implements DataSelectionListener {
@Serial
private static final long serialVersionUID = 1946908728505665451L;
private final TodoListModel model;

Expand Down Expand Up @@ -376,6 +382,7 @@ public void selectionChanged(SelectionChangeEvent event) {
}

private class ClearAndAddAction extends JosmAction implements DataSelectionListener {
@Serial
private static final long serialVersionUID = 6877280292029877851L;
private final TodoListModel model;

Expand Down Expand Up @@ -419,6 +426,7 @@ public void selectionChanged(SelectionChangeEvent event) {
}

private class MarkSelectedAction extends JosmAction implements DataSelectionListener {
@Serial
private static final long serialVersionUID = 4978820863995799461L;
private final TodoListModel model;

Expand Down Expand Up @@ -460,6 +468,7 @@ public void selectionChanged(SelectionChangeEvent event) {

private class MarkAction extends JosmAction implements ListSelectionListener {

@Serial
private static final long serialVersionUID = -2258731277129598881L;
TodoListModel model;

Expand Down Expand Up @@ -497,6 +506,7 @@ public void valueChanged(ListSelectionEvent arg0) {

private static class MarkAllAction extends JosmAction {

@Serial
private static final long serialVersionUID = 4736926588271511062L;
TodoListModel model;

Expand All @@ -521,6 +531,7 @@ public void actionPerformed(ActionEvent arg0) {

private static class UnmarkAllAction extends JosmAction {

@Serial
private static final long serialVersionUID = -2138098883422659123L;
TodoListModel model;

Expand All @@ -544,6 +555,7 @@ public void actionPerformed(ActionEvent arg0) {

private static class ClearAction extends JosmAction {

@Serial
private static final long serialVersionUID = -1380109768343039669L;
TodoListModel model;

Expand Down Expand Up @@ -611,6 +623,7 @@ public void mouseExited(MouseEvent me) {
* A right-click popup context menu for setting options and performing other functions on the todo list items.
*/
class TodoPopup extends ListPopupMenu {
@Serial
private static final long serialVersionUID = 7359564238177893009L;

TodoPopup(JList<TodoListItem> list) {
Expand Down
13 changes: 6 additions & 7 deletions src/org/openstreetmap/josm/plugins/todo/TodoListItemRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.awt.Component;

import javax.swing.DefaultListCellRenderer;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
Expand All @@ -24,24 +23,24 @@ public class TodoListItemRenderer implements ListCellRenderer<TodoListItem> {
@Override
public Component getListCellRendererComponent(JList<? extends TodoListItem> list, TodoListItem value, int index,
boolean isSelected, boolean cellHasFocus) {
Component def = defaultListCellRenderer.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus);
final var def = defaultListCellRenderer.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus);
boolean fast = list.getModel().getSize() > 1000;

if (value != null && def instanceof JLabel) {
if (value != null && def instanceof JLabel jLabel) {
String displayName = value.primitive().getDisplayName(DefaultNameFormatter.getInstance());
String layerName = value.layer().getName();
((JLabel) def).setText(displayName + " [" + layerName + "]");
final ImageIcon icon = !fast && (value.primitive() instanceof OsmPrimitive osmPrimitive)
jLabel.setText(displayName + " [" + layerName + "]");
final var icon = !fast && (value.primitive() instanceof OsmPrimitive osmPrimitive)
? ImageProvider.getPadded(osmPrimitive,
// Height of component no yet known, assume the default 16px.
ImageProvider.ImageSizes.SMALLICON.getImageDimension())
: ImageProvider.get(value.primitive().getType());
if (icon != null) {
((JLabel) def).setIcon(icon);
jLabel.setIcon(icon);
} else {
Logging.warn("Null icon for "+value.primitive().getDisplayType());
}
((JLabel) def).setToolTipText(formatter.buildDefaultToolTip(value.primitive()));
jLabel.setToolTipText(formatter.buildDefaultToolTip(value.primitive()));
}
return def;
}
Expand Down
Loading

0 comments on commit e5e6a6a

Please sign in to comment.