SystrayServiceJdicImpl imports

Hi out there! The lastest update of the
SystrayServiceJdicImpl caused an
build error on my system. The type
SystemTray and TrayIcons are ambiguous, as they exist in
java.awt and
org.jdesktop.jdic.tray, which are both imported as *.

I think, the imports should be the following:


import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.RenderingHints;
import java.awt.Transparency;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;

import javax.swing.ImageIcon;

import net.java.sip.communicator.impl.systray.Resources;
import
net.java.sip.communicator.impl.systray.SystrayActivator;
import
net.java.sip.communicator.service.configuration.Configuratio
nService;
import net.java.sip.communicator.service.gui.Chat;
import
net.java.sip.communicator.service.gui.ExportedWindow;
import net.java.sip.communicator.service.gui.UIService;
import
net.java.sip.communicator.service.gui.event.ChatFocusEvent;
import
net.java.sip.communicator.service.gui.event.ChatFocusListene
r;
import
net.java.sip.communicator.service.protocol.ProtocolProviderS
ervice;
import
net.java.sip.communicator.service.protocol.event.MessageRece
ivedEvent;
import
net.java.sip.communicator.service.systray.SystrayService;
import
net.java.sip.communicator.service.systray.event.SystrayPopup
MessageEvent;
import
net.java.sip.communicator.service.systray.event.SystrayPopup
MessageListener;
import net.java.sip.communicator.util.Logger;

import org.jdesktop.jdic.tray.SystemTray;
import org.jdesktop.jdic.tray.TrayIcon;

best regards
Thomas

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
For additional commands, e-mail: dev-helpsip-communicator.dev.java.net

Hi Thomas,

Nice catch!

This appears to be a problem under java 1.6, because the
systray classes 
added in java 6, have the same names as the ones we use with
the JDIC 
library.

I've committed a fix and it should be ok now. However I
haven't used the 
imports you've sent, simply because our project convention
recommends 
using only package imports, except in the cases, where this
is not 
possible (as in our case here). So I just added two explicit
class 
imports for the ambiguous classes.

Thanks!
Yana

Thomas Hofer wrote:
> Hi out there! The lastest update of the
SystrayServiceJdicImpl caused an
> build error on my system. The type
> SystemTray and TrayIcons are ambiguous, as they exist
in java.awt and
> org.jdesktop.jdic.tray, which are both imported as *.
> 
> I think, the imports should be the following:
> 
> 
> import java.awt.Graphics2D;
> import java.awt.GraphicsConfiguration;
> import java.awt.GraphicsDevice;
> import java.awt.GraphicsEnvironment;
> import java.awt.Image;
> import java.awt.RenderingHints;
> import java.awt.Transparency;
> import java.awt.event.ActionEvent;
> import java.awt.event.ActionListener;
> import java.awt.image.BufferedImage;
> import java.util.ArrayList;
> import java.util.Iterator;
> import java.util.LinkedHashMap;
> import java.util.List;
> import java.util.Map;
> import java.util.Vector;
> 
> import javax.swing.ImageIcon;
> 
> import
net.java.sip.communicator.impl.systray.Resources;
> import
net.java.sip.communicator.impl.systray.SystrayActivator;
> import
net.java.sip.communicator.service.configuration.Configuratio
nService;
> import net.java.sip.communicator.service.gui.Chat;
> import
net.java.sip.communicator.service.gui.ExportedWindow;
> import
net.java.sip.communicator.service.gui.UIService;
> import
net.java.sip.communicator.service.gui.event.ChatFocusEvent;
> import
net.java.sip.communicator.service.gui.event.ChatFocusListene
r;
> import
net.java.sip.communicator.service.protocol.ProtocolProviderS
ervice;
> import
>
net.java.sip.communicator.service.protocol.event.MessageRece
ivedEvent;
> import
net.java.sip.communicator.service.systray.SystrayService;
> import
>
net.java.sip.communicator.service.systray.event.SystrayPopup
MessageEvent;
> import
>
net.java.sip.communicator.service.systray.event.SystrayPopup
MessageListener;
> import net.java.sip.communicator.util.Logger;
> 
> import org.jdesktop.jdic.tray.SystemTray;
> import org.jdesktop.jdic.tray.TrayIcon;
> 
> best regards
> Thomas
> 
>
------------------------------------------------------------
---------
> To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
> For additional commands, e-mail: dev-helpsip-communicator.dev.java.net
> 
> 

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
For additional commands, e-mail: dev-helpsip-communicator.dev.java.net