2
0
Stephen Gold 3 жил өмнө
parent
commit
a88feb0a4b

+ 2 - 2
jme3-core/src/plugins/java/com/jme3/scene/plugins/OBJLoader.java

@@ -244,8 +244,8 @@ public final class OBJLoader implements AssetLoader {
         vertList.clear();
 
         String line = scan.nextLine().trim();
-        String[] verticies = line.split("\\s+");
-        for (String vertex : verticies){
+        String[] vertices = line.split("\\s+");
+        for (String vertex : vertices){
             int v = 0;
             int vt = 0;
             int vn = 0;

+ 8 - 8
jme3-desktop/src/main/java/com/jme3/app/state/MjpegFileWriter.java

@@ -552,14 +552,14 @@ public class MjpegFileWriter implements AutoCloseable {
         }
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        ImageWriter imgWrtr = ImageIO.getImageWritersByFormatName("jpg").next();
-        try (ImageOutputStream imgOutStrm = ImageIO.createImageOutputStream(baos)) {
-            imgWrtr.setOutput(imgOutStrm);
-
-            ImageWriteParam jpgWrtPrm = imgWrtr.getDefaultWriteParam();
-            jpgWrtPrm.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-            jpgWrtPrm.setCompressionQuality(quality);
-            imgWrtr.write(null, new IIOImage(bi, null, null), jpgWrtPrm);
+        ImageWriter imageWriter = ImageIO.getImageWritersByFormatName("jpg").next();
+        try (ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(baos)) {
+            imageWriter.setOutput(imageOutputStream);
+
+            ImageWriteParam jpgWriteParam = imageWriter.getDefaultWriteParam();
+            jpgWriteParam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+            jpgWriteParam.setCompressionQuality(quality);
+            imageWriter.write(null, new IIOImage(bi, null, null), jpgWriteParam);
         }
 
         return baos.toByteArray();

+ 7 - 7
jme3-networking/src/main/java/com/jme3/network/serializing/serializers/MapSerializer.java

@@ -87,7 +87,7 @@ public class MapSerializer extends Serializer {
 
         int flags = data.get() & 0xff;
         boolean uniqueKeys = (flags & 0x01) == 0;
-        boolean uniqueVals = (flags & 0x02) == 0;
+        boolean uniqueValues = (flags & 0x02) == 0;
 
         Class keyClazz = null;
         Class valClazz = null;
@@ -98,7 +98,7 @@ public class MapSerializer extends Serializer {
             keyClazz = reg.getType();
             keySerial = reg.getSerializer();
         }
-        if (!uniqueVals){
+        if (!uniqueValues){
             SerializerRegistration reg = Serializer.readClass(data);
             valClazz = reg.getType();
             valSerial = reg.getSerializer();
@@ -112,7 +112,7 @@ public class MapSerializer extends Serializer {
             }else{
                 key = keySerial.readObject(data, keyClazz);
             }
-            if (uniqueVals){
+            if (uniqueValues){
                 value = Serializer.readClassAndObject(data);
             }else{
                 value = valSerial.readObject(data, valClazz);
@@ -157,10 +157,10 @@ public class MapSerializer extends Serializer {
         }
 
         boolean uniqueKeys = keyClass == null;
-        boolean uniqueVals = valClass == null;
+        boolean uniqueValues = valClass == null;
         int flags = 0;
         if (!uniqueKeys) flags |= 0x01;
-        if (!uniqueVals) flags |= 0x02;
+        if (!uniqueValues) flags |= 0x02;
         buffer.put( (byte) flags );
 
         Serializer keySerial = null, valSerial = null;
@@ -168,7 +168,7 @@ public class MapSerializer extends Serializer {
             Serializer.writeClass(buffer, keyClass);
             keySerial = Serializer.getSerializer(keyClass);
         }
-        if (!uniqueVals){
+        if (!uniqueValues){
             Serializer.writeClass(buffer, valClass);
             valSerial = Serializer.getSerializer(valClass);
         }
@@ -181,7 +181,7 @@ public class MapSerializer extends Serializer {
             }else{
                 keySerial.writeObject(buffer, entry.getKey());
             }
-            if (uniqueVals){
+            if (uniqueValues){
                 Serializer.writeClassAndObject(buffer, entry.getValue());
             }else{
                 valSerial.writeObject(buffer, entry.getValue());