View | Details | Raw Unified | Return to bug 282391
Collapse All | Expand All

(-)src/org/eclipse/ajdt/internal/ui/wizards/exports/AJPluginExportWizardPage.java (+4 lines)
Lines 46-49 Link Here
46
	protected String[] getSigningInfo() {
46
	protected String[] getSigningInfo() {
47
		return super.getSigningInfo();
47
		return super.getSigningInfo();
48
	}
48
	}
49
	
50
	protected boolean allowBinaryCycles() {
51
		return super.allowBinaryCycles();
52
	}
49
}
53
}
(-)src/org/eclipse/ajdt/internal/ui/wizards/exports/AJPluginExportWizard.java (+2 lines)
Lines 54-59 Link Here
54
		info.zipFileName = ((AJPluginExportWizardPage)fPage).getFileName();
54
		info.zipFileName = ((AJPluginExportWizardPage)fPage).getFileName();
55
		info.items = ((AJPluginExportWizardPage)fPage).getSelectedItems();
55
		info.items = ((AJPluginExportWizardPage)fPage).getSelectedItems();
56
		info.signingInfo = ((AJPluginExportWizardPage)fPage).useJARFormat() ? ((AJPluginExportWizardPage)fPage).getSigningInfo() : null;
56
		info.signingInfo = ((AJPluginExportWizardPage)fPage).useJARFormat() ? ((AJPluginExportWizardPage)fPage).getSigningInfo() : null;
57
		info.allowBinaryCycles = ((AJPluginExportWizardPage)fPage).allowBinaryCycles(); 
58
		
57
		
59
		
58
		AJPluginExportJob job = new AJPluginExportJob(info);
60
		AJPluginExportJob job = new AJPluginExportJob(info);
59
		job.setUser(true);
61
		job.setUser(true);
(-)pde-src/org/eclipse/ajdt/internal/core/exports/FeatureExportOperation.java (-1 / +1 lines)
Lines 580-586 Link Here
580
        // Bug 268667: allow binary cycles
580
        // Bug 268667: allow binary cycles
581
        // XXX consider adding this to the UI.
581
        // XXX consider adding this to the UI.
582
		Properties properties = new Properties();
582
		Properties properties = new Properties();
583
		properties.put(IBuildPropertiesConstants.PROPERTY_ALLOW_BINARY_CYCLES, Boolean.toString(true));
583
		properties.put(IBuildPropertiesConstants.PROPERTY_ALLOW_BINARY_CYCLES, Boolean.toString(fInfo.allowBinaryCycles));
584
        properties.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, Boolean.toString(fInfo.useJarFormat && fInfo.exportMetadata));
584
        properties.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, Boolean.toString(fInfo.useJarFormat && fInfo.exportMetadata));
585
		generator.setImmutableAntProperties(properties);
585
		generator.setImmutableAntProperties(properties);
586
        // AspectJ change end
586
        // AspectJ change end

Return to bug 282391