Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@
id="org.eclipse.ui.navigator"
version="0.0.0"/>

<plugin
id="org.eclipse.ui.navigator.resources"
version="0.0.0"/>

<plugin
id="org.eclipse.ui.views"
version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<children xsi:type="menu:HandledMenuItem" xmi:id="_h0BcRzLzEeKMEOdllHiEaA" elementId="org.eclipse.chemclipse.rcp.app.ui.menu.item.about" label="%About" iconURI="platform:/plugin/org.eclipse.jface/icons/full/message_info.svg" tooltip="Show versions and licenses" command="_h0A1RDLzEeKMEOdllHiEaA"/>
</children>
</mainMenu>
<sharedElements xsi:type="basic:Part" xmi:id="_hwsHoEd8EeKxr87RO7WY0w" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="%ProjectExplorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.svg">
<tags>View</tags>
<tags>categoryTag:General</tags>
</sharedElements>
<sharedElements xsi:type="basic:Part" xmi:id="_twQ-EEjnEeKCXsBuXeeyZA" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Property Sheet" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.svg">
<tags>View</tags>
<tags>categoryTag:General</tags>
Expand Down Expand Up @@ -80,7 +76,6 @@
</sharedElements>
<sharedElements xsi:type="basic:Part" xmi:id="_T2mREFeKEeWJDdTjy0i2HA" elementId="org.eclipse.chemclipse.processing.ui.parts.ProcessingInfoPart" contributionURI="bundleclass://org.eclipse.chemclipse.processing.ui/org.eclipse.chemclipse.processing.ui.parts.ProcessingInfoPart" label="Feedback" iconURI="platform:/plugin/org.eclipse.jface/icons/full/message_info.svg"/>
<sharedElements xsi:type="basic:Part" xmi:id="_W8FzsFuuEeWKQYKM0-fotA" elementId="org.eclipse.chemclipse.rcp.app.ui.part.editHistory" contributionURI="bundleclass://org.eclipse.chemclipse.support.ui/org.eclipse.chemclipse.support.ui.parts.EditHistoryPart" label="Edit History" iconURI="platform:/plugin/org.eclipse.jface/icons/full/message_info.svg"/>
<sharedElements xsi:type="basic:Part" xmi:id="_V3EBsHb_EeWs9YprkfnL3Q" elementId="org.eclipse.ease.ui.views.scriptShell" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Script Shell" iconURI="platform:/plugin/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/script_shell.png"/>
<trimBars xmi:id="_h0BcTDLzEeKMEOdllHiEaA" elementId="org.eclipse.chemclipse.rcp.app.ui.trimbar.top">
<children xsi:type="menu:ToolBar" xmi:id="_h0BcTTLzEeKMEOdllHiEaA" elementId="org.eclipse.chemclipse.rcp.app.ui.toolbar.main">
<children xsi:type="menu:ToolBarSeparator" xmi:id="_nIMLMINGEeOuPY34hxPAxA" elementId="org.eclipse.chemclipse.rcp.app.ui.toolbarseparator.3"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.chemclipse.support;bundle-version="0.8.0",
org.eclipse.core.resources;bundle-version="3.8.100",
org.eclipse.ui.ide;bundle-version="3.9.0",
org.eclipse.ui.navigator;bundle-version="3.5.300",
org.eclipse.help.ui;bundle-version="4.0.0",
org.eclipse.chemclipse.rcp.app;bundle-version="0.8.0",
org.eclipse.chemclipse.support.ui;bundle-version="0.8.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
*******************************************************************************/
package org.eclipse.chemclipse.rcp.app.ui;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.eclipse.chemclipse.support.ui.workbench.WorkbenchAdvisorSupport;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
Expand All @@ -25,24 +21,10 @@
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.eclipse.ui.application.WorkbenchWindowAdvisor;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.dialogs.WorkbenchWizardElement;
import org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry;
import org.eclipse.ui.wizards.IWizardCategory;
import org.eclipse.ui.wizards.IWizardDescriptor;
import org.eclipse.ui.wizards.IWizardRegistry;

@SuppressWarnings("restriction")
public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {

private static final String PERSPECTIVE_ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.perspective.main";
/*
* Hide all Java IDE related wizards by default, except:
* org.eclipse.ui.wizards.import.ExternalProject
* org.eclipse.ui.wizards.import.Preferences
* org.eclipse.ui.wizards.export.Preferences
*/
private static final String TEAM_E4_WIZARDS = "org\\.eclipse\\.(team|e4)\\.ui.*";

@Override
public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
Expand All @@ -56,9 +38,6 @@ public void initialize(IWorkbenchConfigurer configurer) {
super.initialize(configurer);
configurer.setSaveAndRestore(true);
WorkbenchAdvisorSupport.declareProjectExplorerImages(configurer);
WorkbenchPlugin workbenchPlugin = WorkbenchPlugin.getDefault();
removeWizards(workbenchPlugin.getImportWizardRegistry());
removeWizards(workbenchPlugin.getExportWizardRegistry());
}

@Override
Expand All @@ -73,38 +52,4 @@ public IAdaptable getDefaultPageInput() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
return workspace.getRoot();
}

private void removeWizards(IWizardRegistry wizardRegistry) {

if(wizardRegistry instanceof AbstractExtensionWizardRegistry abstractWizardRegistry) {
IWizardCategory[] categories = wizardRegistry.getRootCategory().getCategories();
for(IWizardDescriptor wizard : getAllWizards(categories)) {
if(wizard instanceof WorkbenchWizardElement wizardElement) {
if(removeWizard(wizardElement)) {
abstractWizardRegistry.removeExtension(wizardElement.getConfigurationElement().getDeclaringExtension(), new Object[]{wizardElement});
}
}
}
}
}

