diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/container')
4 files changed, 11 insertions, 13 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java index 93e386692..3464d21bb 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2014 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 @@ -17,15 +17,13 @@ import org.eclipse.osgi.util.ManifestElement; public class FilteredSourcePackage extends SingleSourcePackage { private static final char ALL = '*'; - String[] includes; - String[] excludes; + private final String[] includes; + private final String[] excludes; public FilteredSourcePackage(String name, BundleLoader supplier, String includes, String excludes) { super(name, supplier); - if (includes != null) - this.includes = ManifestElement.getArrayFromList(includes); - if (excludes != null) - this.excludes = ManifestElement.getArrayFromList(excludes); + this.includes = includes != null ? ManifestElement.getArrayFromList(includes) : null; + this.excludes = excludes != null ? ManifestElement.getArrayFromList(excludes) : null; } public URL getResource(String name) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java index 69863c1f8..a323f063e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2014 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 @@ -15,7 +15,7 @@ import java.util.*; import org.eclipse.osgi.internal.loader.BundleLoader; public class MultiSourcePackage extends PackageSource { - SingleSourcePackage[] suppliers; + private final SingleSourcePackage[] suppliers; public MultiSourcePackage(String id, SingleSourcePackage[] suppliers) { super(id); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java index d49145c12..02058398f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2014 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 @@ -26,7 +26,7 @@ import org.osgi.framework.ServiceFactory; import org.osgi.service.packageadmin.PackageAdmin; public abstract class PackageSource implements KeyedElement { - protected String id; + protected final String id; public PackageSource(String id) { // others depend on the id being interned; see SingleSourcePackage.equals diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java index 86c1d6540..b77c6cecc 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2014 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 @@ -17,7 +17,7 @@ import org.eclipse.osgi.internal.loader.BundleLoader; import org.eclipse.osgi.internal.loader.ModuleClassLoader; public class SingleSourcePackage extends PackageSource { - BundleLoader supplier; + private final BundleLoader supplier; public SingleSourcePackage(String id, BundleLoader supplier) { super(id); |