Changeset 98 in josm for src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

Timestamp:

2006-04-25T00:11:38+02:00 (20 years ago)

Author:

imi

Message:

• added Applet version of JOSM (unfinished)
• fixed display bug if --no-fullscreen and --geometry was specified

File:

• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (9 diffs)

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -95 +94 @@
 
                 final JOptionPane optionPane = new JOptionPane(p, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-                final JDialog dlg = optionPane.createDialog(Main.main, "Change values?");
+                final JDialog dlg = optionPane.createDialog(Main.parent, "Change values?");
                 dlg.addWindowFocusListener(new WindowFocusListener(){
                         public void windowGainedFocus(WindowEvent e) {
@@ -124 +123 @@
                 if (value.equals(""))
                         value = null; // delete the key
-                mv.editLayer().add(new ChangePropertyCommand(sel, key, value));
+                Main.main.editLayer().add(new ChangePropertyCommand(sel, key, value));
 
                 if (value == null)
@@ -163 +162 @@
                 JTextField values = new JTextField();
                 p2.add(values, BorderLayout.CENTER);
-                int answer = JOptionPane.showConfirmDialog(Main.main, p, 
+                int answer = JOptionPane.showConfirmDialog(Main.parent, p, 
                                 "Change values?", JOptionPane.OK_CANCEL_OPTION); 
                 if (answer != JOptionPane.OK_OPTION)
@@ -171 +170 @@
                 if (value.equals(""))
                         return;
-                mv.editLayer().add(new ChangePropertyCommand(sel, key, value));
+                Main.main.editLayer().add(new ChangePropertyCommand(sel, key, value));
                 selectionChanged(sel); // update table
         }
@@ -182 +181 @@
                 String key = data.getValueAt(row, 0).toString();
                 Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                mv.editLayer().add(new ChangePropertyCommand(sel, key, null));
+                Main.main.editLayer().add(new ChangePropertyCommand(sel, key, null));
                 selectionChanged(sel); // update table
         }
@@ -201 +200 @@
          */
         private final JTable propertyTable = new JTable(data);
-        /**
-         * The map view this dialog operates on.
-         */
-        private final MapView mv;
         
         /**
@@ -211 +206 @@
         public PropertiesDialog(MapFrame mapFrame) {
                 super("Properties", "propertiesdialog", "Property for selected objects.", KeyEvent.VK_P);
-                mv = mapFrame.mapView;
 
                 setPreferredSize(new Dimension(320,150));
@@ -248 +242 @@
                                 else if (e.getActionCommand().equals("Edit")) {
                                         if (sel == -1)
-                                                JOptionPane.showMessageDialog(Main.main, "Please select the row to edit.");
+                                                JOptionPane.showMessageDialog(Main.parent, "Please select the row to edit.");
                                         else
                                                 edit(sel);
                                 } else if (e.getActionCommand().equals("Delete")) {
                                         if (sel == -1)
-                                                JOptionPane.showMessageDialog(Main.main, "Please select the row to delete.");
+                                                JOptionPane.showMessageDialog(Main.parent, "Please select the row to delete.");
                                         else
                                                 delete(sel);