From d65dc82cf62d7c91fec67ea66db9d72dee7719ff Mon Sep 17 00:00:00 2001 From: fmittag Date: Wed, 6 Feb 2013 18:12:03 +0100 Subject: [PATCH] some naming cleanup for map overlay classes --- ...oatCanvasOverlay.java => BoatOverlay.java} | 6 +-- .../gwt/ui/shared/racemap/RaceMap.java | 38 +++++++++---------- .../shared/racemap/RaceMapImageManager.java | 8 ++-- .../ui/shared/racemap/WindSensorOverlay.java | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/{BoatCanvasOverlay.java => BoatOverlay.java} (96%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatOverlay.java similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatCanvasOverlay.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatOverlay.java index de6f8f18845..1719c8496af 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatOverlay.java @@ -13,7 +13,7 @@ import com.sap.sailing.gwt.ui.shared.GPSFixDTO; * A google map overlay based on a HTML5 canvas for drawing boats (images) * The boats will be zoomed/scaled according to the current map state and rotated according to the bearing of the boat. */ -public class BoatCanvasOverlay extends CanvasOverlay { +public class BoatOverlay extends CanvasOverlay { /** * The competitor the boat belongs too. @@ -37,7 +37,7 @@ public class BoatCanvasOverlay extends CanvasOverlay { private final BoatClassImageData boatClassImageData; - public BoatCanvasOverlay(CompetitorDTO competitorDTO) { + public BoatOverlay(CompetitorDTO competitorDTO) { super(RaceMapOverlaysZIndexes.BOATS_ZINDEX); this.competitorDTO = competitorDTO; this.boatClass = competitorDTO.boatClass; @@ -46,7 +46,7 @@ public class BoatCanvasOverlay extends CanvasOverlay { @Override protected Overlay copy() { - return new BoatCanvasOverlay(competitorDTO); + return new BoatOverlay(competitorDTO); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java index bf93d612b4a..9183365b6d0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java @@ -145,7 +145,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe /** * html5 canvases used as boat display on the map */ - private final Map boatCanvasOverlays; + private final Map boatOverlays; /** * html5 canvases used for competitor info display on the map @@ -248,7 +248,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe firstShownFix = new HashMap(); lastShownFix = new HashMap(); markDTOs = new HashMap(); - boatCanvasOverlays = new HashMap(); + boatOverlays = new HashMap(); competitorInfoOverlays = new HashMap(); windSensorOverlays = new HashMap(); courseMarkOverlays = new HashMap(); @@ -284,7 +284,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe map.checkResizeAndCenter(); final List emptyList = Collections.emptyList(); settings.getZoomSettings().setTypesToConsiderOnZoom(emptyList); - Set competitorDTOsOfUnusedMarkers = new HashSet(boatCanvasOverlays.keySet()); + Set competitorDTOsOfUnusedMarkers = new HashSet(boatOverlays.keySet()); for (CompetitorDTO competitorDTO : getCompetitorsToShow()) { boolean usedExistingMarker = updateBoatCanvasForCompetitor(competitorDTO, timer.getTime()); if (usedExistingMarker) { @@ -292,9 +292,9 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe } } for (CompetitorDTO unusedMarkerCompetitorDTO : competitorDTOsOfUnusedMarkers) { - BoatCanvasOverlay boatCanvas = boatCanvasOverlays.get(unusedMarkerCompetitorDTO); + BoatOverlay boatCanvas = boatOverlays.get(unusedMarkerCompetitorDTO); RaceMap.this.map.removeOverlay(boatCanvas); - boatCanvasOverlays.remove(unusedMarkerCompetitorDTO); + boatOverlays.remove(unusedMarkerCompetitorDTO); } } }); @@ -676,7 +676,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe Date tailsFromTime = new Date(date.getTime() - settings.getEffectiveTailLengthInMilliseconds()); Date tailsToTime = new Date(date.getTime()); Set competitorDTOsOfUnusedTails = new HashSet(tails.keySet()); - Set competitorDTOsOfUnusedBoatCanvases = new HashSet(boatCanvasOverlays.keySet()); + Set competitorDTOsOfUnusedBoatCanvases = new HashSet(boatOverlays.keySet()); for (CompetitorDTO competitorDTO : competitorsToShow) { if (fixes.containsKey(competitorDTO)) { Polyline tail = tails.get(competitorDTO); @@ -694,9 +694,9 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe } } for (CompetitorDTO unusedBoatCanvasCompetitorDTO : competitorDTOsOfUnusedBoatCanvases) { - BoatCanvasOverlay boatCanvas = boatCanvasOverlays.get(unusedBoatCanvasCompetitorDTO); + BoatOverlay boatCanvas = boatOverlays.get(unusedBoatCanvasCompetitorDTO); map.removeOverlay(boatCanvas); - boatCanvasOverlays.remove(unusedBoatCanvasCompetitorDTO); + boatOverlays.remove(unusedBoatCanvasCompetitorDTO); } for (CompetitorDTO unusedTailCompetitorDTO : competitorDTOsOfUnusedTails) { map.removeOverlay(tails.remove(unusedTailCompetitorDTO)); @@ -972,11 +972,11 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe boolean usedExistingCanvas = false; GPSFixDTO lastBoatFix = getBoatFix(competitorDTO, date); if (lastBoatFix != null) { - BoatCanvasOverlay boatCanvas = boatCanvasOverlays.get(competitorDTO); + BoatOverlay boatCanvas = boatOverlays.get(competitorDTO); if (boatCanvas == null) { - boatCanvas = createBoatCanvas(competitorDTO, displayHighlighted(competitorDTO)); + boatCanvas = createBoatOverlay(competitorDTO, displayHighlighted(competitorDTO)); map.addOverlay(boatCanvas); - boatCanvasOverlays.put(competitorDTO, boatCanvas); + boatOverlays.put(competitorDTO, boatCanvas); boatCanvas.setSelected(displayHighlighted(competitorDTO)); boatCanvas.setBoatFix(lastBoatFix); boatCanvas.redraw(true); @@ -1029,8 +1029,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe return new CompetitorInfoOverlay(competitorDTO, raceMapImageManager); } - private BoatCanvasOverlay createBoatCanvas(final CompetitorDTO competitorDTO, boolean highlighted) { - final BoatCanvasOverlay boatCanvas = new BoatCanvasOverlay(competitorDTO); + private BoatOverlay createBoatOverlay(final CompetitorDTO competitorDTO, boolean highlighted) { + final BoatOverlay boatCanvas = new BoatOverlay(competitorDTO); boatCanvas.setSelected(highlighted); boatCanvas.getCanvas().addClickHandler(new ClickHandler() { @Override @@ -1529,11 +1529,11 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe if (settings.isShowOnlySelectedCompetitors()) { if (Util.size(competitorSelection.getSelectedCompetitors()) == 1) { // first competitors selected; remove all others from map - Iterator> i = boatCanvasOverlays.entrySet().iterator(); + Iterator> i = boatOverlays.entrySet().iterator(); while (i.hasNext()) { - Entry next = i.next(); + Entry next = i.next(); if (!next.getKey().equals(competitor)) { - BoatCanvasOverlay value = next.getValue(); + BoatOverlay value = next.getValue(); map.removeOverlay(value); removeTail(next.getKey()); i.remove(); // only this way a ConcurrentModificationException while looping can be avoided @@ -1546,7 +1546,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe } } else { // only change highlighting - BoatCanvasOverlay boatCanvas = boatCanvasOverlays.get(competitor); + BoatOverlay boatCanvas = boatOverlays.get(competitor); if (boatCanvas != null) { boatCanvas.setSelected(displayHighlighted(competitor)); boatCanvas.redraw(true); @@ -1592,7 +1592,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe timeChanged(timer.getTime()); } else { // otherwise remove only deselected competitor's boat images and tail - BoatCanvasOverlay removed = boatCanvasOverlays.remove(competitor); + BoatOverlay removed = boatOverlays.remove(competitor); if (removed != null) { map.removeOverlay(removed); } @@ -1601,7 +1601,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe } } else { // "lowlight" currently selected competitor - BoatCanvasOverlay boatCanvas = boatCanvasOverlays.get(competitor); + BoatOverlay boatCanvas = boatOverlays.get(competitor); if (boatCanvas != null) { boatCanvas.setSelected(displayHighlighted(competitor)); boatCanvas.redraw(true); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java index 3110f2ac781..0225eb3bd08 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java @@ -25,7 +25,7 @@ public class RaceMapImageManager { /** * An arrow showing the wind provided by a wind sensor on a boat */ - protected ImageTransformer expeditionWindIconTransformer; + protected ImageTransformer windSensorIconTransformer; /** * The default image for a course mark @@ -44,7 +44,7 @@ public class RaceMapImageManager { maneuverIconsForTypeAndTargetTack = new HashMap, Icon>(); combinedWindIconTransformer = new ImageTransformer(resources.combinedWindIcon()); - expeditionWindIconTransformer = new ImageTransformer(resources.expeditionWindIcon()); + windSensorIconTransformer = new ImageTransformer(resources.expeditionWindIcon()); } public MarkImageDescriptor resolveMarkImage(MarkType type, String color, String shape, String pattern) { @@ -154,7 +154,7 @@ public class RaceMapImageManager { return combinedWindIconTransformer; } - public ImageTransformer getExpeditionWindIconTransformer() { - return expeditionWindIconTransformer; + public ImageTransformer getWindSensorIconTransformer() { + return windSensorIconTransformer; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindSensorOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindSensorOverlay.java index 00abfe818a0..f263873f57e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindSensorOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindSensorOverlay.java @@ -50,7 +50,7 @@ public class WindSensorOverlay extends CanvasOverlay { getCanvas().setCoordinateSpaceWidth(canvasWidth); getCanvas().setCoordinateSpaceHeight(canvasHeight); } - transformer = raceMapImageManager.getExpeditionWindIconTransformer(); + transformer = raceMapImageManager.getWindSensorIconTransformer(); } @Override