Changeset 86 in josm for src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java

@@ -6 +6 @@
 
 import javax.swing.Icon;
+import javax.swing.JPopupMenu;
 
 import org.openstreetmap.josm.Main;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.TileCache;
@@ -43 +45 @@
         }
 
-        @Override
-        public Icon getIcon() {
+        @Override public Icon getIcon() {
                 return icon;
         }
 
-        @Override
-        public String getToolTipText() {
+        @Override public String getToolTipText() {
                 return "WMS layer: "+url;
         }
 
-        @Override
-        public boolean isMergable(Layer other) {
+        @Override public boolean isMergable(Layer other) {
                 return false;
         }
 
-        @Override
-        public void mergeFrom(Layer from) {
+        @Override public void mergeFrom(Layer from) {
         }
 
-        @Override
-        public void paint(Graphics g, final MapView mv) {
+        @Override public void paint(Graphics g, final MapView mv) {
 //              EastNorth max = mv.getEastNorth(mv.getWidth(),0);
 //              EastNorth min = mv.getEastNorth(0,mv.getHeight());
@@ -90 +87 @@
         }
 
-        @Override
-        public void visitBoundingBox(BoundingXYVisitor v) {
+        @Override public void visitBoundingBox(BoundingXYVisitor v) {
                 // doesn't have a bounding box
         }
 
-        @Override
-        public Object getInfoComponent() {
+        @Override public Object getInfoComponent() {
                 return getToolTipText();
         }
+
+        @Override public void addMenuEntries(JPopupMenu menu) {
+                menu.addSeparator();
+                menu.add(new LayerListPopup.InfoAction(this));
+    }
 }