Eliminates duplication among the ~28 Resources classes.

1 files changed, 4 insertions, 38 deletions

diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
index 63e9e3f..d761695 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
@@ -6,12 +6,7 @@
  */
 package net.java.sip.communicator.plugin.dictaccregwizz;
 
-import java.io.*;
-
 import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
-
-import org.osgi.framework.*;
 
 /**
  * The <tt>Resources</tt> class manages the access to the internationalization
@@ -22,8 +17,6 @@ import org.osgi.framework.*;
  */
 public class Resources
 {
-    private static Logger log = Logger.getLogger(Resources.class);
-
     private static ResourceManagementService resourcesService;
 
     public static ImageID DICT_LOGO = new ImageID("protocolIconDict");
@@ -48,42 +41,15 @@ public class Resources
      */
     public static byte[] getImage(ImageID imageID)
     {
-        InputStream in = 
-            getResources().getImageInputStream(imageID.getId());
-        
-        if(in == null)
-            return null;
-        
-        byte[] image = null;
-
-        try
-        {
-            image = new byte[in.available()];
-            in.read(image);
-        }
-        catch (IOException e)
-        {
-            log.error("Failed to load image:" + imageID, e);
-        }
-
-        return image;
+        return getResources().getImageInBytes(imageID.getId());
     }
     
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
-        {
-            ServiceReference serviceReference = DictAccRegWizzActivator.bundleContext
-                .getServiceReference(ResourceManagementService.class.getName());
-
-            if(serviceReference == null)
-                return null;
-            
-            resourcesService = 
-                (ResourceManagementService)DictAccRegWizzActivator.bundleContext
-                    .getService(serviceReference);
-        }
-
+            resourcesService =
+                ResourceManagementServiceUtils
+                    .getService(DictAccRegWizzActivator.bundleContext);
         return resourcesService;
     }
 }