Fixed IceGrid discovery plugin to not depend on IceGrid::Locator directly

2 files changed, 12 insertions, 12 deletions

diff --git a/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java
index ab56b8c817a..d0dbb020352 100644
--- a/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java
+++ b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java
@@ -112,7 +112,7 @@ class DiscoveryPluginI implements Ice.Plugin
 
     private static class LocatorI extends Ice.BlobjectAsync
     {
-        LocatorI(LookupPrx lookup, Ice.Properties properties, String instanceName, IceGrid.LocatorPrx voidLocator)
+        LocatorI(LookupPrx lookup, Ice.Properties properties, String instanceName, Ice.LocatorPrx voidLocator)
         {
             _lookup = lookup;
             _timeout = properties.getPropertyAsIntWithDefault("IceGridDiscovery.Timeout", 300);
@@ -140,7 +140,7 @@ class DiscoveryPluginI implements Ice.Plugin
         }
 
         public synchronized void
-        foundLocator(LocatorPrx locator)
+        foundLocator(Ice.LocatorPrx locator)
         {
             if(locator == null ||
                (!_instanceName.isEmpty() && !locator.ice_getIdentity().category.equals(_instanceName)))
@@ -205,7 +205,7 @@ class DiscoveryPluginI implements Ice.Plugin
                     }
 
                 }
-                _locator = (LocatorPrx)_locator.ice_endpoints(
+                _locator = (Ice.LocatorPrx)_locator.ice_endpoints(
                     newEndpoints.toArray(new Ice.Endpoint[newEndpoints.size()]));
             }
             else
@@ -308,7 +308,7 @@ class DiscoveryPluginI implements Ice.Plugin
 
         @Override
         public void
-        foundLocator(LocatorPrx locator, Ice.Current curr)
+        foundLocator(Ice.LocatorPrx locator, Ice.Current curr)
         {
             _locator.foundLocator(locator);
         }
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java
index 95bb31ea483..e18f5156666 100644
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java
@@ -1170,7 +1170,7 @@ public class SessionKeeper
                 _discoveryLookupReply = new _LookupReplyDisp()
                     {
                         @Override
-                        public void foundLocator(final LocatorPrx locator, Ice.Current curr)
+                        public void foundLocator(final Ice.LocatorPrx locator, Ice.Current curr)
                         {
                             SwingUtilities.invokeLater(new Runnable()
                                 {
@@ -1182,7 +1182,7 @@ public class SessionKeeper
                                             Ice.Endpoint[] endps = locator.ice_getEndpoints();
                                             for(Ice.Endpoint e : endps)
                                             {
-                                                LocatorPrx prx = LocatorPrxHelper.uncheckedCast(
+                                                Ice.LocatorPrx prx = Ice.LocatorPrxHelper.uncheckedCast(
                                                             communicator.stringToProxy(
                                                                 communicator.identityToString(locator.ice_getIdentity()) + 
                                                                 ":" + e.toString()));
@@ -1394,8 +1394,8 @@ public class SessionKeeper
 
             // Direct Discovery Endpoint List
             {
-                _directDiscoveryEndpointModel = new DefaultListModel<LocatorPrx>();
-                _directDiscoveryEndpointList = new JList<LocatorPrx>(_directDiscoveryEndpointModel);
+                _directDiscoveryEndpointModel = new DefaultListModel<Ice.LocatorPrx>();
+                _directDiscoveryEndpointList = new JList<Ice.LocatorPrx>(_directDiscoveryEndpointModel);
                 _directDiscoveryEndpointList.setVisibleRowCount(7);
                 _directDiscoveryEndpointList.addMouseListener(
                     new MouseAdapter()
@@ -1407,7 +1407,7 @@ public class SessionKeeper
                                 {
                                     Object obj = _directDiscoveryEndpointModel.getElementAt(
                                                             _directDiscoveryEndpointList.locationToIndex(e.getPoint()));
-                                    if(obj != null && obj instanceof LocatorPrx)
+                                    if(obj != null && obj instanceof Ice.LocatorPrx)
                                     {
                                         _nextButton.doClick(0);
                                     }
@@ -2181,7 +2181,7 @@ public class SessionKeeper
                                 } 
                                 else 
                                 {
-                                    LocatorPrx locator = _directDiscoveryEndpointList.getSelectedValue();
+                                    Ice.LocatorPrx locator = _directDiscoveryEndpointList.getSelectedValue();
                                     _directInstanceName.setText(locator.ice_getIdentity().category);
                                     _directCustomEndpointValue.setText(locator.ice_getEndpoints()[0].toString());
                                     _directCustomEndpoints.setSelected(true);
@@ -3231,8 +3231,8 @@ public class SessionKeeper
         private JCheckBox _directConnectToMaster;
 
         // Direct Discovery Endpoints
-        private JList<LocatorPrx> _directDiscoveryEndpointList;
-        private DefaultListModel<LocatorPrx> _directDiscoveryEndpointModel;
+        private JList<Ice.LocatorPrx> _directDiscoveryEndpointList;
+        private DefaultListModel<Ice.LocatorPrx> _directDiscoveryEndpointModel;
         private JRadioButton _directDiscoveryDiscoveredEndpoint;
         private JLabel _discoveryStatus;
         private JButton _discoveryRefresh;