Bug 326732

Comment 1 John Ross 2010-10-01 00:30:04 EDT

Created attachment 180010 [details]
Patch for jsr14 and generics.

Adds support for jsr14.

Adds generic information. There are two remaining warnings on the LogTracker because the LogService does not yet support generics. I don't know how to get rid of these until that happens other than suppressing them, which I don't think we want to do.

Removes and replaces deprecated code related to changes to org.eclipse.osgi.framework.eventmgr.* within EventAdminImpl.dispatchEvent.

Updates the manifest to specify versions for imported packages and remove the deprecated export service header.

Comment 2 BJ Hargrave 2010-10-04 15:35:47 EDT

(In reply to comment #1)
> Patch for jsr14 and generics.
> 
> Adds support for jsr14.

Skimmed the patch. Looks good. I would like to see the adapters changes to avoid the use of Hashtable/Dictionary in favor of Map (using the Event constructor which takes a Map argument.) Can you update the patch?

> 
> There are two remaining warnings on the LogTracker
> because the LogService does not yet support generics. I don't know how to get
> rid of these until that happens other than suppressing them, which I don't
> think we want to do.

I think we don't worry about those for now. I guess I should update the remainder of the OSGi API to generics...

Comment 3 John Ross 2010-10-04 18:31:35 EDT

Created attachment 180216 [details]
Patch 2 for jsr14 and generics

Incorporates adapter changes to use Map in favor of Dictionary/Hashtable as requested in comment #2.

Comment 4 John Ross 2010-10-04 18:33:24 EDT

Created attachment 180218 [details]
Patch 3 for jsr14 and generics

Forgot to check patch as the content type for patch 2.

Comment 5 John Ross 2010-10-04 19:20:44 EDT

Created attachment 180220 [details]
Patch with comment 2 changes

Not exactly sure why the second patch is more than twice the size of the first, but, if more convenient, here's a patch containing only the classes that changed since the first based on comment #2.

Comment 6 BJ Hargrave 2010-10-05 11:09:39 EDT

Marked all but one patch as obsolete.

Why does .classpath refer to /org.osgi.service.log? This should be picked up by the PDE classpath container (org.eclipse.pde.core.requiredPlugins).

[Patch is bigger because jdt.core.prefs got reorganized so the diff is much larger.]

Hastable is replaced with a HashMap wrapped in a synchronizedMap. Does it really need to be synchronized? I don't think it does as the Map is just used to create the Event and the Event does not hold onto the Map.

Comment 7 John Ross 2010-10-05 12:16:36 EDT

(In reply to comment #6)
> Marked all but one patch as obsolete.
> Why does .classpath refer to /org.osgi.service.log? This should be picked up by
> the PDE classpath container (org.eclipse.pde.core.requiredPlugins).

Sorry, didn't mean to include that. That was for other work and my temporary way of quickly getting the project to compile against the latest stuff from the OSGi master branch.

> Hastable is replaced with a HashMap wrapped in a synchronizedMap. Does it
> really need to be synchronized? I don't think it does as the Map is just used
> to create the Event and the Event does not hold onto the Map.

I agree. I failed to look at the Event source to see what it actually did with the Map and unwittingly assumed it kept the original.

I'll provide an updated patch.

Comment 8 John Ross 2010-10-05 12:26:33 EDT

Created attachment 180257 [details]
Patch 4 for jsr14 and generics

Incorporates comment #6.

Comment 9 BJ Hargrave 2010-10-05 14:02:42 EDT

Release patch 4 with a minor change to bump the bundles version number to 1.2.1.

Thanks John.