pool/aqute-bnd
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=33

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-17 17:47:34 +00:00 committed by Git OBS Bridge
parent 378921bae0
commit 8091701655
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
reproducible-element-order.patch
View File

@ -142,56 +142,6 @@ index b97251b5..e0e315bf 100644
for (ElementValueInfo elementValueInfo : values) {
String element = elementValueInfo.name;
Object value = newElementValue(elementValueInfo.value, elementType, policy, access_flags);
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Instructions.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Instructions.java
index bf1d13c4..277d8f00 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Instructions.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Instructions.java
@@ -9,10 +9,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
@@ -23,13 +23,13 @@ import aQute.lib.collections.MultiMap;
import aQute.lib.io.IO;
public class Instructions implements Map<Instruction, Attrs> {
- private LinkedHashMap<Instruction, Attrs> map;
+ private TreeMap<Instruction, Attrs> map;
public static Instructions ALWAYS = new Instructions();
static Map<Instruction, Attrs> EMPTY = Collections.emptyMap();
public Instructions(Instructions other) {
if (other.map != null && !other.map.isEmpty()) {
- map = new LinkedHashMap<>(other.map);
+ map = new TreeMap<>(other.map);
}
}
@@ -134,7 +134,7 @@ public class Instructions implements Map<Instruction, Attrs> {
@Override
public Attrs put(Instruction key, Attrs value) {
if (map == null)
- map = new LinkedHashMap<>();
+ map = new TreeMap<>();
return map.put(key, value);
}
@@ -144,7 +144,7 @@ public class Instructions implements Map<Instruction, Attrs> {
if (this.map == null) {
if (map.isEmpty())
return;
- this.map = new LinkedHashMap<>();
+ this.map = new TreeMap<>();
}
this.map.putAll(map);
}
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
index 47312379..f9996bd8 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java