[OpenGS-svn] SF.net SVN: opengs:[710] branches/newbattle

[<sto...@us...>]

Revision: 710
          http://opengs.svn.sourceforge.net/opengs/?rev=710&view=rev
Author:   storchaka
Date:     2009-10-16 23:47:05 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
Sync with trunk

Modified Paths:
--------------
    branches/newbattle/build.xml
    branches/newbattle/src/BatSim.java
    branches/newbattle/src/objects/Galaxy.java
    branches/newbattle/src/objects/GalaxyConstants.java
    branches/newbattle/src/objects/Race.java
    branches/newbattle/src/objects/ShipGroup.java
    branches/newbattle/src/objects/ShipType.java
    branches/newbattle/src/objects/Species.java
    branches/newbattle/src/objects/battle/ShipGroupState.java
    branches/newbattle/src/objects/io/OldGalaxyInput.java
    branches/newbattle/src/objects/io/OldGalaxyOutput.java
    branches/newbattle/src/objects/io/XmlGalaxyInput.java
    branches/newbattle/src/objects/io/XmlGalaxyOutput.java
    branches/newbattle/src/objects/production/CAP_Production.java
    branches/newbattle/src/objects/production/Ship_Production.java
    branches/newbattle/src/report/AbstractParameter.java
    branches/newbattle/src/report/AliensGroupsParameter.java
    branches/newbattle/src/report/AliensShipTypesParameter.java
    branches/newbattle/src/report/BroadcastMessagesParameter.java
    branches/newbattle/src/report/GroupsInSpaceParameter.java
    branches/newbattle/src/report/MyFleetsParameter.java
    branches/newbattle/src/report/MyRoutesParameter.java
    branches/newbattle/src/report/RaceListParameter.java
    branches/newbattle/src/report/RacePIPParameter.java
    branches/newbattle/src/report/SciencesParameter.java
    branches/newbattle/src/report/ShipTypesParameter.java
    branches/newbattle/src/report/ShipsInProductionParameter.java
    branches/newbattle/src/server/MailFactory.java
    branches/newbattle/src/server/OGSserver.java
    branches/newbattle/src/server/Session.java
    branches/newbattle/src/server/actions/CreateNewGame.java
    branches/newbattle/src/server/actions/RLFinish.java
    branches/newbattle/src/server/actions/RLStart.java
    branches/newbattle/src/server/actions/SendFinishMessage.java
    branches/newbattle/src/server/actions/SendInvitationMessage.java
    branches/newbattle/src/server/actions/SendStatisticsMail.java
    branches/newbattle/src/server/commands/AbstractServerCommand.java
    branches/newbattle/src/server/commands/AddMap.java
    branches/newbattle/src/server/commands/AddTeam.java
    branches/newbattle/src/server/commands/AdminMode.java
    branches/newbattle/src/server/commands/ArchiveGame.java
    branches/newbattle/src/server/commands/AutoSchedule.java
    branches/newbattle/src/server/commands/BlackList.java
    branches/newbattle/src/server/commands/CheckEmailAddress.java
    branches/newbattle/src/server/commands/ConfirmGameAddress.java
    branches/newbattle/src/server/commands/ContinueGame.java
    branches/newbattle/src/server/commands/Copyright.java
    branches/newbattle/src/server/commands/CreateNewGame.java
    branches/newbattle/src/server/commands/DeleteGame.java
    branches/newbattle/src/server/commands/EditGame.java
    branches/newbattle/src/server/commands/EndCommands.java
    branches/newbattle/src/server/commands/FinishGame.java
    branches/newbattle/src/server/commands/GenerateGameInfo.java
    branches/newbattle/src/server/commands/GenerateTurn.java
    branches/newbattle/src/server/commands/GetFutureEvents.java
    branches/newbattle/src/server/commands/GetGameInfo.java
    branches/newbattle/src/server/commands/GetGameSchedule.java
    branches/newbattle/src/server/commands/GetGameTemplate.java
    branches/newbattle/src/server/commands/GetHolidays.java
    branches/newbattle/src/server/commands/GetJoinStatus.java
    branches/newbattle/src/server/commands/GetMap.java
    branches/newbattle/src/server/commands/GetReport.java
    branches/newbattle/src/server/commands/Help.java
    branches/newbattle/src/server/commands/JoinRaceToGame.java
    branches/newbattle/src/server/commands/ListForbiddenNames.java
    branches/newbattle/src/server/commands/NoEndCommands.java
    branches/newbattle/src/server/commands/Order.java
    branches/newbattle/src/server/commands/RollBackGame.java
    branches/newbattle/src/server/commands/RunAction.java
    branches/newbattle/src/server/commands/SendAnonymousMessage.java
    branches/newbattle/src/server/commands/SendBroadcastMessage.java
    branches/newbattle/src/server/commands/SendGlobalBroadcastMessage.java
    branches/newbattle/src/server/commands/SendHypercastMessage.java
    branches/newbattle/src/server/commands/SendPrivateMessage.java
    branches/newbattle/src/server/commands/SendReports.java
    branches/newbattle/src/server/commands/SendTeamMessage.java
    branches/newbattle/src/server/commands/SetGameInfo.java
    branches/newbattle/src/server/commands/SetGameSchedule.java
    branches/newbattle/src/server/commands/SetHolidays.java
    branches/newbattle/src/server/commands/StopGame.java
    branches/newbattle/src/server/commands/TestGame.java
    branches/newbattle/src/server/commands/WithdrawRequest.java
    branches/newbattle/src/server/options/Address.java
    branches/newbattle/src/server/options/AutoUnload.java
    branches/newbattle/src/server/options/BattleProtocolLevel.java
    branches/newbattle/src/server/options/Encoding.java
    branches/newbattle/src/server/options/IncludeText.java
    branches/newbattle/src/server/options/Password.java
    branches/newbattle/src/server/options/ReportName.java
    branches/newbattle/src/server/options/ReportParameters.java
    branches/newbattle/src/server/options/Team.java
    branches/newbattle/src/server/order/AbstractOrderCommand.java
    branches/newbattle/src/server/order/DeferredOrder.java
    branches/newbattle/src/server/order/DefineScience.java
    branches/newbattle/src/server/order/DefineShipType.java
    branches/newbattle/src/server/order/DefineShipTypeLimitedWSMass.java
    branches/newbattle/src/server/order/GetReport.java
    branches/newbattle/src/server/order/GiftPlanet.java
    branches/newbattle/src/server/order/Help.java
    branches/newbattle/src/server/order/InterceptShips.java
    branches/newbattle/src/server/order/JoinGroups.java
    branches/newbattle/src/server/order/NamePlanet.java
    branches/newbattle/src/server/order/Production.java
    branches/newbattle/src/server/order/QuitGame.java
    branches/newbattle/src/server/order/RaceOptions.java
    branches/newbattle/src/server/order/RecallShips.java
    branches/newbattle/src/server/order/RenameShipType.java
    branches/newbattle/src/server/order/SetDiplomacyState.java
    branches/newbattle/src/server/order/SetGUARDDiplomacyState.java
    branches/newbattle/src/server/order/SetPEACEDiplomacyState.java
    branches/newbattle/src/server/order/SetRoute.java
    branches/newbattle/src/server/order/SetWARDiplomacyState.java
    branches/newbattle/src/util/Utils.java

