mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Synchronize trade route stop handling.

This commit is contained in:
Mike Pope 2018-01-15 15:06:35 +10:30
parent 523c683c4b
commit 966c2cbf90
6 changed files with 79 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sf/freecol/client/gui/panel/TradeRouteInputPanel.java
View File

@ -549,7 +549,7 @@ public final class TradeRouteInputPanel extends FreeColPanel
this.dropListener = new DropListener();
this.stopListModel = new DefaultListModel<>();
for (TradeRouteStop stop : tradeRoute.getStops()) {
for (TradeRouteStop stop : tradeRoute.getStopList()) {
this.stopListModel.addElement(stop);
}

86
src/net/sf/freecol/common/model/TradeRoute.java
View File

@ -103,13 +103,40 @@ public class TradeRoute extends FreeColGameObject
this.silent = silent;
}
/**
* Get the number of stops in this trade route.
*
* @return The number of stops, or negative on error.
*/
public final int getStopCount() {
synchronized (this.stops) {
return this.stops.size();
}
}
/**
* Get a stop in the trade route by index.
*
* @return The {@code TradeRouteStop} found, or null if the index
* is invalid.
*/
public final TradeRouteStop getStop(int index) {
synchronized (this.stops) {
return (index >= 0 && index < this.stops.size())
? this.stops.get(index)
: null;
}
}
/**
* Get the stops in this trade route.
*
* @return A list of {@code TradeRouteStop}s.
*/
public final List<TradeRouteStop> getStops() {
return this.stops;
public final List<TradeRouteStop> getStopList() {
synchronized (this.stops) {
return new ArrayList<>(this.stops);
}
}
/**
@ -125,9 +152,11 @@ public class TradeRoute extends FreeColGameObject
int i0 = getIndex(start), in = getIndex(end);
if (i0 < 0 || in < 0) return null;
List<TradeRouteStop> result = new ArrayList<>();
while (i0 != in) {
result.add(this.stops.get(i0));
if (++i0 >= this.stops.size()) i0 = 0;
synchronized (this.stops) {
while (i0 != in) {
result.add(this.stops.get(i0));
if (++i0 >= this.stops.size()) i0 = 0;
}
}
return result;
}
@ -138,7 +167,9 @@ public class TradeRoute extends FreeColGameObject
* @param stop The {@code TradeRouteStop} to add.
*/
public void addStop(TradeRouteStop stop) {
if (stop != null) this.stops.add(stop);
synchronized (this.stops) {
this.stops.add(stop);
}
}
/**
@ -147,7 +178,9 @@ public class TradeRoute extends FreeColGameObject
* @param stop The {@code TradeRouteStop} to remove.
*/
public void removeStop(TradeRouteStop stop) {
if (stop != null) this.stops.remove(stop);
synchronized (this.stops) {
this.stops.remove(stop);
}
}
/**
@ -157,8 +190,10 @@ public class TradeRoute extends FreeColGameObject
* @return True if any stop was removed.
*/
public boolean removeMatchingStops(Location loc) {
return removeInPlace(stops,
trs -> Map.isSameLocation(trs.getLocation(), loc));
synchronized (this.stops) {
return removeInPlace(this.stops,
trs -> Map.isSameLocation(trs.getLocation(), loc));
}
}
/**
@ -168,10 +203,12 @@ public class TradeRoute extends FreeColGameObject
* @return The index of the given stop, or negative on failure.
*/
public int getIndex(TradeRouteStop stop) {
int i = 0;
for (TradeRouteStop trs : this.stops) {
if (trs == stop) return i;
i++;
synchronized (this.stops) {
int i = 0;
for (TradeRouteStop trs : this.stops) {
if (trs == stop) return i;
i++;
}
}
return -1;
}
@ -180,7 +217,9 @@ public class TradeRoute extends FreeColGameObject
* Clear the stops in this trade route.
*/
public void clearStops() {
this.stops.clear();
synchronized (this.stops) {
this.stops.clear();
}
}
/**
@ -243,7 +282,7 @@ public class TradeRoute extends FreeColGameObject
}
// Verify that it has at least two stops
if (this.stops.size() < 2) {
if (getStopCount() < 2) {
return StringTemplate.template("model.tradeRoute.notEnoughStops");
}
@ -251,9 +290,11 @@ public class TradeRoute extends FreeColGameObject
// - all stops are valid
// - there is at least one non-empty stop
// - there is no goods that is present unmaintained at all stops
Set<GoodsType> always = new HashSet<>(this.stops.get(0).getCargo());
Set<GoodsType> always = new HashSet<>(getStop(0).getCargo());
boolean empty = true;
for (TradeRouteStop stop : this.stops) {
int n = getStopCount();
for (int i = 0; i < n; i++){
TradeRouteStop stop = getStop(i);
if (!TradeRoute.isStopValid(owner, stop)) {
return stop.invalidStopLabel(owner);
}
@ -321,8 +362,10 @@ public class TradeRoute extends FreeColGameObject
final Game game = getGame();
this.name = o.getName();
this.owner = o.getOwner();
this.stops.clear();
this.stops.addAll(game.updateRef(o.getStops()));
synchronized (this.stops) {
this.stops.clear();
this.stops.addAll(o.getStopList());
}
this.silent = o.isSilent();
return true;
}
@ -393,7 +436,8 @@ public class TradeRoute extends FreeColGameObject
final String tag = xr.getLocalName();
if (TradeRouteStop.TAG.equals(tag)) {
addStop(new TradeRouteStop(getGame(), xr));
TradeRouteStop trs = new TradeRouteStop(getGame(), xr);
if (trs != null) addStop(trs);
} else {
super.readChild(xr);
@ -418,7 +462,7 @@ public class TradeRoute extends FreeColGameObject
.append(" \"").append(this.name).append('"');
if (this.owner != null) sb.append(" owner=").append(this.owner.getId());
sb.append(" silent=").append(Boolean.toString(this.silent));
for (TradeRouteStop stop : getStops()) sb.append(' ').append(stop);
for (TradeRouteStop stop : getStopList()) sb.append(' ').append(stop);
sb.append(']');
return sb.toString();
}

19
src/net/sf/freecol/common/model/Unit.java
View File

@ -1626,7 +1626,7 @@ public class Unit extends GoodsLocation
*/
public TradeRouteStop getStop() {
return (validateCurrentStop() < 0) ? null
: getTradeRoute().getStops().get(currentStop);
: getTradeRoute().getStop(currentStop);
}
/**
@ -1636,8 +1636,7 @@ public class Unit extends GoodsLocation
*/
public List<TradeRouteStop> getCurrentStops() {
if (validateCurrentStop() < 0) return null;
List<TradeRouteStop> stops
= new ArrayList<TradeRouteStop>(getTradeRoute().getStops());
List<TradeRouteStop> stops = getTradeRoute().getStopList();
rotate(stops, currentStop);
return stops;
}
@ -1669,15 +1668,13 @@ public class Unit extends GoodsLocation
if (tradeRoute == null) {
currentStop = -1;
} else {
List<TradeRouteStop> stops = tradeRoute.getStops();
if (stops == null || stops.isEmpty()) {
int stopCount = tradeRoute.getStopCount();
if (stopCount <= 0) {
currentStop = -1;
} else {
if (currentStop < 0 || currentStop >= stops.size()) {
// The current stop can become out of range if the trade
// route is modified.
currentStop = 0;
}
} else if (currentStop < 0 || currentStop >= stopCount) {
// The current stop can become out of range if the trade
// route is modified.
currentStop = 0;
}
}
return currentStop;

2
src/net/sf/freecol/common/networking/SetCurrentStopMessage.java
View File

@ -100,7 +100,7 @@ public class SetCurrentStopMessage extends AttributeMessage {
return serverPlayer.clientError("Stop index is not an integer: " +
indexString);
}
if (count < 0 || count > tr.getStops().size()) {
if (count < 0 || count >= tr.getStopCount()) {
return serverPlayer.clientError("Invalid stop index: "
+ indexString);
}

6
src/net/sf/freecol/server/control/InGameController.java
View File

@ -932,7 +932,7 @@ public final class InGameController extends Controller {
: null);
unit.setTradeRoute(tradeRoute);
if (tradeRoute != null) {
List<TradeRouteStop> stops = tradeRoute.getStops();
List<TradeRouteStop> stops = tradeRoute.getStopList();
int found = -1;
for (int i = 0; i < stops.size(); i++) {
if (Map.isSameLocation(unit.getLocation(),
@ -3651,9 +3651,9 @@ public final class InGameController extends Controller {
TradeRoute tr = unit.getTradeRoute();
if (tr == null) {
return serverPlayer.clientError("Unit has no trade route to set stop for.");
} else if (index < 0 || index >= tr.getStops().size()) {
} else if (index < 0 || index >= tr.getStopCount()) {
return serverPlayer.clientError("Stop index out of range [0.."
+ tr.getStops().size() + "]: " + index);
+ tr.getStopCount() + "]: " + index);
}
unit.setCurrentStop(index);

2
test/src/net/sf/freecol/common/model/TradeRouteTest.java
View File

@ -74,7 +74,7 @@ public class TradeRouteTest extends FreeColTestCase {
// Build towards validity
assertNotNull(tr.verify()); // Invalid, no stops
assertTrue(tr.getStops().isEmpty());
assertEquals(0, tr.getStopCount());
TradeRouteStop trs1 = new TradeRouteStop(game, colony1);
assertTrue(trs1.isValid(player));
tr.addStop(trs1);