Refactor: rename enums in DumperOptions to make the names consistent
diff --git a/README b/README
index bfe7978..0351cea 100644
--- a/README
+++ b/README
@@ -104,7 +104,8 @@
 
 == History ==
 
-'''1.1.1 (in Mercurial)'''
+'''1.2 (in Mercurial)'''
+ * Refactor: rename enums in DumperOptions to make the names consistent
  * Add possibility to parse all scalars as Strings
  * Respect `DumperOptions` with a custom Representer
  * Represent TAB as '\t' instead of '(9' in an error message
diff --git a/doc/wiki/Documentation.txt b/doc/wiki/Documentation.txt
index 683a49e..3ecfcb8 100644
--- a/doc/wiki/Documentation.txt
+++ b/doc/wiki/Documentation.txt
@@ -45,7 +45,7 @@
 '''`defaultFlowStyle`''' of '''`DumperOptions`''' to '''`block`'''. For instance,

 {{{

 DumperOptions options = new DumperOptions();

-options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

 Yaml yaml = new Yaml(options);

 String document = "  a: 1\n  b:\n    c: 3\n    d: 4\n";

 System.out.println(yaml.dump(yaml.load(document)));

@@ -552,7 +552,7 @@
         data.add(i);

     }

     DumperOptions options = new DumperOptions();

-    options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+    options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

     Yaml yaml = new Yaml(options);

     String output = yaml.dump(data);

     System.out.println(output);

@@ -572,7 +572,7 @@
         data.add(i);

     }

     DumperOptions options = new DumperOptions();

-    options.setDefaultStyle(DumperOptions.DefaultScalarStyle.DOUBLE_QUOTED);

+    options.setDefaultScalarStyle(DumperOptions.ScalarStyle.DOUBLE_QUOTED);

     Yaml yaml = new Yaml(options);

     String output = yaml.dump(data);

     System.out.println(output);

@@ -900,7 +900,7 @@
 {{{

 public void testDumpEnumBean() {

     DumperOptions options = new DumperOptions();

-    options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+    options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

     Yaml yaml = new Yaml(options);

     EnumBean bean = new EnumBean();

     bean.setId(17);

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 451a4d4..cdbdf14 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -6,6 +6,9 @@
 	<body>

 	    <release version="1.1.1-SNAPSHOT" date="in Mercurial" description="development">

             <action dev="py4fun" type="add">

+                Refactor: rename enums in DumperOptions to make the names consistent (2009-04-07)

+            </action>

+            <action dev="py4fun" type="add">

                 Refactor: use Character instead of char primitive for style in Emitter (2009-04-07)

             </action>

             <action dev="py4fun" type="add">

diff --git a/src/main/java/org/yaml/snakeyaml/Dumper.java b/src/main/java/org/yaml/snakeyaml/Dumper.java
index d5735e9..0464ca8 100644
--- a/src/main/java/org/yaml/snakeyaml/Dumper.java
+++ b/src/main/java/org/yaml/snakeyaml/Dumper.java
@@ -23,7 +23,7 @@
     public Dumper(Representer representer, DumperOptions options) {

         this.representer = representer;

         representer.setDefaultFlowStyle(options.getDefaultFlowStyle());

-        representer.setDefaultStyle(options.getDefaultStyle());

+        representer.setDefaultScalarStyle(options.getDefaultScalarStyle());

         this.options = options;

     }

 

diff --git a/src/main/java/org/yaml/snakeyaml/DumperOptions.java b/src/main/java/org/yaml/snakeyaml/DumperOptions.java
index 49e69ae..c4d2000 100644
--- a/src/main/java/org/yaml/snakeyaml/DumperOptions.java
+++ b/src/main/java/org/yaml/snakeyaml/DumperOptions.java
@@ -12,13 +12,13 @@
  * @see <a href="http://pyyaml.org/wiki/PyYAML">PyYAML</a> for more information
  */
 public class DumperOptions {
-    public enum DefaultScalarStyle {
+    public enum ScalarStyle {
         DOUBLE_QUOTED(new Character('"')), SINGLE_QUOTED(new Character('\'')), LITERAL(
                 new Character('|')), FOLDED(new Character('>')), PLAIN(null);
         private Character styleChar;
 
-        private DefaultScalarStyle(Character defaultStyle) {
-            this.styleChar = defaultStyle;
+        private ScalarStyle(Character style) {
+            this.styleChar = style;
         }
 
         public Character getChar() {
@@ -31,13 +31,13 @@
         }
     }
 
-    public enum DefaultFlowStyle {
+    public enum FlowStyle {
         FLOW(Boolean.TRUE), BLOCK(Boolean.FALSE), AUTO(null);
 
         private Boolean styleBoolean;
 
-        private DefaultFlowStyle(Boolean defaultFlowStyle) {
-            styleBoolean = defaultFlowStyle;
+        private FlowStyle(Boolean flowStyle) {
+            styleBoolean = flowStyle;
         }
 
         public Boolean getStyleBoolean() {
@@ -88,8 +88,8 @@
         }
     }
 
-    private DefaultScalarStyle defaultStyle = DefaultScalarStyle.PLAIN;
-    private DefaultFlowStyle defaultFlowStyle = DefaultFlowStyle.AUTO;
+    private ScalarStyle defaultStyle = ScalarStyle.PLAIN;
+    private FlowStyle defaultFlowStyle = FlowStyle.AUTO;
     private boolean canonical = false;
     private boolean allowUnicode = true;
     private int indent = 2;
@@ -117,7 +117,7 @@
         this.allowUnicode = allowUnicode;
     }
 
-    public DefaultScalarStyle getDefaultStyle() {
+    public ScalarStyle getDefaultScalarStyle() {
         return defaultStyle;
     }
 
@@ -127,9 +127,9 @@
      * 
      * @param defaultStyle
      */
-    public void setDefaultStyle(DefaultScalarStyle defaultStyle) {
+    public void setDefaultScalarStyle(ScalarStyle defaultStyle) {
         if (defaultStyle == null) {
-            throw new NullPointerException("Use DefaultScalarStyle enum.");
+            throw new NullPointerException("Use ScalarStyle enum.");
         }
         this.defaultStyle = defaultStyle;
     }
@@ -185,14 +185,14 @@
         return lineBreak;
     }
 
-    public void setDefaultFlowStyle(DefaultFlowStyle defaultFlowStyle) {
+    public void setDefaultFlowStyle(FlowStyle defaultFlowStyle) {
         if (defaultFlowStyle == null) {
-            throw new NullPointerException("Use DefaultFlowStyle enum.");
+            throw new NullPointerException("Use FlowStyle enum.");
         }
         this.defaultFlowStyle = defaultFlowStyle;
     }
 
-    public DefaultFlowStyle getDefaultFlowStyle() {
+    public FlowStyle getDefaultFlowStyle() {
         return defaultFlowStyle;
     }
 
diff --git a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
index 62ccbeb..75a1f4a 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
@@ -11,8 +11,8 @@
 import java.util.Map;

 import java.util.Set;

 

-import org.yaml.snakeyaml.DumperOptions.DefaultFlowStyle;

-import org.yaml.snakeyaml.DumperOptions.DefaultScalarStyle;

+import org.yaml.snakeyaml.DumperOptions.FlowStyle;

+import org.yaml.snakeyaml.DumperOptions.ScalarStyle;

 import org.yaml.snakeyaml.error.YAMLException;

 import org.yaml.snakeyaml.nodes.MappingNode;

 import org.yaml.snakeyaml.nodes.Node;

@@ -156,11 +156,11 @@
 

     protected abstract boolean ignoreAliases(Object data);

 

-    public void setDefaultStyle(DefaultScalarStyle defaultStyle) {

+    public void setDefaultScalarStyle(ScalarStyle defaultStyle) {

         this.defaultStyle = defaultStyle.getChar();

     }

 

-    public void setDefaultFlowStyle(DefaultFlowStyle defaultFlowStyle) {

+    public void setDefaultFlowStyle(FlowStyle defaultFlowStyle) {

         this.defaultFlowStyle = defaultFlowStyle.getStyleBoolean();

     }

 }

diff --git a/src/test/java/examples/CollectionStyleTest.java b/src/test/java/examples/CollectionStyleTest.java
index 4529f99..23765b2 100644
--- a/src/test/java/examples/CollectionStyleTest.java
+++ b/src/test/java/examples/CollectionStyleTest.java
@@ -19,7 +19,7 @@
 

     public void testNestedStyle2() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

         Yaml yaml = new Yaml(options);

         String document = "  a: 1\n  b:\n    c: 3\n    d: 4\n";

         System.out.println(yaml.dump(yaml.load(document)));

diff --git a/src/test/java/examples/DumpExampleTest.java b/src/test/java/examples/DumpExampleTest.java
index e44ce84..b6e1cab 100644
--- a/src/test/java/examples/DumpExampleTest.java
+++ b/src/test/java/examples/DumpExampleTest.java
@@ -101,7 +101,7 @@
             data.add(i);

         }

         DumperOptions options = new DumperOptions();

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

         Yaml yaml = new Yaml(options);

         String output = yaml.dump(data);

         System.out.println(output);

@@ -116,7 +116,7 @@
             data.add(i);

         }

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.DOUBLE_QUOTED);

+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.DOUBLE_QUOTED);

         Yaml yaml = new Yaml(options);

         String output = yaml.dump(data);

         System.out.println(output);

diff --git a/src/test/java/org/pyyaml/PyEmitterTest.java b/src/test/java/org/pyyaml/PyEmitterTest.java
index f2de9a6..4f8ea66 100644
--- a/src/test/java/org/pyyaml/PyEmitterTest.java
+++ b/src/test/java/org/pyyaml/PyEmitterTest.java
@@ -125,7 +125,7 @@
                 }

                 //

                 for (Boolean flowStyle : new Boolean[] { Boolean.FALSE, Boolean.TRUE }) {

-                    for (DumperOptions.DefaultScalarStyle style : DumperOptions.DefaultScalarStyle

+                    for (DumperOptions.ScalarStyle style : DumperOptions.ScalarStyle

                             .values()) {

                         List<Event> styledEvents = new LinkedList<Event>();

                         for (Event event : events) {

diff --git a/src/test/java/org/yaml/snakeyaml/DumperOptionsTest.java b/src/test/java/org/yaml/snakeyaml/DumperOptionsTest.java
index 7793196..3c70044 100644
--- a/src/test/java/org/yaml/snakeyaml/DumperOptionsTest.java
+++ b/src/test/java/org/yaml/snakeyaml/DumperOptionsTest.java
@@ -20,24 +20,24 @@
         // string which looks like integer
         assertEquals("'123'\n", yaml.dump("123"));
         //
-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.DOUBLE_QUOTED);
+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.DOUBLE_QUOTED);
         yaml = new Yaml(options);
         assertEquals("\"123\"\n", yaml.dump("123"));
         //
-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.SINGLE_QUOTED);
+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.SINGLE_QUOTED);
         yaml = new Yaml(options);
         assertEquals("'123'\n", yaml.dump("123"));
         //
-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.PLAIN);
+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.PLAIN);
         yaml = new Yaml(options);
         assertEquals("'123'\n", yaml.dump("123"));
         assertEquals("abc\n", yaml.dump("abc"));
         // null check
         try {
-            options.setDefaultStyle(null);
+            options.setDefaultScalarStyle(null);
             fail("Null must not be accepted.");
         } catch (NullPointerException e) {
-            assertEquals("Use DefaultScalarStyle enum.", e.getMessage());
+            assertEquals("Use ScalarStyle enum.", e.getMessage());
         }
     }
 
@@ -51,12 +51,12 @@
         //
         DumperOptions options = new DumperOptions();
         options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.FLOW);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.FLOW);
         yaml = new Yaml(options);
         assertEquals("[1, 2, 3]\n", yaml.dump(list));
         //
         options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         yaml = new Yaml(options);
         assertEquals("- 1\n- 2\n- 3\n", yaml.dump(list));
         // null check
@@ -64,7 +64,7 @@
             options.setDefaultFlowStyle(null);
             fail("Null must not be accepted.");
         } catch (NullPointerException e) {
-            assertEquals("Use DefaultFlowStyle enum.", e.getMessage());
+            assertEquals("Use FlowStyle enum.", e.getMessage());
         }
     }
 
@@ -81,12 +81,12 @@
         //
         DumperOptions options = new DumperOptions();
         options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.FLOW);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.FLOW);
         yaml = new Yaml(options);
         assertEquals("{a: b, c: [1, 2, 3]}\n", yaml.dump(map));
         //
         options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         yaml = new Yaml(options);
         assertEquals("a: b\nc:\n- 1\n- 2\n- 3\n", yaml.dump(map));
     }
