compile:
[javac] Compiling 374 source files to
/home/nekrad/src/packaging/pkg/freecol.git/build
[javac]
/home/nekrad/src/packaging/pkg/freecol.git/src/net/sf/freecol/common/model/Specification.java:2013:
error: incompatible types
[javac] Collection<AbstractOption> allG = new
HashSet<>(allOptionGroups.values());
[javac] ^
[javac] required: Collection<AbstractOption>
[javac] found: HashSet<OptionGroup>
---
src/net/sf/freecol/common/model/Specification.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/net/sf/freecol/common/model/Specification.java
b/src/net/sf/freecol/common/model/Specification.java
index 659bdb7c31f..c076dcc8cef 100644
--- a/src/net/sf/freecol/common/model/Specification.java
+++ b/src/net/sf/freecol/common/model/Specification.java
@@ -2008,7 +2008,7 @@ public final class Specification {
*/
private void fixOrphanOptions() {
Collection<AbstractOption> allO = new HashSet<>(allOptions.values());
- Collection<AbstractOption> allG = new
HashSet<>(allOptionGroups.values());
+ Collection<AbstractOption> allG = new
HashSet<AbstractOption>(allOptionGroups.values());
for (String id : coreOptionGroups) {
dropOptions(allOptionGroups.get(id), allO);
dropOptions(allOptionGroups.get(id), allG);
--
2.11.0.rc0.7.gbe5a750
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
