diff --git a/src/org/jitsi/impl/neomedia/MediaStreamImpl.java b/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
index 2265eb48f9924693e460708f68eececc8e5696f0..30ad56b218ec74e78c628cdb303919c6f946fd43 100644
--- a/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
+++ b/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia;
+import java.beans.*;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.beans.*;
import javax.media.*;
import javax.media.control.*;
diff --git a/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java b/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
index 9277c4309ef8ec2b7cee4022030617c4152f8541..d03ef4efc5516e5721d70802bbeb5382eb0d9a8d 100644
--- a/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
+++ b/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
@@ -17,11 +17,11 @@
import javax.media.rtp.event.*;
import javax.media.rtp.rtcp.*;
-import com.sun.media.rtp.*;
-
import org.jitsi.service.neomedia.*;
import org.jitsi.util.*;
+import com.sun.media.rtp.*;
+
/**
* Implements <tt>RTPTranslator</tt> which represents an RTP translator which
* forwards RTP and RTCP traffic between multiple <tt>MediaStream</tt>s.
diff --git a/src/org/jitsi/impl/neomedia/RecorderImpl.java b/src/org/jitsi/impl/neomedia/RecorderImpl.java
index 239c782aa61e238d251082f1ee67a9d3c4c27c7b..49baa33665efe1d7c90ac9611bccc39ab31d0942 100644
--- a/src/org/jitsi/impl/neomedia/RecorderImpl.java
+++ b/src/org/jitsi/impl/neomedia/RecorderImpl.java
@@ -14,8 +14,9 @@
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.neomedia.MediaException; // disambiguation
+import org.jitsi.service.neomedia.MediaException;
import org.jitsi.util.*;
+// disambiguation
/**
* The call recording implementation.
diff --git a/src/org/jitsi/impl/neomedia/StreamRTPManager.java b/src/org/jitsi/impl/neomedia/StreamRTPManager.java
index 56206b998c946d3ff7c50722bfa862c0127f8487..e8a7804f4c02ff405c4324b533fb76c5949d6db0 100644
--- a/src/org/jitsi/impl/neomedia/StreamRTPManager.java
+++ b/src/org/jitsi/impl/neomedia/StreamRTPManager.java
@@ -14,10 +14,10 @@
import javax.media.protocol.*;
import javax.media.rtp.*;
-import com.sun.media.rtp.*;
-
import org.jitsi.service.neomedia.*;
+import com.sun.media.rtp.*;
+
/**
* Implements the <tt>RTPManager</tt> interface as used by a
* <tt>MediaStream</tt>.
diff --git a/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java b/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
index 832ccfeb6a5d991e8c67cf4f32e2f7bbb68ef947..9e91e6d2795b6d47013e1b25d079481dbef9cf70 100644
--- a/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
+++ b/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
@@ -6,15 +6,15 @@
*/
package org.jitsi.impl.neomedia;
+import gnu.java.zrtp.utils.*;
+
import java.io.*;
import javax.media.*;
-import javax.media.control.FormatControl;
+import javax.media.control.*;
import javax.media.format.*;
import javax.media.protocol.*;
-import gnu.java.zrtp.utils.*;
-
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
index 646c3616f4d13f332523317d2991689ec2e19d31..df03ddac776a7c0ca50e7a1e421cc38f3a56de45 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
@@ -9,9 +9,10 @@
import javax.media.*;
import javax.media.format.*;
-import com.sun.media.codec.audio.*;
import org.jitsi.impl.neomedia.codec.*;
+import com.sun.media.codec.audio.*;
+
/**
* DePacketizer for ALAW codec
* @author Damian Minkov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
index c73c78d1fe869282b566909e01e375783ebe868f..0da684def43c7c5607e857f56e6476bb973ffc55 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
@@ -9,9 +9,10 @@
import javax.media.*;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.codec.*;
-import net.sf.fmj.media.*;
/**
* @author Lubomir Marinov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
index 09599d29bc9855b3bb5e5c55bd5dc80eeb0d596c..4d55e9eeea5e562c13a7b94772d27d32670ad265 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
@@ -11,9 +11,10 @@
import javax.media.*;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.codec.*;
-import net.sf.fmj.media.*;
/**
* @author Lubomir Marinov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java b/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
index 52efd6e8f861f9a9c833f069f967a7cdbb537958..f50e27d5227325e3a026487e52beb9c073e0c2a9 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
@@ -6,12 +6,11 @@
*/
package org.jitsi.impl.neomedia.codec.audio.gsm;
-import net.sf.fmj.media.*;
-
import javax.media.*;
-import javax.media.Format;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
/**
* GSM encoder Codec. Encodes 160 16-bit PCM samples into array of
* 33 bytes (GSM frame).
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
index 5d155784ea740d530c5cbf2234d2bb877b32391f..a64fd007b5dd93ec319d45932ee6b9aad50ce10e 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
index a3d352505affe4f86ccb76c990473cea7d1006dc..c43bfa668e07310cee7b0545dc4ceaba9fad05bc 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
index ca3e08c091240dff037f03b57fb42a4f84ed1094..c9ae3b6d550e7c5827d687dc31ab0496296464be 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
index 9aba12f97150ef5c913c37b5ceb4e473e7b2fe4a..3d9883ee005bee64d69f5aed78b0a077e3f22b5c 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
@@ -7,13 +7,15 @@
package org.jitsi.impl.neomedia.codec.audio.speex;
import java.io.*;
+
import javax.media.*;
import javax.media.format.*;
-import org.xiph.speex.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+import org.xiph.speex.*;
+
/**
* Speex to PCM java decoder
* @author Damian Minkov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
index 4ec49832532c89b009bf25077cc8f57aa9144ade..220f969a9c1507cd3c86c2e9f1d1ebfd8d48bef2 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
@@ -9,9 +9,9 @@
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
import org.xiph.speex.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
index 14da50bfc50dacb3cc1cf7621bd081038f9be933..ebab81a214e48beb3da3594fa979eddc0db06e70 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
@@ -12,6 +12,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
index 26e004c374ef65e7c17f9e24e2dcb48167e9685c..537e456c713735cdd340d40e7c92e3cf93c89500 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
@@ -5,11 +5,11 @@
*/
package org.jitsi.impl.neomedia.codec.audio.ulaw;
-import com.sun.media.controls.*;
-
import javax.media.*;
import javax.media.format.*;
+import com.sun.media.controls.*;
+
public class JavaDecoder
extends com.ibm.media.codec.audio.AudioCodec
{
diff --git a/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java b/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
index 64f3d4a7bf82fc686ad2902b822e8ab6181de941..066eab67da536130782ee83b8e0e9709052a997a 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
@@ -9,15 +9,11 @@
import java.awt.*;
import java.awt.image.*;
-import javax.media.Buffer;
-import javax.media.Codec;
-import javax.media.Format;
-import javax.media.format.RGBFormat;
-import javax.media.format.VideoFormat;
-
-import net.sf.fmj.media.AbstractCodec;
-import net.sf.fmj.media.util.BufferToImage;
-import net.sf.fmj.media.util.ImageToBuffer;
+import javax.media.*;
+import javax.media.format.*;
+
+import net.sf.fmj.media.*;
+import net.sf.fmj.media.util.*;
/**
* Codec that scales images from one size to another.
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
index bcd9e26053dd6a97bc122aabdf21057003d869ec..31260b438ae761e036c116f112b40bc7a54f29dd 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
@@ -8,14 +8,16 @@
import java.awt.*;
import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+// disambiguation
+
/**
* Packetizes H.263+ encoded data into RTP packets in accord with RFC 4529
* "RTP Payload Format for ITU-T Rec. H.263 Video".
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
index 6d933a345369ef04ae57053832468a357b7b72f6..5c5978c98720997e917653f190efa6982c312b25 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
@@ -6,16 +6,19 @@
*/
package org.jitsi.impl.neomedia.codec.video.h264;
-import java.awt.Dimension; // disambiguation
+import java.awt.*;
import java.util.*;
+import java.util.List;
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.impl.neomedia.format.*;
+// disambiguation
+
/**
* Packetizes H.264 encoded data/NAL units into RTP packets in accord with RFC
* 3984 "RTP Payload Format for H.264 Video".
diff --git a/src/org/jitsi/impl/neomedia/conference/AudioMixer.java b/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
index c79c39280e3df926ba69c9c20b0f082cd3e6db5e..7954fabbd38e3f13f4d8b278293669f512696416 100644
--- a/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
+++ b/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
@@ -11,7 +11,7 @@
import java.util.*;
import javax.media.*;
-import javax.media.Controls; // disambiguation
+import javax.media.Controls;
import javax.media.control.*;
import javax.media.format.*;
import javax.media.protocol.*;
@@ -21,6 +21,7 @@
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.impl.neomedia.protocol.*;
import org.jitsi.util.*;
+// disambiguation
/**
* Represents an audio mixer which manages the mixing of multiple audio streams
diff --git a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
index c2612af621ba52a55464010b3d7db0ebebe5559d..7ce90c426fc15e60fc22913b497f8e4324cfb0f6 100644
--- a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
+++ b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia.device;
+import java.beans.*;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.beans.*;
import javax.media.*;
import javax.media.protocol.*;
diff --git a/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java b/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
index 6cad0a014a58c3771574b124f9a1b78154b6cf6a..e83a1ae934a54977edc1ae389c725e691705a3b2 100644
--- a/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
+++ b/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
@@ -6,7 +6,7 @@
*/
package org.jitsi.impl.neomedia.device;
-import java.lang.reflect.Method;
+import java.lang.reflect.*;
/**
* Auto-detection of FMJ audio capture devices.
diff --git a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
index 58c0a8b6d5c05e59af0d6ebf684f3c5530fb91cd..e56d54a6f8f32df4caf20431b0746a14f02ea6fa 100644
--- a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
+++ b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
@@ -6,9 +6,10 @@
*/
package org.jitsi.impl.neomedia.device;
-import java.awt.Dimension; // disambiguation
+import java.awt.*;
import java.io.*;
import java.util.*;
+import java.util.List;
import javax.media.*;
import javax.media.control.*;
@@ -25,6 +26,7 @@
import org.jitsi.service.neomedia.format.*;
import org.jitsi.util.*;
import org.jitsi.util.event.*;
+// disambiguation
/**
* Represents the use of a specific <tt>MediaDevice</tt> by a
diff --git a/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java b/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
index e874d17bdc9727d2cdd1f3c0c5f87b8bfee51646..b2f9f82f6a4dd38b50bc703dfa7268b0803e58fd 100644
--- a/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
+++ b/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
@@ -7,6 +7,7 @@
package org.jitsi.impl.neomedia.format;
import java.util.*;
+
import javax.media.*;
import javax.media.format.*;
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
index 10ccea9acb4ae38b521e119dea92336ba3aac033..e6e465037100e44285a6994d0ea0d2381911cd0a 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
@@ -11,14 +11,15 @@
import java.util.*;
import javax.media.*;
-import javax.media.Controls; // disambiguation
+import javax.media.Controls;
import javax.media.control.*;
import javax.media.protocol.*;
+import net.sf.fmj.media.util.*;
+
import org.jitsi.impl.neomedia.control.*;
import org.jitsi.util.*;
-
-import net.sf.fmj.media.util.*;
+// disambiguation
/**
* Facilitates the implementations of the <tt>CaptureDevice</tt> and
diff --git a/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java b/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
index 2f8687d9f5ecfa9436b8bbbd583c77770fed48ab..b837faf0cf7574c8fc392a20b9f424acbe72c18f 100644
--- a/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
+++ b/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
@@ -7,16 +7,18 @@
package org.jitsi.impl.neomedia.protocol;
import java.io.*;
-import java.nio.ByteBuffer; // disambiguation.
-import java.nio.ByteOrder; // disambiguation.
-import java.nio.IntBuffer; // disambiguation.
+import java.nio.*;
import java.util.*;
import javax.media.*;
+import javax.media.Buffer;
import javax.media.format.*;
import javax.media.protocol.*;
import org.jitsi.service.neomedia.*;
+// disambiguation.
+// disambiguation.
+// disambiguation.
/**
* Implements a <tt>PushBufferDataSource</tt> wrapper which provides mute
diff --git a/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java b/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
index 80732da368af9520f3ea8d17ddab6a3ced1c03d9..c9b9c36e9d7b47abb13721f11297ba1a8d6e91ac 100644
--- a/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
+++ b/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
@@ -6,18 +6,18 @@
*/
package org.jitsi.impl.neomedia.transform.sdes;
-import gnu.java.zrtp.utils.ZrtpFortuna;
+import gnu.java.zrtp.utils.*;
import java.util.*;
-import ch.imvs.sdes4j.srtp.*;
-
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.transform.*;
import org.jitsi.impl.neomedia.transform.zrtp.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.neomedia.event.*;
+import ch.imvs.sdes4j.srtp.*;
+
/**
* Default implementation of {@link SDesControl} that supports the crypto suites
* of the original RFC4568 and the KDR parameter, but nothing else.
diff --git a/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java b/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
index fb7687eec0e23aeabc0ca7f3f36d33a7310b7681..38953263dc3b6e87d9d8e33a594466eafd8c4039 100644
--- a/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
+++ b/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia.transform.sdes;
-import ch.imvs.sdes4j.srtp.*;
-
import org.jitsi.impl.neomedia.transform.srtp.*;
+import ch.imvs.sdes4j.srtp.*;
+
/**
* PacketTransformer for SDES based SRTP encryption.
*
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
index 7b2ad445bd7d031fa568d0bb0f445a099f87c126..92be1403d97889c2fbb2939128b2e8bd2adbd25c 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
@@ -26,19 +26,14 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import java.util.Arrays;
+import java.util.*;
-import org.jitsi.impl.neomedia.*;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
+import org.bouncycastle.crypto.*;
+import org.bouncycastle.crypto.digests.*;
+import org.bouncycastle.crypto.engines.*;
import org.bouncycastle.crypto.macs.*;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersForSkein;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
+import org.bouncycastle.crypto.params.*;
+import org.jitsi.impl.neomedia.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
index a27c703887bf1bfd558e232f6035a7ff968d16b3..9d9817451c08b0d64db39e8b4094246e366fc74f 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
@@ -25,7 +25,7 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.*;
/**
* SRTPCipherCTR implements SRTP Counter Mode AES Encryption (AES-CM).
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
index a53216eca03844113862343ab426af40a8aed6a8..932f8e6565fe375f712cb05a3425eea6633d0584 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
@@ -27,8 +27,8 @@
import java.util.*;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.*;
+import org.bouncycastle.crypto.params.*;
/**
* SRTPCipherF8 implements SRTP F8 Mode AES Encryption (AES-f8).
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
index 914a9fe27c9d5276049ff1d898a05f365eaafc92..5e1101979a4308633dfcd4b8838b673ac075ae6d 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
@@ -26,15 +26,14 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import java.util.Arrays;
-
-import org.jitsi.impl.neomedia.*;
+import java.util.*;
import org.bouncycastle.crypto.*;
import org.bouncycastle.crypto.digests.*;
import org.bouncycastle.crypto.engines.*;
import org.bouncycastle.crypto.macs.*;
import org.bouncycastle.crypto.params.*;
+import org.jitsi.impl.neomedia.*;
/**
* SRTPCryptoContext class is the core class of SRTP implementation.
diff --git a/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java b/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
index 674db504806bf78dc143a0bea6f87a4382e8edef..cf3a12b53886e1e70682f34c507d13b0f943cd32 100644
--- a/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
+++ b/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
@@ -7,7 +7,7 @@
package org.jitsi.service.configuration;
import java.beans.*;
-import java.util.EventListener;
+import java.util.*;
/**
* This interface uses SC's own ProperteyVetoException.
diff --git a/src/org/jitsi/service/neomedia/MediaStreamStats.java b/src/org/jitsi/service/neomedia/MediaStreamStats.java
index 251f37c305d82e98dc55d8a4cf794535b7fe9798..dc76236d3f0011df3d1bef4eb54bf3bba4c86e5b 100644
--- a/src/org/jitsi/service/neomedia/MediaStreamStats.java
+++ b/src/org/jitsi/service/neomedia/MediaStreamStats.java
@@ -7,6 +7,7 @@
package org.jitsi.service.neomedia;
import java.awt.*;
+
import net.sf.fmj.media.rtp.*;
/**
diff --git a/src/org/jitsi/service/neomedia/SDesControl.java b/src/org/jitsi/service/neomedia/SDesControl.java
index 6b72764faf177bd6b3234c33bd50bfc5e919190d..c7875f15d4257d2952fc4dad690fc00a91f4234e 100644
--- a/src/org/jitsi/service/neomedia/SDesControl.java
+++ b/src/org/jitsi/service/neomedia/SDesControl.java
@@ -6,7 +6,7 @@
*/
package org.jitsi.service.neomedia;
-import ch.imvs.sdes4j.srtp.SrtpCryptoAttribute;
+import ch.imvs.sdes4j.srtp.*;
/**
* SDES based SRTP MediaStream encryption control.
diff --git a/src/org/jitsi/service/neomedia/SrtpControl.java b/src/org/jitsi/service/neomedia/SrtpControl.java
index 622aff2240dbf4d192d2fc338e2d74e5eee988c0..97c7b2baa31a589b7c9bd6a3bb6cc5f4af163397 100644
--- a/src/org/jitsi/service/neomedia/SrtpControl.java
+++ b/src/org/jitsi/service/neomedia/SrtpControl.java
@@ -6,8 +6,8 @@
*/
package org.jitsi.service.neomedia;
-import org.jitsi.impl.neomedia.AbstractRTPConnector;
-import org.jitsi.impl.neomedia.transform.TransformEngine;
+import org.jitsi.impl.neomedia.*;
+import org.jitsi.impl.neomedia.transform.*;
import org.jitsi.service.neomedia.event.*;
/**
diff --git a/src/org/jitsi/util/event/PropertyChangeNotifier.java b/src/org/jitsi/util/event/PropertyChangeNotifier.java
index 03547b711d8d6a7227c6a8003c7b58626a66fa84..e1555885c2eee8f9c0c89308a28ef8e3da7aa75e 100644
--- a/src/org/jitsi/util/event/PropertyChangeNotifier.java
+++ b/src/org/jitsi/util/event/PropertyChangeNotifier.java
@@ -6,8 +6,8 @@
*/
package org.jitsi.util.event;
-import java.util.*;
import java.beans.*;
+import java.util.*;
/**
* Represents a source of <tt>PropertyChangeEvent</tt>s which notifies
diff --git a/src/org/jitsi/util/event/VideoNotifierSupport.java b/src/org/jitsi/util/event/VideoNotifierSupport.java
index 5bd98437e2d0d0ea406f81f3d1ee7e313b28b6ed..ca37685243c96976c1fd881d2b06f4f7f3970f5f 100644
--- a/src/org/jitsi/util/event/VideoNotifierSupport.java
+++ b/src/org/jitsi/util/event/VideoNotifierSupport.java
@@ -8,7 +8,8 @@
import java.awt.*;
import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
+// disambiguation
/**
* Represents a mechanism to easily add to a specific <tt>Object</tt> by means