private boolean removeWizard(IWizardDescriptor wizard) {

String id = wizard.getId();
/*
* Inspect the ids here.
*/
return id.matches(TEAM_E4_WIZARDS);
}

private IWizardDescriptor[] getAllWizards(IWizardCategory[] categories) {

List<IWizardDescriptor> results = new ArrayList<>();
for(IWizardCategory wizardCategory : categories) {
results.addAll(Arrays.asList(wizardCategory.getWizards()));
results.addAll(Arrays.asList(getAllWizards(wizardCategory.getCategories())));
}

return results.toArray(new IWizardDescriptor[0]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.chemclipse.wsd.converter;bundle-version="0.8.0",
org.eclipse.chemclipse.model;bundle-version="0.8.0",
org.eclipse.chemclipse.wsd.model;bundle-version="0.8.0",
org.eclipse.ui.navigator;bundle-version="3.5.200",
org.eclipse.core.resources;bundle-version="3.8.100",
org.eclipse.chemclipse.processing;bundle-version="0.8.0",
org.eclipse.chemclipse.processing.ui;bundle-version="0.8.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<elements xsi:type="basic:Part" xmi:id="_7SwRMNngEeiyx5W2f1mKlA" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.chromatogramOverlay" contributionURI="bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.parts.ChromatogramOverlayPart" label="%ChromatogramOverlay" iconURI="platform:/plugin/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/chromatogramOverlayDefault.gif"/>
<elements xsi:type="basic:Part" xmi:id="_-4WmgM_TEem5S_IrSHwKAQ" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.peakDetector" contributionURI="bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.parts.PeakDetectorPart" label="%PeakDetector" iconURI="platform:/plugin/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/detectionTypeScanBB.gif"/>
<elements xsi:type="basic:Part" xmi:id="_XKgwsDU0EeuREPdzMrDpOQ" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.edithistory" contributionURI="bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.parts.EditHistoryPart" label="%EditHistory" iconURI="platform:/plugin/org.eclipse.jface/icons/full/message_info.svg"/>
<elements xsi:type="basic:Part" xmi:id="_SUu-YK2iEeuuJ_UXBFJQCQ" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="%ProjectExplorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.svg"/>
<elements xsi:type="basic:Part" xmi:id="_aHkWoK2kEeuuJ_UXBFJQCQ" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.processinginfo" contributionURI="bundleclass://org.eclipse.chemclipse.processing.ui/org.eclipse.chemclipse.processing.ui.parts.ProcessingInfoPart" label="%Feedback" iconURI="platform:/plugin/org.eclipse.jface/icons/full/message_info.svg"/>
<elements xsi:type="basic:Part" xmi:id="_u1EUMP9YEeu8g9dKSTy3Bg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.heatmap" contributionURI="bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.parts.ChromatogramHeatmapPart" label="%Heatmap" iconURI="platform:/plugin/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/chromatogramHeatmap.gif"/>
<elements xsi:type="basic:Part" xmi:id="_61Le4CFuEe6EJMB17iQyNA" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partdescriptor.measurementResultsPart" contributionURI="bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.parts.MeasurementResultsPart" label="%MeasurementResults" iconURI="platform:/plugin/org.eclipse.chemclipse.rcp.ui.icons/icons/scalable/measurementResults.svg"/>
Expand All @@ -23,7 +22,6 @@
<children xsi:type="basic:PartSashContainer" xmi:id="_ioDCUCskEeakPPc3RJFSAg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partsashcontainer.1" containerData="2500">
<children xsi:type="basic:PartStack" xmi:id="_kUeu8CskEeakPPc3RJFSAg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partstack.left.top" containerData="6500">
<children xsi:type="advanced:Placeholder" xmi:id="_2Aqc0CskEeakPPc3RJFSAg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.dataexplorer" ref="_qtur4Cf2EeafjOXnfHSw0Q"/>
<children xsi:type="advanced:Placeholder" xmi:id="_lrDDgCyIEeakko_bfjza1A" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_SUu-YK2iEeuuJ_UXBFJQCQ"/>
<children xsi:type="advanced:Placeholder" xmi:id="_-51qwI8wEeiO3oL5WUkZBQ" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.sequenceexplorer" ref="_pWhTQI8wEeiO3oL5WUkZBQ"/>
<children xsi:type="advanced:Placeholder" xmi:id="_TEAWcKKVEe-Jq4Ox9k12rA" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.peakScanListPartDescriptor" ref="_dXp1AC5uEeiL24_JU7_FGA"/>
</children>
Expand Down Expand Up @@ -77,7 +75,6 @@
<children xsi:type="basic:PartSashContainer" xmi:id="_QSF3APtbEeuOJq-XN8B4cw" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partsashcontainer.11" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_SzI3cPtbEeuOJq-XN8B4cw" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partstack.2" containerData="3500">
<children xsi:type="advanced:Placeholder" xmi:id="_Dcq14P9PEeu8g9dKSTy3Bg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.dataexplorer" ref="_qtur4Cf2EeafjOXnfHSw0Q"/>
<children xsi:type="advanced:Placeholder" xmi:id="_FaDvoP9PEeu8g9dKSTy3Bg" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_SUu-YK2iEeuuJ_UXBFJQCQ"/>
<children xsi:type="advanced:Placeholder" xmi:id="_H8-_YP9PEeu8g9dKSTy3Bg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.part.sequenceexplorer" ref="_pWhTQI8wEeiO3oL5WUkZBQ"/>
</children>
<children xsi:type="basic:PartSashContainer" xmi:id="_QwrpoP9PEeu8g9dKSTy3Bg" elementId="org.eclipse.chemclipse.ux.extension.xxd.ui.partsashcontainer.12" containerData="6500" horizontal="true">
Expand Down