-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Embed the required StateFactory implementations #455
Draft
laeubi
wants to merge
1
commit into
eclipse-equinox:master
Choose a base branch
from
laeubi:do_not_require_compat
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 180 additions & 0 deletions
180
...clipse/src/org/eclipse/equinox/p2/publisher/eclipse/statefactory/BaseDescriptionImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2004, 2016 IBM Corporation and others. | ||
* | ||
* This program and the accompanying materials | ||
* are made available under the terms of the Eclipse Public License 2.0 | ||
* which accompanies this distribution, and is available at | ||
* https://www.eclipse.org/legal/epl-2.0/ | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* IBM Corporation - initial API and implementation | ||
* Rob Harrop - SpringSource Inc. (bug 247522) | ||
*******************************************************************************/ | ||
package org.eclipse.equinox.p2.publisher.eclipse.statefactory; | ||
|
||
import java.util.*; | ||
import java.util.Map.Entry; | ||
import org.eclipse.osgi.service.resolver.BaseDescription; | ||
import org.osgi.framework.Version; | ||
import org.osgi.framework.wiring.BundleCapability; | ||
import org.osgi.framework.wiring.BundleRevision; | ||
|
||
public abstract class BaseDescriptionImpl implements BaseDescription { | ||
|
||
protected final Object monitor = new Object(); | ||
|
||
private volatile String name; | ||
|
||
private volatile Version version; | ||
|
||
private volatile Object userObject; | ||
|
||
public String getName() { | ||
return name; | ||
} | ||
|
||
public Version getVersion() { | ||
synchronized (this.monitor) { | ||
if (version == null) | ||
return Version.emptyVersion; | ||
return version; | ||
} | ||
} | ||
|
||
protected void setName(String name) { | ||
this.name = name; | ||
} | ||
|
||
protected void setVersion(Version version) { | ||
this.version = version; | ||
} | ||
|
||
static <V> String toString(Map<String, V> map, boolean directives) { | ||
if (map.size() == 0) | ||
return ""; //$NON-NLS-1$ | ||
String assignment = directives ? ":=" : "="; //$NON-NLS-1$//$NON-NLS-2$ | ||
Set<Entry<String, V>> set = map.entrySet(); | ||
StringBuilder sb = new StringBuilder(); | ||
for (Entry<String, V> entry : set) { | ||
sb.append("; "); //$NON-NLS-1$ | ||
String key = entry.getKey(); | ||
Object value = entry.getValue(); | ||
if (value instanceof List) { | ||
@SuppressWarnings("unchecked") | ||
List<Object> list = (List<Object>) value; | ||
if (list.size() == 0) | ||
continue; | ||
Object component = list.get(0); | ||
String className = component.getClass().getName(); | ||
String type = className.substring(className.lastIndexOf('.') + 1); | ||
sb.append(key).append(':').append("List<").append(type).append(">").append(assignment).append('"'); //$NON-NLS-1$ //$NON-NLS-2$ | ||
for (Object object : list) | ||
sb.append(object).append(','); | ||
sb.setLength(sb.length() - 1); | ||
sb.append('"'); | ||
} else { | ||
String type = ""; //$NON-NLS-1$ | ||
if (!(value instanceof String)) { | ||
String className = value.getClass().getName(); | ||
type = ":" + className.substring(className.lastIndexOf('.') + 1); //$NON-NLS-1$ | ||
} | ||
sb.append(key).append(type).append(assignment).append('"').append(value).append('"'); | ||
} | ||
} | ||
return sb.toString(); | ||
} | ||
|
||
String getInternalNameSpace() { | ||
return null; | ||
} | ||
|
||
public BaseDescription getFragmentDeclaration() { | ||
return null; | ||
} | ||
|
||
public BundleCapability getCapability() { | ||
return getCapability(null); | ||
} | ||
|
||
BundleCapability getCapability(String namespace) { | ||
BaseDescriptionImpl fragmentDeclaration = (BaseDescriptionImpl) getFragmentDeclaration(); | ||
if (fragmentDeclaration != null) | ||
return fragmentDeclaration.getCapability(namespace); | ||
if (namespace == null) | ||
namespace = getInternalNameSpace(); | ||
if (namespace == null) | ||
return null; | ||
return new BaseCapability(namespace); | ||
} | ||
|
||
public Object getUserObject() { | ||
return userObject; | ||
} | ||
|
||
public void setUserObject(Object userObject) { | ||
this.userObject = userObject; | ||
} | ||
|
||
public class BaseCapability implements BundleCapability { | ||
private final String namespace; | ||
|
||
public BaseCapability(String namespace) { | ||
super(); | ||
this.namespace = namespace; | ||
} | ||
|
||
public BundleRevision getRevision() { | ||
return getSupplier(); | ||
} | ||
|
||
public String getNamespace() { | ||
return namespace; | ||
} | ||
|
||
public Map<String, String> getDirectives() { | ||
return getDeclaredDirectives(); | ||
} | ||
|
||
public Map<String, Object> getAttributes() { | ||
Map<String, Object> attrs = getDeclaredAttributes(); | ||
String internalName = BaseDescriptionImpl.this.getInternalNameSpace(); | ||
if (namespace.equals(internalName)) | ||
return attrs; | ||
// we are doing an alias, must remove internal Name and add alias | ||
attrs = new HashMap<>(attrs); | ||
Object nameValue = attrs.remove(internalName); | ||
if (nameValue != null) | ||
attrs.put(namespace, nameValue); | ||
return Collections.unmodifiableMap(attrs); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return System.identityHashCode(BaseDescriptionImpl.this); | ||
} | ||
|
||
public BaseDescriptionImpl getBaseDescription() { | ||
return BaseDescriptionImpl.this; | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (this == obj) | ||
return true; | ||
if (!(obj instanceof BaseCapability)) | ||
return false; | ||
return (((BaseCapability) obj).getBaseDescription() == BaseDescriptionImpl.this) && namespace.equals(((BaseCapability) obj).getNamespace()); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return getNamespace() + BaseDescriptionImpl.toString(getAttributes(), false) + BaseDescriptionImpl.toString(getDirectives(), true); | ||
} | ||
|
||
public BundleRevision getResource() { | ||
return getRevision(); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Importing of internal packages should not be done for this.