Remove resources.properties, where not used any more.

37 files changed, 72 insertions, 150 deletions

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/Resources.java b/src/net/java/sip/communicator/plugin/accountinfo/Resources.java
index 2828c14..0ed178e 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/Resources.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/Resources.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.plugin.accountinfo;
 

 import java.awt.image.*;

 import java.io.*;

-import java.util.*;

 

 import javax.imageio.*;

 import javax.swing.*;

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/resources.properties b/src/net/java/sip/communicator/plugin/accountinfo/resources.properties
deleted file mode 100644
index 08ad913..0000000
--- a/src/net/java/sip/communicator/plugin/accountinfo/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-infoIcon=resources/images/plugin/accountinfo/userInfo16x16.png

-defaultPersonIcon=resources/images/plugin/accountinfo/personPhoto.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties
deleted file mode 100644
index c0e6083..0000000
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/aim/aim16x16-online.png
-pageImage=resources/images/protocol/aim/aim64x64.png
diff --git a/src/net/java/sip/communicator/plugin/branding/brandingResources.properties b/src/net/java/sip/communicator/plugin/branding/brandingResources.properties
deleted file mode 100644
index 8ae9145..0000000
--- a/src/net/java/sip/communicator/plugin/branding/brandingResources.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-aboutWindowBg=resources/images/plugin/branding/aboutWindowBackground.png
-splashScreenBg=resources/images/plugin/branding/splashScreenBackground.png
-textStyle=resources/styles/defaultStyle.css
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/resources.properties b/src/net/java/sip/communicator/plugin/contactinfo/resources.properties
deleted file mode 100644
index 01fc264..0000000
--- a/src/net/java/sip/communicator/plugin/contactinfo/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-infoIcon=resources/images/plugin/contactinfo/userInfo16x16.png

-defaultPersonIcon=resources/images/plugin/contactinfo/personPhoto.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/dictaccregwizz/resources.properties
deleted file mode 100644
index b1146b3..0000000
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/dict/dict-16x16.png
-pageImage=resources/images/protocol/dict/dict-64x64.png
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/resources.properties b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/resources.properties
deleted file mode 100644
index eb9fee8..0000000
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/resources.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-searchIcon=resources/images/plugin/extendedcallhistorysearch/searchIcon.png
-historyMenuIcon=resources/images/plugin/extendedcallhistorysearch/history16x16.png
-incomingCall=resources/images/plugin/extendedcallhistorysearch/incomingCall.png
-outgoingCall=resources/images/plugin/extendedcallhistorysearch/outgoingCall.png
-calendarIcon=resources/images/plugin/extendedcallhistorysearch/calendarIcon.png
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/resources.properties b/src/net/java/sip/communicator/plugin/generalconfig/resources.properties
deleted file mode 100644
index 8f8966d..0000000
--- a/src/net/java/sip/communicator/plugin/generalconfig/resources.properties
+++ /dev/null
@@ -1 +0,0 @@
-pluginIcon=resources/images/plugin/generalconfig/configureIcon.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
deleted file mode 100644
index 3ad7bde..0000000
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/gibberish/gibberish-online.png
-pageImage=resources/images/protocol/gibberish/gibberish64x64.png
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
deleted file mode 100644
index 0b2b5ad..0000000
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/icq/icq16x16-online.png
-pageImage=resources/images/protocol/icq/icq64x64.png
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties
deleted file mode 100644
index 1cf1aeb..0000000
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/irc/cr16-action-irc_online.png
-pageImage=resources/images/protocol/irc/cr64-app-irc_protocol.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
index 6dc5ab8..4910c60 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
@@ -8,8 +8,6 @@
 package net.java.sip.communicator.plugin.jabberaccregwizz;
 
 import java.io.*;
