diff --git a/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java b/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java index 32be84912..358fc94c0 100644 --- a/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java +++ b/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java @@ -10,6 +10,7 @@ import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.configuration.event.*; +import net.java.sip.communicator.util.*; /** * This is a utility class that can be used by objects that support constrained diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 77f86eafb..ffaf6d5c4 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -4,13 +4,12 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ - package net.java.sip.communicator.impl.gui.main; import java.awt.*; import java.awt.event.*; import java.awt.image.*; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import java.util.List; diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java index f6bfe53fd..619488a9e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java @@ -9,7 +9,8 @@ import java.awt.*; import java.awt.Container; import java.awt.event.*; -import java.beans.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.*; import java.util.*; import javax.swing.*; diff --git a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java index 3a51cab4f..30c303fe2 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java @@ -10,8 +10,8 @@ import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.service.configuration.*; -import net.java.sip.communicator.service.configuration.event.*; import net.java.sip.communicator.service.protocol.*; +import net.java.sip.communicator.util.*; public class ConfigurationManager { diff --git a/src/net/java/sip/communicator/impl/media/device/DeviceConfiguration.java b/src/net/java/sip/communicator/impl/media/device/DeviceConfiguration.java index f70fd5258..e7625c8da 100644 --- a/src/net/java/sip/communicator/impl/media/device/DeviceConfiguration.java +++ b/src/net/java/sip/communicator/impl/media/device/DeviceConfiguration.java @@ -10,16 +10,13 @@ import javax.media.*; import javax.media.format.*; -import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.util.*; - - /** - * This class aims to provide a simple configuration interface for JMF. - * It retrieves stored configuration when started or listens to - * ConfigurationEvent for property changes and configures the JMF accordingly. - * + * This class aims to provide a simple configuration interface for JMF. It + * retrieves stored configuration when started or listens to ConfigurationEvent + * for property changes and configures the JMF accordingly. + * * @author Martin Andre * @author Emil Ivov */ @@ -27,14 +24,6 @@ public class DeviceConfiguration { private Logger logger = Logger.getLogger(DeviceConfiguration.class); - private Object syncRoot_Config = new Object(); - - /** - * Our configuration listener. - */ - private ConfigurationListener configurationListener = - new ConfigurationListener(); - /** * The device that we'll be using for audio capture. */ @@ -58,8 +47,8 @@ public DeviceConfiguration() */ public void initialize() { - //these seem to be throwing exceptions every now and then so we'll - //blindly catch them for now + // these seem to be throwing exceptions every now and then so we'll + // blindly catch them for now try { JmfDeviceDetector.detectAndConfigureCaptureDevices(); @@ -72,48 +61,55 @@ public void initialize() } /** - * Detects capture devices configured through JMF and disable audio - * and/or video transmission if none were found. - * Stores found devices in audioCaptureDevice and videoCaptureDevice. + * Detects capture devices configured through JMF and disable audio and/or + * video transmission if none were found. Stores found devices in + * audioCaptureDevice and videoCaptureDevice. */ private void extractConfiguredCaptureDevices() { logger.info("Scanning for configured Audio Devices."); - Vector audioCaptureDevices = CaptureDeviceManager.getDeviceList(new - AudioFormat(AudioFormat.LINEAR, 44100, 16, - 1));//1 means 1 channel for mono - if (audioCaptureDevices.size() < 1) { + Vector audioCaptureDevices = + CaptureDeviceManager.getDeviceList(new AudioFormat( + AudioFormat.LINEAR, 44100, 16, 1));// 1 means 1 channel for mono + if (audioCaptureDevices.size() < 1) + { logger.warn("No Audio Device was found."); audioCaptureDevice = null; } - else { + else + { logger.debug("Found " + audioCaptureDevices.size() - + " capture devices: " + audioCaptureDevices); + + " capture devices: " + audioCaptureDevices); audioCaptureDevice = (CaptureDeviceInfo) audioCaptureDevices.get(0); logger.info("Found " + audioCaptureDevice.getName() - +" as an audio capture device."); + + " as an audio capture device."); } logger.info("Scanning for configured Video Devices."); - Vector videoCaptureDevices = CaptureDeviceManager.getDeviceList(new - VideoFormat(VideoFormat.RGB)); - if (videoCaptureDevices.size() > 0) { + Vector videoCaptureDevices = + CaptureDeviceManager + .getDeviceList(new VideoFormat(VideoFormat.RGB)); + if (videoCaptureDevices.size() > 0) + { videoCaptureDevice = (CaptureDeviceInfo) videoCaptureDevices.get(0); logger.info("Found " + videoCaptureDevice.getName() - + " as an RGB Video Device."); + + " as an RGB Video Device."); } // no RGB camera found. And what about YUV ? else { - videoCaptureDevices = CaptureDeviceManager.getDeviceList(new - VideoFormat(VideoFormat.YUV)); - if (videoCaptureDevices.size() > 0) { - videoCaptureDevice - = (CaptureDeviceInfo) videoCaptureDevices.get(0); + videoCaptureDevices = + CaptureDeviceManager.getDeviceList(new VideoFormat( + VideoFormat.YUV)); + if (videoCaptureDevices.size() > 0) + { + videoCaptureDevice = + (CaptureDeviceInfo) videoCaptureDevices.get(0); logger.info("Found " + videoCaptureDevice.getName() - + " as an YUV Video Device."); + + " as an YUV Video Device."); } - else { + else + { logger.info("No Video Device was found."); videoCaptureDevice = null; } @@ -122,8 +118,9 @@ private void extractConfiguredCaptureDevices() /** * Returns a device that we could use for audio capture. + * * @return the CaptureDeviceInfo of a device that we could use for audio - * capture. + * capture. */ public CaptureDeviceInfo getAudioCaptureDevice() { @@ -132,8 +129,9 @@ public CaptureDeviceInfo getAudioCaptureDevice() /** * Returns a device that we could use for video capture. + * * @return the CaptureDeviceInfo of a device that we could use for video - * capture. + * capture. */ public CaptureDeviceInfo getVideoCaptureDevice() { @@ -142,18 +140,21 @@ public CaptureDeviceInfo getVideoCaptureDevice() /** * Enable or disable Audio stream transmission. + * * @return true if audio capture is supported and false otherwise. */ - public boolean isAudioCaptureSupported() { + public boolean isAudioCaptureSupported() + { return this.audioCaptureDevice != null; } /** * Enable or disable Video stream transmission. + * * @return true if audio capture is supported and false otherwise. */ - public boolean isVideoCaptureSupported() { + public boolean isVideoCaptureSupported() + { return this.videoCaptureDevice != null; } - } diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java index 6584220dd..433130e65 100644 --- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.icq; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import net.java.sip.communicator.service.protocol.*; diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java index 3c5ec82e9..4348e5040 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.irc; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import net.java.sip.communicator.service.protocol.*; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java index 0c9d98f62..efec09bbe 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.jabber; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import net.java.sip.communicator.impl.protocol.jabber.extensions.version.*; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java index aba9237ae..104f17655 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.jabber; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import org.jivesoftware.smack.*; diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java index b38ae6cbf..e5c816d38 100644 --- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.msn; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import net.java.sip.communicator.service.protocol.*; diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java index 46ee8b32f..c5179fc2b 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java @@ -9,7 +9,7 @@ import java.net.*; import java.text.*; import java.util.*; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.io.*; import javax.sip.*; diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetPersistentPresenceYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetPersistentPresenceYahooImpl.java index f602d443e..39545b467 100644 --- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetPersistentPresenceYahooImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetPersistentPresenceYahooImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.protocol.yahoo; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.io.*; import java.util.*; import net.java.sip.communicator.service.protocol.*; diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java index f6bfebadf..71cec0f73 100644 --- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java +++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java @@ -4,11 +4,10 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ - package net.java.sip.communicator.impl.systray.jdic; import java.awt.*; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import javax.swing.*; diff --git a/src/net/java/sip/communicator/service/configuration/ConfigurationService.java b/src/net/java/sip/communicator/service/configuration/ConfigurationService.java index 9c2dab7ef..8401efaaf 100644 --- a/src/net/java/sip/communicator/service/configuration/ConfigurationService.java +++ b/src/net/java/sip/communicator/service/configuration/ConfigurationService.java @@ -10,6 +10,7 @@ import java.util.*; import net.java.sip.communicator.service.configuration.event.*; +import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.xml.*; /** diff --git a/src/net/java/sip/communicator/service/configuration/PropertyVetoException.java b/src/net/java/sip/communicator/service/configuration/PropertyVetoException.java index d0e05b5e8..fad5b1ad9 100644 --- a/src/net/java/sip/communicator/service/configuration/PropertyVetoException.java +++ b/src/net/java/sip/communicator/service/configuration/PropertyVetoException.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.service.configuration; -import net.java.sip.communicator.service.configuration.event.*; +import net.java.sip.communicator.util.*; /** * A PropertyVetoException is thrown when a proposed change to a diff --git a/src/net/java/sip/communicator/service/configuration/event/PropertyChangeEvent.java b/src/net/java/sip/communicator/service/configuration/event/PropertyChangeEvent.java deleted file mode 100644 index 0fd32e27d..000000000 --- a/src/net/java/sip/communicator/service/configuration/event/PropertyChangeEvent.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * 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.configuration.event; - - - -/** - * A "ConfigurationChange" event gets delivered whenever a someone changes a - * configuration property. A ConfigurationEvent object is sent as an - * argument to the ConfigurationChangeListener methods. - *

- * Normally ConfigurationChangeEvents are accompanied by the name and the old - * and new values of the changed property. If the new value is a primitive - * type (such as int or boolean) it must be wrapped as the - * corresponding java.lang.* Object type (such as Integer or Boolean). - *

- * Null values may be provided for the old and the new values if their - * true values are not known. - *

- * An event source may send a null object as the name to indicate that an - * arbitrary set of if its properties have changed. In this case the - * old and new values should also be null. - *

- * In the case where the event reflects the change of a constrained property, - * it will first be dispatched to all propertyWillChange methods and only in - * case that none of them has objected (no ChangeVetoException has been thrown) - * the propertyChange method is called. - * - * @author Emil Ivov - */ -public class PropertyChangeEvent - extends java.util.EventObject -{ - - /** - * name of the property that changed. May be null, if not known. - * @serial - */ - private String propertyName; - - /** - * New value for property. May be null if not known. - * @serial - */ - private Object newValue; - - /** - * Previous value for property. May be null if not known. - * @serial - */ - private Object oldValue; - - /** - * Constructs a new PropertyChangeEvent. - * - * @param source The bean that fired the event. - * @param propertyName The programmatic name of the property - * that was changed. - * @param oldValue The old value of the property. - * @param newValue The new value of the property. - */ - public PropertyChangeEvent(Object source, String propertyName, - Object oldValue, Object newValue) - { - super(source); - this.propertyName = propertyName; - this.newValue = newValue; - this.oldValue = oldValue; - } - - /** - * Gets the programmatic name of the property that was changed. - * - * @return The programmatic name of the property that was changed. - * May be null if multiple properties have changed. - */ - public String getPropertyName() - { - return propertyName; - } - - /** - * Sets the new value for the property, expressed as an Object. - * - * @return The new value for the property, expressed as an Object. - * May be null if multiple properties have changed. - */ - public Object getNewValue() - { - return newValue; - } - - /** - * Gets the old value for the property, expressed as an Object. - * - * @return The old value for the property, expressed as an Object. - * May be null if multiple properties have changed. - */ - public Object getOldValue() - { - return oldValue; - } -} diff --git a/src/net/java/sip/communicator/service/configuration/event/VetoableChangeListener.java b/src/net/java/sip/communicator/service/configuration/event/VetoableChangeListener.java index 95d0442ea..3c52135c4 100644 --- a/src/net/java/sip/communicator/service/configuration/event/VetoableChangeListener.java +++ b/src/net/java/sip/communicator/service/configuration/event/VetoableChangeListener.java @@ -9,6 +9,7 @@ import java.util.*; import net.java.sip.communicator.service.configuration.*; +import net.java.sip.communicator.util.*; /** * A VetoableChange event gets fired whenever a property is about to change. diff --git a/src/net/java/sip/communicator/util/PropertyChangeEvent.java b/src/net/java/sip/communicator/util/PropertyChangeEvent.java new file mode 100644 index 000000000..4903209e1 --- /dev/null +++ b/src/net/java/sip/communicator/util/PropertyChangeEvent.java @@ -0,0 +1,111 @@ +/* + * 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.util; + +import java.util.*; + +/** + * A "ConfigurationChange" event gets delivered whenever a someone changes a + * configuration property. A ConfigurationEvent object is sent as an argument to + * the ConfigurationChangeListener methods. + *

+ * Normally ConfigurationChangeEvents are accompanied by the name and the old + * and new values of the changed property. If the new value is a primitive type + * (such as int or boolean) it must be wrapped as the corresponding java.lang.* + * Object type (such as Integer or Boolean). + *

+ * Null values may be provided for the old and the new values if their true + * values are not known. + *

+ * An event source may send a null object as the name to indicate that an + * arbitrary set of if its properties have changed. In this case the old and new + * values should also be null. + *

+ * In the case where the event reflects the change of a constrained property, it + * will first be dispatched to all propertyWillChange methods and only in case + * that none of them has objected (no ChangeVetoException has been thrown) the + * propertyChange method is called. + * + * @author Emil Ivov + */ +public class PropertyChangeEvent + extends EventObject +{ + + /** + * name of the property that changed. May be null, if not known. + * + * @serial + */ + private final String propertyName; + + /** + * New value for property. May be null if not known. + * + * @serial + */ + private final Object newValue; + + /** + * Previous value for property. May be null if not known. + * + * @serial + */ + private final Object oldValue; + + /** + * Constructs a new PropertyChangeEvent. + * + * @param source The bean that fired the event. + * @param propertyName The programmatic name of the property that was + * changed. + * @param oldValue The old value of the property. + * @param newValue The new value of the property. + */ + public PropertyChangeEvent(Object source, String propertyName, + Object oldValue, Object newValue) + { + super(source); + + this.propertyName = propertyName; + this.newValue = newValue; + this.oldValue = oldValue; + } + + /** + * Gets the programmatic name of the property that was changed. + * + * @return The programmatic name of the property that was changed. May be + * null if multiple properties have changed. + */ + public String getPropertyName() + { + return propertyName; + } + + /** + * Sets the new value for the property, expressed as an Object. + * + * @return The new value for the property, expressed as an Object. May be + * null if multiple properties have changed. + */ + public Object getNewValue() + { + return newValue; + } + + /** + * Gets the old value for the property, expressed as an Object. + * + * @return The old value for the property, expressed as an Object. May be + * null if multiple properties have changed. + */ + public Object getOldValue() + { + return oldValue; + } +} diff --git a/src/net/java/sip/communicator/service/configuration/event/PropertyChangeListener.java b/src/net/java/sip/communicator/util/PropertyChangeListener.java similarity index 74% rename from src/net/java/sip/communicator/service/configuration/event/PropertyChangeListener.java rename to src/net/java/sip/communicator/util/PropertyChangeListener.java index f243ba95d..c130c3c0b 100644 --- a/src/net/java/sip/communicator/service/configuration/event/PropertyChangeListener.java +++ b/src/net/java/sip/communicator/util/PropertyChangeListener.java @@ -4,24 +4,25 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.service.configuration.event; - +package net.java.sip.communicator.util; +import java.util.*; /** * A "ConfigurationChange" event gets fired whenever a configuration property * changes. Depending on whether the property was constrained or not, the * propertyChange or vetoableChange methods get called. - * + * * @author Emil Ivov */ -public interface PropertyChangeListener extends java.util.EventListener +public interface PropertyChangeListener + extends EventListener { /** * This method gets called when a bound property is changed. - * @param evt A PropertyChangeEvent object describing the event source - * and the property that has changed. + * + * @param evt A PropertyChangeEvent object describing the event source and + * the property that has changed. */ void propertyChange(PropertyChangeEvent evt); - } diff --git a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java index bc4051dd1..447b1ac59 100644 --- a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java +++ b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java @@ -12,6 +12,7 @@ import junit.framework.*; import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.configuration.event.*; +import net.java.sip.communicator.util.*; /** * Tests basic ConfiguratioService behaviour. diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java index 6f328737f..a57ddc1d9 100644 --- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.gibberish; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java index 5b750440b..e8e0497e3 100644 --- a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java +++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.icq; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.io.*; import java.util.*; diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java index bf6071b60..855117396 100644 --- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.icq; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java index 26b0c312e..9e956be3c 100644 --- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.jabber; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java index 8e03baaa7..702985730 100644 --- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.msn; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java index 38764de57..54216f30a 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.sip; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java index eac8119f4..c58b23e75 100644 --- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java +++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.slick.protocol.yahoo; -import java.beans.*; +import java.beans.PropertyChangeEvent; import java.util.*; import junit.framework.*;