| author | Thomas Watson | 2011-03-09 15:05:35 (EST) |
|---|---|---|
| committer | Glyn Normington | 2011-03-09 15:05:35 (EST) |
| commit | dd1885e0dee73ceea135bb978a5a957282bbc504 (patch) (side-by-side diff) | |
| tree | 5e845cab316b9b904126d99e0d0c6370f556503d | |
| parent | 6eea00d3678f950a25489423201db92a1576e3e5 (diff) | |
| download | org.eclipse.virgo.kernel-dd1885e0dee73ceea135bb978a5a957282bbc504.zip org.eclipse.virgo.kernel-dd1885e0dee73ceea135bb978a5a957282bbc504.tar.gz org.eclipse.virgo.kernel-dd1885e0dee73ceea135bb978a5a957282bbc504.tar.bz2 | |
- Format code using virgo templates/formaters.
4 files changed, 9 insertions, 8 deletions
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionResolverHook.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionResolverHook.java index 897acbc..c915c1d 100644 --- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionResolverHook.java +++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionResolverHook.java @@ -140,7 +140,7 @@ final class RegionResolverHook implements ResolverHook { while (i.hasNext()) { BundleCapability c = i.next(); if (!filter.isCapabilityAllowed(c) && !filter.isBundleAllowed(c.getRevision())) - i.remove(); + i.remove(); } } @@ -163,7 +163,7 @@ final class RegionResolverHook implements ResolverHook { @Override public void filterSingletonCollisions(BundleCapability singleton, Collection<BundleCapability> collisionCandidates) { - collisionCandidates.clear(); //XXX temporary hack in lieu of Borislav's changes + collisionCandidates.clear(); // XXX temporary hack in lieu of Borislav's changes } private void debugEntry(BundleRevision requirer, Collection<BundleCapability> candidates) { diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionServiceFindHook.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionServiceFindHook.java index 2f8da5b..d42de0d 100644 --- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionServiceFindHook.java +++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/hook/RegionServiceFindHook.java @@ -11,7 +11,6 @@ package org.eclipse.virgo.kernel.osgi.region.hook; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -19,11 +18,10 @@ import java.util.Set; import org.eclipse.virgo.kernel.osgi.region.Region; import org.eclipse.virgo.kernel.osgi.region.RegionDigraph; -import org.eclipse.virgo.kernel.osgi.region.RegionFilter; import org.eclipse.virgo.kernel.osgi.region.RegionDigraph.FilteredRegion; +import org.eclipse.virgo.kernel.osgi.region.RegionFilter; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import org.osgi.framework.Filter; import org.osgi.framework.ServiceReference; import org.osgi.framework.hooks.service.FindHook; diff --git a/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/region/internal/BundleIdBasedRegionTests.java b/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/region/internal/BundleIdBasedRegionTests.java index a868ba2..3af2eb7 100644 --- a/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/region/internal/BundleIdBasedRegionTests.java +++ b/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/region/internal/BundleIdBasedRegionTests.java @@ -11,7 +11,10 @@ package org.eclipse.virgo.kernel.osgi.region.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.HashSet; import java.util.Iterator; @@ -20,8 +23,8 @@ import java.util.Set; import org.easymock.EasyMock; import org.eclipse.virgo.kernel.osgi.region.Region; import org.eclipse.virgo.kernel.osgi.region.RegionDigraph; -import org.eclipse.virgo.kernel.osgi.region.RegionFilter; import org.eclipse.virgo.kernel.osgi.region.RegionDigraph.FilteredRegion; +import org.eclipse.virgo.kernel.osgi.region.RegionFilter; import org.eclipse.virgo.util.math.OrderedPair; import org.junit.After; import org.junit.Before; diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java index 5014a2a..7200d86 100644 --- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java +++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java @@ -355,7 +355,7 @@ public final class DependencyCalculator { BundleDescription[] bundleDescriptions = state.getBundles(bundleSymbolicName); for (BundleDescription bundleDescription : bundleDescriptions) { if (bundleDescription.getVersion().equals(version)) { - //XXX Refactoring required here. This temporary code only traverses the coregion and user region. + // XXX Refactoring required here. This temporary code only traverses the coregion and user region. Set<FilteredRegion> edges = this.coregion.getEdges(); FilteredRegion edge = edges.iterator().next(); Region userRegion = edge.getRegion(); |

