On 17/04/2013 17:49, Daniel Fuchs wrote:
Most of the merge troubles were in the FactoryFinder.java
and XxxxFactoryFinder.java files - the merge was a bit difficult
because some lines had changes in both parent and child - like
method signature where a <?> had been added to the return type
in the child and a new argument had been added in the parent.
In transform/FactoryFinder I had removed a boolean from the
newInstance(...) methods - and that caused a merge issue too
which had to be resolved carefully.
(originally requested by Mandy who noticed that the method
was always called with the same boolean value - and therefore
did not need that boolean has argument).
Merge in the other files was otherwise trivial.
-- daniel
I've looked through the FactoryFinders again and I don't see anything
obviously wrong (meaning it looks like the changes we agreed). So I
think this is good to go.
-Alan
