Perform clean code of ui/org.eclipse.pde.ui

eclipse-pde-bot · eclipse-pde-bot · commit c5fb6898a1f6 · 2025-05-16T03:28:29.000Z
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandComposerPart.java
@@ -125,7 +125,7 @@ protected void createCC(ScrolledForm form, FormToolkit toolkit, ISelectionChange
 
 		fCommandDetails = new CommandDetails(this, sashForm);
 
-		sashForm.setWeights(new int[] {4, 5});
+		sashForm.setWeights(4, 5);
 		fToolkit.adapt(sashForm, true, true);
 
 		if (fPC != null) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ConfigureProblemSeverityForPDECompilerResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ConfigureProblemSeverityForPDECompilerResolution.java
@@ -93,7 +93,7 @@ public void run(IMarker marker) {
 		if (!hasProjectOptions) {
 			String message = MessageFormat.format(
 					PDEUIMessages.ConfigureProblemSeverityForPDECompiler_1,
-					new Object[] { JavaElementLabels.getElementLabel(project, JavaElementLabels.ALL_DEFAULT) });
+					JavaElementLabels.getElementLabel(project, JavaElementLabels.ALL_DEFAULT));
 
 			String[] buttons = new String[] { PDEUIMessages.ConfigureProblemSeverityForPDECompiler_2, PDEUIMessages.ConfigureProblemSeverityForPDECompiler_3,
 					IDialogConstants.CANCEL_LABEL };
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/RepositoryDialog.java
@@ -73,7 +73,7 @@ protected Control createDialogArea(Composite parent) {
 		fLocation.setLayoutData(data);
 		fName.setLayoutData(data);
 		DropTarget target = new DropTarget(fLocation, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK);
-		target.setTransfer(new Transfer[] { URLTransfer.getInstance(), FileTransfer.getInstance() });
+		target.setTransfer(URLTransfer.getInstance(), FileTransfer.getInstance());
 		target.addDropListener(new TextURLDropAdapter(fLocation, true));
 		fLocation.addModifyListener(e -> validate());
 		fName.addModifyListener(e -> validate());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
@@ -93,7 +93,7 @@ public boolean isEditable() {
 				return false;
 			}
 			IBaseModel model = fEditor.getAggregateModel();
-			return model instanceof IEditable ? ((IEditable) model).isEditable() : false;
+			return model instanceof IEditable i ? i.isEditable() : false;
 		}
 	}
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java
@@ -79,7 +79,7 @@ public void setActiveEditor(IEditorPart part) {
 			manager.setMessage(null);
 			manager.setErrorMessage(null);
 
-			ITextEditor textEditor = (part instanceof ITextEditor) ? (ITextEditor) part : null;
+			ITextEditor textEditor = (part instanceof ITextEditor i) ? i : null;
 			if (fCorrectionAssist != null) {
 				fCorrectionAssist.setAction(getAction(textEditor, ITextEditorActionConstants.QUICK_ASSIST));
 			}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/HyperlinkAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/HyperlinkAction.java
@@ -91,15 +91,15 @@ public boolean detectHyperlink() {
 	}
 
 	public void setTextEditor(ITextEditor editor) {
-		StyledText newText = editor instanceof PDESourcePage ? ((PDESourcePage) editor).getViewer().getTextWidget() : null;
+		StyledText newText = editor instanceof PDESourcePage p ? p.getViewer().getTextWidget() : null;
 		if (fStyledText != null && fStyledText.equals(newText)) {
 			return;
 		}
 
 		// remove the previous listeners if there were any
 		removeListeners();
 		fStyledText = newText;
-		fDetector = editor instanceof PDESourcePage ? (IHyperlinkDetector) ((PDESourcePage) editor).getAdapter(IHyperlinkDetector.class) : null;
+		fDetector = editor instanceof PDESourcePage p ? (IHyperlinkDetector) p.getAdapter(IHyperlinkDetector.class) : null;
 		// Add new listeners, if hyperlinks are present
 		addListeners();
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
@@ -204,7 +204,7 @@ public boolean hasChildren(Object element) {
 	public static class FolderContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
-			return (parent instanceof IBuildEntry) ? ((IBuildEntry) parent).getTokens() : new Object[0];
+			return (parent instanceof IBuildEntry i) ? i.getTokens() : new Object[0];
 		}
 	}
 
@@ -681,7 +681,7 @@ protected String[] getLibraryNames() {
 	protected void handleNew() {
 		final String[] libNames = getLibraryNames();
 		IBaseModel pmodel = getPage().getModel();
-		final IPluginModelBase pluginModelBase = (pmodel instanceof IPluginModelBase) ? (IPluginModelBase) pmodel : null;
+		final IPluginModelBase pluginModelBase = (pmodel instanceof IPluginModelBase i) ? i : null;
 
 		BusyIndicator.showWhile(fLibraryViewer.getTable().getDisplay(), () -> {
 			IBuildModel buildModel = getBuildModel();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryUndoManager.java
@@ -77,7 +77,7 @@ protected void execute(IModelChangedEvent event, boolean undo) {
 	}
 
 	private void executeAdd(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;
+		ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;
 		ISite site = siteModel != null ? siteModel.getSite() : null;
 
 		try {
@@ -105,7 +105,7 @@ private void executeAdd(IModelChangeProvider model, Object[] elements) {
 	}
 
 	private void executeRemove(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;
+		ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;
 		ISite site = siteModel != null ? siteModel.getSite() : null;
 
 		try {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/AbstractPluginElementDetails.java
@@ -40,7 +40,7 @@ public boolean doGlobalAction(String actionId) {
 		if (actionId.equals(ActionFactory.FIND.getId())) {
 			if (fMasterSection != null && fMasterSection instanceof ExtensionsSection) {
 				final Control focusControl = Display.getCurrent().getFocusControl(); // getPage().getLastFocusControl();
-				String filterText = (focusControl instanceof Text) ? ((Text) focusControl).getText() : (focusControl instanceof CCombo) ? ((CCombo) focusControl).getText() : null;
+				String filterText = (focusControl instanceof Text t) ? t.getText() : (focusControl instanceof CCombo c) ? c.getText() : null;
 				if (filterText != null) {
 					// add value of the currently focused attribute text to the filter
 					((ExtensionsSection) fMasterSection).addAttributeToFilter(filterText, true);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
@@ -1368,7 +1368,7 @@ private void updateButtons(Object item) {
 			getTreePart().setButtonEnabled(BUTTON_MOVE_DOWN, false);
 			return;
 		}
-		IStructuredSelection selection = (item instanceof IStructuredSelection) ? (IStructuredSelection) item : null;
+		IStructuredSelection selection = (item instanceof IStructuredSelection i) ? i : null;
 
 		boolean filtered = fFilteredTree.isFiltered();
 		boolean addEnabled = true;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MissingResourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MissingResourcePage.java
@@ -41,7 +41,7 @@ protected void createFormContent(IManagedForm managedForm) {
 		String text;
 		if (persistable instanceof IFileEditorInput) {
 			IFile file = ((IFileEditorInput) persistable).getFile();
-			text = NLS.bind(PDEUIMessages.MissingResourcePage_unableToOpenFull, new String[] {PDEUIMessages.MissingResourcePage_unableToOpen, file.getProjectRelativePath().toString(), file.getProject().getName()});
+			text = NLS.bind(PDEUIMessages.MissingResourcePage_unableToOpenFull, PDEUIMessages.MissingResourcePage_unableToOpen, file.getProjectRelativePath().toString(), file.getProject().getName());
 		} else {
 			text = PDEUIMessages.MissingResourcePage_unableToOpen;
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java
@@ -57,7 +57,7 @@ public ExtensionAttributeRow(IContextPart part, IPluginAttribute att) {
 	}
 
 	public ISchemaAttribute getAttribute() {
-		return (att instanceof ISchemaAttribute) ? (ISchemaAttribute) att : null;
+		return (att instanceof ISchemaAttribute i) ? i : null;
 	}
 
 	public String getName() {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
@@ -135,7 +135,7 @@ protected void createClient(Section section, FormToolkit toolkit) {
 		fEEsCombo.addSelectionChangedListener(event -> {
 			if (!fBlockChanges) {
 				Object selection = event.getStructuredSelection().getFirstElement();
-				setEE(selection instanceof IExecutionEnvironment ? (IExecutionEnvironment) selection : null);
+				setEE(selection instanceof IExecutionEnvironment i ? i : null);
 				fEEButton.setEnabled(selection instanceof IExecutionEnvironment);
 			}
 		});
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java
@@ -79,7 +79,7 @@ protected void execute(IModelChangedEvent event, boolean undo) {
 	}
 
 	private void executeAdd(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;
+		ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;
 		ISite site = siteModel != null ? siteModel.getSite() : null;
 
 		try {
@@ -101,7 +101,7 @@ private void executeAdd(IModelChangeProvider model, Object[] elements) {
 	}
 
 	private void executeRemove(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;
+		ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;
 		ISite site = siteModel != null ? siteModel.getSite() : null;
 
 		try {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
@@ -96,7 +96,7 @@ protected void initialize() {
 			rule.addWord(Constants.BUNDLE_ACTIVATIONPOLICY, fToken);
 			rule.addWord("Automatic-Module-Name", fToken); //$NON-NLS-1$
 			rule.addWord("Manifest-Version", fToken); //$NON-NLS-1$
-			setRules(new IRule[] {rule});
+			setRules(rule);
 			setDefaultReturnToken(new Token(createTextAttribute(IPDEColorConstants.P_HEADER_KEY)));
 		}
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiFrameworkBlock.java
@@ -122,7 +122,7 @@ public void createControl(Composite parent) {
 		label.setText(PDEUIMessages.EquinoxPluginsTab_defaultAuto);
 
 		fDefaultAutoStart = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
-		fDefaultAutoStart.setItems(new String[] {Boolean.toString(true), Boolean.toString(false)});
+		fDefaultAutoStart.setItems(Boolean.toString(true), Boolean.toString(false));
 		fDefaultAutoStart.select(0);
 		fDefaultAutoStart.addSelectionListener(fListener);
 		fDefaultAutoStart.setLayoutData(new GridData());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
@@ -244,7 +244,7 @@ public void createControl(Composite parent) {
 
 		setPageComplete(hasCheckedElements());
 
-		superSash.setWeights(new int[] {4, 7});
+		superSash.setWeights(4, 7);
 		setControl(superSash);
 		Dialog.applyDialogFont(superSash);
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
@@ -554,7 +554,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		updateButtons();
 
 		Composite detailsComposite = SWTFactory.createComposite(sash, 1, 1, GridData.FILL_BOTH, 0, 0);
-		sash.setWeights(new int[] { 70, 30 });
+		sash.setWeights(70, 30);
 		SWTFactory.createLabel(detailsComposite, PDEUIMessages.TargetPlatformPreferencePage2_25, 1);
 		fDetails = new TreeViewer(detailsComposite);
 		fDetails.setLabelProvider(new StyledBundleLabelProvider(true, true));
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java
@@ -157,7 +157,7 @@ private static TextEdit createTextEdit(IDocumentAttributeNode attr, IJavaElement
 			return null;
 		}
 
-		String oldName = (element instanceof IType) ? ((IType) element).getFullyQualifiedName('$') : element.getElementName();
+		String oldName = (element instanceof IType i) ? i.getFullyQualifiedName('$') : element.getElementName();
 		String value = attr.getAttributeValue();
 		if (oldName.equals(value) || isGoodMatch(value, oldName, element instanceof IPackageFragment)) {
 			int offset = attr.getValueOffset();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/RefactoringPluginInfo.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/RefactoringPluginInfo.java
@@ -45,7 +45,7 @@ public String getCurrentValue() {
 
 	@Override
 	public IPluginModelBase getBase() {
-		return (fSelection instanceof IPluginModelBase) ? (IPluginModelBase) fSelection : null;
+		return (fSelection instanceof IPluginModelBase i) ? i : null;
 	}
 
 }
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java
@@ -171,7 +171,7 @@ private static IRegion getAttributeMatch(ManifestEditor editor, IPluginObject ob
 				int offset = ((PluginObjectNode) element).getOffset();
 				offset += ((PluginObjectNode) element).getLength();
 				String name = (object instanceof IPluginExtension) ? "point" : "id"; //$NON-NLS-1$ //$NON-NLS-2$
-				String value = (object instanceof IPluginExtension) ? ((IPluginExtension) object).getPoint() : ((IPluginExtensionPoint) object).getId();
+				String value = (object instanceof IPluginExtension i) ? i.getPoint() : ((IPluginExtensionPoint) object).getId();
 				return getAttributeRegion(document, name, value, offset);
 			}
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java
@@ -121,7 +121,7 @@ private void addFindReferencesAction(Object object, IMenuManager menu) {
 			object = ((ImportObject) object).getImport();
 		}
 		if (object instanceof IPluginExtensionPoint || object instanceof IPluginImport || (object instanceof IPlugin) || (object instanceof IPluginExtension)) {
-			String basePointID = fModel instanceof IPluginModelBase ? ((IPluginModelBase) fModel).getPluginBase().getId() : null;
+			String basePointID = fModel instanceof IPluginModelBase i ? i.getPluginBase().getId() : null;
 			menu.add(new FindReferencesAction(object, basePointID));
 		}
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesOperation.java
@@ -180,7 +180,7 @@ private Set<String> findManifestPlugins(IBundle bundle, Set<String> ignorePkgs)
 		if (header == null) {
 			return new HashSet<>(0);
 		}
-		Set<String> plugins = (header instanceof RequireBundleHeader) ? findManifestPlugins((RequireBundleHeader) header, ignorePkgs) : findManifestPlugins(ignorePkgs);
+		Set<String> plugins = (header instanceof RequireBundleHeader r) ? findManifestPlugins(r, ignorePkgs) : findManifestPlugins(ignorePkgs);
 		if (plugins.contains(IPDEBuildConstants.BUNDLE_CORE_RUNTIME)) {
 			plugins.add("system.bundle"); //$NON-NLS-1$
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java
@@ -50,7 +50,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
 
 		// create the query for packages, features and bundles
-		IQuery<IInstallableUnit> query = QueryUtil.createMatchQuery("properties[$0] == true || providedCapabilities.exists(p | p.namespace == 'osgi.bundle')", new Object[] {MetadataFactory.InstallableUnitDescription.PROP_TYPE_GROUP}); //$NON-NLS-1$
+		IQuery<IInstallableUnit> query = QueryUtil.createMatchQuery("properties[$0] == true || providedCapabilities.exists(p | p.namespace == 'osgi.bundle')", MetadataFactory.InstallableUnitDescription.PROP_TYPE_GROUP); //$NON-NLS-1$
 		//IQuery query = QueryUtil.createIUAnyQuery();
 
 		FilteredIUSelectionDialog dialog = new FilteredIUSelectionDialog(window.getShell(), query);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/CachedCheckboxTableViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/CachedCheckboxTableViewer.java
@@ -35,7 +35,7 @@
  */
 public class CachedCheckboxTableViewer extends CheckboxTableViewer {
 
-	private Set<Object> checkState = new HashSet<>();
+	private final Set<Object> checkState = new HashSet<>();
 	private static final Object[] NO_ELEMENTS = new Object[0];
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
@@ -145,7 +145,7 @@ public Image getImage(Object element) {
 
 		fDescription = SWTFactory.createText(sashForm, SWT.READ_ONLY | SWT.BORDER | SWT.MULTI | SWT.WRAP, 1);
 
-		sashForm.setWeights(new int[] {70, 30});
+		sashForm.setWeights(70, 30);
 		initViewerContents(wizardSelectionViewer);
 		setControl(comp);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.ADD_LOCATION_WIZARD);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetStatus.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetStatus.java
@@ -175,7 +175,7 @@ private static StatusLineContributionItem getContributionItem() {
 	// see https://bugs.eclipse.org/378395
 	private static IStatusLineManager getStatusLineManager(IWorkbenchWindow window) {
 		// We are not in a view or editor so this is the only practical way of getting the status line manager at this time -  see https://bugs.eclipse.org/378395
-		return (window instanceof org.eclipse.ui.internal.WorkbenchWindow) ? ((org.eclipse.ui.internal.WorkbenchWindow) window).getStatusLineManager() : null;
+		return (window instanceof org.eclipse.ui.internal.WorkbenchWindow w) ? w.getStatusLineManager() : null;
 	}
 
 	/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
@@ -101,7 +101,7 @@ public void createControl(Composite parent) {
 		createDescriptionIn(descriptionComposite);
 
 		initializeViewers();
-		rootSash.setWeights(new int[] {70, 30});
+		rootSash.setWeights(70, 30);
 		setControl(container);
 	}
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportOptionsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportOptionsTab.java
@@ -158,7 +158,7 @@ protected void addQualifierOption(Composite container) {
 	@Override
 	protected void initialize(IDialogSettings settings) {
 		fIncludeSourceButton.setSelection(settings.getBoolean(S_EXPORT_SOURCE));
-		fIncludeSourceCombo.setItems(new String[] {PDEUIMessages.ExportWizard_generateAssociatedSourceBundles, PDEUIMessages.ExportWizard_includeSourceInBinaryBundles});
+		fIncludeSourceCombo.setItems(PDEUIMessages.ExportWizard_generateAssociatedSourceBundles, PDEUIMessages.ExportWizard_includeSourceInBinaryBundles);
 		String sourceComboValue = settings.get(S_EXPORT_SOURCE_FORMAT) != null ? settings.get(S_EXPORT_SOURCE_FORMAT) : PDEUIMessages.ExportWizard_generateAssociatedSourceBundles;
 		fIncludeSourceCombo.setText(sourceComboValue);
 		fIncludeSourceCombo.setEnabled(fIncludeSourceButton.getSelection());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
@@ -155,7 +155,7 @@ protected void initialize() {
 		fExportGroup.initialize(settings, fConfigurationGroup.getProductFile());
 
 		fExportSourceButton.setSelection(settings.getBoolean(S_EXPORT_SOURCE));
-		fExportSourceCombo.setItems(new String[] {PDEUIMessages.ExportWizard_generateAssociatedSourceBundles, PDEUIMessages.ExportWizard_includeSourceInBinaryBundles});
+		fExportSourceCombo.setItems(PDEUIMessages.ExportWizard_generateAssociatedSourceBundles, PDEUIMessages.ExportWizard_includeSourceInBinaryBundles);
 		String sourceComboValue = settings.get(S_EXPORT_SOURCE_FORMAT) != null ? settings.get(S_EXPORT_SOURCE_FORMAT) : PDEUIMessages.ExportWizard_generateAssociatedSourceBundles;
 		fExportSourceCombo.setText(sourceComboValue);
 		fExportSourceCombo.setEnabled(fExportSourceButton.getSelection());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
@@ -183,8 +183,8 @@ private Composite createOldVersionComp(Composite notebook) {
 
 		fMatchCombo = new Combo(comp, SWT.READ_ONLY | SWT.BORDER);
 		fMatchCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fMatchCombo.setItems(new String[] {"", //$NON-NLS-1$
-				PDEUIMessages.ManifestEditor_MatchSection_equivalent, PDEUIMessages.ManifestEditor_MatchSection_compatible, PDEUIMessages.ManifestEditor_MatchSection_perfect, PDEUIMessages.ManifestEditor_MatchSection_greater});
+		fMatchCombo.setItems("", //$NON-NLS-1$
+						PDEUIMessages.ManifestEditor_MatchSection_equivalent, PDEUIMessages.ManifestEditor_MatchSection_compatible, PDEUIMessages.ManifestEditor_MatchSection_perfect, PDEUIMessages.ManifestEditor_MatchSection_greater);
 		fMatchCombo.setText(fMatchCombo.getItem(0));
 		return comp;
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
@@ -133,7 +133,7 @@ protected void adjustManifests(IProgressMonitor monitor, IProject project, IPlug
 		int units = fData.doFindDependencies() ? 4 : 2;
 		units += fData.isUpdateReferences() ? 1 : 0;
 		SubMonitor subMonitor = SubMonitor.convert(monitor, units);
-		IBundle bundle = (base instanceof BundlePluginBase) ? ((BundlePluginBase) base).getBundle() : null;
+		IBundle bundle = (base instanceof BundlePluginBase b) ? b.getBundle() : null;
 		if (bundle != null) {
 			adjustExportRoot(project, bundle);
 			subMonitor.worked(1);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
@@ -148,7 +148,7 @@ private void createFormatGroup(Composite container) {
 		fOSGIButton.setSelection(fData.getOSGiFramework() != null);
 
 		fOSGiCombo = new Combo(group, SWT.READ_ONLY | SWT.SINGLE);
-		fOSGiCombo.setItems(new String[] {ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard});
+		fOSGiCombo.setItems(ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard);
 		fOSGiCombo.setText(ICoreConstants.EQUINOX);
 
 		fJarredCheck = new Button(group, SWT.CHECK);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
@@ -150,7 +150,7 @@ protected void createFormatGroup(Composite container) {
 		fOSGIButton.setSelection(osgiProject);
 
 		fOSGiCombo = new Combo(group, SWT.READ_ONLY | SWT.SINGLE);
-		fOSGiCombo.setItems(new String[] {ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard});
+		fOSGiCombo.setItems(ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard);
 
 		fOSGiCombo.setText(fwType);
 		useAutomaticMetadata = new Button(group, SWT.CHECK);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public boolean isEditable() {`
`93`	`93`	`return false;`
`94`	`94`	`}`
`95`	`95`	`IBaseModel model = fEditor.getAggregateModel();`
`96`		`- return model instanceof IEditable ? ((IEditable) model).isEditable() : false;`
	`96`	`+ return model instanceof IEditable i ? i.isEditable() : false;`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void setActiveEditor(IEditorPart part) {`
`79`	`79`	`manager.setMessage(null);`
`80`	`80`	`manager.setErrorMessage(null);`
`81`	`81`
`82`		`- ITextEditor textEditor = (part instanceof ITextEditor) ? (ITextEditor) part : null;`
	`82`	`+ ITextEditor textEditor = (part instanceof ITextEditor i) ? i : null;`
`83`	`83`	`if (fCorrectionAssist != null) {`
`84`	`84`	`fCorrectionAssist.setAction(getAction(textEditor, ITextEditorActionConstants.QUICK_ASSIST));`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected void execute(IModelChangedEvent event, boolean undo) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private void executeAdd(IModelChangeProvider model, Object[] elements) {`
`80`		`- ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;`
	`80`	`+ ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;`
`81`	`81`	`ISite site = siteModel != null ? siteModel.getSite() : null;`
`82`	`82`
`83`	`83`	`try {`
`@@ -105,7 +105,7 @@ private void executeAdd(IModelChangeProvider model, Object[] elements) {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`private void executeRemove(IModelChangeProvider model, Object[] elements) {`
`108`		`- ISiteModel siteModel = (model instanceof ISiteModel) ? (ISiteModel) model : null;`
	`108`	`+ ISiteModel siteModel = (model instanceof ISiteModel i) ? i : null;`
`109`	`109`	`ISite site = siteModel != null ? siteModel.getSite() : null;`
`110`	`110`
`111`	`111`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ private void updateButtons(Object item) {`
`1368`	`1368`	`getTreePart().setButtonEnabled(BUTTON_MOVE_DOWN, false);`
`1369`	`1369`	`return;`
`1370`	`1370`	`}`
`1371`		`- IStructuredSelection selection = (item instanceof IStructuredSelection) ? (IStructuredSelection) item : null;`
	`1371`	`+ IStructuredSelection selection = (item instanceof IStructuredSelection i) ? i : null;`
`1372`	`1372`
`1373`	`1373`	`boolean filtered = fFilteredTree.isFiltered();`
`1374`	`1374`	`boolean addEnabled = true;`