Fix enum types

script/enum-generator/template/Enum.java

@@ -9,7 +9,7 @@ public enum $name {
 $values;
 
     private int value;
-    private static Map map = new HashMap<$name, Integer>();
+    private static Map<Integer, $name> map = new HashMap<>();
 
     private $name(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsAccess.java

@@ -25,7 +25,7 @@ public enum VipsAccess {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsAccess, Integer>();
+    private static Map<Integer, VipsAccess> map = new HashMap<>();
 
     private VipsAccess(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsAlign.java

@@ -26,7 +26,7 @@ public enum VipsAlign {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsAlign, Integer>();
+    private static Map<Integer, VipsAlign> map = new HashMap<>();
 
     private VipsAlign(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsAngle.java

@@ -28,7 +28,7 @@ public enum VipsAngle {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsAngle, Integer>();
+    private static Map<Integer, VipsAngle> map = new HashMap<>();
 
     private VipsAngle(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsAngle45.java

@@ -36,7 +36,7 @@ public enum VipsAngle45 {
     Last(8);
 
     private int value;
-    private static Map map = new HashMap<VipsAngle45, Integer>();
+    private static Map<Integer, VipsAngle45> map = new HashMap<>();
 
     private VipsAngle45(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java

@@ -37,7 +37,7 @@ public enum VipsArgumentFlags {
     Modify(128);
 
     private int value;
-    private static Map map = new HashMap<VipsArgumentFlags, Integer>();
+    private static Map<Integer, VipsArgumentFlags> map = new HashMap<>();
 
     private VipsArgumentFlags(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsBandFormat.java

@@ -42,7 +42,7 @@ public enum VipsBandFormat {
     FormatLast(10);
 
     private int value;
-    private static Map map = new HashMap<VipsBandFormat, Integer>();
+    private static Map<Integer, VipsBandFormat> map = new HashMap<>();
 
     private VipsBandFormat(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsBlendMode.java

@@ -70,7 +70,7 @@ public enum VipsBlendMode {
     Last(25);
 
     private int value;
-    private static Map map = new HashMap<VipsBlendMode, Integer>();
+    private static Map<Integer, VipsBlendMode> map = new HashMap<>();
 
     private VipsBlendMode(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsCoding.java

@@ -27,7 +27,7 @@ public enum VipsCoding {
     Last(7);
 
     private int value;
-    private static Map map = new HashMap<VipsCoding, Integer>();
+    private static Map<Integer, VipsCoding> map = new HashMap<>();
 
     private VipsCoding(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsCombine.java

@@ -26,7 +26,7 @@ public enum VipsCombine {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsCombine, Integer>();
+    private static Map<Integer, VipsCombine> map = new HashMap<>();
 
     private VipsCombine(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsCombineMode.java

@@ -24,7 +24,7 @@ public enum VipsCombineMode {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsCombineMode, Integer>();
+    private static Map<Integer, VipsCombineMode> map = new HashMap<>();
 
     private VipsCombineMode(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsCompassDirection.java

@@ -38,7 +38,7 @@ public enum VipsCompassDirection {
     Last(9);
 
     private int value;
-    private static Map map = new HashMap<VipsCompassDirection, Integer>();
+    private static Map<Integer, VipsCompassDirection> map = new HashMap<>();
 
     private VipsCompassDirection(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsDemandStyle.java

@@ -28,7 +28,7 @@ public enum VipsDemandStyle {
     Any(3);
 
     private int value;
-    private static Map map = new HashMap<VipsDemandStyle, Integer>();
+    private static Map<Integer, VipsDemandStyle> map = new HashMap<>();
 
     private VipsDemandStyle(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsDirection.java

@@ -24,7 +24,7 @@ public enum VipsDirection {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsDirection, Integer>();
+    private static Map<Integer, VipsDirection> map = new HashMap<>();
 
     private VipsDirection(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsExtend.java

@@ -31,7 +31,7 @@ public enum VipsExtend {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsExtend, Integer>();
+    private static Map<Integer, VipsExtend> map = new HashMap<>();
 
     private VipsExtend(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsFailOn.java

@@ -28,7 +28,7 @@ public enum VipsFailOn {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsFailOn, Integer>();
+    private static Map<Integer, VipsFailOn> map = new HashMap<>();
 
     private VipsFailOn(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java

@@ -26,7 +26,7 @@ public enum VipsForeignDzContainer {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzContainer, Integer>();
+    private static Map<Integer, VipsForeignDzContainer> map = new HashMap<>();
 
     private VipsForeignDzContainer(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java

@@ -26,7 +26,7 @@ public enum VipsForeignDzDepth {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzDepth, Integer>();
+    private static Map<Integer, VipsForeignDzDepth> map = new HashMap<>();
 
     private VipsForeignDzDepth(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java

@@ -30,7 +30,7 @@ public enum VipsForeignDzLayout {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzLayout, Integer>();
+    private static Map<Integer, VipsForeignDzLayout> map = new HashMap<>();
 
     private VipsForeignDzLayout(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignFlags.java

@@ -28,7 +28,7 @@ public enum VipsForeignFlags {
     All(7);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignFlags, Integer>();
+    private static Map<Integer, VipsForeignFlags> map = new HashMap<>();
 
     private VipsForeignFlags(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignHeifCompression.java

@@ -28,7 +28,7 @@ public enum VipsForeignHeifCompression {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignHeifCompression, Integer>();
+    private static Map<Integer, VipsForeignHeifCompression> map = new HashMap<>();
 
     private VipsForeignHeifCompression(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignJpegSubsample.java

@@ -26,7 +26,7 @@ public enum VipsForeignJpegSubsample {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignJpegSubsample, Integer>();
+    private static Map<Integer, VipsForeignJpegSubsample> map = new HashMap<>();
 
     private VipsForeignJpegSubsample(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java

@@ -31,7 +31,7 @@ public enum VipsForeignPngFilter {
     All(248);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignPngFilter, Integer>();
+    private static Map<Integer, VipsForeignPngFilter> map = new HashMap<>();
 
     private VipsForeignPngFilter(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java

@@ -28,7 +28,7 @@ public enum VipsForeignPpmFormat {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignPpmFormat, Integer>();
+    private static Map<Integer, VipsForeignPpmFormat> map = new HashMap<>();
 
     private VipsForeignPpmFormat(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java

@@ -26,7 +26,7 @@ public enum VipsForeignSubsample {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignSubsample, Integer>();
+    private static Map<Integer, VipsForeignSubsample> map = new HashMap<>();
 
     private VipsForeignSubsample(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignTiffCompression.java

@@ -38,7 +38,7 @@ public enum VipsForeignTiffCompression {
     Last(9);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffCompression, Integer>();
+    private static Map<Integer, VipsForeignTiffCompression> map = new HashMap<>();
 
     private VipsForeignTiffCompression(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignTiffPredictor.java

@@ -26,7 +26,7 @@ public enum VipsForeignTiffPredictor {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffPredictor, Integer>();
+    private static Map<Integer, VipsForeignTiffPredictor> map = new HashMap<>();
 
     private VipsForeignTiffPredictor(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java

@@ -24,7 +24,7 @@ public enum VipsForeignTiffResunit {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffResunit, Integer>();
+    private static Map<Integer, VipsForeignTiffResunit> map = new HashMap<>();
 
     private VipsForeignTiffResunit(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java

@@ -32,7 +32,7 @@ public enum VipsForeignWebpPreset {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignWebpPreset, Integer>();
+    private static Map<Integer, VipsForeignWebpPreset> map = new HashMap<>();
 
     private VipsForeignWebpPreset(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsImageType.java

@@ -28,7 +28,7 @@ public enum VipsImageType {
     Partial(7);
 
     private int value;
-    private static Map map = new HashMap<VipsImageType, Integer>();
+    private static Map<Integer, VipsImageType> map = new HashMap<>();
 
     private VipsImageType(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsIntent.java

@@ -28,7 +28,7 @@ public enum VipsIntent {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsIntent, Integer>();
+    private static Map<Integer, VipsIntent> map = new HashMap<>();
 
     private VipsIntent(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsInteresting.java

@@ -34,7 +34,7 @@ public enum VipsInteresting {
     Last(7);
 
     private int value;
-    private static Map map = new HashMap<VipsInteresting, Integer>();
+    private static Map<Integer, VipsInteresting> map = new HashMap<>();
 
     private VipsInteresting(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsInterpretation.java

@@ -58,7 +58,7 @@ public enum VipsInterpretation {
     Last(30);
 
     private int value;
-    private static Map map = new HashMap<VipsInterpretation, Integer>();
+    private static Map<Integer, VipsInterpretation> map = new HashMap<>();
 
     private VipsInterpretation(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsKernel.java

@@ -32,7 +32,7 @@ public enum VipsKernel {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsKernel, Integer>();
+    private static Map<Integer, VipsKernel> map = new HashMap<>();
 
     private VipsKernel(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java

@@ -30,7 +30,7 @@ public enum VipsOperationBoolean {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationBoolean, Integer>();
+    private static Map<Integer, VipsOperationBoolean> map = new HashMap<>();
 
     private VipsOperationBoolean(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationComplex.java

@@ -26,7 +26,7 @@ public enum VipsOperationComplex {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplex, Integer>();
+    private static Map<Integer, VipsOperationComplex> map = new HashMap<>();
 
     private VipsOperationComplex(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java

@@ -22,7 +22,7 @@ public enum VipsOperationComplex2 {
     Last(1);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplex2, Integer>();
+    private static Map<Integer, VipsOperationComplex2> map = new HashMap<>();
 
     private VipsOperationComplex2(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationComplexget.java

@@ -24,7 +24,7 @@ public enum VipsOperationComplexget {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplexget, Integer>();
+    private static Map<Integer, VipsOperationComplexget> map = new HashMap<>();
 
     private VipsOperationComplexget(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationFlags.java

@@ -28,7 +28,7 @@ public enum VipsOperationFlags {
     Deprecated(8);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationFlags, Integer>();
+    private static Map<Integer, VipsOperationFlags> map = new HashMap<>();
 
     private VipsOperationFlags(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationMath.java

@@ -52,7 +52,7 @@ public enum VipsOperationMath {
     Last(16);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMath, Integer>();
+    private static Map<Integer, VipsOperationMath> map = new HashMap<>();
 
     private VipsOperationMath(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationMath2.java

@@ -26,7 +26,7 @@ public enum VipsOperationMath2 {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMath2, Integer>();
+    private static Map<Integer, VipsOperationMath2> map = new HashMap<>();
 
     private VipsOperationMath2(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationMorphology.java

@@ -24,7 +24,7 @@ public enum VipsOperationMorphology {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMorphology, Integer>();
+    private static Map<Integer, VipsOperationMorphology> map = new HashMap<>();
 
     private VipsOperationMorphology(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationRelational.java

@@ -31,7 +31,7 @@ public enum VipsOperationRelational {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationRelational, Integer>();
+    private static Map<Integer, VipsOperationRelational> map = new HashMap<>();
 
     private VipsOperationRelational(int i) {
       value = i;

src/main/java/com/criteo/vips/enums/VipsOperationRound.java

@@ -26,7 +26,7 @@ public enum VipsOperationRound {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationRound, Integer>();
+    private static Map<Integer, VipsOperationRound> map = new HashMap<>();
 
     private VipsOperationRound(int i) {
       value = i;