Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2008-02-19 10:56:12 -0500
committerThomas Watson2008-02-19 10:56:12 -0500
commite5a6e87f207bffe305234e6ec94561b99539dd18 (patch)
tree290a3eff6b133ce065d9fe8d222263c78b36029f /bundles/org.eclipse.osgi/resolver
parent2b9b43f5930c767af53cc9f6214f75fa4ce91381 (diff)
downloadrt.equinox.framework-e5a6e87f207bffe305234e6ec94561b99539dd18.tar.gz
rt.equinox.framework-e5a6e87f207bffe305234e6ec94561b99539dd18.tar.xz
rt.equinox.framework-e5a6e87f207bffe305234e6ec94561b99539dd18.zip
Format code with latest project settings.
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java8
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java5
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java4
3 files changed, 8 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
index bbf7dd98c..3d7844f07 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -53,11 +53,11 @@ public class PermissionChecker {
success = producer.hasPermission(producerPermission);
if (!success) {
switch (errorType) {
- case ResolverError.IMPORT_PACKAGE_PERMISSION:
+ case ResolverError.IMPORT_PACKAGE_PERMISSION :
errorType = ResolverError.EXPORT_PACKAGE_PERMISSION;
break;
- case ResolverError.REQUIRE_BUNDLE_PERMISSION:
- case ResolverError.FRAGMENT_BUNDLE_PERMISSION:
+ case ResolverError.REQUIRE_BUNDLE_PERMISSION :
+ case ResolverError.FRAGMENT_BUNDLE_PERMISSION :
errorType = errorType == ResolverError.REQUIRE_BUNDLE_PERMISSION ? ResolverError.PROVIDE_BUNDLE_PERMISSION : ResolverError.HOST_BUNDLE_PERMISSION;
break;
}
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
index a86e11932..fceadd166 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 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
@@ -40,8 +40,7 @@ public class BundleSpecificationImpl extends VersionConstraintImpl implements Bu
BundleDescription candidate = (BundleDescription) supplier;
if (candidate.getHost() != null)
return false;
- if (getName() != null && getName().equals(candidate.getSymbolicName()) &&
- (getVersionRange() == null || getVersionRange().isIncluded(candidate.getVersion())))
+ if (getName() != null && getName().equals(candidate.getSymbolicName()) && (getVersionRange() == null || getVersionRange().isIncluded(candidate.getVersion())))
return true;
return false;
}
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java
index 6c1738ae4..dffa5234c 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateDeltaImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 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
@@ -111,7 +111,7 @@ public class StateDeltaImpl implements StateDelta {
void recordBundleResolved(BundleDescriptionImpl resolved, boolean result) {
if (resolved.isResolved() == result)
- return; // do not record anything if nothing has changed
+ return; // do not record anything if nothing has changed
BundleDeltaImpl change = (BundleDeltaImpl) changes.get(resolved);
int newType = result ? BundleDelta.RESOLVED : BundleDelta.UNRESOLVED;
if (change == null) {

Back to the top