Merge branch 'master' into slim

FreeCol · Dec 29, 2019 · 1a605b3 · 1a605b3
2 parents 5e902e1 + 79b57ee
commit 1a605b3
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 33 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: http://www.freecol.org/news/donations.html
diff --git a/packaging/common/freecol.appdata.xml b/packaging/common/freecol.appdata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
     <id type="desktop">freecol.desktop</id>
-    <licence>CC0</licence>
+    <project_license>GPL-2.0</project_license>
+    <metadata_license>CC0-1.0</metadata_license>
     <description>
         <p>
             The FreeCol team aims to create an Open Source version of Colonization (released under the GPL). 

diff --git a/src/net/sf/freecol/client/control/ConnectController.java b/src/net/sf/freecol/client/control/ConnectController.java
@@ -19,38 +19,36 @@
 
 package net.sf.freecol.client.control;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.SwingUtilities;
-
-import net.sf.freecol.FreeCol; 
+import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.control.FreeColClientHolder;
 import net.sf.freecol.client.gui.ChoiceItem;
 import net.sf.freecol.client.gui.GUI;
 import net.sf.freecol.client.gui.LoadingSavegameInfo;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColModFile;
 import net.sf.freecol.common.io.FreeColSavegameFile;
-import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Game.LogoutReason;
 import net.sf.freecol.common.model.Player;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.model.StringTemplate;
 import net.sf.freecol.common.model.Unit;
-import net.sf.freecol.common.networking.Connection;
-import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
 import net.sf.freecol.server.FreeColServer;
 import net.sf.freecol.server.FreeColServer.ServerState;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static net.sf.freecol.common.util.CollectionUtils.alwaysTrue;
