Re: [Freecol-developers] River styles

2017-01-31 Thread Michael T. Pope
On Sun, 29 Jan 2017 15:52:52 +0100 win...@genial.ms wrote: > I was trying to improve how rivers are handled by the > map editor, which currently is annoying to use. > It seems that TileImprovement.updateRiverConnections > got 3 conflicting uses requiring different handling. > 1. right click on a la

Re: [Freecol-developers] Modifiers - lists vs sets

2017-01-31 Thread Michael T. Pope
On Mon, 30 Jan 2017 17:49:40 +0100 "Enrico Weigelt, metux IT consult" wrote: > On 29.01.2017 00:05, Michael T. Pope wrote: > > On Sat, 28 Jan 2017 17:26:46 +0100 > > "Enrico Weigelt, metux IT consult" wrote: > >> I've seen that modifiers are sometimes collected in lists, sometimes in > >> sets.

Re: [Freecol-developers] River styles

2017-01-31 Thread winter
Hi, > Gesendet: Dienstag, 31. Januar 2017 um 09:27 Uhr > Von: "Michael T. Pope" > An: freecol-developers@lists.sourceforge.net > Betreff: Re: [Freecol-developers] River styles > > On Sun, 29 Jan 2017 15:52:52 +0100 > win...@genial.ms wrote: > > I was trying to improve how rivers are handled by th

Re: [Freecol-developers] Modifiers - lists vs sets

2017-01-31 Thread Enrico Weigelt, metux IT consult
On 31.01.2017 10:03, Michael T. Pope wrote: >> Ok. Seems that Set is used more often (especially in FeatureContainer), >> therefore duplicate modifiers (incl. all attributes eg. source) are >> not allowed. > > I can not think of a case where exactly equal Modifiers can coexist. Okay, then most u

[Freecol-developers] [PATCH 2/4] client: control: ClientInputHandler: drop unused unregister()

2017-01-31 Thread Enrico Weigelt, metux IT consult
--- src/net/sf/freecol/client/control/ClientInputHandler.java | 12 1 file changed, 12 deletions(-) diff --git a/src/net/sf/freecol/client/control/ClientInputHandler.java b/src/net/sf/freecol/client/control/ClientInputHandler.java index 83134f8291c..59e650664ee 100644 --- a/src/net/

[Freecol-developers] [PATCH 1/4] server: control: ServerInputHandler: drop unused unregister()

2017-01-31 Thread Enrico Weigelt, metux IT consult
--- src/net/sf/freecol/server/control/ServerInputHandler.java | 11 --- 1 file changed, 11 deletions(-) diff --git a/src/net/sf/freecol/server/control/ServerInputHandler.java b/src/net/sf/freecol/server/control/ServerInputHandler.java index 31e57c2f1de..1dab9bb0694 100644 --- a/src/net/s

[Freecol-developers] [PATCH 4/4] client: control: simplify message element handlers w/o expensive callback objects

2017-01-31 Thread Enrico Weigelt, metux IT consult
--- .../freecol/client/control/ClientInputHandler.java | 68 +++ .../freecol/client/control/InGameInputHandler.java | 220 ++--- .../client/control/PreGameInputHandler.java| 94 ++--- 3 files changed, 246 insertions(+), 136 deletions(-) diff --git a/src/net/sf/fr

[Freecol-developers] [PATCH 0/4] network request handler cleanups

2017-01-31 Thread Enrico Weigelt, metux IT consult
Cleanups and simplifications of the network cleanup handlers. The current approach w/ allocating extra callback object instances (which do nothing but call another method) and putting them into a map, is unnecessarily complex and expensive. Simple switch() statements also do the job and are much e

[Freecol-developers] [PATCH 3/4] server: control: simplify message element handlers w/o expensive callback objects

2017-01-31 Thread Enrico Weigelt, metux IT consult
--- .../freecol/server/control/InGameInputHandler.java | 396 +++-- .../server/control/PreGameInputHandler.java| 59 +-- .../freecol/server/control/ServerInputHandler.java | 107 +++--- .../server/control/UserConnectionHandler.java | 28 +- 4 files changed, 298 inser

[Freecol-developers] [PATCH] common: model: encapsulate checks for ability to build

2017-01-31 Thread Enrico Weigelt, metux IT consult
BuildableType's and Colony's are often checked for whether they are able to build certain BuildableType in general (different from whether a Colony can do it right now, eg. required resources available). Instead of directly going to the low-level ability test, introduce an semantic interface, se w

[Freecol-developers] strange modifiers in TilePanel ?

2017-01-31 Thread Enrico Weigelt, metux IT consult
Hi folks, just stubled across some lines in TilePanel constructor, that look a bit strange to me: 150> final UnitType expert = spec.getExpertForProducing(gt); 151> if (expert != null) { 152> expertPotential = (int)expert.applyModifiers(amount, 153> getGame().getTurn(), gt.getId()); 15

Re: [Freecol-developers] Modifiers - lists vs sets

2017-01-31 Thread Michael T. Pope
On Tue, 31 Jan 2017 17:14:49 +0100 "Enrico Weigelt, metux IT consult" wrote: > Okay, then most uses of Set could be lifted to List (except the few > cases where specific modifiers need to be removed from the caches), > correct ? I can not think of a counterexample. Indeed I have done this in a f