replaced buoy icon, made Position serializable

This commit is contained in:
Axel Uhl committed 2012-04-25 18:11:18 +02:00
1 parent f40ecf63ac
commit dd276b17ce
8 files changed
+27 -16

No files matched your search

@@ -5,6 +5,7 @@ import com.sap.sailing.domain.common.impl.RadianBearingImpl;
import com.sap.sailing.domain.common.impl.RadianPosition;
public class AbstractPosition implements Position {
private static final long serialVersionUID = -3057027562787541064L;
public int hashCode() {
return (int) (4711. * getLngRad() * getLatRad());
@@ -1,6 +1,8 @@
package com.sap.sailing.domain.common;
public interface Position {
import java.io.Serializable;
public interface Position extends Serializable {
double getLatRad();
double getLngRad();
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.common.impl;
import com.sap.sailing.domain.common.AbstractPosition;
public class DegreePosition extends AbstractPosition {
private static final long serialVersionUID = 2060676561122615530L;
private final double lat;
private final double lng;
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.common.impl;
import com.sap.sailing.domain.common.AbstractPosition;
public class RadianPosition extends AbstractPosition {
private static final long serialVersionUID = -8488453506845560385L;
private final double latRad;
private final double lngRad;
@@ -31,6 +31,7 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl {
private byte validityCache = -1;
private class CompactPosition extends AbstractPosition {
private static final long serialVersionUID = 5621506820766614178L;
@Override
public double getLatDeg() {
@@ -6,6 +6,7 @@ import java.util.Map;
import com.google.gwt.core.client.GWT;
import com.google.gwt.maps.client.MapWidget;
import com.google.gwt.maps.client.geom.Point;
import com.google.gwt.maps.client.geom.Size;
import com.google.gwt.maps.client.overlay.Icon;
import com.sap.sailing.domain.common.LegType;
import com.sap.sailing.domain.common.ManeuverType;
@@ -92,6 +93,7 @@ public class RaceMapImageManager {
public void loadMapIcons(MapWidget map) {
if(map != null) {
buoyIcon = Icon.newInstance(resources.buoyIcon().getSafeUri().asString());
buoyIcon.setIconSize(Size.newInstance(8, 12));
buoyIcon.setIconAnchor(Point.newInstance(4, 4));
Icon tackToStarboardIcon = Icon
@@ -5,7 +5,7 @@ import com.google.gwt.resources.client.ImageResource;
interface RaceMapResources extends ClientBundle {
@Source("com/sap/sailing/gwt/ui/client/images/coursemark.png")
@Source("com/sap/sailing/gwt/ui/client/images/buoy.png")
ImageResource buoyIcon();
@Source("com/sap/sailing/gwt/ui/client/images/wind_combined.png")
@@ -3,6 +3,7 @@ package com.sap.sailing.server.impl;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.SocketException;
import java.net.URI;
@@ -483,22 +484,26 @@ public class RacingEventServiceImpl implements RacingEventService {
private void ensureEventIsObservedForDefaultLeaderboardAndAutoLeaderboardLinking(DynamicTrackedEvent trackedEvent) {
synchronized (eventsObservedForDefaultLeaderboard) {
if (!eventsObservedForDefaultLeaderboard.contains(trackedEvent)) {
trackedEvent.addRaceListener(new RaceListener() {
@Override
public void raceRemoved(TrackedRace trackedRace) {
}
@Override
public void raceAdded(TrackedRace trackedRace) {
linkRaceToConfiguredLeaderboardColumns(trackedRace);
leaderboardsByName.get(DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME).addRace(trackedRace,
trackedRace.getRace().getName(), /* medalRace */ false);
}
});
trackedEvent.addRaceListener(new RaceAdditionListener());
eventsObservedForDefaultLeaderboard.add(trackedEvent);
}
}
}
private class RaceAdditionListener implements RaceListener, Serializable {
private static final long serialVersionUID = 1036955460477000265L;
@Override
public void raceRemoved(TrackedRace trackedRace) {
}
@Override
public void raceAdded(TrackedRace trackedRace) {
linkRaceToConfiguredLeaderboardColumns(trackedRace);
leaderboardsByName.get(DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME).addRace(trackedRace,
trackedRace.getRace().getName(), /* medalRace */false);
}
}
/**
* Based on the <code>trackedRace</code>'s {@link TrackedRace#getRaceIdentifier() race identifier}, the tracked race