Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2013-11-15 15:27:40 +0000
committerptessier2013-11-15 15:27:40 +0000
commit78caf907e7572d04addedd2d9d2087e5a994a349 (patch)
tree84136a579b6a1d8828495123bf6dd7cc648a80d7 /extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool
parent3371b62ce4e698bf54672dcb11d33f9af1dc8239 (diff)
downloadorg.eclipse.papyrus-78caf907e7572d04addedd2d9d2087e5a994a349.tar.gz
org.eclipse.papyrus-78caf907e7572d04addedd2d9d2087e5a994a349.tar.xz
org.eclipse.papyrus-78caf907e7572d04addedd2d9d2087e5a994a349.zip
401703: Create adl4eclipse profile
https://bugs.eclipse.org/bugs/show_bug.cgi?id=401703
Diffstat (limited to 'extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool')
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF15
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties4
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java20
3 files changed, 27 insertions, 12 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
index 8fce2c3509e..0230253ddb4 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Export-Package: org.eclipse.papyrus.adltool,
org.eclipse.papyrus.adltool.designer.wizard
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.uml2.uml;bundle-version="4.0.100",
+ org.eclipse.emf.transaction,
+ org.eclipse.uml2.uml,
org.eclipse.pde.core,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
- org.eclipse.papyrus.adl4eclipse.profile;bundle-version="1.0.0",
- org.eclipse.papyrus.osgi.profile;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.extensionpoints,
+ org.eclipse.papyrus.uml.tools.utils,
+ org.eclipse.papyrus.adl4eclipse.profile,
+ org.eclipse.papyrus.osgi.profile
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
@@ -20,7 +20,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.adltool.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipsetool
-Eclipse-RegisterBuddy:
+Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipsetool;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
index 73a5119ed93..676605b2a1c 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- plugin.xml
+ about.html,\
+ bin/
+src.includes = about.html
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
index 9130528b00d..2f43ecd34d9 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
@@ -334,8 +334,8 @@ public abstract class ArchitectureSnapshotDesigner{
protected void modelRelationExtensionBased(Component bundleComponent, IExtension extension, Port clientPort, Port supplierPort) {
Dependency dependency=UMLFactory.eINSTANCE.createDependency();
dependency.setName(extension.getExtensionPointUniqueIdentifier());
- bundleComponent.getNearestPackage().getPackagedElements().add(dependency);
- //bundleComponent.getPackagedElements().add(dependency);
+ //bundleComponent.getNearestPackage().getPackagedElements().add(dependency);
+ bundleComponent.getPackagedElements().add(dependency);
dependency.getClients().add(clientPort);
dependency.getSuppliers().add(supplierPort);
}
@@ -458,7 +458,11 @@ public abstract class ArchitectureSnapshotDesigner{
if(bundleRef.isOptional()||foundBundle!=null){
if (foundBundle!=null){
if((!(createdFeatureIndex.containsKey(bundleRef.getSymbolicName())))&&(!(createdFeatureIndex.containsKey(bundleRef.getSymbolicName())))) {
- modelBundle(library,foundBundle, currentLevel+1);
+ if( isInitialPlugin(bundleRef.getSymbolicName())){
+ modelBundle(library,foundBundle, currentLevel);
+ }
+ else{
+ modelBundle(library,foundBundle, currentLevel+1);}
}
}
else {
@@ -510,5 +514,15 @@ public abstract class ArchitectureSnapshotDesigner{
}
return out;
}
+ protected boolean isInitialPlugin(String name) {
+ Iterator<Object> bundleProjectsIterator= bundleInitialList.iterator();
+ while(bundleProjectsIterator.hasNext()) {
+ Object bundleProject = (Object)bundleProjectsIterator.next();
+ if(name.equals(bundleDesignerRegistry.getSymbolicName(bundleProject))){
+ return true;
+ }
+ }
+ return false;
+ }
}

Back to the top