Skip to content

Commit fa23dc2

Browse files
committed
<> clean up
1 parent 4d0ccfe commit fa23dc2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ public Iterator<PGPSignature> getSignatures()
641641
{
642642
if (subSigs == null)
643643
{
644-
List<PGPSignature> sigs = new ArrayList<>(keySigs);
644+
List<PGPSignature> sigs = new ArrayList<PGPSignature>(keySigs);
645645

646646
for (int i = 0; i != idSigs.size(); i++)
647647
{
@@ -665,7 +665,7 @@ public Iterator<PGPSignature> getKeySignatures()
665665
{
666666
if (subSigs == null)
667667
{
668-
List<PGPSignature> sigs = new ArrayList<>(keySigs);
668+
List<PGPSignature> sigs = new ArrayList<PGPSignature>(keySigs);
669669

670670
return sigs.iterator();
671671
}
@@ -1179,11 +1179,11 @@ public static PGPPublicKey join(
11791179
}
11801180

11811181
TrustPacket trustPk = key.trustPk;
1182-
List<PGPSignature> keySigs = new ArrayList<>(key.keySigs);
1183-
List<UserDataPacket> ids = new ArrayList<>(key.ids);
1184-
List<TrustPacket> idTrusts = new ArrayList<>(key.idTrusts);
1185-
List<List<PGPSignature>> idSigs = new ArrayList<>(key.idSigs);
1186-
List<PGPSignature> subSigs = key.subSigs == null ? null : new ArrayList<>(key.subSigs);
1182+
List<PGPSignature> keySigs = new ArrayList<PGPSignature>(key.keySigs);
1183+
List<UserDataPacket> ids = new ArrayList<UserDataPacket>(key.ids);
1184+
List<TrustPacket> idTrusts = new ArrayList<TrustPacket>(key.idTrusts);
1185+
List<List<PGPSignature>> idSigs = new ArrayList<List<PGPSignature>>(key.idSigs);
1186+
List<PGPSignature> subSigs = key.subSigs == null ? null : new ArrayList<PGPSignature>(key.subSigs);
11871187

11881188
if (joinTrustPackets)
11891189
{
@@ -1222,7 +1222,7 @@ public static PGPPublicKey join(
12221222
for (int idIdx = 0; idIdx < copy.ids.size(); idIdx++)
12231223
{
12241224
UserDataPacket copyId = copy.ids.get(idIdx);
1225-
List<PGPSignature> copyIdSigs = new ArrayList<>(copy.idSigs.get(idIdx));
1225+
List<PGPSignature> copyIdSigs = new ArrayList<PGPSignature>(copy.idSigs.get(idIdx));
12261226
TrustPacket copyTrust = copy.idTrusts.get(idIdx);
12271227

12281228
int existingIdIndex = -1;
@@ -1293,7 +1293,7 @@ public static PGPPublicKey join(
12931293
{
12941294
if (subSigs == null && allowSubkeySigsOnNonSubkey)
12951295
{
1296-
subSigs = new ArrayList<>(copy.subSigs);
1296+
subSigs = new ArrayList<PGPSignature>(copy.subSigs);
12971297
}
12981298
else
12991299
{

0 commit comments

Comments
 (0)