From 5c655881af2674ab54d41b026f0bb5efda3ca391 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 13 May 2009 17:53:52 +0000 Subject: Bug 276119 [event] Event(String, Hashtable) constructor is being removed --- .../src/org/eclipse/equinox/internal/app/AppPersistence.java | 6 +++--- .../eclipse/equinox/internal/event/mapper/BundleEventAdapter.java | 7 ++++--- .../equinox/internal/event/mapper/FrameworkEventAdapter.java | 7 ++++--- .../eclipse/equinox/internal/event/mapper/ServiceEventAdapter.java | 7 ++++--- .../org/eclipse/equinox/log/internal/EventAdminLogListener.java | 5 +++-- .../eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java | 5 +++-- .../org/eclipse/equinox/internal/wireadmin/WireReDispatcher.java | 5 +++-- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java index 87be44d4a..055ea77b3 100644 --- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java +++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. + * Copyright (c) 2005, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -145,7 +145,7 @@ public class AppPersistence implements ServiceTrackerCustomizer { if (!scheduling && !checkSchedulingSupport()) throw new ApplicationException(ApplicationException.APPLICATION_SCHEDULING_FAILED, "Cannot support scheduling without org.osgi.service.event package"); //$NON-NLS-1$ // check the event filter for correct syntax - context.createFilter(eventFilter); + context.createFilter(eventFilter); EclipseScheduledApplication result; synchronized (scheduledApps) { result = new EclipseScheduledApplication(context, getNextScheduledID(scheduleId), descriptor.getApplicationId(), arguments, topic, eventFilter, recurring); @@ -368,7 +368,7 @@ public class AppPersistence implements ServiceTrackerCustomizer { props.put(ScheduledApplication.DAY_OF_WEEK, new Integer(cal.get(Calendar.DAY_OF_WEEK))); props.put(ScheduledApplication.HOUR_OF_DAY, new Integer(cal.get(Calendar.HOUR_OF_DAY))); props.put(ScheduledApplication.MINUTE, new Integer(minute)); - Event timerEvent = new Event(ScheduledApplication.TIMER_TOPIC, props); + Event timerEvent = new Event(ScheduledApplication.TIMER_TOPIC, (Dictionary) props); EclipseScheduledApplication[] apps = null; // poor mans implementation of dispatching events; the spec will not allow us to use event admin to dispatch the virtual timer events; boo!! synchronized (timerApps) { diff --git a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/BundleEventAdapter.java b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/BundleEventAdapter.java index 7a6a17199..12277fd1d 100644 --- a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/BundleEventAdapter.java +++ b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/BundleEventAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation. + * Copyright (c) 2005, 2009 IBM Corporation. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.event.mapper; +import java.util.Dictionary; import java.util.Hashtable; import org.osgi.framework.Bundle; import org.osgi.framework.BundleEvent; @@ -17,7 +18,7 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; /** - * @version $Revision: 1.3 $ + * @version $Revision: 1.1 $ */ public class BundleEventAdapter extends EventAdapter { // constants for Event topic substring @@ -76,7 +77,7 @@ public class BundleEventAdapter extends EventAdapter { } putBundleProperties(properties, bundle); properties.put(Constants.EVENT, event); - Event converted = new Event(topic, properties); + Event converted = new Event(topic, (Dictionary) properties); return converted; } } \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/FrameworkEventAdapter.java b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/FrameworkEventAdapter.java index 89a617404..f8a3ffc87 100644 --- a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/FrameworkEventAdapter.java +++ b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/FrameworkEventAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation. + * Copyright (c) 2005, 2009 IBM Corporation. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.equinox.internal.event.mapper; +import java.util.Dictionary; import java.util.Hashtable; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkEvent; @@ -18,7 +19,7 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; /** - * @version $Revision: 1.3 $ + * @version $Revision: 1.1 $ */ public class FrameworkEventAdapter extends EventAdapter { // constants for Event topic substring @@ -66,7 +67,7 @@ public class FrameworkEventAdapter extends EventAdapter { putExceptionProperties(properties, t); } properties.put(Constants.EVENT, event); - Event converted = new Event(topic, properties); + Event converted = new Event(topic, (Dictionary) properties); return converted; } } \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/ServiceEventAdapter.java b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/ServiceEventAdapter.java index 36b2cee00..f2b740e47 100644 --- a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/ServiceEventAdapter.java +++ b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/mapper/ServiceEventAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation. + * Copyright (c) 2005, 2009 IBM Corporation. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.equinox.internal.event.mapper; +import java.util.Dictionary; import java.util.Hashtable; import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceReference; @@ -18,7 +19,7 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; /** - * @version $Revision: 1.4 $ + * @version $Revision: 1.1 $ */ public class ServiceEventAdapter extends EventAdapter { // constants for Event topic substring @@ -58,7 +59,7 @@ public class ServiceEventAdapter extends EventAdapter { putServiceReferenceProperties(properties, ref); } properties.put(Constants.EVENT, event); - Event converted = new Event(topic, properties); + Event converted = new Event(topic, (Dictionary) properties); return converted; } } \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/EventAdminLogListener.java b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/EventAdminLogListener.java index 53b3dd842..11728b867 100644 --- a/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/EventAdminLogListener.java +++ b/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/EventAdminLogListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation + * Copyright (c) 2007, 2009 IBM Corporation * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ *******************************************************************************/ package org.eclipse.equinox.log.internal; +import java.util.Dictionary; import java.util.Hashtable; import org.eclipse.equinox.log.SynchronousLogListener; import org.osgi.framework.Bundle; @@ -93,7 +94,7 @@ public class EventAdminLogListener implements SynchronousLogListener { if (entry.getMessage() != null) properties.put(MESSAGE, entry.getMessage()); properties.put(TIMESTAMP, new Long(entry.getTime())); - return new Event(topic, properties); + return new Event(topic, (Dictionary) properties); } public static void putServiceReferenceProperties(Hashtable properties, ServiceReference ref) { diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java index 21dc3086d..989a4a2b5 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation. + * Copyright (c) 2005, 2009 IBM Corporation. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.equinox.internal.useradmin; +import java.util.Dictionary; import java.util.Hashtable; import org.osgi.framework.*; import org.osgi.service.event.Event; @@ -102,7 +103,7 @@ public class UserAdminEventAdapter implements UserAdminListener { properties.put(ROLE_TYPE, new Integer(role.getType())); } properties.put(EVENT, event); - Event convertedEvent = new Event(topic, properties); + Event convertedEvent = new Event(topic, (Dictionary) properties); eventAdmin.postEvent(convertedEvent); } } diff --git a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/internal/wireadmin/WireReDispatcher.java b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/internal/wireadmin/WireReDispatcher.java index 56246c79e..ca5383cf8 100644 --- a/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/internal/wireadmin/WireReDispatcher.java +++ b/bundles/org.eclipse.equinox.wireadmin/src/org/eclipse/equinox/internal/wireadmin/WireReDispatcher.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997-2007 by ProSyst Software GmbH + * Copyright (c) 1997-2009 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.wireadmin; +import java.util.Dictionary; import java.util.Hashtable; import org.eclipse.equinox.internal.util.ref.Log; import org.osgi.framework.*; @@ -201,7 +202,7 @@ public class WireReDispatcher implements WireAdminListener { addExceptionProps(props, throwable); } props.put(EVENT, event); - eventAdmin.postEvent(new Event(topic, props)); + eventAdmin.postEvent(new Event(topic, (Dictionary) props)); if (Activator.LOG_DEBUG) log.debug(0, 10018, event.toString(), null, false); } -- cgit v1.2.3