Shading of package name should happen in FormatterProviderImpl

forge · Nov 26, 2014 · 030bfe7 · 030bfe7
1 parent e0c9e47
commit 030bfe7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/util/Formatter.java b/impl/src/main/java/org/jboss/forge/roaster/model/util/Formatter.java
@@ -142,14 +142,7 @@ private static Properties readConfig(File prefs) throws IOException
          try
          {
             Properties config = parseConfig(stream);
-            Properties modified = new Properties();
-            String shadePackage = JavaCore.class.getPackage().getName().replaceAll("org\\.eclipse.*$", "");
-            for (Entry<Object, Object> property : config.entrySet())
-            {
-               modified.put(shadePackage + property.getKey(), property.getValue());
-            }
-
-            return modified;
+            return applyShadedPackageName(config);
          }
          catch (IOException e)
          {
@@ -165,6 +158,18 @@ private static Properties readConfig(File prefs) throws IOException
       return null;
    }
 
+   public static Properties applyShadedPackageName(Properties config)
+   {
+      Properties modified = new Properties();
+      String shadePackage = JavaCore.class.getPackage().getName().replaceAll("org\\.eclipse.*$", "");
+      for (Entry<Object, Object> property : config.entrySet())
+      {
+         modified.put(shadePackage + property.getKey(), property.getValue());
+      }
+
+      return modified;
+   }
+
    private static Properties readConfigInternal(String filename)
    {
       InputStream stream = new BufferedInputStream(org.jboss.forge.roaster.model.util.Formatter.class

diff --git a/impl/src/main/java/org/jboss/forge/roaster/spi/FormatterProviderImpl.java b/impl/src/main/java/org/jboss/forge/roaster/spi/FormatterProviderImpl.java
@@ -27,6 +27,7 @@ public String format(String source)
    @Override
    public String format(Properties properties, String source)
    {
-      return Formatter.format(properties, source);
+      Properties shadedProperties = Formatter.applyShadedPackageName(properties);
+      return Formatter.format(shadedProperties, source);
    }
 }