Revert "Refactored shading of package names to format(Properties,Stri…

…ng)" This reverts commit 675c485.
forge · Nov 26, 2014 · e0c9e47 · e0c9e47
1 parent 675c485
commit e0c9e47
Showing 1 changed file with 10 additions and 15 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
@@ -106,8 +106,7 @@ public static String format(String source)
     */
    public static String format(Properties prefs, String source)
    {
-      Properties shadedProperties = applyShadedPackageName(prefs);
-      final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(shadedProperties);
+      final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(prefs);
       return _format(source, codeFormatter);
    }
 
@@ -142,7 +141,15 @@ private static Properties readConfig(File prefs) throws IOException
          InputStream stream = new BufferedInputStream(new FileInputStream(prefs));
          try
          {
-            return parseConfig(stream);
+            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;
          }
          catch (IOException e)
          {
@@ -158,18 +165,6 @@ private static Properties readConfig(File prefs) throws IOException
       return null;
    }
 
-   private 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