Changeset 21 in josm for src/org/openstreetmap/josm/gui/dialogs/LayerList.java

Timestamp:

2005-10-20T13:00:33+02:00 (21 years ago)

Author:

imi

Message:

• started command implementation
• cleaned up Layer
• gpsbabel style for importing qpegps tracks

File:

• src/org/openstreetmap/josm/gui/dialogs/LayerList.java (modified) (5 diffs)

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

@@ -23 +23 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.DataSet;
 import org.openstreetmap.josm.gui.ImageProvider;
-import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -84 +84 @@
                                 Layer layer = (Layer)value;
                                 JLabel label = (JLabel)super.getListCellRendererComponent(list, 
-                                                layer.getName(), index, isSelected, cellHasFocus);
+                                                layer.name, index, isSelected, cellHasFocus);
                                 Icon icon = layer.getIcon();
-                                if (!layer.isVisible())
+                                if (!layer.visible)
                                         icon = ImageProvider.overlay(icon, invisible, ImageProvider.OverlayPosition.SOUTHEAST);
                                 label.setIcon(icon);
                                 
-                                DataSet ds = layer.getDataSet();
+                                DataSet ds = layer.dataSet;
                                 if (ds != null) {
                                         label.setToolTipText(ds.nodes.size()+" nodes, "+
@@ -148 +148 @@
                         public void actionPerformed(ActionEvent e) {
                                 Layer l = (Layer)layers.getSelectedValue();
-                                l.setVisible(!l.isVisible());
+                                l.visible = !l.visible;
                                 mapView.repaint();
                                 layers.repaint();
@@ -175 +175 @@
                                 public void actionPerformed(ActionEvent e) {
                                         Layer lFrom = (Layer)layers.getSelectedValue();
-                                        DataSet dsFrom = lFrom.getDataSet();
+                                        DataSet dsFrom = lFrom.dataSet;
                                         Layer lTo = (Layer)model.get(layers.getSelectedIndex()+1);
-                                        DataSet dsTo = lTo.getDataSet();
+                                        DataSet dsTo = lTo.dataSet;
                                         dsTo.mergeFrom(dsFrom, Main.pref.mergeNodes);
                                         layers.setSelectedValue(lTo, true);
@@ -198 +198 @@
                 boolean enable = model.getSize() > 1;
                 enable = enable && sel < model.getSize()-1;
-                enable = enable && l.getDataSet() != null;
-                enable = enable && ((Layer)model.get(sel+1)).getDataSet() != null;
+                enable = enable && l.dataSet != null;
+                enable = enable && ((Layer)model.get(sel+1)).dataSet != null;
                 enable = enable && l.isEditable() == ((Layer)model.get(sel+1)).isEditable();
                 mergeButton.setEnabled(enable);