Fix compile errors after refactoring org.eclipse.osgi.

4 files changed, 37 insertions, 25 deletions

diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
index 25c5c88b5..cb3b5fb94 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
@@ -75,9 +75,9 @@ public class PlatformAdminImpl implements PlatformAdmin {
 				ModuleRevision current = module.getCurrentRevision();
 				BundleDescription description = converter.createDescription(current);
 				state.addBundle(description);
-				state.setPlatformProperties(asDictionary(equinoxContainer.getConfiguration().asMap()));
+				state.setPlatformProperties(asDictionary(equinoxContainer.getConfiguration().getInitialConfig()));
 			}
-			state.setTimeStamp(database.getTimestamp());
+			state.setTimeStamp(database.getRevisionsTimestamp());
 			// TODO add hooks to get the resolution correct
 			// TODO add listeners to keep state copy in sync
 		} finally {
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
index 24a5cd497..aaa2d06b4 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
@@ -13,8 +13,8 @@ package org.eclipse.osgi.internal.module;
 
 import java.security.AccessController;
 import java.util.*;
+import org.eclipse.osgi.framework.util.ArrayMap;
 import org.eclipse.osgi.framework.util.SecureAction;
-import org.eclipse.osgi.internal.baseadaptor.ArrayMap;
 import org.eclipse.osgi.internal.debug.Debug;
 import org.eclipse.osgi.internal.debug.FrameworkDebugOptions;
 import org.eclipse.osgi.internal.framework.EquinoxContainer;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
index 82048e87c..1bbb00470 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
@@ -68,23 +68,23 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement
 			if (osNames.length == 0)
 				match = true;
 			else {
+				Collection<String> platformOSAliases;
 				Object platformOS = platformProps[i].get(Constants.FRAMEWORK_OS_NAME);
-				Object aliasedPlatformOS = platformOS == null || !(platformOS instanceof String) ? platformOS : aliasMapper.aliasOSName((String) platformOS);
-				Object[] platformOSes;
-				if (aliasedPlatformOS instanceof Collection)
-					platformOSes = ((Collection<?>) aliasedPlatformOS).toArray();
-				else
-					platformOSes = aliasedPlatformOS == null ? new Object[0] : new Object[] {aliasedPlatformOS};
-				for (int j = 0; j < osNames.length && !match; j++) {
-					Object aliasedName = aliasMapper.aliasOSName(osNames[j]);
-					for (int k = 0; k < platformOSes.length; k++) {
-						if (aliasedName instanceof String) {
-							if (platformOSes[k].equals(aliasedName))
-								match = true;
-						} else {
-							for (Iterator<?> iAliases = ((Collection<?>) aliasedName).iterator(); iAliases.hasNext() && !match;)
-								if (platformOSes[k].equals(iAliases.next()))
-									match = true;
+				if (platformOS instanceof Collection) {
+					@SuppressWarnings("unchecked")
+					Collection<String> platformOSTemp = (Collection<String>) platformOS;
+					platformOSAliases = platformOSTemp;
+				} else if (platformOS instanceof String) {
+					platformOSAliases = aliasMapper.getOSNameAliases((String) platformOS);
+				} else {
+					platformOSAliases = Collections.emptyList();
+				}
+				osNamesLoop: for (String osName : osNames) {
+					String canonicalOSName = aliasMapper.getCanonicalOSName(osName);
+					for (String osAlias : platformOSAliases) {
+						if (osAlias.equalsIgnoreCase(canonicalOSName)) {
+							match = true;
+							break osNamesLoop;
 						}
 					}
 				}
@@ -97,14 +97,26 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement
 			if (processors.length == 0)
 				match = true;
 			else {
+				Collection<String> platformProcessorAliases;
 				Object platformProcessor = platformProps[i].get(Constants.FRAMEWORK_PROCESSOR);
-				Object aliasedPlatformProcessor = platformProcessor == null || !(platformProcessor instanceof String) ? platformProcessor : aliasMapper.aliasProcessor((String) platformProcessor);
-				if (aliasedPlatformProcessor != null)
-					for (int j = 0; j < processors.length && !match; j++) {
-						String aliasedProcessor = aliasMapper.aliasProcessor(processors[j]);
-						if (aliasedPlatformProcessor.equals(aliasedProcessor))
+				if (platformProcessor instanceof Collection) {
+					@SuppressWarnings("unchecked")
+					Collection<String> platformProcessorTemp = (Collection<String>) platformProcessor;
+					platformProcessorAliases = platformProcessorTemp;
+				} else if (platformProcessor instanceof String) {
+					platformProcessorAliases = aliasMapper.getProcessorAliases((String) platformProcessor);
+				} else {
+					platformProcessorAliases = Collections.emptyList();
+				}
+				processorLoop: for (String processor : processors) {
+					String canonicalProcessor = aliasMapper.getCanonicalProcessor(processor);
+					for (String processorAlias : platformProcessorAliases) {
+						if (processorAlias.equalsIgnoreCase(canonicalProcessor)) {
 							match = true;
+							break processorLoop;
+						}
 					}
+				}
 			}
 			if (!match)
 				return false;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
index e6cc72a7e..8d754739c 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
@@ -12,7 +12,7 @@
 package org.eclipse.osgi.internal.resolver;
 
 import java.util.*;
-import org.eclipse.osgi.internal.baseadaptor.ArrayMap;
+import org.eclipse.osgi.framework.util.ArrayMap;
 import org.eclipse.osgi.internal.container.ComputeNodeOrder;
 import org.eclipse.osgi.service.resolver.*;
 import org.osgi.framework.Constants;