Bug 553500 - quick fix "Export aspect package X" does nothing
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
index b071477..daf0478 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.pde.ui;singleton:=true
Automatic-Module-Name: org.eclipse.objectteams.otdt.pde.ui
-Bundle-Version: 2.7.4.qualifier
+Bundle-Version: 2.7.6.qualifier
Bundle-Activator: org.eclipse.objectteams.otdt.internal.pde.ui.OTPDEUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
@@ -17,7 +17,7 @@
org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.search;bundle-version="[3.9.0,4.0.0)",
org.eclipse.pde.api.tools.ui;bundle-version="[1.0.300,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.18.0.OTDT_r274,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.20.0.OTDT_r276,4.0.0)",
org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/src/org/eclipse/objectteams/otdt/internal/pde/validation/BundleValidation.java b/plugins/org.eclipse.objectteams.otdt.pde.ui/src/org/eclipse/objectteams/otdt/internal/pde/validation/BundleValidation.java
index 95af2be..af7f28d 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/src/org/eclipse/objectteams/otdt/internal/pde/validation/BundleValidation.java
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/src/org/eclipse/objectteams/otdt/internal/pde/validation/BundleValidation.java
@@ -579,10 +579,10 @@
int semi = bundleSymbolicName.indexOf(';');
if (semi != -1)
bundleSymbolicName = bundleSymbolicName.substring(0, semi); // strip of attributes/directives like ;singleton:=true
- addMarkerAttribute(marker, "export", unmatched+";ot-aspect-host=\""+bundleSymbolicName+"\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ addMarkerAttribute(marker, "packages", unmatched+";ot-aspect-host=\""+bundleSymbolicName+"\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else {
- addMarkerAttribute(marker, "export", unmatched); //$NON-NLS-1$
+ addMarkerAttribute(marker, "packages", unmatched); //$NON-NLS-1$
}
}
}
@@ -615,9 +615,9 @@
String packageName;
String export; // extended version with ot-aspect-host attribute
public ExportAspectPackageResolution(IMarker marker) {
- super(marker, AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("export", null)); //$NON-NLS-1$
+ super(marker, AbstractPDEMarkerResolution.CREATE_TYPE, marker.getAttribute("packages", null)); //$NON-NLS-1$
this.packageName = marker.getAttribute("package", null); //$NON-NLS-1$
- this.export = marker.getAttribute("export", null); //$NON-NLS-1$
+ this.export = marker.getAttribute("packages", null); //$NON-NLS-1$
}
@Override
public String getLabel() {
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index ad0e843..12427ed 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -41,7 +41,7 @@
plugin@org.eclipse.objectteams.otdt.compiler.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.compiler.adaptor
plugin@org.eclipse.objectteams.otdt.debug.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor,tag=builds/201909081329
plugin@org.eclipse.objectteams.otdt.refactoring=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring,tag=builds/201909081329
-plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui,tag=builds/201906101736
+plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui
plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201706061122
!** Consume BCEL from Orbit: **!