@@ -250,10 +250,10 @@
     }
 
     public void testToString() {
-        DumperOptions.DefaultScalarStyle scalarStyle = DumperOptions.DefaultScalarStyle.LITERAL;
+        DumperOptions.ScalarStyle scalarStyle = DumperOptions.ScalarStyle.LITERAL;
         assertEquals("Scalar style: '|'", scalarStyle.toString());
         //
-        DumperOptions.DefaultFlowStyle flowStyle = DumperOptions.DefaultFlowStyle.BLOCK;
+        DumperOptions.FlowStyle flowStyle = DumperOptions.FlowStyle.BLOCK;
         assertEquals("Flow style: 'false'", flowStyle.toString());
         //
         DumperOptions.LineBreak lb = DumperOptions.LineBreak.LINUX;
@@ -264,7 +264,7 @@
         Representer representer = new Representer();
         DumperOptions options = new DumperOptions();
         options.setIndent(4);
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Dumper dumper = new Dumper(representer, options);
         Yaml yaml = new Yaml(dumper);
         List<Integer> list = new LinkedList<Integer>();
diff --git a/src/test/java/org/yaml/snakeyaml/DumperTest.java b/src/test/java/org/yaml/snakeyaml/DumperTest.java
index ddbab0e..bad91de 100644
--- a/src/test/java/org/yaml/snakeyaml/DumperTest.java
+++ b/src/test/java/org/yaml/snakeyaml/DumperTest.java
@@ -14,7 +14,7 @@
 

     public void testDump1() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.DOUBLE_QUOTED);

