Changeset 28008 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

Timestamp:

2012-03-06T21:32:44+01:00 (12 years ago)

Author:

zverik

Message:

Something works :)

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -14 +14 @@
  * @author zverik
  */
-public class OffsetDialog extends JDialog {
+public class OffsetDialog extends JDialog implements ActionListener {
     private List<ImageryOffsetBase> offsets;
-    private int selectedOffset;
+    private ImageryOffsetBase selectedOffset;
 
     public OffsetDialog( List<ImageryOffsetBase> offsets ) {
@@ -27 +27 @@
         JPanel buttonPanel = new JPanel(new GridLayout(offsets.size() + 1, 1));
         for( ImageryOffsetBase offset : offsets ) {
-            buttonPanel.add(new OffsetDialogButton(offset));
+            OffsetDialogButton button = new OffsetDialogButton(offset);
+            button.addActionListener(this);
+            buttonPanel.add(button);
         }
         JButton cancelButton = new JButton("Cancel");
-        cancelButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                selectedOffset = -1;
-                OffsetDialog.this.setVisible(false);
-            }
-        });
+        cancelButton.addActionListener(this);
         buttonPanel.add(cancelButton); // todo: proper button
         setContentPane(buttonPanel);
@@ -43 +40 @@
     
     public ImageryOffsetBase showDialog() {
-        selectedOffset = -1;
+        selectedOffset = null;
         prepareDialog();
         setVisible(true);
-        return selectedOffset < 0 ? null : offsets.get(selectedOffset);
+        return selectedOffset;
+    }
+
+    public void actionPerformed( ActionEvent e ) {
+        if( e.getSource() instanceof OffsetDialogButton ) {
+            selectedOffset = ((OffsetDialogButton)e.getSource()).getOffset();
+        } else
+            selectedOffset = null;
+        setVisible(false);
     }
 }