1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
Description: Fix build failure with JDK 7
Rename function to resolve name clash
Source: https://groups.google.com/forum/#!msg/jopendocument/mY3HWyRmd1g/5xJB5q9a3M4J
Index: libjopendocument-java/src/org/jopendocument/dom/Library.java
===================================================================
--- libjopendocument-java.orig/src/org/jopendocument/dom/Library.java
+++ libjopendocument-java/src/org/jopendocument/dom/Library.java
@@ -643,10 +643,10 @@ public abstract class Library {
final EmbeddedLibrary other = (EmbeddedLibrary) obj;
if (this.passwordProtected != other.passwordProtected)
return false;
- return canBeMerged(this.modules, other.modules) && canBeMerged(this.dialogs, other.dialogs);
+ return canBeMerged2(this.modules, other.modules) && canBeMerged2(this.dialogs, other.dialogs);
}
- static private final <V> boolean canBeMerged(final Map<String, V> m1, final Map<String, V> m2) {
+ static private final <V> boolean canBeMerged2(final Map<String, V> m1, final Map<String, V> m2) {
final Set<String> duplicateKeys = CollectionUtils.inter(m1.keySet(), m2.keySet());
for (final String key : duplicateKeys) {
final V v1 = m1.get(key);
|