-import java.net.URL;
-import java.util.*;
 
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/resources.properties b/src/net/java/sip/communicator/plugin/keybindingchooser/resources.properties
deleted file mode 100644
index 141a680..0000000
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/resources.properties
+++ /dev/null
@@ -1 +0,0 @@
-pluginIcon=resources/images/plugin/keybindingchooser/pluginIcon.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/mailbox/resources.properties b/src/net/java/sip/communicator/plugin/mailbox/resources.properties
deleted file mode 100644
index adcac7b..0000000
--- a/src/net/java/sip/communicator/plugin/mailbox/resources.properties
+++ /dev/null
@@ -1 +0,0 @@
-mailboxIcon=resources/images/tape.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
index 3beb785..697119a 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
@@ -58,10 +58,10 @@ public class Resources
     {
         InputStream in = 
             getResources().getImageInputStream(imageID.getId());
-        
+
         if(in == null)
             return null;
-        
+
         byte[] image = null;
 
         try
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
deleted file mode 100755
index 38492c7..0000000
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/msn/msn16x16.png
-pageImage=resources/images/protocol/msn/msn64x64.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationActivator.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationActivator.java
index d4e4592..dcd3944 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationActivator.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationActivator.java
@@ -10,6 +10,7 @@ import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
 
@@ -19,14 +20,17 @@ import org.osgi.framework.*;
  */
 public class NotificationConfigurationActivator implements BundleActivator
 {
+    private Logger logger
+        = Logger.getLogger(NotificationConfigurationActivator.class);
+
     public static BundleContext bundleContext;
-    
+
     private static ConfigurationService configService;
-    
+
     private static AudioNotifierService audioService;
-    
+
     private static NotificationService notificationService;
-   
+
     /**
      * Starts this bundle and adds the <tt>AudioConfigurationConfigForm</tt> 
      * contained in it to the configuration window obtained from the 
@@ -35,13 +39,15 @@ public class NotificationConfigurationActivator implements BundleActivator
     public void start(BundleContext bc) throws Exception
     {
         bundleContext = bc;
-        
+
         NotificationConfigurationConfigForm notificationconfiguration
             = new NotificationConfigurationConfigForm();
 
         bundleContext.registerService(  ConfigurationForm.class.getName(),
                                         notificationconfiguration,
                                         null);
+
+        logger.trace("Notification Configuration: [ STARTED ]");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationConfigForm.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationConfigForm.java
index 427f990..7246435 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationConfigForm.java
@@ -7,26 +7,20 @@
 
 package net.java.sip.communicator.plugin.notificationconfiguration;
 
-import java.io.*;
-import java.lang.String.*;
-import java.net.MalformedURLException;
-import java.util.*;
-
 import java.awt.*;
 import java.awt.event.*;
+import java.io.*;
+import java.net.*;
+import java.util.*;
 
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.ImageIcon.*;
 import javax.swing.border.*;
-import javax.swing.JPanel.*;
-import javax.swing.BoxLayout.*;
+import javax.swing.event.*;
 
-import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.audionotifier.*;
+import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.notification.event.*;
-
 import net.java.sip.communicator.util.*;
 
 /**
@@ -159,7 +153,7 @@ public class NotificationConfigurationConfigForm
         activate.setMinimumSize(new Dimension(150,30));
         activate.setPreferredSize(new Dimension(150,30));
         activate.addActionListener(this);
-        desactivate = new JButton(Resources.getString("desactivate"));
+        desactivate = new JButton(Resources.getString("deactivate"));
         desactivate.setMinimumSize(new Dimension(150,30));
         desactivate.setPreferredSize(new Dimension(150,30));
         desactivate.addActionListener(this);
@@ -386,7 +380,7 @@ public class NotificationConfigurationConfigForm
         programFileTextField.setText(tmpNTE.getProgramFile());
         playSoundCheckBox.setSelected(tmpNTE.getSound());
         playSoundButton.setEnabled(tmpNTE.getSound());
-        soundFileChooser.setEnabled(tmpNTE.getSound());           
+        soundFileChooser.setEnabled(tmpNTE.getSound());
         soundFileTextField.setEnabled(tmpNTE.getSound());
         soundFileTextField.setText(tmpNTE.getSoundFile());
         popupCheckBox.setSelected(tmpNTE.getPopup());
@@ -399,7 +393,7 @@ public class NotificationConfigurationConfigForm
      */
     public String getTitle()
     {
-        return Resources.getString("notification");
+        return Resources.getString("notifications");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
index 9648c33..5618e38 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
@@ -7,15 +7,17 @@
 
 package net.java.sip.communicator.plugin.notificationconfiguration;
 
-import java.awt.image.*;
 import java.io.*;
+import java.net.*;
 import java.util.*;
 
-import javax.imageio.*;
 import javax.swing.*;
 
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Messages class manages the access to the internationalization
  * properties files.
@@ -25,23 +27,20 @@ public class Resources {
 
     private static Logger log = Logger.getLogger(Resources.class);
 
-    private static final String BUNDLE_NAME
-        = "net.java.sip.communicator.plugin.notificationconfiguration.resources";
-
-    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-            .getBundle(BUNDLE_NAME);
-
     /**
      * Returns an internationalized string corresponding to the given key.
      * @param key The key of the string.
      * @return An internationalized string corresponding to the given key.
      */
-    public static String getString(String key) {
-        try {
-            return RESOURCE_BUNDLE.getString(key);
-
-        } catch (MissingResourceException e) {
+    public static String getString(String key)
+    {
+        try
+        {
+            return getResources().getI18NString(key);
 
+        }
+        catch (MissingResourceException e)
+        {
             return '!' + key + '!';
         }
     }
@@ -51,19 +50,15 @@ public class Resources {
      * @param imageID The identifier of the image.
      * @return The image for the given identifier.
      */
-    public static ImageIcon getImage(String imageID) {
-        BufferedImage image = null;
-
-        String path = Resources.getString(imageID);
-        try {
-            image = ImageIO.read(Resources.class.getClassLoader()
-                    .getResourceAsStream(path));
+    public static ImageIcon getImage(String imageID)
+    {
+        URL imageURL = 
+            getResources().getImageURL(imageID);
 
-        } catch (IOException e) {
-            log.error("Failed to load image:" + path, e);
-        }
+        if(imageURL == null)
+            return null;
 
-        return new ImageIcon(image);
+        return new ImageIcon(imageURL);
     }
     
     /**
@@ -71,18 +66,39 @@ public class Resources {
      * @param imageID The identifier of the image.
      * @return The image for the given identifier.
      */
-    public static byte[] getImageInBytes(String imageID) {
-        byte[] image = new byte[100000];
+    public static byte[] getImageInBytes(String imageID)
+    {
+        InputStream in = 
+            getResources().getImageInputStream(imageID);
 
-        String path = Resources.getString(imageID);
-        try {
-            Resources.class.getClassLoader()
-                    .getResourceAsStream(path).read(image);
+        if(in == null)
+            return null;
 
-        } catch (IOException e) {
-            log.error("Failed to load image:" + path, e);
+        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;
     }
+
+    private static ResourceManagementService getResources()
+    {
+        ServiceReference serviceReference = NotificationConfigurationActivator
+            .bundleContext.getServiceReference(
+                ResourceManagementService.class.getName());
+
+        if(serviceReference == null)
+            return null;
+
+        return (ResourceManagementService) NotificationConfigurationActivator
+            .bundleContext.getService(serviceReference);
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index b7bd9ea..43618fb 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -12,6 +12,7 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.audionotifier,
  net.java.sip.communicator.service.notification,
  net.java.sip.communicator.service.notification.event,
+ net.java.sip.communicator.service.resources,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources.properties b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources.properties
deleted file mode 100644
index 4020846..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-notification=Notifications
-play=Play
-activate=Activate
-desactivate=Desactivate
-turnonall=Turn On All
-turnoffall=Turn Off All
-actions=Actions
-quickcontrols=Quick Controls
-apply=Apply
-restore=Restore Defaults
-playsound=Play a sound :
-execprog=Execute a program :
-displaypopup=Show a message in a pop-up window
-notificationIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/notificationIcon.png
-playIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/playIcon.png
-progIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/progIcon.png
-popupIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/popupIcon.png
-soundIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/soundIcon.png
-activatedIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/activeIcon.png
-desactivatedIcon=net/java/sip/communicator/plugin/notificationconfiguration/resources/desactivatedIcon.png
-foldericon=net/java/sip/communicator/plugin/notificationconfiguration/resources/folder.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/activeIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/activeIcon.png
deleted file mode 100644
index e8632f8..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/activeIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/desactivatedIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/desactivatedIcon.png
deleted file mode 100644
index 33db9c2..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/desactivatedIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/folder.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/folder.png
deleted file mode 100644
index 35cf94f..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/folder.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/notificationIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/notificationIcon.png
deleted file mode 100644
index ede0d8e..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/notificationIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/playIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/playIcon.png
deleted file mode 100644
index ae438d1..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/playIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/popupIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/popupIcon.png
deleted file mode 100644
index 0232fde..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/popupIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/progIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/progIcon.png
deleted file mode 100644
index b25bb08..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/progIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/soundIcon.png b/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/soundIcon.png
deleted file mode 100644
index c1c9c8f..0000000
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/resources/soundIcon.png
+++ /dev/null
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/resources.properties b/src/net/java/sip/communicator/plugin/pluginmanager/resources.properties
deleted file mode 100644
index e8bd1df..0000000
--- a/src/net/java/sip/communicator/plugin/pluginmanager/resources.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-installedStateIcon=resources/images/plugin/pluginmanager/installed.png
-deactivatedStateIcon=resources/images/plugin/pluginmanager/deactivated.png
-startingStateIcon=resources/images/plugin/pluginmanager/starting.png
-stoppingStateIcon=resources/images/plugin/pluginmanager/stopping.png
-activeStateIcon=resources/images/plugin/pluginmanager/active.png
-pluginIcon=resources/images/plugin/pluginmanager/pluginIcon.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties
deleted file mode 100644
index 4e33838..0000000
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/rss/rss-online.png
-pageImage=resources/images/protocol/rss/rss64x64.png
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
deleted file mode 100755
index 7025db1..0000000
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/sip/sip16x16.png
-pageImage=resources/images/protocol/sip/sip64x64.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties
deleted file mode 100644
index b4ff955..0000000
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/ssh/ssh-online.png
-pageImage=resources/images/protocol/ssh/ssh64x64.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/statusupdate/StatusUpdateActivator.java b/src/net/java/sip/communicator/plugin/statusupdate/StatusUpdateActivator.java
index 58cd621..1806eb3 100644
--- a/src/net/java/sip/communicator/plugin/statusupdate/StatusUpdateActivator.java
+++ b/src/net/java/sip/communicator/plugin/statusupdate/StatusUpdateActivator.java
@@ -41,9 +41,7 @@ public class StatusUpdateActivator implements BundleActivator
     public void start(BundleContext bc) throws Exception
     {
         bundleContext = bc;
-        
 
-        
         // Set config form
         StatusConfigForm statusCF = new StatusConfigForm();
         bundleContext.registerService(ConfigurationForm.class.getName(),
@@ -155,7 +153,8 @@ public class StatusUpdateActivator implements BundleActivator
 
         for (ServiceReference serviceReference : serRefs)
         {
-            ProtocolProviderService protocolProvider = (ProtocolProviderService) bundleContext
+            ProtocolProviderService protocolProvider
+                = (ProtocolProviderService) bundleContext
                     .getService(serviceReference);
             pps.add(protocolProvider);
         }
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/resources.properties b/src/net/java/sip/communicator/plugin/whiteboard/resources.properties
deleted file mode 100644
index c9e78b4..0000000
--- a/src/net/java/sip/communicator/plugin/whiteboard/resources.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-circleIcon=resources/images/plugin/whiteboard/circle.png
-circle2Icon=resources/images/plugin/whiteboard/circle2.png
-circleFIcon=resources/images/plugin/whiteboard/circleF.png
-colorIcon=resources/images/plugin/whiteboard/color.png
-editCopyIcon=resources/images/plugin/whiteboard/editcopy.png
-editPasteIcon=resources/images/plugin/whiteboard/editpaste.png
-fileImportIcon=resources/images/plugin/whiteboard/fileimport.png
-fileNewIcon=resources/images/plugin/whiteboard/filenew.png
-fileSaveIcon=resources/images/plugin/whiteboard/filesave.png
-imgIcon=resources/images/plugin/whiteboard/img.png
-lineIcon=resources/images/plugin/whiteboard/line.png
-line2Icon=resources/images/plugin/whiteboard/line2.png
-modifIcon=resources/images/plugin/whiteboard/modif.png
-penIcon=resources/images/plugin/whiteboard/pen.png
-mpenIcon=resources/images/plugin/whiteboard/m_pen.png
-polyIcon=resources/images/plugin/whiteboard/poly.png
-polyFIcon=resources/images/plugin/whiteboard/polyF.png
-polyLineIcon=resources/images/plugin/whiteboard/polyLine.png
-rectIcon=resources/images/plugin/whiteboard/rect.png
-rectFIcon=resources/images/plugin/whiteboard/rectF.png
-sc_logo16x16=resources/images/plugin/whiteboard/sc_logo16x16.png
-selectIcon=resources/images/plugin/whiteboard/select.png
-squareIcon=resources/images/plugin/whiteboard/square.png
-straightLineIcon=resources/images/plugin/whiteboard/straight_line.png
-textIcon=resources/images/plugin/whiteboard/text.png
-text2Icon=resources/images/plugin/whiteboard/text2.png
-inviteIcon=resources/images/plugin/whiteboard/inviteDialogIcon.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
deleted file mode 100644
index ca27ad0..0000000
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/yahoo/yahoo16x16.png
-pageImage=resources/images/protocol/yahoo/yahoo64x64.png
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties
deleted file mode 100644
index fea2e2f..0000000
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-protocolIcon=resources/images/protocol/zeroconf/zeroconf-color-16.png
-pageImage=resources/images/protocol/zeroconf/zeroconf-color-64.png
\ No newline at end of file