Merged in master (pull request #25)

Refactor - order modifiers as per java specification

Approved-by: Alexander Maslov
Approved-by: Andrey Somov

9 files changed, 34 insertions, 34 deletions

diff --git a/src/main/java/org/yaml/snakeyaml/TypeDescription.java b/src/main/java/org/yaml/snakeyaml/TypeDescription.java
index 19b00956..e65308b1 100644
--- a/src/main/java/org/yaml/snakeyaml/TypeDescription.java
+++ b/src/main/java/org/yaml/snakeyaml/TypeDescription.java
@@ -40,7 +40,7 @@ import org.yaml.snakeyaml.nodes.Tag;
  */
 public class TypeDescription {
 
-  final private static Logger log = Logger.getLogger(TypeDescription.class.getPackage().getName());
+  final static private Logger log = Logger.getLogger(TypeDescription.class.getPackage().getName());
 
   private final Class<? extends Object> type;
 
@@ -50,9 +50,9 @@ public class TypeDescription {
 
   private Tag tag;
 
-  transient private Set<Property> dumpProperties;
-  transient private PropertyUtils propertyUtils;
-  transient private boolean delegatesChecked;
+  private transient Set<Property> dumpProperties;
+  private transient PropertyUtils propertyUtils;
+  private transient boolean delegatesChecked;
 
   private Map<String, PropertySubstitute> properties = Collections.emptyMap();
 
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
index 954742e7..a4ed1f50 100644
--- a/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
+++ b/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
@@ -304,7 +304,7 @@ public abstract class BaseConstructor {
     return newInstance(Object.class, node);
   }
 
-  final protected Object newInstance(Class<?> ancestor, Node node) {
+  protected final Object newInstance(Class<?> ancestor, Node node) {
     return newInstance(ancestor, node, true);
   }
 
diff --git a/src/main/java/org/yaml/snakeyaml/introspector/GenericProperty.java b/src/main/java/org/yaml/snakeyaml/introspector/GenericProperty.java
index c7414cf8..7fff2b5e 100644
--- a/src/main/java/org/yaml/snakeyaml/introspector/GenericProperty.java
+++ b/src/main/java/org/yaml/snakeyaml/introspector/GenericProperty.java
@@ -18,7 +18,7 @@ import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-abstract public class GenericProperty extends Property {
+public abstract class GenericProperty extends Property {
 
   private final Type genType;
 
diff --git a/src/main/java/org/yaml/snakeyaml/introspector/Property.java b/src/main/java/org/yaml/snakeyaml/introspector/Property.java
index 9293b62e..a65d8505 100644
--- a/src/main/java/org/yaml/snakeyaml/introspector/Property.java
+++ b/src/main/java/org/yaml/snakeyaml/introspector/Property.java
@@ -42,7 +42,7 @@ public abstract class Property implements Comparable<Property> {
     return type;
   }
 
-  abstract public Class<?>[] getActualTypeArguments();
+  public abstract Class<?>[] getActualTypeArguments();
 
   public String getName() {
     return name;
@@ -65,9 +65,9 @@ public abstract class Property implements Comparable<Property> {
     return true;
   }
 
-  abstract public void set(Object object, Object value) throws Exception;
+  public abstract void set(Object object, Object value) throws Exception;
 
-  abstract public Object get(Object object);
+  public abstract Object get(Object object);
 
   /**
    * Returns the annotations that are present on this property or empty {@code List} if there're no
@@ -76,7 +76,7 @@ public abstract class Property implements Comparable<Property> {
    * @return the annotations that are present on this property or empty {@code List} if there're no
    *         annotations
    */
-  abstract public List<Annotation> getAnnotations();
+  public abstract List<Annotation> getAnnotations();
 
   /**
    * Returns property's annotation for the given type or {@code null} if it's not present.
@@ -86,7 +86,7 @@ public abstract class Property implements Comparable<Property> {
    *
    * @return property's annotation for the given type or {@code null} if it's not present
    */
-  abstract public <A extends Annotation> A getAnnotation(Class<A> annotationType);
+  public abstract <A extends Annotation> A getAnnotation(Class<A> annotationType);
 
   @Override
   public int hashCode() {
diff --git a/src/main/java/org/yaml/snakeyaml/introspector/PropertySubstitute.java b/src/main/java/org/yaml/snakeyaml/introspector/PropertySubstitute.java
index 95a15b1c..162df62a 100644
--- a/src/main/java/org/yaml/snakeyaml/introspector/PropertySubstitute.java
+++ b/src/main/java/org/yaml/snakeyaml/introspector/PropertySubstitute.java
@@ -31,14 +31,14 @@ import org.yaml.snakeyaml.error.YAMLException;
 // correct place ?
 public class PropertySubstitute extends Property {
 
-  final private static Logger log =
+  private static final Logger log =
       Logger.getLogger(PropertySubstitute.class.getPackage().getName());
 
   protected Class<?> targetType;
   private final String readMethod;
   private final String writeMethod;
-  transient private Method read;
-  transient private Method write;
+  private transient Method read;
+  private transient Method write;
   private Field field;
   protected Class<?>[] parameters;
   private Property delegate;
diff --git a/src/main/java/org/yaml/snakeyaml/nodes/CollectionNode.java b/src/main/java/org/yaml/snakeyaml/nodes/CollectionNode.java
index 2b4e3288..09ad80f5 100644
--- a/src/main/java/org/yaml/snakeyaml/nodes/CollectionNode.java
+++ b/src/main/java/org/yaml/snakeyaml/nodes/CollectionNode.java
@@ -47,7 +47,7 @@ public abstract class CollectionNode<T> extends Node {
    *
    * @return Nodes in the specified order.
    */
-  abstract public List<T> getValue();
+  public abstract List<T> getValue();
 
   /**
    * Serialization style of this collection.
diff --git a/src/main/java/org/yaml/snakeyaml/nodes/SequenceNode.java b/src/main/java/org/yaml/snakeyaml/nodes/SequenceNode.java
index fbfefbcf..745268da 100644
--- a/src/main/java/org/yaml/snakeyaml/nodes/SequenceNode.java
+++ b/src/main/java/org/yaml/snakeyaml/nodes/SequenceNode.java
@@ -25,7 +25,7 @@ import org.yaml.snakeyaml.error.Mark;
  */
 public class SequenceNode extends CollectionNode<Node> {
 
-  final private List<Node> value;
+  private final List<Node> value;
 
   public SequenceNode(Tag tag, boolean resolved, List<Node> value, Mark startMark, Mark endMark,
       DumperOptions.FlowStyle flowStyle) {
diff --git a/src/main/java/org/yaml/snakeyaml/scanner/Constant.java b/src/main/java/org/yaml/snakeyaml/scanner/Constant.java
index 7342ca46..83720afe 100644
--- a/src/main/java/org/yaml/snakeyaml/scanner/Constant.java
+++ b/src/main/java/org/yaml/snakeyaml/scanner/Constant.java
@@ -17,25 +17,25 @@ import java.util.Arrays;
 
 public final class Constant {
 
-  private final static String ALPHA_S =
+  private static final String ALPHA_S =
       "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
 
-  private final static String LINEBR_S = "\n\u0085\u2028\u2029";
-  private final static String FULL_LINEBR_S = "\r" + LINEBR_S;
-  private final static String NULL_OR_LINEBR_S = "\0" + FULL_LINEBR_S;
-  private final static String NULL_BL_LINEBR_S = " " + NULL_OR_LINEBR_S;
-  private final static String NULL_BL_T_LINEBR_S = "\t" + NULL_BL_LINEBR_S;
-  private final static String NULL_BL_T_S = "\0 \t";
-  private final static String URI_CHARS_S = ALPHA_S + "-;/?:@&=+$,_.!~*'()[]%";
+  private static final String LINEBR_S = "\n\u0085\u2028\u2029";
+  private static final String FULL_LINEBR_S = "\r" + LINEBR_S;
+  private static final String NULL_OR_LINEBR_S = "\0" + FULL_LINEBR_S;
+  private static final String NULL_BL_LINEBR_S = " " + NULL_OR_LINEBR_S;
+  private static final String NULL_BL_T_LINEBR_S = "\t" + NULL_BL_LINEBR_S;
+  private static final String NULL_BL_T_S = "\0 \t";
+  private static final String URI_CHARS_S = ALPHA_S + "-;/?:@&=+$,_.!~*'()[]%";
 
-  public final static Constant LINEBR = new Constant(LINEBR_S);
-  public final static Constant NULL_OR_LINEBR = new Constant(NULL_OR_LINEBR_S);
-  public final static Constant NULL_BL_LINEBR = new Constant(NULL_BL_LINEBR_S);
-  public final static Constant NULL_BL_T_LINEBR = new Constant(NULL_BL_T_LINEBR_S);
-  public final static Constant NULL_BL_T = new Constant(NULL_BL_T_S);
-  public final static Constant URI_CHARS = new Constant(URI_CHARS_S);
+  public static final Constant LINEBR = new Constant(LINEBR_S);
+  public static final Constant NULL_OR_LINEBR = new Constant(NULL_OR_LINEBR_S);
+  public static final Constant NULL_BL_LINEBR = new Constant(NULL_BL_LINEBR_S);
+  public static final Constant NULL_BL_T_LINEBR = new Constant(NULL_BL_T_LINEBR_S);
+  public static final Constant NULL_BL_T = new Constant(NULL_BL_T_S);
+  public static final Constant URI_CHARS = new Constant(URI_CHARS_S);
 
-  public final static Constant ALPHA = new Constant(ALPHA_S);
+  public static final Constant ALPHA = new Constant(ALPHA_S);
 
   private String content;
   boolean[] contains = new boolean[128];
diff --git a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java
index 75c9c15a..ec8711f9 100644
--- a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java
+++ b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java
@@ -86,7 +86,7 @@ public final class ScannerImpl implements Scanner {
   /**
    * A regular expression matching characters which are not in the hexadecimal set (0-9, A-F, a-f).
    */
-  private final static Pattern NOT_HEXA = Pattern.compile("[^0-9A-Fa-f]");
+  private static final Pattern NOT_HEXA = Pattern.compile("[^0-9A-Fa-f]");
 
   /**
    * A mapping from an escaped character in the input stream to the string representation that they
@@ -96,7 +96,7 @@ public final class ScannerImpl implements Scanner {
    *
    * @see <a href="http://www.yaml.org/spec/current.html#id2517668">4.1.6. Escape Sequences</a>
    */
-  public final static Map<Character, String> ESCAPE_REPLACEMENTS = new HashMap<Character, String>();
+  public static final Map<Character, String> ESCAPE_REPLACEMENTS = new HashMap<Character, String>();
 
   /**
    * A mapping from a character to a number of bytes to read-ahead for that escape sequence. These
@@ -111,7 +111,7 @@ public final class ScannerImpl implements Scanner {
    *
    * @see <a href="http://yaml.org/spec/1.1/current.html#id872840">5.6. Escape Sequences</a>
    */
-  public final static Map<Character, Integer> ESCAPE_CODES = new HashMap<Character, Integer>();
+  public static final Map<Character, Integer> ESCAPE_CODES = new HashMap<Character, Integer>();
 
   static {
     // ASCII null