diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-04 19:42:16 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-04 19:42:16 +0000 |
| commit | e4eba4680b2058554bfc74d2983ba06f0b8c379e (patch) | |
| tree | 0c0c09209cc0786df6546eb605abd7a0b6adade3 /java/src/IceGridGUI/RegistryObserverI.java | |
| parent | Improved observers, refactored topic manager and initialization Added (diff) | |
| download | ice-e4eba4680b2058554bfc74d2983ba06f0b8c379e.tar.bz2 ice-e4eba4680b2058554bfc74d2983ba06f0b8c379e.tar.xz ice-e4eba4680b2058554bfc74d2983ba06f0b8c379e.zip | |
Added application/adapter/object observers
Diffstat (limited to 'java/src/IceGridGUI/RegistryObserverI.java')
| -rwxr-xr-x | java/src/IceGridGUI/RegistryObserverI.java | 185 |
1 files changed, 21 insertions, 164 deletions
diff --git a/java/src/IceGridGUI/RegistryObserverI.java b/java/src/IceGridGUI/RegistryObserverI.java index 5918ae5dcfe..e8634fee905 100755 --- a/java/src/IceGridGUI/RegistryObserverI.java +++ b/java/src/IceGridGUI/RegistryObserverI.java @@ -14,182 +14,39 @@ import IceGrid.*; class RegistryObserverI extends _RegistryObserverDisp
{
- RegistryObserverI(String instanceName, Coordinator coordinator)
+ RegistryObserverI(Coordinator coordinator)
{
- _instanceName = instanceName;
_coordinator = coordinator;
}
- //
- // Runs in the UI thread
- //
- synchronized void waitForInit()
+ public void registryInit(final RegistryInfo[] registries, Ice.Current current)
{
- //
- // TODO: configurable timeout
- //
- long timeout = 10000;
-
- long start = System.currentTimeMillis();
-
- while(!_initialized)
- {
- try
- {
- wait(timeout);
- }
- catch(InterruptedException e)
- {
- }
-
- if((start + timeout) < System.currentTimeMillis())
- {
- break;
- }
- }
-
- if(_initialized)
- {
- _coordinator.registryInit(_instanceName,
- _serial, _applications, _adapters, _objects);
- }
- else
- {
- throw new Ice.TimeoutException();
- }
- }
-
-
- public synchronized void init(int serial, java.util.List applications, AdapterInfo[] adapters,
- ObjectInfo[] objects, Ice.Current current)
- {
- _initialized = true;
- _serial = serial;
-
- _applications = new java.util.LinkedList();
- java.util.Iterator p = applications.iterator();
- while(p.hasNext())
- {
- _applications.add(((ApplicationInfo)p.next()).descriptor); // TODO: Use ApplicationInfo directly.
- }
-
- _adapters = adapters;
- _objects = objects;
- notify();
- }
-
- public void applicationAdded(final int serial, final ApplicationInfo info,
- Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.applicationAdded(serial, info.descriptor); // TODO: Use ApplicationInfo directly.
- }
- });
+ // TODO: XXX
}
- public void applicationRemoved(final int serial, final String name,
- final Ice.Current current)
+ public void registryUp(final RegistryInfo registryInfo, Ice.Current current)
{
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.applicationRemoved(serial, name);
- }
- });
+ // TODO: XXX
+// SwingUtilities.invokeLater(new Runnable()
+// {
+// public void run()
+// {
+// _coordinator.registryUp(registryInfo);
+// }
+// });
}
- public void applicationUpdated(final int serial, final ApplicationUpdateInfo info,
- Ice.Current current)
+ public void registryDown(final String registryName, Ice.Current current)
{
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.applicationUpdated(serial, info.descriptor); // TODO: Use ApplicationUpdateInfo
- }
- });
+ // TODO: XXX
+// SwingUtilities.invokeLater(new Runnable()
+// {
+// public void run()
+// {
+// _coordinator.registryDown(registryName);
+// }
+// });
}
- public void adapterAdded(final int serial, final AdapterInfo info, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.adapterAdded(serial, info);
- }
- });
- }
-
- public void adapterUpdated(final int serial, final AdapterInfo info, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.adapterUpdated(serial, info);
- }
- });
- }
-
- public void adapterRemoved(final int serial, final String id, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.adapterRemoved(serial, id);
- }
- });
- }
-
- public void objectAdded(final int serial, final ObjectInfo info, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.objectAdded(serial, info);
- }
- });
- }
-
- public void objectUpdated(final int serial, final ObjectInfo info, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.objectUpdated(serial, info);
- }
- });
- }
-
- public void objectRemoved(final int serial, final Ice.Identity id, Ice.Current current)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- _coordinator.objectRemoved(serial, id);
- }
- });
- }
-
private final Coordinator _coordinator;
-
- private boolean _initialized = false;
-
- //
- // Values given to init
- //
- private final String _instanceName;
- private int _serial;
- private java.util.List _applications;
- private AdapterInfo[] _adapters;
- private ObjectInfo[] _objects;
};
|