commit 1b971d5c50cc9a797d9a65b799815a670354bbd1
author maslovalex <alexander.maslov@gmail.com> Thu Sep 09 13:43:53 2010 +0300
committer maslovalex <alexander.maslov@gmail.com> Thu Sep 09 13:43:53 2010 +0300
tree 0e95fadefdd88586233f776af2c8792346b68fdd
parent fcc37a0efcd53c2910ef03c2c07affcd0b58aa00
parent 29ef0ca3d831e1f90c87158473919b05d0e4d40e

merged with master

src/main/java/org/yaml/snakeyaml/composer/Composer.java

diff --git a/src/main/java/org/yaml/snakeyaml/composer/Composer.java b/src/main/java/org/yaml/snakeyaml/composer/Composer.java
index 460f4b5..08ed9d4 100644
--- a/src/main/java/org/yaml/snakeyaml/composer/Composer.java
+++ b/src/main/java/org/yaml/snakeyaml/composer/Composer.java
@@ -150,7 +150,6 @@
                     this.anchors.get(anchor).getStartMark(), "second occurence", event
                             .getStartMark());
         }
-        // resolver.descendResolver(parent, index);
         Node node = null;
         if (parser.checkEvent(Event.ID.Scalar)) {
             node = composeScalarNode(anchor);

src/main/java/org/yaml/snakeyaml/representer/Representer.java

diff --git a/src/main/java/org/yaml/snakeyaml/representer/Representer.java b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
index 7c10dcd..f7d6c9b 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/Representer.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
@@ -127,13 +127,13 @@
         if (propertyValue != null && customTag == null && !hasAlias) {
             NodeId nodeId = nodeValue.getNodeId();
             if (nodeId == NodeId.scalar) {
-                if (propertyValue instanceof Enum) {
+                if (propertyValue instanceof Enum<?>) {
                     nodeValue.setTag(Tag.STR);
                 }
             } else {
                 if (nodeId == NodeId.mapping) {
                     if (property.getType() == propertyValue.getClass()) {
-                        if (!(propertyValue instanceof Map)) {
+                        if (!(propertyValue instanceof Map<?, ?>)) {
                             if (!nodeValue.getTag().equals(Tag.SET)) {
                                 nodeValue.setTag(Tag.MAP);
                             }