diff options
author | Thomas Watson | 2013-09-05 15:21:40 +0000 |
---|---|---|
committer | Thomas Watson | 2013-09-06 18:33:09 +0000 |
commit | a71b34af9b82b18d5c6d077de98a078ca0b7614e (patch) | |
tree | 44635ec3f95d42ac74e9b8097d7ecd2dd16050a5 | |
parent | d0cbf71363408642eb7f037cd210906df2ce714b (diff) | |
download | rt.equinox.framework-a71b34af9b82b18d5c6d077de98a078ca0b7614e.tar.gz rt.equinox.framework-a71b34af9b82b18d5c6d077de98a078ca0b7614e.tar.xz rt.equinox.framework-a71b34af9b82b18d5c6d077de98a078ca0b7614e.zip |
Move Tokenizer to org.eclipse.osgi.internal.util
-rw-r--r-- | bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java (renamed from bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Tokenizer.java) | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java index 3ad610c8c..1de76de6a 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2013 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 @@ -14,9 +14,9 @@ package org.eclipse.osgi.internal.resolver; import java.lang.reflect.Constructor; import java.util.*; import org.eclipse.osgi.framework.internal.core.Msg; -import org.eclipse.osgi.framework.internal.core.Tokenizer; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.framework.FilterImpl; +import org.eclipse.osgi.internal.util.Tokenizer; import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.ManifestElement; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java index 871302cef..9b9962d0b 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java @@ -17,9 +17,9 @@ import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.container.namespaces.EclipsePlatformNamespace; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.internal.core.Msg; -import org.eclipse.osgi.framework.internal.core.Tokenizer; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.framework.FilterImpl; +import org.eclipse.osgi.internal.util.Tokenizer; import org.eclipse.osgi.storage.NativeCodeFinder; import org.eclipse.osgi.storage.Storage; import org.eclipse.osgi.util.ManifestElement; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java index 83735feaf..e1b3d1a94 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java @@ -13,8 +13,8 @@ package org.eclipse.osgi.internal.framework; import java.io.*; import java.util.*; import java.util.Map.Entry; -import org.eclipse.osgi.framework.internal.core.Tokenizer; import org.eclipse.osgi.internal.debug.Debug; +import org.eclipse.osgi.internal.util.Tokenizer; /** * This class maps aliases. diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Tokenizer.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java index b7eb7fd70..893e72a44 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Tokenizer.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/Tokenizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2013 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 @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.osgi.framework.internal.core; +package org.eclipse.osgi.internal.util; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java index c7f142b50..1cb8b3aeb 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java @@ -14,8 +14,8 @@ package org.eclipse.osgi.util; import java.io.*; import java.util.*; import org.eclipse.osgi.framework.internal.core.Msg; -import org.eclipse.osgi.framework.internal.core.Tokenizer; import org.eclipse.osgi.internal.util.SupplementDebug; +import org.eclipse.osgi.internal.util.Tokenizer; import org.osgi.framework.BundleException; /** |