Added Paths:
-----------
    branches/newbattle/src/MapGen.java
    branches/newbattle/src/mapgen/
    branches/newbattle/src/mapgen/AbstractMapGenerator.java
    branches/newbattle/src/mapgen/AutosizeMapGenerator.java
    branches/newbattle/src/mapgen/ClusterMapGenerator.java
    branches/newbattle/src/mapgen/FileMapGenerator.java
    branches/newbattle/src/mapgen/FractalMapGenerator.java
    branches/newbattle/src/mapgen/MilkyWayMapGenerator.java
    branches/newbattle/src/mapgen/MultihomeMapGenerator.java
    branches/newbattle/src/mapgen/OctagonMapGenerator.java
    branches/newbattle/src/mapgen/PatternMapGenerator.java
    branches/newbattle/src/mapgen/PlanetType.java
    branches/newbattle/src/mapgen/RegularMapGenerator.java
    branches/newbattle/src/mapgen/ResearchMapGenerator.java
    branches/newbattle/src/mapgen/RhombMapGenerator.java
    branches/newbattle/src/mapgen/SpiralMapGenerator.java
    branches/newbattle/src/mapgen/StandardMapGenerator.java
    branches/newbattle/src/mapgen/SymmetricMapGenerator.java
    branches/newbattle/src/mapgen/TeamMapGenerator.java
    branches/newbattle/src/objects/IMapGenerator.java
    branches/newbattle/src/objects/IOrderCommand.java
    branches/newbattle/src/objects/IParameter.java
    branches/newbattle/src/objects/IPhase.java
    branches/newbattle/src/objects/IRaceOption.java
    branches/newbattle/src/objects/geom/
    branches/newbattle/src/objects/geom/CylinderMapGeometry.java
    branches/newbattle/src/objects/geom/HexagonalMapGeometry.java
    branches/newbattle/src/objects/geom/KleinMapGeometry.java
    branches/newbattle/src/objects/geom/MapGeometry.java
    branches/newbattle/src/objects/geom/MobiusMapGeometry.java
    branches/newbattle/src/objects/geom/PlainMapGeometry.java
    branches/newbattle/src/objects/geom/ToroidalMapGeometry.java
    branches/newbattle/src/objects/util/
    branches/newbattle/src/objects/util/GameInfo.java
    branches/newbattle/src/objects/util/GameInfoOldXml.java
    branches/newbattle/src/objects/util/GameInfoText.java
    branches/newbattle/src/objects/util/GameInfoXml.java
    branches/newbattle/src/objects/util/GamerAddress.java
    branches/newbattle/src/objects/util/GamerAddressException.java
    branches/newbattle/src/objects/util/GamerAddressList.java
    branches/newbattle/src/objects/util/LockServer.java
    branches/newbattle/src/server/Answer.java
    branches/newbattle/src/server/IAction.java
    branches/newbattle/src/server/IServerCommand.java
    branches/newbattle/src/server/finish/
    branches/newbattle/src/server/finish/AllianceVictory.java
    branches/newbattle/src/server/finish/Breakaway.java
    branches/newbattle/src/server/finish/ElectionVictory.java
    branches/newbattle/src/server/finish/IGameFinisher.java
    branches/newbattle/src/server/finish/LimitedTurn.java
    branches/newbattle/src/server/finish/ProgressiveAllianceVictory.java
    branches/newbattle/src/server/finish/RandomTurn.java
    branches/newbattle/src/server/finish/SoleVictory.java
    branches/newbattle/src/server/finish/TeamVictory.java
    branches/newbattle/src/server/order/BreakGroupOrFleet.java
    branches/newbattle/src/server/order/GiftShips.java
    branches/newbattle/src/server/order/GiftShipsOrPlanet.java
    branches/newbattle/src/server/order/LoadShips.java
    branches/newbattle/src/server/order/ScrapShips.java
    branches/newbattle/src/server/order/ScrapShipsToCapitals.java
    branches/newbattle/src/server/order/ScrapShipsToTech.java
    branches/newbattle/src/server/order/SendShips.java
    branches/newbattle/src/server/order/UnloadShips.java
    branches/newbattle/src/server/order/UpgradeShips.java
    branches/newbattle/src/server/order/UpgradeShipsGP.java
    branches/newbattle/src/server/order/UpgradeShipsOld.java
    branches/newbattle/src/server/order/Vote.java
    branches/newbattle/src/server/phase/
    branches/newbattle/src/server/phase/AbstractPhase.java
    branches/newbattle/src/server/phase/BombPhase.java
    branches/newbattle/src/server/phase/ChangePIPPhase.java
    branches/newbattle/src/server/phase/CheckVictoryPhase.java
    branches/newbattle/src/server/phase/CollapsePhase.java
    branches/newbattle/src/server/phase/EndUpgradePhase.java
    branches/newbattle/src/server/phase/ExpandPhase.java
    branches/newbattle/src/server/phase/FightPhase.java
    branches/newbattle/src/server/phase/InterceptPhase.java
    branches/newbattle/src/server/phase/JoinPhase.java
    branches/newbattle/src/server/phase/LoadPhase.java
    branches/newbattle/src/server/phase/MovePhase.java
    branches/newbattle/src/server/phase/ProducePhase.java
    branches/newbattle/src/server/phase/QuitByLostAllPhase.java
    branches/newbattle/src/server/phase/QuitBySleepPhase.java
    branches/newbattle/src/server/phase/RotatePhase.java
    branches/newbattle/src/server/phase/TransferPhase.java
    branches/newbattle/src/server/phase/UnloadPhase.java