+import static net.sf.freecol.common.util.CollectionUtils.makeUnmodifiableList;
+import static net.sf.freecol.common.util.CollectionUtils.transform;
+
 
 /**
  * The controller responsible for starting a server and connecting to it.
@@ -351,6 +349,8 @@ public boolean startSavedGame(File file) {
         // public server state from the file, and update the client
         // options if possible.
         final ClientOptions options = getClientOptions();
+
+
         final boolean defaultSinglePlayer;
         final boolean defaultPublicServer;
         FreeColSavegameFile fis = null;
@@ -370,6 +370,7 @@ public boolean startSavedGame(File file) {
             return false;
         }
         options.merge(fis);
+
         options.fixClientOptions();
         List<String> values = null;
         try {
@@ -414,7 +415,8 @@ public boolean startSavedGame(File file) {
             port = -1;
         }
         Messages.loadActiveModMessageBundle(options.getActiveMods(),
-                                            FreeCol.getLocale());
+            FreeCol.getLocale());
+
         if (!fcc.unblockServer(port)) return false;
 
         if (fcc.isLoggedIn()) { // Should not happen, warn and suppress
@@ -425,6 +427,9 @@ public boolean startSavedGame(File file) {
         FreeColServer fcs = fcc.startServer(publicServer, singlePlayer, file,
                                             port, serverName);
         if (fcs == null) return false;
+
+        fcs.getGame().getSpecification().loadMods(options.getActiveMods());
+
         fcc.setFreeColServer(fcs);
         fcc.setSinglePlayer(true);
         return requestLogin(FreeCol.getName(), fcs.getHost(), fcs.getPort());

diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
@@ -2458,7 +2458,7 @@ public boolean assignTradeRoute(Unit unit, TradeRoute tradeRoute) {
      * Called from CargoPanel, TilePopup.
      *
      * @param unit The {@code Unit} which is to board the carrier.
-     * @param carrier The carrier to board.
+     * @param carrier The location of this Unit.
      * @return True if the unit boards the carrier.
      */
     public boolean boardShip(Unit unit, Unit carrier) {

diff --git a/src/net/sf/freecol/client/gui/CanvasMouseListener.java b/src/net/sf/freecol/client/gui/CanvasMouseListener.java
@@ -78,7 +78,14 @@ public void mousePressed(MouseEvent e) {
         }
 
         switch (e.getButton()) {
-        case MouseEvent.BUTTON1: // Drag and selection
+        case MouseEvent.BUTTON1: 
+            // If we have GoTo mode enabled then GoTo takes precedence
+            if (getGUI().isGotoStarted()) {
+                getGUI().performGoto(e.getX(), e.getY());
+                break;
+            }
+
+            // Drag and selection
             // Enable dragging with button 1
             // @see CanvasMouseMotionListener#mouseDragged
             getGUI().prepareDrag(e.getX(), e.getY());

diff --git a/src/net/sf/freecol/client/gui/GUI.java b/src/net/sf/freecol/client/gui/GUI.java
@@ -1570,6 +1570,17 @@ public void clearGotoPath() {}
      */
     public void performGoto(Tile tile) {}
 
+    /**
+     * Check if the user has  GoTo mode enabled.
+     *
+     * Called from {@link CanvasMouseListener}.
+     *
+     * @return True if the user has toggled GoTo mode.
+     */
+    public boolean isGotoStarted() {
+        return false;
+    }
+
     /**
      * Perform an immediate goto to a point on the map.
      *

diff --git a/src/net/sf/freecol/client/gui/SwingGUI.java b/src/net/sf/freecol/client/gui/SwingGUI.java
@@ -809,6 +809,14 @@ public void clearGotoPath() {
         updateUnitPath();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isGotoStarted() {
+        return canvas.isGotoStarted();
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/net/sf/freecol/client/gui/panel/report/ReportCompactColonyPanel.java b/src/net/sf/freecol/client/gui/panel/report/ReportCompactColonyPanel.java
@@ -83,8 +83,6 @@ public final class ReportCompactColonyPanel extends ReportPanel {
     /** Predicate to select units that are not working. */
     private static final Predicate<Unit> notWorkingPred = u ->
         u.getState() != Unit.UnitState.FORTIFIED && u.getState() != Unit.UnitState.SENTRY;
-
-    private static final JLabel emptyLabel = new JLabel();
 
     /** Container class for all the information about a colony. */
     private static class ColonySummary {
@@ -463,7 +461,7 @@ private JButton newButton(String action, String h, ImageIcon i,
 
     private void addTogether(List<? extends JComponent> components) {
         if (components.isEmpty()) {
-            reportPanel.add(emptyLabel);
+            reportPanel.add(new JLabel());
             return;
         }
         String layout = (components.size() > 1) ? "split " + components.size()
@@ -574,7 +572,7 @@ private void updateColony(ColonySummary s) {
         } else {
             b = null;
         }
-        reportPanel.add((b == null) ? emptyLabel : b);
+        reportPanel.add((b == null) ? new JLabel() : b);
 
         // Field: The number of potential colony tiles that need
         // exploring.
@@ -589,7 +587,7 @@ private void updateColony(ColonySummary s) {
         } else {
             b = null;
         }
-        reportPanel.add((b == null) ? emptyLabel : b);
+        reportPanel.add((b == null) ? new JLabel() : b);
 
         // Fields: The number of existing colony tiles that would
         // benefit from improvements.
@@ -631,7 +629,7 @@ private void updateColony(ColonySummary s) {
             } else {
                 b = null;
             }
-            reportPanel.add((b == null) ? emptyLabel : b);
+            reportPanel.add((b == null) ? new JLabel() : b);
         }
 
         // Fields: The net production of each storable+non-trade-goods
@@ -719,7 +717,7 @@ private void updateColony(ColonySummary s) {
             default:
                 throw new IllegalStateException("Bogus status: " + gp.status);
             }
-            reportPanel.add((c == null) ? emptyLabel
+            reportPanel.add((c == null) ? new JLabel()
                 : newButton(cac, Integer.toString(gp.amount), null, c, t));
         }
 
@@ -744,7 +742,7 @@ private void updateColony(ColonySummary s) {
         } else {
             b = null;
         }
-        reportPanel.add((b == null) ? emptyLabel : b);
+        reportPanel.add((b == null) ? new JLabel() : b);
 
         // Field: What is currently being built (clickable if on the
         // buildqueue) and the turns until it completes, including
@@ -828,7 +826,7 @@ private void updateColony(ColonySummary s) {
         // Field: The units that could be upgraded, followed by the units
         // that could be added.
         if (s.improve.isEmpty() && s.want.isEmpty()) {
-            reportPanel.add(emptyLabel);
+            reportPanel.add(new JLabel());
         } else {
             buttons.clear();
             buttons.addAll(unitButtons(s.improve, s.couldWork, s.colony));
@@ -956,7 +954,7 @@ private void updateCombinedColonies(List<ColonySummary> summaries) {
         Set<Tile> tiles = transform(rTileSuggestions,
                                     TileImprovementSuggestion::isExploration,
                                     ts -> ts.tile, Collectors.toSet());
-        reportPanel.add((tiles.isEmpty()) ? emptyLabel
+        reportPanel.add((tiles.isEmpty()) ? new JLabel()
             : newLabel(Integer.toString(tiles.size()), null, cAlarm,
                        stpld("report.colony.exploring.summary")));
 
@@ -969,7 +967,7 @@ private void updateCombinedColonies(List<ColonySummary> summaries) {
             tiles.addAll(transform(rTileSuggestions,
                                    matchKey(ti, ts -> ts.tileImprovementType),
                                    ts -> ts.tile, Collectors.toSet()));
-            reportPanel.add((tiles.isEmpty()) ? emptyLabel
+            reportPanel.add((tiles.isEmpty()) ? new JLabel()
                 : newLabel(Integer.toString(tiles.size()), null, cAlarm,
                            stpld("report.colony.tile." + ti.getSuffix()
                                + ".summary")));
@@ -997,7 +995,7 @@ private void updateCombinedColonies(List<ColonySummary> summaries) {
             default:
                 throw new IllegalStateException("Bogus status: " + gp.status);
             }
-            reportPanel.add((c == null) ? emptyLabel
+            reportPanel.add((c == null) ? new JLabel()
                 : newLabel(Integer.toString(gp.amount), null, c,
                     stpld("report.colony.production.summary")
                         .addNamed("%goods%", gt)));

diff --git a/src/net/sf/freecol/common/model/Goods.java b/src/net/sf/freecol/common/model/Goods.java
@@ -147,7 +147,7 @@ public Location getLocation() {
     }
 
     /**
-     * {@inheritDoc}
+     * @param location The Settlement that is located on this Tile
      */
     @Override
     public boolean setLocation(Location location) {

diff --git a/src/net/sf/freecol/common/model/Unit.java b/src/net/sf/freecol/common/model/Unit.java
@@ -4083,7 +4083,7 @@ public Location getLocation() {
      * -til: While units do not contribute to tile appearance as such, if
      *     they move in/out of a colony the visible colony size changes.
      *
-     * @param newLocation The new {@code Location}.
+     * @param newLocation The Tile where this Unit is located. Or null if its location is Europe.
      * @return True if the location change succeeds.
      */
     @Override

diff --git a/src/net/sf/freecol/common/networking/DiplomacyMessage.java b/src/net/sf/freecol/common/networking/DiplomacyMessage.java
@@ -249,7 +249,7 @@ public ChangeSet serverHandler(FreeColServer freeColServer,
         String otherId = getStringAttribute(OTHER_ID_TAG);
         if (our == null) {
             cs = serverPlayer.clientError("Missing our object: " + ourId);
-        } if (our instanceof Unit) {
+        } else if (our instanceof Unit) {
             ourUnit = (Unit)our;
             if (!serverPlayer.owns(ourUnit)) {
                 cs = serverPlayer.clientError("Not our unit: " + ourId);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		custom: http://www.freecol.org/news/donations.html