+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.DOUBLE_QUOTED);

         options.setExplicitStart(true);

         options.setExplicitEnd(true);

         List<Integer> list = new LinkedList<Integer>();

@@ -40,7 +40,7 @@
 

     public void testDump3() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.SINGLE_QUOTED);

+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.SINGLE_QUOTED);

         List<Integer> list = new LinkedList<Integer>();

         for (int i = 0; i < 3; i++) {

             list.add(i);

diff --git a/src/test/java/org/yaml/snakeyaml/EnumTest.java b/src/test/java/org/yaml/snakeyaml/EnumTest.java
index 39dc0d9..6407b67 100644
--- a/src/test/java/org/yaml/snakeyaml/EnumTest.java
+++ b/src/test/java/org/yaml/snakeyaml/EnumTest.java
@@ -24,7 +24,7 @@
 
     public void testDumpEnumArray() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         String output = yaml.dump(Suit.values());
         assertEquals(
@@ -34,7 +34,7 @@
 
     public void testDumpEnumList() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         List<Suit> list = Arrays.asList(Suit.values());
         String output = yaml.dump(list);
@@ -45,7 +45,7 @@
 
     public void testDumpEnumListNoAnchor() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         List<Suit> list = new ArrayList<Suit>(3);
         list.add(Suit.CLUBS);
@@ -59,7 +59,7 @@
 
     public void testDumpEnumMap() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         Map<String, Suit> map = new LinkedHashMap<String, Suit>();
         map.put("c", Suit.CLUBS);
@@ -72,7 +72,7 @@
 
     public void testDumpEnumMap2() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         Map<Suit, Integer> map = new EnumMap<Suit, Integer>(Suit.class);
         map.put(Suit.CLUBS, 0);
@@ -85,7 +85,7 @@
 
     public void testDumpEnumBean() {
         DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
         EnumBean bean = new EnumBean();
         bean.setId(17);
diff --git a/src/test/java/org/yaml/snakeyaml/constructor/BeanConstructorTest.java b/src/test/java/org/yaml/snakeyaml/constructor/BeanConstructorTest.java
index 57d273c..0346829 100644
--- a/src/test/java/org/yaml/snakeyaml/constructor/BeanConstructorTest.java
+++ b/src/test/java/org/yaml/snakeyaml/constructor/BeanConstructorTest.java
@@ -47,7 +47,7 @@
         assertEquals("public", result.publicField);

         //

         DumperOptions options = new DumperOptions();

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

         Yaml yamlToDump = new Yaml(options);

         String output = yamlToDump.dump(result);

         System.out.println(output);

diff --git a/src/test/java/org/yaml/snakeyaml/emitter/EmitterTest.java b/src/test/java/org/yaml/snakeyaml/emitter/EmitterTest.java
index 1314fbb..98d63e3 100644
--- a/src/test/java/org/yaml/snakeyaml/emitter/EmitterTest.java
+++ b/src/test/java/org/yaml/snakeyaml/emitter/EmitterTest.java
@@ -10,13 +10,13 @@
 

 import org.yaml.snakeyaml.DumperOptions;

 import org.yaml.snakeyaml.Yaml;

-import org.yaml.snakeyaml.DumperOptions.DefaultScalarStyle;

+import org.yaml.snakeyaml.DumperOptions.ScalarStyle;

 

 public class EmitterTest extends TestCase {

 

     public void testWriteFolded() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DefaultScalarStyle.FOLDED);

+        options.setDefaultScalarStyle(ScalarStyle.FOLDED);

         String folded = "0123456789 0123456789\n0123456789 0123456789";

         Map<String, String> map = new LinkedHashMap<String, String>();

         map.put("aaa", folded);

@@ -29,7 +29,7 @@
 

     public void testWriteLiteral() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DefaultScalarStyle.LITERAL);

+        options.setDefaultScalarStyle(ScalarStyle.LITERAL);

         String folded = "0123456789 0123456789 0123456789 0123456789";

         Map<String, String> map = new LinkedHashMap<String, String>();

         map.put("aaa", folded);

@@ -43,7 +43,7 @@
 

     public void testWritePlain() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DefaultScalarStyle.PLAIN);

+        options.setDefaultScalarStyle(ScalarStyle.PLAIN);

         String folded = "0123456789 0123456789\n0123456789 0123456789";

         Map<String, String> map = new LinkedHashMap<String, String>();

         map.put("aaa", folded);

@@ -56,7 +56,7 @@
 

     public void testWriteSingleQuoted() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DefaultScalarStyle.SINGLE_QUOTED);

