diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.device')
7 files changed, 10 insertions, 12 deletions
diff --git a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF index b69aa1a58..b4ffdd1cc 100644 --- a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName -Bundle-Version: 1.0.700.qualifier +Bundle-Version: 1.0.800.qualifier Bundle-Activator: org.eclipse.equinox.device.Activator Bundle-SymbolicName: org.eclipse.equinox.device Bundle-Vendor: %bundleVendor diff --git a/bundles/org.eclipse.equinox.device/pom.xml b/bundles/org.eclipse.equinox.device/pom.xml index 172ce5a89..a310f0745 100644 --- a/bundles/org.eclipse.equinox.device/pom.xml +++ b/bundles/org.eclipse.equinox.device/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.device</artifactId> - <version>1.0.700-SNAPSHOT</version> + <version>1.0.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java index 97380c6b0..9cc1736c4 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/Activator.java @@ -103,7 +103,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer, Fra /** * Start the Device Manager. * - * @param context The device manager's bundle context + * @param contxt The device manager's bundle context */ public void start(BundleContext contxt) throws Exception { @@ -195,7 +195,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer, Fra /** * Stop the Device Manager bundle. * - * @param context The device manager's bundle context + * @param contxt The device manager's bundle context */ public void stop(BundleContext contxt) throws Exception { @@ -296,7 +296,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer, Fra * by the ServiceTracker. * * @param reference Reference to service that has been removed. - * @param service The service object for the removed service. + * @param object The service object for the removed service. */ public void removedService(ServiceReference reference, Object object) { if (Activator.DEBUG) { @@ -391,7 +391,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer, Fra /* This should be included per Section 8.7.7 of the OSGi SP R2 * spec, but it causes the OSGi SP R2 Test Suite to fail. * We should turn this on for R3. - + if (driverServiceRegistered) */ // if (false) { diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java index be2d69e1e..4bf3b4bab 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DeviceTracker.java @@ -49,7 +49,6 @@ public class DeviceTracker extends ServiceTracker { * * @param manager DeviceManager object * @param device ServiceReference to the Device service. - * @param id ID of DeviceTracker object */ public DeviceTracker(Activator manager, ServiceReference device) { super(manager.context, device, null); diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java index 6795f86ed..f98c219b9 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverLocatorTracker.java @@ -104,7 +104,7 @@ public class DriverLocatorTracker extends ServiceTracker { * @param reference Reference to service that has been removed. * @param service The service object for the removed service. */ - public void removedService(ServiceReference reference, Object object) { + public void removedService(ServiceReference reference, Object service) { if (Activator.DEBUG) { log.log(reference, LogService.LOG_DEBUG, "DriverLocatorTracker removing service"); //$NON-NLS-1$ } @@ -196,7 +196,7 @@ public class DriverLocatorTracker extends ServiceTracker { /** * Get an <code>InputStream</code> from which the driver bundle providing a driver with the giving ID can be installed. * - * @param id the ID of the driver that needs to be installed. + * @param driver_id the ID of the driver that needs to be installed. * bundle can be installed */ diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java index 1fd65941c..b7f2db1b3 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverSelectorTracker.java @@ -89,7 +89,7 @@ public class DriverSelectorTracker extends ServiceTracker { /** * Default match selection algorithm from OSGi SPR2 spec. * - * @param matchArray An array of the successful matches. + * @param matches An array of the successful matches. * @return ServiceReference to the selected Driver service */ public ServiceReference defaultSelection(Match[] matches) { diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java index 6689e0694..0f050be02 100644 --- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java +++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java @@ -158,7 +158,7 @@ public class DriverTracker extends ServiceTracker { * @param reference Reference to service that has been removed. * @param service The service object for the removed service. */ - public void removedService(ServiceReference reference, Object object) { + public void removedService(ServiceReference reference, Object service) { if (Activator.DEBUG) { log.log(reference, LogService.LOG_DEBUG, this + " removing service"); //$NON-NLS-1$ } @@ -203,7 +203,6 @@ public class DriverTracker extends ServiceTracker { * is set, it will use the Bundle's location instead. * * @param reference Reference to driver service. - * @param log LogService object. * @return DRIVER_ID string. */ public String getDriverID(final ServiceReference reference) { |