Leaves a single ImageID class.

18 files changed, 31 insertions, 318 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
index fd6b99e..91bbcbd 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.utils;
 
 import java.awt.*;
@@ -17,6 +16,7 @@ import javax.imageio.*;
 import javax.imageio.stream.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -976,7 +976,7 @@ public class ImageLoader {
      * Call 16x16 image.
      * //TODO : change to an appropriate logo
      */
-    public static final ImageLoader.ImageID CALL_16x16_ICON
+    public static final ImageID CALL_16x16_ICON
             = new ImageID("CALL_16x16_ICON");
 
     /**
@@ -1345,21 +1345,6 @@ public class ImageLoader {
     }
 
     /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID {
-        private String id;
-
-        private ImageID(String id) {
-            this.id = id;
-        }
-
-        public String getId() {
-            return id;
-        }
-    }
-
-    /**
      * Returns the path string of an already loaded image, otherwise null.
      *
      * @param image
diff --git a/src/net/java/sip/communicator/impl/gui/utils/Smiley.java b/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
index 1c47048..955a475 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
@@ -4,15 +4,15 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.utils;
 
 import java.net.*;
+
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.ImageLoader.*;
+import net.java.sip.communicator.service.resources.*;
 
 /**
- * The <tt>Smily</tt> is used to store a smily.
+ * The <tt>Smiley</tt> is used to store a smiley.
  * 
  * @author Yana Stamcheva
  */
diff --git a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
index e03ef69..4eb210f 100644
--- a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
+++ b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
@@ -177,22 +177,4 @@ public class SCCallbackResources
 
         return image;
     }
-    
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID 
-    {
-        private String id;
-
-        private ImageID(String id) 
-        {
-            this.id = id;
-        }
-
-        public String getId() 
-        {
-            return id;
-        }
-    }
 }
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/Resources.java b/src/net/java/sip/communicator/impl/protocol/ssh/Resources.java
index 59a29ae..7859949 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/Resources.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/Resources.java
@@ -9,11 +9,11 @@
  * SSH Suport in SIP Communicator - GSoC' 07 Project
  *
  */
-
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
 
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -63,23 +63,4 @@ public class Resources
         
         return image;
     }
-    
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-        
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-        
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
 }
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
index 1f82730..9217b0a 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.aimaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -74,24 +72,6 @@ public class Resources
 
         return image;
     }
-
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
     
     public static ResourceManagementService getResources()
     {
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
index 348f0f6..63e9e3f 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.dictaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -70,24 +68,6 @@ public class Resources
 
         return image;
     }
-
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
     
     public static ResourceManagementService getResources()
     {
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
index afe720b..747a48c 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.gibberishaccregwizz;
 
 import java.io.*;
@@ -76,24 +75,6 @@ public class Resources
 
         return image;
     }
-
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
     
     public static ResourceManagementService getResources()
     {
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
index 3129ab7..ee94ab3 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
@@ -96,24 +96,6 @@ public class Resources
     {

         return getResources().getI18NString(key);

     }

-

-    /**

-     * Represents the Image Identifier.

-     */

-    public static class ImageID

-    {

-        private String id;

-

-        private ImageID(String id)

-        {

-            this.id = id;

-        }

-

-        public String getId()

-        {

-            return id;

-        }

-    }

     

     public static ResourceManagementService getResources()

     {

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
index c87677d..012eb35 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.icqaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -69,24 +67,6 @@ public class Resources
 
         return image;
     }
-
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
     
     public static ResourceManagementService getResources()
     {
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
index 703f268..22a5308 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.ircaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -75,24 +73,6 @@ public class Resources
 
         return image;
     }
-
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
     
     public static ResourceManagementService getResources()
     {
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
index 4910c60..19497f7 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.jabberaccregwizz;
 
 import java.io.*;
@@ -99,24 +98,6 @@ public class Resources
         return getResources().getSettingsInputStream(key);
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
index 697119a..04be3d6 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.msnaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -77,24 +75,6 @@ public class Resources
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
index 14b054e..91e017e 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
@@ -7,7 +7,6 @@
 package net.java.sip.communicator.plugin.rssaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -77,24 +76,6 @@ public class Resources
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
index 66ed257..2d596e6 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.sipaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -70,24 +68,6 @@ public class Resources {
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
index b0eba2c..39eb9bc 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
@@ -11,11 +11,9 @@
  * SSH Suport in SIP Communicator - GSoC' 07 Project
  *
  */
-
 package net.java.sip.communicator.plugin.sshaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -78,24 +76,6 @@ public class Resources
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
index 40760be..b25d791 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.yahooaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -69,24 +67,6 @@ public class Resources
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
@@ -104,5 +84,4 @@ public class Resources
 
         return resourcesService;
     }
-
 }
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
index 9caaa3e..fc3b4cd 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
@@ -4,11 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.plugin.zeroconfaccregwizz;
 
 import java.io.*;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -71,28 +69,6 @@ public class Resources
         return image;
     }
 
-    /**
-     * Represents the Image Identifier.
-     */
-    public static class ImageID
-    {
-        private String id;
-
-        private ImageID(String id)
-        {
-            this.id = id;
-        }
-
-        /**
-         * Returns the user ID of this account
-         * @return user ID
-         */
-        public String getId()
-        {
-            return id;
-        }
-    }
-    
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/service/resources/ImageID.java b/src/net/java/sip/communicator/service/resources/ImageID.java
new file mode 100644
index 0000000..b4cbf16
--- /dev/null
+++ b/src/net/java/sip/communicator/service/resources/ImageID.java
@@ -0,0 +1,25 @@
+/*

+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.

+ *

+ * Distributable under LGPL license.

+ * See terms of license at gnu.org.

+ */

+package net.java.sip.communicator.service.resources;

+

+/**

+ * Represents the Image Identifier.

+ */

+public class ImageID

+{

+    private final String id;

+

+    public ImageID(String id)

+    {

+        this.id = id;

+    }

+

+    public String getId()

+    {

+        return id;

+    }

+}