+        options.setDefaultScalarStyle(ScalarStyle.SINGLE_QUOTED);

         String folded = "0123456789 0123456789\n0123456789 0123456789";

         Map<String, String> map = new LinkedHashMap<String, String>();

         map.put("aaa", folded);

@@ -69,7 +69,7 @@
 

     public void testWriteDoubleQuoted() {

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DefaultScalarStyle.DOUBLE_QUOTED);

+        options.setDefaultScalarStyle(ScalarStyle.DOUBLE_QUOTED);

         String folded = "0123456789 0123456789\n0123456789 0123456789";

         Map<String, String> map = new LinkedHashMap<String, String>();

         map.put("aaa", folded);

diff --git a/src/test/java/org/yaml/snakeyaml/representer/SafeRepresenterTest.java b/src/test/java/org/yaml/snakeyaml/representer/SafeRepresenterTest.java
index 262161a..383a615 100644
--- a/src/test/java/org/yaml/snakeyaml/representer/SafeRepresenterTest.java
+++ b/src/test/java/org/yaml/snakeyaml/representer/SafeRepresenterTest.java
@@ -54,7 +54,7 @@
         list.add(new Date(1229684761000L));

         list.add(new Date(1229684760000L));

         DumperOptions options = new DumperOptions();

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

         Yaml yaml = new Yaml(options);

         String output = yaml.dump(list);

         assertEquals(

@@ -77,8 +77,8 @@
         map.put("name", "Ubuntu");

         map.put("age", 5);

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.DOUBLE_QUOTED);

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.BLOCK);

+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.DOUBLE_QUOTED);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

         Yaml yaml = new Yaml(options);

         String output = yaml.dump(map);

         assertTrue(output.contains("\"age\": !!int \"5\""));

@@ -95,8 +95,8 @@
         map.put("name", "Ubuntu");

         map.put("list", list);

         DumperOptions options = new DumperOptions();

-        options.setDefaultStyle(DumperOptions.DefaultScalarStyle.SINGLE_QUOTED);

-        options.setDefaultFlowStyle(DumperOptions.DefaultFlowStyle.FLOW);

+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.SINGLE_QUOTED);

+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.FLOW);

         Yaml yaml = new Yaml(options);

         String output = yaml.dump(map);

         assertEquals("{'age': !!int '5', 'name': 'Ubuntu', 'list': [!!int '1', !!int '1']}\n",