1 files changed, 34 insertions, 42 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
index 1424d0becad6..6cb6add68697 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
 package com.sun.star.report.pentaho.styles;
 
 import java.util.HashMap;
@@ -54,53 +52,47 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
  */
 public class StyleMapper
 {
-  private final Map backend;
 
-  public StyleMapper()
-  {
-    this.backend = new HashMap();
-  }
+    private final Map backend;
 
-  public void addMapping(final StyleMappingRule rule)
-  {
-    backend.put(rule.getKey(), rule);
-  }
+    public StyleMapper()
+    {
+        this.backend = new HashMap();
+    }
 
-  public boolean isListOfStyles(final String elementNamespace,
-                                final String elementTagName,
-                                final String attributeNamespace,
-                                final String attributeName)
-  {
-    final StyleMapperKey key = new StyleMapperKey
-        (elementNamespace, elementTagName, attributeNamespace, attributeName);
-    final StyleMappingRule rule = (StyleMappingRule) backend.get(key);
-    if (rule == null)
+    public void addMapping(final StyleMappingRule rule)
     {
-      return false;
+        backend.put(rule.getKey(), rule);
     }
-    return rule.isListOfValues();
-  }
 
-  public String getStyleFamilyFor(final String elementNamespace,
-                                  final String elementTagName,
-                                  final String attributeNamespace,
-                                  final String attributeName)
-  {
-    final StyleMapperKey key = new StyleMapperKey
-        (elementNamespace, elementTagName, attributeNamespace, attributeName);
-    final StyleMappingRule rule = (StyleMappingRule) backend.get(key);
-    if (rule == null)
+    public boolean isListOfStyles(final String elementNamespace,
+            final String elementTagName,
+            final String attributeNamespace,
+            final String attributeName)
     {
-      return null;
+        final StyleMapperKey key = new StyleMapperKey(elementNamespace, elementTagName, attributeNamespace, attributeName);
+        final StyleMappingRule rule = (StyleMappingRule) backend.get(key);
+        return rule != null && rule.isListOfValues();
     }
-    return rule.getFamily();
-  }
 
-  public static StyleMapper loadInstance (final ResourceManager resourceManager)
-      throws ResourceException
-  {
-    final Resource resource = resourceManager.createDirectly
-        ("res://com/sun/star/report/pentaho/styles/stylemapper.xml", StyleMapper.class);
-    return (StyleMapper) resource.getResource();
-  }
+    public String getStyleFamilyFor(final String elementNamespace,
+            final String elementTagName,
+            final String attributeNamespace,
+            final String attributeName)
+    {
+        final StyleMapperKey key = new StyleMapperKey(elementNamespace, elementTagName, attributeNamespace, attributeName);
+        final StyleMappingRule rule = (StyleMappingRule) backend.get(key);
+        if (rule == null)
+        {
+            return null;
+        }
+        return rule.getFamily();
+    }
+
+    public static StyleMapper loadInstance(final ResourceManager resourceManager)
+            throws ResourceException
+    {
+        final Resource resource = resourceManager.createDirectly("res://com/sun/star/report/pentaho/styles/stylemapper.xml", StyleMapper.class);
+        return (StyleMapper) resource.getResource();
+    }
 }