Removed Paths:
-------------
    branches/newbattle/src/mapgen/AbstractMapGenerator.java
    branches/newbattle/src/mapgen/AutosizeMapGenerator.java
    branches/newbattle/src/mapgen/ClusterMapGenerator.java
    branches/newbattle/src/mapgen/FileMapGenerator.java
    branches/newbattle/src/mapgen/FractalMapGenerator.java
    branches/newbattle/src/mapgen/MilkyWayMapGenerator.java
    branches/newbattle/src/mapgen/MultihomeMapGenerator.java
    branches/newbattle/src/mapgen/OctagonMapGenerator.java
    branches/newbattle/src/mapgen/PatternMapGenerator.java
    branches/newbattle/src/mapgen/PlanetType.java
    branches/newbattle/src/mapgen/RegularMapGenerator.java
    branches/newbattle/src/mapgen/ResearchMapGenerator.java
    branches/newbattle/src/mapgen/RhombMapGenerator.java
    branches/newbattle/src/mapgen/SpiralMapGenerator.java
    branches/newbattle/src/mapgen/StandardMapGenerator.java
    branches/newbattle/src/mapgen/SymmetricMapGenerator.java
    branches/newbattle/src/mapgen/TeamMapGenerator.java
    branches/newbattle/src/objects/finish/
    branches/newbattle/src/objects/geom/CylinderMapGeometry.java
    branches/newbattle/src/objects/geom/HexagonalMapGeometry.java
    branches/newbattle/src/objects/geom/KleinMapGeometry.java
    branches/newbattle/src/objects/geom/MapGeometry.java
    branches/newbattle/src/objects/geom/MobiusMapGeometry.java
    branches/newbattle/src/objects/geom/PlainMapGeometry.java
    branches/newbattle/src/objects/geom/ToroidalMapGeometry.java
    branches/newbattle/src/objects/maps/
    branches/newbattle/src/objects/phase/
    branches/newbattle/src/objects/util/GameInfo.java
    branches/newbattle/src/objects/util/GameInfoOldXml.java
    branches/newbattle/src/objects/util/GameInfoText.java
    branches/newbattle/src/objects/util/GameInfoXml.java
    branches/newbattle/src/objects/util/GamerAddress.java
    branches/newbattle/src/objects/util/GamerAddressException.java
    branches/newbattle/src/objects/util/GamerAddressList.java
    branches/newbattle/src/objects/util/LockServer.java
    branches/newbattle/src/report/GetLastReportParameter.java
    branches/newbattle/src/report/IParameter.java
    branches/newbattle/src/server/actions/IAction.java
    branches/newbattle/src/server/commands/Answer.java
    branches/newbattle/src/server/commands/IServerCommand.java
    branches/newbattle/src/server/finish/AllianceVictory.java
    branches/newbattle/src/server/finish/Breakaway.java
    branches/newbattle/src/server/finish/ElectionVictory.java
    branches/newbattle/src/server/finish/IGameFinisher.java
    branches/newbattle/src/server/finish/LimitedTurn.java
    branches/newbattle/src/server/finish/ProgressiveAllianceVictory.java
    branches/newbattle/src/server/finish/RandomTurn.java
    branches/newbattle/src/server/finish/SoleVictory.java
    branches/newbattle/src/server/finish/TeamVictory.java
    branches/newbattle/src/server/options/IOption.java
    branches/newbattle/src/server/order/BreakGroups.java
    branches/newbattle/src/server/order/GiftGroup.java
    branches/newbattle/src/server/order/GiftGroupOrPlanet.java
    branches/newbattle/src/server/order/GiveVotes.java
    branches/newbattle/src/server/order/IOrderCommand.java
    branches/newbattle/src/server/order/LoadGroup.java
    branches/newbattle/src/server/order/SendGroupOrFleet.java
    branches/newbattle/src/server/order/UnloadGroup.java
    branches/newbattle/src/server/order/UnmountGroupDismantleCAP.java
    branches/newbattle/src/server/order/UnmountGroupDismantleTech.java
    branches/newbattle/src/server/order/UnmountGroups.java
    branches/newbattle/src/server/order/UpgradeGroup.java
    branches/newbattle/src/server/order/UpgradeGroupDG.java
    branches/newbattle/src/server/order/UpgradeGroupGP.java
    branches/newbattle/src/server/phase/AbstractPhase.java
    branches/newbattle/src/server/phase/BombPhase.java
    branches/newbattle/src/server/phase/ChangePIPPhase.java
    branches/newbattle/src/server/phase/CheckVictoryPhase.java
    branches/newbattle/src/server/phase/CollapsePhase.java
    branches/newbattle/src/server/phase/EndUpgradePhase.java
    branches/newbattle/src/server/phase/ExpandPhase.java
    branches/newbattle/src/server/phase/FightPhase.java
    branches/newbattle/src/server/phase/InterceptPhase.java
    branches/newbattle/src/server/phase/JoinPhase.java
    branches/newbattle/src/server/phase/LoadPhase.java
    branches/newbattle/src/server/phase/MovePhase.java
    branches/newbattle/src/server/phase/ProducePhase.java
    branches/newbattle/src/server/phase/QuitByLostAllPhase.java
    branches/newbattle/src/server/phase/QuitBySleepPhase.java
    branches/newbattle/src/server/phase/RotatePhase.java
    branches/newbattle/src/server/phase/TransferPhase.java
    branches/newbattle/src/server/phase/UnloadPhase.java
    branches/newbattle/src/util/GameInfo.java
    branches/newbattle/src/util/GameInfoOldXml.java
    branches/newbattle/src/util/GameInfoText.java
    branches/newbattle/src/util/GameInfoXml.java
    branches/newbattle/src/util/GamerAddress.java
    branches/newbattle/src/util/GamerAddressException.java
    branches/newbattle/src/util/GamerAddressList.java
    branches/newbattle/src/util/LockServer.java

Property Changed:
----------------
    branches/newbattle/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.