From ded8170abc920bc8beb02b874053c3aec2c1288f Mon Sep 17 00:00:00 2001 From: calebrw Date: Sun, 24 Jan 2021 21:41:02 -0600 Subject: [PATCH] Update Copyright Year to 2021. --- build/skeletons/universalJavaApplicationStub | 4 ++-- data/base/client-options.xml | 2 +- data/base/roles-compat.xml | 2 +- data/base/unit-change-types-compat.xml | 2 +- data/mods/bryce/specification.xml | 2 +- data/mods/convertUpgrade/specification.xml | 2 +- data/mods/example/specification.xml | 2 +- data/mods/plantForest/specification.xml | 2 +- data/rules/classic/resources.properties | 2 +- data/rules/classic/specification.xml | 2 +- data/rules/freecol/specification.xml | 2 +- data/rules/testing/specification.xml | 2 +- data/strings/FreeColMessages.properties | 4 ++-- .../strings/FreeColMessages_be-tarask.properties | 2 +- data/strings/FreeColMessages_bg.properties | 2 +- data/strings/FreeColMessages_ca.properties | 2 +- data/strings/FreeColMessages_cs_CZ.properties | 2 +- data/strings/FreeColMessages_da.properties | 2 +- data/strings/FreeColMessages_es_ES.properties | 2 +- data/strings/FreeColMessages_fi.properties | 2 +- data/strings/FreeColMessages_fr.properties | 2 +- data/strings/FreeColMessages_ia.properties | 2 +- data/strings/FreeColMessages_it_IT.properties | 2 +- data/strings/FreeColMessages_ja.properties | 2 +- data/strings/FreeColMessages_ko.properties | 2 +- data/strings/FreeColMessages_pl_PL.properties | 2 +- data/strings/FreeColMessages_pms.properties | 2 +- data/strings/FreeColMessages_pt_BR.properties | 2 +- data/strings/FreeColMessages_sr-ec.properties | 2 +- data/strings/FreeColMessages_sv_SE.properties | 2 +- data/strings/FreeColMessages_tr.properties | 2 +- data/strings/FreeColMessages_zh-hant.properties | 2 +- data/strings/FreeColMessages_zh_CN.properties | 2 +- doc/FreeCol.tex | 2 +- packaging/common/README | 2 +- packaging/common/freecol.svg | 4 ++-- schema/data/data-aiMain.xsd | 2 +- schema/data/data-aiUnit.xsd | 2 +- schema/data/data-building.xsd | 2 +- schema/data/data-cachedTile.xsd | 2 +- schema/data/data-colony.xsd | 2 +- schema/data/data-colonyTile.xsd | 2 +- schema/data/data-common.xsd | 2 +- schema/data/data-equipment.xsd | 2 +- schema/data/data-europe.xsd | 2 +- schema/data/data-exportData.xsd | 2 +- schema/data/data-game.xsd | 2 +- schema/data/data-goods.xsd | 2 +- schema/data/data-goodsContainer.xsd | 2 +- schema/data/data-historyEvent.xsd | 2 +- schema/data/data-indianSettlement.xsd | 2 +- schema/data/data-lostCityRumour.xsd | 2 +- schema/data/data-map.xsd | 2 +- schema/data/data-market.xsd | 2 +- schema/data/data-modelMessage.xsd | 2 +- schema/data/data-monarch.xsd | 2 +- schema/data/data-nationOptions.xsd | 2 +- schema/data/data-options.xsd | 2 +- schema/data/data-player.xsd | 2 +- schema/data/data-region.xsd | 2 +- schema/data/data-resource.xsd | 2 +- schema/data/data-savedGame.xsd | 2 +- schema/data/data-serverObjects.xsd | 2 +- schema/data/data-stringTemplate.xsd | 2 +- schema/data/data-tile.xsd | 2 +- schema/data/data-tileImprovement.xsd | 2 +- schema/data/data-tileItemContainer.xsd | 2 +- schema/data/data-tradeRoute.xsd | 2 +- schema/data/data-unit.xsd | 2 +- schema/data/data.xsd | 2 +- schema/spec/spec-building-types.xsd | 2 +- schema/spec/spec-common.xsd | 2 +- schema/spec/spec-disasters.xsd | 2 +- schema/spec/spec-equipment-types.xsd | 2 +- schema/spec/spec-events.xsd | 2 +- schema/spec/spec-founding-fathers.xsd | 2 +- schema/spec/spec-goods-types.xsd | 2 +- schema/spec/spec-model.xsd | 2 +- schema/spec/spec-modifiers.xsd | 2 +- schema/spec/spec-nations.xsd | 2 +- schema/spec/spec-options.xsd | 2 +- schema/spec/spec-resource-types.xsd | 2 +- schema/spec/spec-roles.xsd | 2 +- schema/spec/spec-tile-improvement.xsd | 2 +- schema/spec/spec-tile-types.xsd | 2 +- schema/spec/spec-unit-change-types.xsd | 2 +- schema/spec/spec-unit-types.xsd | 2 +- schema/spec/spec.xsd | 2 +- src/net/sf/freecol/FreeCol.java | 2 +- src/net/sf/freecol/client/ClientOptions.java | 2 +- src/net/sf/freecol/client/FreeColClient.java | 2 +- .../client/control/ClientInputHandler.java | 2 +- .../client/control/ConnectController.java | 2 +- .../client/control/FreeColClientHolder.java | 2 +- .../freecol/client/control/InGameController.java | 2 +- .../client/control/MapEditorController.java | 2 +- .../sf/freecol/client/control/MapTransform.java | 2 +- .../client/control/PreGameController.java | 2 +- .../freecol/client/control/SoundController.java | 2 +- .../client/gui/AbstractCanvasListener.java | 2 +- src/net/sf/freecol/client/gui/Canvas.java | 2 +- .../client/gui/CanvasMapEditorMouseListener.java | 2 +- .../freecol/client/gui/CanvasMouseListener.java | 2 +- .../client/gui/CanvasMouseMotionListener.java | 2 +- src/net/sf/freecol/client/gui/ChatDisplay.java | 2 +- src/net/sf/freecol/client/gui/ChoiceItem.java | 2 +- src/net/sf/freecol/client/gui/DialogHandler.java | 2 +- src/net/sf/freecol/client/gui/FontLibrary.java | 2 +- .../freecol/client/gui/FrameMotionListener.java | 2 +- src/net/sf/freecol/client/gui/FreeColFrame.java | 2 +- .../client/gui/FullScreenFrameListener.java | 2 +- src/net/sf/freecol/client/gui/GUI.java | 2 +- src/net/sf/freecol/client/gui/GUIMessage.java | 2 +- src/net/sf/freecol/client/gui/GrayLayer.java | 2 +- src/net/sf/freecol/client/gui/ImageLibrary.java | 2 +- .../freecol/client/gui/LoadingSavegameInfo.java | 2 +- src/net/sf/freecol/client/gui/MapViewer.java | 2 +- .../sf/freecol/client/gui/ModifierFormat.java | 2 +- src/net/sf/freecol/client/gui/RoadPainter.java | 2 +- src/net/sf/freecol/client/gui/ScrollThread.java | 2 +- src/net/sf/freecol/client/gui/Size.java | 2 +- src/net/sf/freecol/client/gui/SplashScreen.java | 2 +- src/net/sf/freecol/client/gui/SwingGUI.java | 2 +- src/net/sf/freecol/client/gui/TerrainCursor.java | 2 +- src/net/sf/freecol/client/gui/TilePopup.java | 2 +- src/net/sf/freecol/client/gui/TileViewer.java | 2 +- src/net/sf/freecol/client/gui/Widgets.java | 2 +- .../client/gui/WindowedFrameListener.java | 2 +- .../freecol/client/gui/action/AboutAction.java | 2 +- .../freecol/client/gui/action/ActionManager.java | 2 +- .../gui/action/AssignTradeRouteAction.java | 2 +- .../client/gui/action/BuildColonyAction.java | 2 +- .../freecol/client/gui/action/CenterAction.java | 2 +- .../freecol/client/gui/action/ChangeAction.java | 2 +- .../gui/action/ChangeWindowedModeAction.java | 2 +- .../sf/freecol/client/gui/action/ChatAction.java | 2 +- .../client/gui/action/ClearOrdersAction.java | 2 +- .../client/gui/action/ColopediaAction.java | 2 +- .../client/gui/action/ContinueAction.java | 2 +- .../freecol/client/gui/action/DebugAction.java | 2 +- .../gui/action/DeclareIndependenceAction.java | 2 +- .../gui/action/DetermineHighSeasAction.java | 2 +- .../client/gui/action/DisbandUnitAction.java | 2 +- .../client/gui/action/DisplayBordersAction.java | 2 +- .../client/gui/action/DisplayGridAction.java | 2 +- .../client/gui/action/DisplayTileTextAction.java | 2 +- .../freecol/client/gui/action/EndTurnAction.java | 2 +- .../freecol/client/gui/action/EuropeAction.java | 2 +- .../gui/action/ExecuteGotoOrdersAction.java | 2 +- .../client/gui/action/FindSettlementAction.java | 2 +- .../freecol/client/gui/action/FortifyAction.java | 2 +- .../freecol/client/gui/action/FreeColAction.java | 2 +- .../sf/freecol/client/gui/action/GotoAction.java | 2 +- .../client/gui/action/GotoTileAction.java | 2 +- .../client/gui/action/ImprovementAction.java | 2 +- .../sf/freecol/client/gui/action/LoadAction.java | 2 +- .../client/gui/action/MapControlsAction.java | 2 +- .../client/gui/action/MapEditorAction.java | 2 +- .../client/gui/action/MapboardAction.java | 2 +- .../gui/action/MiniMapToggleFogOfWarAction.java | 2 +- .../gui/action/MiniMapToggleViewAction.java | 2 +- .../client/gui/action/MiniMapZoomInAction.java | 2 +- .../client/gui/action/MiniMapZoomOutAction.java | 2 +- .../sf/freecol/client/gui/action/MoveAction.java | 2 +- .../sf/freecol/client/gui/action/NewAction.java | 2 +- .../client/gui/action/NewEmptyMapAction.java | 2 +- .../sf/freecol/client/gui/action/OpenAction.java | 2 +- .../client/gui/action/PreferencesAction.java | 2 +- .../sf/freecol/client/gui/action/QuitAction.java | 2 +- .../client/gui/action/ReconnectAction.java | 2 +- .../freecol/client/gui/action/RenameAction.java | 2 +- .../client/gui/action/ReportCargoAction.java | 2 +- .../client/gui/action/ReportColonyAction.java | 2 +- .../action/ReportContinentalCongressAction.java | 2 +- .../client/gui/action/ReportEducationAction.java | 2 +- .../gui/action/ReportExplorationAction.java | 2 +- .../client/gui/action/ReportForeignAction.java | 2 +- .../gui/action/ReportHighScoresAction.java | 2 +- .../client/gui/action/ReportHistoryAction.java | 2 +- .../client/gui/action/ReportIndianAction.java | 2 +- .../client/gui/action/ReportLabourAction.java | 2 +- .../client/gui/action/ReportMilitaryAction.java | 2 +- .../client/gui/action/ReportNavalAction.java | 2 +- .../gui/action/ReportProductionAction.java | 2 +- .../client/gui/action/ReportReligionAction.java | 2 +- .../gui/action/ReportRequirementsAction.java | 2 +- .../client/gui/action/ReportTradeAction.java | 2 +- .../client/gui/action/ReportTurnAction.java | 2 +- .../freecol/client/gui/action/RetireAction.java | 2 +- .../sf/freecol/client/gui/action/SaveAction.java | 2 +- .../client/gui/action/SaveAndQuitAction.java | 2 +- .../client/gui/action/ScaleMapAction.java | 2 +- .../client/gui/action/SelectableAction.java | 2 +- .../freecol/client/gui/action/SentryAction.java | 2 +- .../client/gui/action/ShowDifficultyAction.java | 2 +- .../client/gui/action/ShowGameOptionsAction.java | 2 +- .../client/gui/action/ShowMainAction.java | 2 +- .../action/ShowMapGeneratorOptionsAction.java | 2 +- .../client/gui/action/SkipUnitAction.java | 2 +- .../client/gui/action/StartMapAction.java | 2 +- .../client/gui/action/TilePopupAction.java | 2 +- .../client/gui/action/ToggleViewModeAction.java | 2 +- .../client/gui/action/TradeRouteAction.java | 2 +- .../sf/freecol/client/gui/action/UnitAction.java | 2 +- .../freecol/client/gui/action/UnloadAction.java | 2 +- .../sf/freecol/client/gui/action/WaitAction.java | 2 +- .../freecol/client/gui/action/ZoomInAction.java | 2 +- .../freecol/client/gui/action/ZoomOutAction.java | 2 +- .../freecol/client/gui/animation/Animation.java | 2 +- .../freecol/client/gui/animation/Animations.java | 2 +- .../client/gui/animation/UnitImageAnimation.java | 2 +- .../client/gui/animation/UnitMoveAnimation.java | 2 +- .../client/gui/dialog/CaptureGoodsDialog.java | 2 +- .../gui/dialog/ChooseFoundingFatherDialog.java | 2 +- .../client/gui/dialog/ClientOptionsDialog.java | 2 +- .../gui/dialog/ConfirmDeclarationDialog.java | 2 +- .../client/gui/dialog/DifficultyDialog.java | 2 +- .../client/gui/dialog/DumpCargoDialog.java | 2 +- .../client/gui/dialog/EditOptionDialog.java | 2 +- .../client/gui/dialog/EditSettlementDialog.java | 2 +- .../client/gui/dialog/EmigrationDialog.java | 2 +- .../freecol/client/gui/dialog/EndTurnDialog.java | 2 +- .../client/gui/dialog/FirstContactDialog.java | 2 +- src/net/sf/freecol/client/gui/dialog/Flag.java | 2 +- .../client/gui/dialog/FreeColChoiceDialog.java | 2 +- .../client/gui/dialog/FreeColConfirmDialog.java | 2 +- .../freecol/client/gui/dialog/FreeColDialog.java | 2 +- .../client/gui/dialog/FreeColInputDialog.java | 2 +- .../gui/dialog/FreeColStringInputDialog.java | 2 +- .../client/gui/dialog/GameOptionsDialog.java | 2 +- .../sf/freecol/client/gui/dialog/LoadDialog.java | 2 +- .../client/gui/dialog/LoadingSavegameDialog.java | 2 +- .../gui/dialog/MapGeneratorOptionsDialog.java | 2 +- .../freecol/client/gui/dialog/MapSizeDialog.java | 2 +- .../freecol/client/gui/dialog/MonarchDialog.java | 2 +- .../client/gui/dialog/NativeDemandDialog.java | 2 +- .../client/gui/dialog/NegotiationDialog.java | 2 +- .../freecol/client/gui/dialog/OptionsDialog.java | 2 +- .../sf/freecol/client/gui/dialog/Parameters.java | 2 +- .../client/gui/dialog/ParametersDialog.java | 2 +- .../client/gui/dialog/PreCombatDialog.java | 2 +- .../client/gui/dialog/RiverStyleDialog.java | 2 +- .../sf/freecol/client/gui/dialog/SaveDialog.java | 2 +- .../client/gui/dialog/ScaleMapSizeDialog.java | 2 +- .../client/gui/dialog/SelectAmountDialog.java | 2 +- .../gui/dialog/SelectDestinationDialog.java | 2 +- .../gui/dialog/SelectTributeAmountDialog.java | 2 +- .../freecol/client/gui/dialog/VictoryDialog.java | 2 +- .../client/gui/dialog/WarehouseDialog.java | 2 +- .../client/gui/label/AbstractGoodsLabel.java | 2 +- .../sf/freecol/client/gui/label/CargoLabel.java | 2 +- .../sf/freecol/client/gui/label/Draggable.java | 2 +- .../freecol/client/gui/label/FreeColLabel.java | 2 +- .../sf/freecol/client/gui/label/GoodsLabel.java | 2 +- .../sf/freecol/client/gui/label/MarketLabel.java | 2 +- .../client/gui/label/ProductionLabel.java | 2 +- .../sf/freecol/client/gui/label/UnitLabel.java | 2 +- .../sf/freecol/client/gui/menu/DebugMenu.java | 2 +- .../freecol/client/gui/menu/FreeColMenuBar.java | 2 +- .../freecol/client/gui/menu/FreeColMenuTest.java | 2 +- .../freecol/client/gui/menu/InGameMenuBar.java | 2 +- .../client/gui/menu/MapEditorMenuBar.java | 2 +- .../client/gui/menu/MenuMouseMotionListener.java | 2 +- .../client/gui/option/AbstractUnitOptionUI.java | 2 +- .../client/gui/option/AudioMixerOptionUI.java | 2 +- .../client/gui/option/BooleanOptionUI.java | 2 +- .../freecol/client/gui/option/FileOptionUI.java | 2 +- .../client/gui/option/FreeColActionUI.java | 2 +- .../client/gui/option/IntegerOptionUI.java | 2 +- .../client/gui/option/LanguageOptionUI.java | 2 +- .../freecol/client/gui/option/ListOptionUI.java | 2 +- .../freecol/client/gui/option/ModOptionUI.java | 2 +- .../freecol/client/gui/option/OptionGroupUI.java | 2 +- .../sf/freecol/client/gui/option/OptionUI.java | 2 +- .../freecol/client/gui/option/OptionUpdater.java | 2 +- .../client/gui/option/PercentageOptionUI.java | 2 +- .../freecol/client/gui/option/RangeOptionUI.java | 2 +- .../client/gui/option/SelectOptionUI.java | 2 +- .../client/gui/option/SliderOptionUI.java | 2 +- .../client/gui/option/StringOptionUI.java | 2 +- .../freecol/client/gui/option/TextOptionUI.java | 2 +- .../client/gui/option/UnitTypeOptionUI.java | 2 +- .../sf/freecol/client/gui/panel/AboutPanel.java | 2 +- .../client/gui/panel/BuildQueuePanel.java | 2 +- .../freecol/client/gui/panel/BuildingPanel.java | 2 +- .../sf/freecol/client/gui/panel/CargoPanel.java | 2 +- .../sf/freecol/client/gui/panel/ChatPanel.java | 2 +- .../client/gui/panel/ClassicMapControls.java | 2 +- .../sf/freecol/client/gui/panel/ColonyPanel.java | 2 +- .../client/gui/panel/ColorCellEditor.java | 2 +- .../client/gui/panel/ColorCellRenderer.java | 2 +- .../client/gui/panel/ColorChooserPanel.java | 2 +- .../client/gui/panel/ConstructionPanel.java | 2 +- .../client/gui/panel/CornerMapControls.java | 2 +- .../client/gui/panel/DeclarationPanel.java | 2 +- .../client/gui/panel/DefaultTransferHandler.java | 2 +- .../freecol/client/gui/panel/DragListener.java | 2 +- .../freecol/client/gui/panel/DropListener.java | 2 +- .../sf/freecol/client/gui/panel/DropTarget.java | 2 +- .../sf/freecol/client/gui/panel/ErrorPanel.java | 2 +- .../sf/freecol/client/gui/panel/EuropePanel.java | 2 +- .../sf/freecol/client/gui/panel/EventPanel.java | 2 +- .../client/gui/panel/FindSettlementPanel.java | 2 +- .../client/gui/panel/FreeColImageBorder.java | 2 +- .../freecol/client/gui/panel/FreeColPanel.java | 2 +- .../client/gui/panel/FreeColProgressBar.java | 2 +- .../freecol/client/gui/panel/ImageSelection.java | 2 +- .../sf/freecol/client/gui/panel/InPortPanel.java | 2 +- .../client/gui/panel/IndianSettlementPanel.java | 2 +- .../sf/freecol/client/gui/panel/InfoPanel.java | 2 +- .../client/gui/panel/InformationPanel.java | 2 +- .../sf/freecol/client/gui/panel/MainPanel.java | 2 +- .../sf/freecol/client/gui/panel/MapControls.java | 2 +- .../gui/panel/MapEditorTransformPanel.java | 2 +- .../sf/freecol/client/gui/panel/MigPanel.java | 2 +- src/net/sf/freecol/client/gui/panel/MiniMap.java | 2 +- .../sf/freecol/client/gui/panel/NewPanel.java | 2 +- .../freecol/client/gui/panel/NewUnitPanel.java | 2 +- .../freecol/client/gui/panel/PlayersTable.java | 2 +- .../sf/freecol/client/gui/panel/PortPanel.java | 2 +- .../freecol/client/gui/panel/PurchasePanel.java | 2 +- .../client/gui/panel/QuickActionMenu.java | 2 +- .../freecol/client/gui/panel/RecruitPanel.java | 2 +- .../client/gui/panel/ServerListPanel.java | 2 +- .../client/gui/panel/ServerListTableModel.java | 2 +- .../freecol/client/gui/panel/StartGamePanel.java | 2 +- .../client/gui/panel/StatisticsPanel.java | 2 +- .../sf/freecol/client/gui/panel/StatusPanel.java | 2 +- .../sf/freecol/client/gui/panel/TilePanel.java | 2 +- .../client/gui/panel/TradeRouteInputPanel.java | 2 +- .../client/gui/panel/TradeRoutePanel.java | 2 +- .../sf/freecol/client/gui/panel/TrainPanel.java | 2 +- .../sf/freecol/client/gui/panel/UnitButton.java | 2 +- .../sf/freecol/client/gui/panel/UnitPanel.java | 2 +- src/net/sf/freecol/client/gui/panel/Utility.java | 2 +- .../client/gui/panel/WorkProductionPanel.java | 2 +- .../gui/panel/colopedia/BuildingDetailPanel.java | 2 +- .../panel/colopedia/ColopediaDetailPanel.java | 2 +- .../colopedia/ColopediaGameObjectTypePanel.java | 2 +- .../gui/panel/colopedia/ColopediaPanel.java | 2 +- .../colopedia/ColopediaTreeCellRenderer.java | 2 +- .../gui/panel/colopedia/ColopediaTreeItem.java | 2 +- .../gui/panel/colopedia/ConceptDetailPanel.java | 2 +- .../gui/panel/colopedia/FatherDetailPanel.java | 2 +- .../gui/panel/colopedia/GoodsDetailPanel.java | 2 +- .../gui/panel/colopedia/NationDetailPanel.java | 2 +- .../panel/colopedia/NationTypeDetailPanel.java | 2 +- .../panel/colopedia/ResourcesDetailPanel.java | 2 +- .../gui/panel/colopedia/TerrainDetailPanel.java | 2 +- .../gui/panel/colopedia/UnitDetailPanel.java | 2 +- .../gui/panel/report/CompactLabourReport.java | 2 +- .../client/gui/panel/report/LabourData.java | 2 +- .../gui/panel/report/ReportCargoPanel.java | 2 +- .../panel/report/ReportClassicColonyPanel.java | 2 +- .../panel/report/ReportCompactColonyPanel.java | 2 +- .../report/ReportContinentalCongressPanel.java | 2 +- .../gui/panel/report/ReportEducationPanel.java | 2 +- .../gui/panel/report/ReportExplorationPanel.java | 2 +- .../panel/report/ReportForeignAffairPanel.java | 2 +- .../gui/panel/report/ReportHighScoresPanel.java | 2 +- .../gui/panel/report/ReportHistoryPanel.java | 2 +- .../gui/panel/report/ReportIndianPanel.java | 2 +- .../panel/report/ReportLabourDetailPanel.java | 2 +- .../gui/panel/report/ReportLabourPanel.java | 2 +- .../gui/panel/report/ReportMilitaryPanel.java | 2 +- .../gui/panel/report/ReportNavalPanel.java | 2 +- .../client/gui/panel/report/ReportPanel.java | 2 +- .../gui/panel/report/ReportProductionPanel.java | 2 +- .../gui/panel/report/ReportReligiousPanel.java | 2 +- .../panel/report/ReportRequirementsPanel.java | 2 +- .../gui/panel/report/ReportTradePanel.java | 2 +- .../client/gui/panel/report/ReportTurnPanel.java | 2 +- .../client/gui/panel/report/ReportUnitPanel.java | 2 +- .../client/gui/plaf/FreeColBrightPanelUI.java | 2 +- .../freecol/client/gui/plaf/FreeColButtonUI.java | 2 +- .../client/gui/plaf/FreeColCheckBoxUI.java | 2 +- .../client/gui/plaf/FreeColComboBoxRenderer.java | 2 +- .../client/gui/plaf/FreeColComboBoxUI.java | 2 +- .../client/gui/plaf/FreeColFileChooserUI.java | 2 +- .../freecol/client/gui/plaf/FreeColLabelUI.java | 2 +- .../freecol/client/gui/plaf/FreeColListUI.java | 2 +- .../client/gui/plaf/FreeColLookAndFeel.java | 2 +- .../client/gui/plaf/FreeColMenuBarUI.java | 2 +- .../client/gui/plaf/FreeColMenuItemUI.java | 2 +- .../client/gui/plaf/FreeColOptionPaneUI.java | 2 +- .../freecol/client/gui/plaf/FreeColPanelUI.java | 2 +- .../client/gui/plaf/FreeColPopupMenuUI.java | 2 +- .../client/gui/plaf/FreeColRadioButtonUI.java | 2 +- .../client/gui/plaf/FreeColScrollPaneUI.java | 2 +- .../client/gui/plaf/FreeColSelectedPanelUI.java | 2 +- .../client/gui/plaf/FreeColTableHeaderUI.java | 2 +- .../freecol/client/gui/plaf/FreeColTableUI.java | 2 +- .../client/gui/plaf/FreeColTextAreaUI.java | 2 +- .../client/gui/plaf/FreeColTextFieldUI.java | 2 +- .../client/gui/plaf/FreeColToolTipUI.java | 2 +- .../gui/plaf/FreeColTransparentPanelUI.java | 2 +- .../sf/freecol/client/gui/plaf/LAFUtilities.java | 2 +- .../client/gui/tooltip/BuildingToolTip.java | 2 +- .../freecol/client/gui/tooltip/RebelToolTip.java | 2 +- .../freecol/client/gui/video/VideoComponent.java | 2 +- .../freecol/client/gui/video/VideoListener.java | 2 +- .../freecol/client/networking/UserServerAPI.java | 2 +- src/net/sf/freecol/common/FreeColException.java | 2 +- src/net/sf/freecol/common/FreeColSeed.java | 2 +- src/net/sf/freecol/common/ObjectWithId.java | 2 +- src/net/sf/freecol/common/debug/DebugUtils.java | 2 +- .../sf/freecol/common/debug/FreeColDebugger.java | 2 +- .../freecol/common/i18n/DefaultNumberRule.java | 2 +- .../sf/freecol/common/i18n/DualNumberRule.java | 2 +- src/net/sf/freecol/common/i18n/Messages.java | 2 +- src/net/sf/freecol/common/i18n/NameCache.java | 2 +- src/net/sf/freecol/common/i18n/Number.java | 2 +- src/net/sf/freecol/common/i18n/NumberRules.java | 2 +- .../sf/freecol/common/i18n/OtherNumberRule.java | 2 +- .../sf/freecol/common/i18n/PluralNumberRule.java | 2 +- src/net/sf/freecol/common/i18n/Relation.java | 2 +- src/net/sf/freecol/common/i18n/Rule.java | 2 +- src/net/sf/freecol/common/i18n/Selector.java | 2 +- .../freecol/common/i18n/ZeroOneNumberRule.java | 2 +- .../sf/freecol/common/io/FreeColDataFile.java | 2 +- .../sf/freecol/common/io/FreeColDirectories.java | 2 +- src/net/sf/freecol/common/io/FreeColModFile.java | 2 +- .../freecol/common/io/FreeColSavegameFile.java | 2 +- src/net/sf/freecol/common/io/FreeColTcFile.java | 2 +- .../sf/freecol/common/io/FreeColXMLReader.java | 2 +- .../sf/freecol/common/io/FreeColXMLWriter.java | 2 +- .../sf/freecol/common/io/sza/AnimationEvent.java | 2 +- .../common/io/sza/ImageAnimationEvent.java | 2 +- .../common/io/sza/SimpleZippedAnimation.java | 2 +- .../freecol/common/logging/DefaultHandler.java | 2 +- .../sf/freecol/common/logging/TextFormatter.java | 2 +- .../common/metaserver/MetaServerUtils.java | 2 +- .../sf/freecol/common/metaserver/ServerInfo.java | 2 +- src/net/sf/freecol/common/model/Ability.java | 2 +- .../sf/freecol/common/model/AbstractGoods.java | 2 +- .../sf/freecol/common/model/AbstractUnit.java | 2 +- .../sf/freecol/common/model/BaseProduction.java | 2 +- src/net/sf/freecol/common/model/BuildQueue.java | 2 +- .../sf/freecol/common/model/BuildableType.java | 2 +- src/net/sf/freecol/common/model/Building.java | 2 +- .../sf/freecol/common/model/BuildingType.java | 2 +- src/net/sf/freecol/common/model/Colony.java | 2 +- src/net/sf/freecol/common/model/ColonyTile.java | 2 +- .../sf/freecol/common/model/ColonyTradeItem.java | 2 +- src/net/sf/freecol/common/model/ColonyWas.java | 2 +- src/net/sf/freecol/common/model/CombatModel.java | 2 +- src/net/sf/freecol/common/model/Constants.java | 2 +- src/net/sf/freecol/common/model/Consumer.java | 2 +- .../sf/freecol/common/model/DiplomaticTrade.java | 2 +- src/net/sf/freecol/common/model/Direction.java | 2 +- src/net/sf/freecol/common/model/Disaster.java | 2 +- src/net/sf/freecol/common/model/Effect.java | 2 +- src/net/sf/freecol/common/model/Europe.java | 2 +- src/net/sf/freecol/common/model/EuropeWas.java | 2 +- .../freecol/common/model/EuropeanNationType.java | 2 +- src/net/sf/freecol/common/model/Event.java | 2 +- src/net/sf/freecol/common/model/ExportData.java | 2 +- src/net/sf/freecol/common/model/Feature.java | 2 +- .../freecol/common/model/FeatureContainer.java | 2 +- src/net/sf/freecol/common/model/Force.java | 2 +- .../sf/freecol/common/model/FoundingFather.java | 2 +- .../freecol/common/model/FreeColGameObject.java | 2 +- .../common/model/FreeColGameObjectListener.java | 2 +- .../sf/freecol/common/model/FreeColObject.java | 2 +- .../freecol/common/model/FreeColSpecObject.java | 2 +- .../common/model/FreeColSpecObjectType.java | 2 +- src/net/sf/freecol/common/model/Game.java | 2 +- .../sf/freecol/common/model/GoldTradeItem.java | 2 +- src/net/sf/freecol/common/model/Goods.java | 2 +- .../sf/freecol/common/model/GoodsContainer.java | 2 +- .../sf/freecol/common/model/GoodsLocation.java | 2 +- .../sf/freecol/common/model/GoodsTradeItem.java | 2 +- src/net/sf/freecol/common/model/GoodsType.java | 2 +- src/net/sf/freecol/common/model/HighScore.java | 2 +- src/net/sf/freecol/common/model/HighSeas.java | 2 +- .../sf/freecol/common/model/HistoryEvent.java | 2 +- .../sf/freecol/common/model/InciteTradeItem.java | 2 +- .../freecol/common/model/IndianNationType.java | 2 +- .../freecol/common/model/IndianSettlement.java | 2 +- src/net/sf/freecol/common/model/LandMap.java | 2 +- src/net/sf/freecol/common/model/LastSale.java | 2 +- src/net/sf/freecol/common/model/Limit.java | 2 +- src/net/sf/freecol/common/model/Locatable.java | 2 +- src/net/sf/freecol/common/model/Location.java | 2 +- .../sf/freecol/common/model/LostCityRumour.java | 2 +- src/net/sf/freecol/common/model/Map.java | 2 +- src/net/sf/freecol/common/model/Market.java | 2 +- src/net/sf/freecol/common/model/MarketData.java | 2 +- src/net/sf/freecol/common/model/MarketWas.java | 2 +- .../sf/freecol/common/model/ModelMessage.java | 2 +- src/net/sf/freecol/common/model/Modifier.java | 2 +- src/net/sf/freecol/common/model/Monarch.java | 2 +- src/net/sf/freecol/common/model/Movable.java | 2 +- src/net/sf/freecol/common/model/Nameable.java | 2 +- src/net/sf/freecol/common/model/Named.java | 2 +- src/net/sf/freecol/common/model/Nation.java | 2 +- .../sf/freecol/common/model/NationOptions.java | 2 +- .../sf/freecol/common/model/NationSummary.java | 2 +- src/net/sf/freecol/common/model/NationType.java | 2 +- src/net/sf/freecol/common/model/NativeTrade.java | 2 +- .../sf/freecol/common/model/NativeTradeItem.java | 2 +- src/net/sf/freecol/common/model/Occupation.java | 2 +- src/net/sf/freecol/common/model/Operand.java | 2 +- src/net/sf/freecol/common/model/Ownable.java | 2 +- src/net/sf/freecol/common/model/PathNode.java | 2 +- src/net/sf/freecol/common/model/Player.java | 2 +- src/net/sf/freecol/common/model/PlunderType.java | 2 +- .../sf/freecol/common/model/ProductionCache.java | 2 +- .../sf/freecol/common/model/ProductionInfo.java | 2 +- .../sf/freecol/common/model/ProductionMap.java | 2 +- .../sf/freecol/common/model/ProductionType.java | 2 +- src/net/sf/freecol/common/model/RandomRange.java | 2 +- src/net/sf/freecol/common/model/Region.java | 2 +- src/net/sf/freecol/common/model/Resource.java | 2 +- .../sf/freecol/common/model/ResourceType.java | 2 +- src/net/sf/freecol/common/model/Role.java | 2 +- src/net/sf/freecol/common/model/Scope.java | 2 +- .../sf/freecol/common/model/ScopeContainer.java | 2 +- src/net/sf/freecol/common/model/Settlement.java | 2 +- .../sf/freecol/common/model/SettlementType.java | 2 +- .../freecol/common/model/SimpleCombatModel.java | 2 +- .../sf/freecol/common/model/Specification.java | 2 +- src/net/sf/freecol/common/model/Stance.java | 2 +- .../sf/freecol/common/model/StanceTradeItem.java | 2 +- .../sf/freecol/common/model/StringTemplate.java | 2 +- src/net/sf/freecol/common/model/Tension.java | 2 +- src/net/sf/freecol/common/model/Tile.java | 2 +- .../sf/freecol/common/model/TileImprovement.java | 2 +- .../common/model/TileImprovementStyle.java | 2 +- .../common/model/TileImprovementType.java | 2 +- src/net/sf/freecol/common/model/TileItem.java | 2 +- .../freecol/common/model/TileItemContainer.java | 2 +- src/net/sf/freecol/common/model/TileType.java | 2 +- .../sf/freecol/common/model/TileTypeChange.java | 2 +- src/net/sf/freecol/common/model/TradeItem.java | 2 +- .../sf/freecol/common/model/TradeLocation.java | 2 +- src/net/sf/freecol/common/model/TradeRoute.java | 2 +- .../sf/freecol/common/model/TradeRouteStop.java | 2 +- .../common/model/TransactionListener.java | 2 +- src/net/sf/freecol/common/model/Turn.java | 2 +- .../sf/freecol/common/model/TypeCountMap.java | 2 +- src/net/sf/freecol/common/model/Unit.java | 2 +- .../sf/freecol/common/model/UnitChangeType.java | 2 +- .../sf/freecol/common/model/UnitIterator.java | 2 +- .../sf/freecol/common/model/UnitLocation.java | 2 +- .../sf/freecol/common/model/UnitTradeItem.java | 2 +- src/net/sf/freecol/common/model/UnitType.java | 2 +- .../sf/freecol/common/model/UnitTypeChange.java | 2 +- src/net/sf/freecol/common/model/UnitWas.java | 2 +- .../sf/freecol/common/model/WorkLocation.java | 2 +- .../common/model/mission/AbstractMission.java | 2 +- .../common/model/mission/CompoundMission.java | 2 +- .../common/model/mission/GoToMission.java | 2 +- .../common/model/mission/ImprovementMission.java | 2 +- .../sf/freecol/common/model/mission/Mission.java | 2 +- .../common/model/mission/MissionManager.java | 2 +- .../model/pathfinding/BaseCostDecider.java | 2 +- .../common/model/pathfinding/CostDecider.java | 2 +- .../common/model/pathfinding/CostDeciders.java | 2 +- .../common/model/pathfinding/GoalDecider.java | 2 +- .../common/model/pathfinding/GoalDeciders.java | 2 +- .../common/networking/AbandonColonyMessage.java | 2 +- .../common/networking/AddPlayerMessage.java | 2 +- .../common/networking/AnimateAttackMessage.java | 2 +- .../common/networking/AnimateMoveMessage.java | 2 +- .../common/networking/AskSkillMessage.java | 2 +- .../common/networking/AssignTeacherMessage.java | 2 +- .../networking/AssignTradeRouteMessage.java | 2 +- .../freecol/common/networking/AttackMessage.java | 2 +- .../common/networking/AttributeMessage.java | 2 +- .../common/networking/BuildColonyMessage.java | 2 +- .../networking/CashInTreasureTrainMessage.java | 2 +- .../sf/freecol/common/networking/ChangeSet.java | 2 +- .../common/networking/ChangeStateMessage.java | 2 +- .../ChangeWorkImprovementTypeMessage.java | 2 +- .../common/networking/ChangeWorkTypeMessage.java | 2 +- .../freecol/common/networking/ChatMessage.java | 2 +- .../networking/ChooseFoundingFatherMessage.java | 2 +- .../common/networking/ClaimLandMessage.java | 2 +- .../networking/ClearSpecialityMessage.java | 2 +- .../freecol/common/networking/CloseMessage.java | 2 +- .../sf/freecol/common/networking/Connection.java | 2 +- .../common/networking/ContinueMessage.java | 2 +- .../networking/DeclareIndependenceMessage.java | 2 +- .../common/networking/DeclineMoundsMessage.java | 2 +- .../networking/DeleteTradeRouteMessage.java | 2 +- .../common/networking/DeliverGiftMessage.java | 2 +- .../common/networking/DemandTributeMessage.java | 2 +- .../common/networking/DiplomacyMessage.java | 2 +- .../common/networking/DisbandUnitMessage.java | 2 +- .../common/networking/DisconnectMessage.java | 2 +- .../common/networking/DisembarkMessage.java | 2 +- .../freecol/common/networking/EmbarkMessage.java | 2 +- .../common/networking/EmigrateUnitMessage.java | 2 +- .../common/networking/EndTurnMessage.java | 2 +- .../networking/EnterRevengeModeMessage.java | 2 +- .../common/networking/EquipForRoleMessage.java | 2 +- .../freecol/common/networking/ErrorMessage.java | 2 +- .../common/networking/FeatureChangeMessage.java | 2 +- .../common/networking/FirstContactMessage.java | 2 +- .../networking/FountainOfYouthMessage.java | 2 +- .../common/networking/GameEndedMessage.java | 2 +- .../common/networking/GameStateMessage.java | 2 +- .../common/networking/HighScoresMessage.java | 2 +- .../freecol/common/networking/InciteMessage.java | 2 +- .../common/networking/IndianDemandMessage.java | 2 +- .../common/networking/JoinColonyMessage.java | 2 +- .../common/networking/LearnSkillMessage.java | 2 +- .../common/networking/LoadGoodsMessage.java | 2 +- .../freecol/common/networking/LoginMessage.java | 2 +- .../freecol/common/networking/LogoutMessage.java | 2 +- .../common/networking/LootCargoMessage.java | 2 +- .../sf/freecol/common/networking/Message.java | 2 +- .../common/networking/MessageHandler.java | 2 +- .../common/networking/MissionaryMessage.java | 2 +- .../common/networking/MonarchActionMessage.java | 2 +- .../freecol/common/networking/MoveMessage.java | 2 +- .../freecol/common/networking/MoveToMessage.java | 2 +- .../common/networking/MultipleMessage.java | 2 +- .../common/networking/NationSummaryMessage.java | 2 +- .../common/networking/NativeGiftMessage.java | 2 +- .../common/networking/NativeTradeMessage.java | 2 +- .../common/networking/NetworkReplyObject.java | 2 +- .../common/networking/NewLandNameMessage.java | 2 +- .../common/networking/NewRegionNameMessage.java | 2 +- .../common/networking/NewTradeRouteMessage.java | 2 +- .../common/networking/NewTurnMessage.java | 2 +- .../freecol/common/networking/ObjectMessage.java | 2 +- .../common/networking/PartialMessage.java | 2 +- .../common/networking/PayArrearsMessage.java | 2 +- .../common/networking/PayForBuildingMessage.java | 2 +- .../networking/PutOutsideColonyMessage.java | 2 +- .../common/networking/QuestionMessage.java | 2 +- .../freecol/common/networking/ReadyMessage.java | 2 +- .../networking/RearrangeColonyMessage.java | 2 +- .../common/networking/ReceivingThread.java | 2 +- .../common/networking/ReconnectMessage.java | 2 +- .../common/networking/RegisterServerMessage.java | 2 +- .../freecol/common/networking/RemoveMessage.java | 2 +- .../common/networking/RemoveServerMessage.java | 2 +- .../freecol/common/networking/RenameMessage.java | 2 +- .../freecol/common/networking/ReplyMessage.java | 2 +- .../common/networking/RequestLaunchMessage.java | 2 +- .../freecol/common/networking/RetireMessage.java | 2 +- .../networking/ScoutIndianSettlementMessage.java | 2 +- .../networking/ScoutSpeakToChiefMessage.java | 2 +- .../sf/freecol/common/networking/ServerAPI.java | 2 +- .../common/networking/ServerInfoMessage.java | 2 +- .../common/networking/ServerListMessage.java | 2 +- .../freecol/common/networking/SetAIMessage.java | 2 +- .../common/networking/SetAvailableMessage.java | 2 +- .../common/networking/SetBuildQueueMessage.java | 2 +- .../common/networking/SetColorMessage.java | 2 +- .../networking/SetCurrentPlayerMessage.java | 2 +- .../common/networking/SetCurrentStopMessage.java | 2 +- .../common/networking/SetDeadMessage.java | 2 +- .../common/networking/SetDestinationMessage.java | 2 +- .../common/networking/SetGoodsLevelsMessage.java | 2 +- .../common/networking/SetNationMessage.java | 2 +- .../common/networking/SetNationTypeMessage.java | 2 +- .../common/networking/SetStanceMessage.java | 2 +- .../common/networking/SpySettlementMessage.java | 2 +- .../common/networking/StartGameMessage.java | 2 +- .../networking/TrainUnitInEuropeMessage.java | 2 +- .../common/networking/TrivialMessage.java | 2 +- .../common/networking/UnloadGoodsMessage.java | 2 +- .../networking/UpdateGameOptionsMessage.java | 2 +- .../UpdateMapGeneratorOptionsMessage.java | 2 +- .../freecol/common/networking/UpdateMessage.java | 2 +- .../common/networking/UpdateServerMessage.java | 2 +- .../networking/UpdateTradeRouteMessage.java | 2 +- .../common/networking/VacantPlayersMessage.java | 2 +- .../freecol/common/networking/WorkMessage.java | 2 +- .../common/networking/WrapperMessage.java | 2 +- .../sf/freecol/common/option/AbstractOption.java | 2 +- .../common/option/AbstractUnitOption.java | 2 +- .../freecol/common/option/AudioMixerOption.java | 2 +- .../sf/freecol/common/option/BooleanOption.java | 2 +- src/net/sf/freecol/common/option/FileOption.java | 2 +- .../sf/freecol/common/option/GameOptions.java | 2 +- .../sf/freecol/common/option/IntegerOption.java | 2 +- .../sf/freecol/common/option/LanguageOption.java | 2 +- src/net/sf/freecol/common/option/ListOption.java | 2 +- .../common/option/MapGeneratorOptions.java | 2 +- .../sf/freecol/common/option/ModListOption.java | 2 +- src/net/sf/freecol/common/option/ModOption.java | 2 +- src/net/sf/freecol/common/option/Option.java | 2 +- .../freecol/common/option/OptionContainer.java | 2 +- .../sf/freecol/common/option/OptionGroup.java | 2 +- .../freecol/common/option/PercentageOption.java | 2 +- .../sf/freecol/common/option/RangeOption.java | 2 +- .../sf/freecol/common/option/SelectOption.java | 2 +- .../sf/freecol/common/option/StringOption.java | 2 +- src/net/sf/freecol/common/option/TextOption.java | 2 +- .../sf/freecol/common/option/UnitListOption.java | 2 +- .../sf/freecol/common/option/UnitTypeOption.java | 2 +- .../freecol/common/resources/AudioResource.java | 2 +- .../freecol/common/resources/ColorResource.java | 2 +- src/net/sf/freecol/common/resources/FAFile.java | 2 +- .../freecol/common/resources/FAFileResource.java | 2 +- .../freecol/common/resources/FontResource.java | 2 +- .../sf/freecol/common/resources/ImageCache.java | 2 +- .../freecol/common/resources/ImageResource.java | 2 +- .../sf/freecol/common/resources/Resource.java | 2 +- .../common/resources/ResourceFactory.java | 2 +- .../common/resources/ResourceManager.java | 2 +- .../freecol/common/resources/ResourceMapper.java | 2 +- .../common/resources/ResourceMapping.java | 2 +- .../sf/freecol/common/resources/SZAResource.java | 2 +- .../freecol/common/resources/StringResource.java | 2 +- src/net/sf/freecol/common/resources/Video.java | 2 +- .../freecol/common/resources/VideoResource.java | 2 +- .../common/sound/OggVorbisDecoderFactory.java | 2 +- src/net/sf/freecol/common/sound/SoundPlayer.java | 2 +- .../sf/freecol/common/util/CachingFunction.java | 2 +- .../sf/freecol/common/util/CollectionUtils.java | 2 +- src/net/sf/freecol/common/util/ImageUtils.java | 2 +- src/net/sf/freecol/common/util/Introspector.java | 2 +- src/net/sf/freecol/common/util/LogBuilder.java | 2 +- src/net/sf/freecol/common/util/OSUtils.java | 2 +- src/net/sf/freecol/common/util/RandomChoice.java | 2 +- src/net/sf/freecol/common/util/RandomUtils.java | 2 +- src/net/sf/freecol/common/util/StringUtils.java | 2 +- src/net/sf/freecol/common/util/Utils.java | 2 +- src/net/sf/freecol/metaserver/MetaRegister.java | 2 +- src/net/sf/freecol/metaserver/MetaServer.java | 2 +- .../sf/freecol/metaserver/MetaServerHandler.java | 2 +- src/net/sf/freecol/server/FreeColServer.java | 2 +- src/net/sf/freecol/server/ai/AIColony.java | 2 +- src/net/sf/freecol/server/ai/AIGoods.java | 2 +- .../freecol/server/ai/AIInGameInputHandler.java | 2 +- src/net/sf/freecol/server/ai/AIMain.java | 2 +- src/net/sf/freecol/server/ai/AIMessage.java | 2 +- src/net/sf/freecol/server/ai/AIObject.java | 2 +- src/net/sf/freecol/server/ai/AIPlayer.java | 2 +- src/net/sf/freecol/server/ai/AIServerAPI.java | 2 +- src/net/sf/freecol/server/ai/AIUnit.java | 2 +- src/net/sf/freecol/server/ai/Cargo.java | 2 +- src/net/sf/freecol/server/ai/ColonyPlan.java | 2 +- .../sf/freecol/server/ai/EuropeanAIPlayer.java | 2 +- src/net/sf/freecol/server/ai/GoodsWish.java | 2 +- .../sf/freecol/server/ai/MissionAIPlayer.java | 2 +- src/net/sf/freecol/server/ai/NativeAIPlayer.java | 2 +- src/net/sf/freecol/server/ai/REFAIPlayer.java | 2 +- .../freecol/server/ai/TileImprovementPlan.java | 2 +- .../freecol/server/ai/TransportableAIObject.java | 2 +- src/net/sf/freecol/server/ai/ValuedAIObject.java | 2 +- src/net/sf/freecol/server/ai/Wish.java | 2 +- .../sf/freecol/server/ai/WorkLocationPlan.java | 2 +- src/net/sf/freecol/server/ai/WorkerWish.java | 2 +- .../server/ai/mission/BuildColonyMission.java | 2 +- .../ai/mission/CashInTreasureTrainMission.java | 2 +- .../ai/mission/DefendSettlementMission.java | 2 +- .../ai/mission/IdleAtSettlementMission.java | 2 +- .../ai/mission/IndianBringGiftMission.java | 2 +- .../server/ai/mission/IndianDemandMission.java | 2 +- .../sf/freecol/server/ai/mission/Mission.java | 2 +- .../server/ai/mission/MissionaryMission.java | 2 +- .../server/ai/mission/PioneeringMission.java | 2 +- .../server/ai/mission/PrivateerMission.java | 2 +- .../server/ai/mission/ScoutingMission.java | 2 +- .../server/ai/mission/TransportMission.java | 2 +- .../ai/mission/UnitSeekAndDestroyMission.java | 2 +- .../ai/mission/UnitWanderHostileMission.java | 2 +- .../server/ai/mission/UnitWanderMission.java | 2 +- .../ai/mission/WishRealizationMission.java | 2 +- .../ai/mission/WorkInsideColonyMission.java | 2 +- .../sf/freecol/server/control/Controller.java | 2 +- .../server/control/FreeColServerHolder.java | 2 +- .../freecol/server/control/InGameController.java | 2 +- .../server/control/PreGameController.java | 2 +- .../server/control/ServerInputHandler.java | 2 +- .../server/control/UserConnectionHandler.java | 2 +- .../server/generator/ColonizationMapLoader.java | 2 +- .../server/generator/FreeColMapLoader.java | 2 +- .../freecol/server/generator/MapGenerator.java | 2 +- .../server/generator/MapLayerGenerator.java | 2 +- .../sf/freecol/server/generator/MapLoader.java | 2 +- src/net/sf/freecol/server/generator/River.java | 2 +- .../freecol/server/generator/RiverSection.java | 2 +- .../server/generator/SimpleMapGenerator.java | 2 +- .../server/generator/TerrainGenerator.java | 2 +- .../freecol/server/model/DiplomacySession.java | 2 +- src/net/sf/freecol/server/model/LootSession.java | 2 +- .../sf/freecol/server/model/MonarchSession.java | 2 +- .../server/model/NativeDemandSession.java | 2 +- .../freecol/server/model/NativeTradeSession.java | 2 +- .../sf/freecol/server/model/ServerBuilding.java | 2 +- .../sf/freecol/server/model/ServerColony.java | 2 +- .../freecol/server/model/ServerColonyTile.java | 2 +- .../sf/freecol/server/model/ServerEurope.java | 2 +- src/net/sf/freecol/server/model/ServerGame.java | 2 +- .../server/model/ServerIndianSettlement.java | 2 +- .../sf/freecol/server/model/ServerPlayer.java | 2 +- .../sf/freecol/server/model/ServerRegion.java | 2 +- src/net/sf/freecol/server/model/ServerUnit.java | 2 +- src/net/sf/freecol/server/model/Session.java | 2 +- .../sf/freecol/server/model/TimedSession.java | 2 +- src/net/sf/freecol/server/model/TurnTaker.java | 2 +- .../server/networking/DummyConnection.java | 2 +- src/net/sf/freecol/server/networking/Server.java | 2 +- .../sf/freecol/tools/ColonizationMapReader.java | 2 +- .../tools/ColonizationSaveGameReader.java | 2 +- src/net/sf/freecol/tools/DesktopEntry.java | 2 +- src/net/sf/freecol/tools/FSGConverter.java | 2 +- src/net/sf/freecol/tools/FlagTest.java | 2 +- src/net/sf/freecol/tools/ForestMaker.java | 2 +- .../sf/freecol/tools/GenerateDocumentation.java | 2 +- .../sf/freecol/tools/InstallerTranslations.java | 2 +- src/net/sf/freecol/tools/MapConverter.java | 2 +- src/net/sf/freecol/tools/MergeTranslations.java | 2 +- src/net/sf/freecol/tools/RiverMaker.java | 2 +- src/net/sf/freecol/tools/SaveGameValidator.java | 2 +- src/net/sf/freecol/tools/TranslationReport.java | 2 +- srcdata/graphics/Units/galleon/galleon.svg | 16 ++++++++-------- test/src/net/sf/freecol/AllTests.java | 2 +- test/src/net/sf/freecol/client/AllTests.java | 2 +- .../net/sf/freecol/client/ClientTestHelper.java | 2 +- .../net/sf/freecol/client/control/AllTests.java | 2 +- .../net/sf/freecol/client/control/MoveTest.java | 2 +- test/src/net/sf/freecol/client/gui/AllTests.java | 2 +- test/src/net/sf/freecol/client/gui/FontTest.java | 2 +- test/src/net/sf/freecol/common/AllTests.java | 2 +- .../src/net/sf/freecol/common/i18n/AllTests.java | 2 +- .../src/net/sf/freecol/common/i18n/CLDRTest.java | 2 +- test/src/net/sf/freecol/common/i18n/Merge.java | 2 +- .../common/i18n/MergeTableCellRenderer.java | 2 +- .../sf/freecol/common/i18n/MergeTableModel.java | 2 +- .../net/sf/freecol/common/i18n/MessageMerge.java | 2 +- .../net/sf/freecol/common/i18n/MessagesTest.java | 2 +- test/src/net/sf/freecol/common/io/AllTests.java | 2 +- test/src/net/sf/freecol/common/io/ModTest.java | 2 +- .../net/sf/freecol/common/model/AllTests.java | 2 +- .../common/model/BaseCostDeciderTest.java | 2 +- .../sf/freecol/common/model/BuildingTest.java | 2 +- .../common/model/ColonyProductionTest.java | 2 +- .../net/sf/freecol/common/model/ColonyTest.java | 2 +- .../net/sf/freecol/common/model/CombatTest.java | 2 +- .../sf/freecol/common/model/DisasterTest.java | 2 +- .../net/sf/freecol/common/model/EuropeTest.java | 2 +- .../freecol/common/model/FoundingFatherTest.java | 2 +- .../net/sf/freecol/common/model/GameTest.java | 2 +- .../freecol/common/model/GoodsContainerTest.java | 2 +- .../net/sf/freecol/common/model/GoodsTest.java | 2 +- .../sf/freecol/common/model/HighSeasTest.java | 2 +- .../common/model/IndianSettlementTest.java | 2 +- .../common/model/IndividualFatherTest.java | 2 +- .../net/sf/freecol/common/model/LimitTest.java | 2 +- .../src/net/sf/freecol/common/model/MapTest.java | 2 +- .../net/sf/freecol/common/model/MarketTest.java | 2 +- .../freecol/common/model/ModelMessageTest.java | 2 +- .../sf/freecol/common/model/ModifierTest.java | 2 +- .../net/sf/freecol/common/model/MonarchTest.java | 2 +- .../sf/freecol/common/model/MovementTest.java | 2 +- .../sf/freecol/common/model/NationTypeTest.java | 2 +- .../sf/freecol/common/model/PathfindingTest.java | 2 +- .../net/sf/freecol/common/model/PlayerTest.java | 2 +- .../freecol/common/model/ProductionTypeTest.java | 2 +- .../sf/freecol/common/model/RandomRangeTest.java | 2 +- .../net/sf/freecol/common/model/RoleTest.java | 2 +- .../net/sf/freecol/common/model/SchoolTest.java | 2 +- .../net/sf/freecol/common/model/ScopeTest.java | 2 +- .../freecol/common/model/SerializationTest.java | 2 +- .../sf/freecol/common/model/SettlementTest.java | 2 +- .../src/net/sf/freecol/common/model/SoLTest.java | 2 +- .../freecol/common/model/SpecificationTest.java | 2 +- .../common/model/TileImprovementTest.java | 2 +- .../common/model/TileItemContainerTest.java | 2 +- .../net/sf/freecol/common/model/TileTest.java | 2 +- .../sf/freecol/common/model/TradeRouteTest.java | 2 +- .../freecol/common/model/UnitChangeTypeTest.java | 2 +- .../net/sf/freecol/common/model/UnitTest.java | 2 +- .../net/sf/freecol/common/option/AllTests.java | 2 +- .../net/sf/freecol/common/option/OptionTest.java | 2 +- .../net/sf/freecol/common/sound/AllTests.java | 2 +- .../net/sf/freecol/common/sound/SoundTest.java | 2 +- .../net/sf/freecol/common/utils/AllTests.java | 2 +- .../net/sf/freecol/common/utils/UtilsTest.java | 2 +- test/src/net/sf/freecol/server/AllTests.java | 2 +- test/src/net/sf/freecol/server/SaveLoadTest.java | 2 +- .../net/sf/freecol/server/ServerTestHelper.java | 2 +- .../net/sf/freecol/server/ai/AIColonyTest.java | 2 +- test/src/net/sf/freecol/server/ai/AllTests.java | 2 +- .../net/sf/freecol/server/ai/ColonyPlanTest.java | 2 +- .../net/sf/freecol/server/ai/ContactTest.java | 2 +- .../freecol/server/ai/MissionAssignmentTest.java | 2 +- test/src/net/sf/freecol/server/ai/REFTest.java | 2 +- .../freecol/server/ai/StandardAIPlayerTest.java | 2 +- .../net/sf/freecol/server/ai/TensionTest.java | 2 +- .../sf/freecol/server/ai/mission/AllTests.java | 2 +- .../server/ai/mission/PioneeringMissionTest.java | 2 +- .../server/ai/mission/PrivateerMissionTest.java | 2 +- .../server/ai/mission/ScoutingMissionTest.java | 2 +- .../server/ai/mission/TransportMissionTest.java | 2 +- .../mission/UnitSeekAndDestroyMissionTest.java | 2 +- .../net/sf/freecol/server/control/AllTests.java | 2 +- .../server/control/InGameControllerTest.java | 2 +- .../sf/freecol/server/generator/AllTests.java | 2 +- .../server/generator/MapGeneratorTest.java | 2 +- .../net/sf/freecol/server/model/AllTests.java | 2 +- .../freecol/server/model/ServerBuildingTest.java | 2 +- .../freecol/server/model/ServerColonyTest.java | 2 +- .../server/model/ServerIndianSettlementTest.java | 2 +- .../freecol/server/model/ServerPlayerTest.java | 2 +- .../sf/freecol/server/model/ServerUnitTest.java | 2 +- .../sf/freecol/util/test/FreeColTestCase.java | 2 +- .../sf/freecol/util/test/FreeColTestUtils.java | 2 +- .../sf/freecol/util/test/MockMapGenerator.java | 2 +- .../sf/freecol/util/test/MockPseudoRandom.java | 2 +- www.freecol.org/_layouts/default.html | 2 +- ...-steps-for-contributing-to-freecol-website.md | 2 +- www.freecol.org/docs/FreeCol.html | 6 +++--- 912 files changed, 924 insertions(+), 924 deletions(-) diff --git a/build/skeletons/universalJavaApplicationStub b/build/skeletons/universalJavaApplicationStub index 352555667..ee4f76cba 100755 --- a/build/skeletons/universalJavaApplicationStub +++ b/build/skeletons/universalJavaApplicationStub @@ -11,14 +11,14 @@ # # # @author Tobias Fischer # # @url https://github.com/tofi86/universalJavaApplicationStub # -# @date 2020-03-19 # +# @date 2021-03-19 # # @version 3.0.6 # # # ################################################################################## # # # The MIT License (MIT) # # # -# Copyright (c) 2014-2020 Tobias Fischer # +# Copyright (c) 2014-2021 Tobias Fischer # # # # Permission is hereby granted, free of charge, to any person obtaining a copy # # of this software and associated documentation files (the "Software"), to deal # diff --git a/data/base/client-options.xml b/data/base/client-options.xml index 245a1ba29..b7bf5cdcd 100644 --- a/data/base/client-options.xml +++ b/data/base/client-options.xml @@ -1,6 +1,6 @@

4.6 Exploration

-

+

The original Colonization game awarded exploration points only for the discovery of the Pacific Ocean. This is also the default behaviour for FreeCol. However, you may choose to play with exploration points, in which case you will