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

Author: eclipse-pde-bot

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLCompletionProposal.java

@@ -308,10 +308,8 @@ private void modifyModel(IDocument document) {
 						findExtensionVirtualPointValue(base);
 						break;
 				}
-			} else if (fRange instanceof IDocumentElementNode && base instanceof IDocumentElementNode) {
+			} else if (fRange instanceof IDocumentElementNode node && base instanceof IDocumentElementNode newSearch) {
 				ArrayDeque<IDocumentElementNode> s = new ArrayDeque<>();
-				IDocumentElementNode node = (IDocumentElementNode) fRange;
-				IDocumentElementNode newSearch = (IDocumentElementNode) base;
 				// traverse up old model, pushing all nodes onto the stack along the way
 				while (node != null && !(node instanceof IPluginBase)) {
 					s.push(node);

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyManagementSection.java

@@ -632,9 +632,8 @@ protected void doPaste(Object targetObject, Object[] sourceObjects) {
 
 	protected void doAddDependencies() {
 		IBaseModel model = getPage().getModel();
-		if (model instanceof IBundlePluginModelBase) {
+		if (model instanceof IBundlePluginModelBase bmodel) {
 			IProject proj = getPage().getPDEEditor().getCommonProject();
-			IBundlePluginModelBase bmodel = ((IBundlePluginModelBase) model);
 			AddNewDependenciesAction action = new AddNewDependenciesAction(proj, bmodel);
 			action.run();
 		}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsSection.java

@@ -266,9 +266,8 @@ protected void handleDoubleClick(IStructuredSelection selection) {
 	private void handleDelete() {
 		Object[] selection = pointTable.getStructuredSelection().toArray();
 		for (Object selectedObject : selection) {
-			if (selectedObject != null && selectedObject instanceof IPluginExtensionPoint) {
+			if (selectedObject != null && selectedObject instanceof IPluginExtensionPoint ep) {
 				IStructuredSelection newSelection = null;
-				IPluginExtensionPoint ep = (IPluginExtensionPoint) selectedObject;
 				IPluginBase plugin = ep.getPluginBase();
 				IPluginExtensionPoint[] points = plugin.getExtensionPoints();
 				int index = getNewSelectionIndex(getArrayIndex(points, ep), points.length);

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java

@@ -80,7 +80,7 @@ public Object getPageKey(Object object) {
 			if (object instanceof IPluginExtension) {
 				return IPluginExtension.class;
 			}
-			if (object instanceof IPluginElement) {
+			if (object instanceof IPluginElement pelement) {
 				ISchemaElement element = ExtensionsSection.getSchemaElement((IPluginElement) object);
 				// Extension point schema exists
 				if (element != null) {
@@ -96,7 +96,6 @@ public Object getPageKey(Object object) {
 				}
 				// No Extension point schema
 				// no element - construct one
-				IPluginElement pelement = (IPluginElement) object;
 				// Use the body text page if the element has no child
 				// elements or attributes
 				if ((pelement.getAttributeCount() == 0) && (pelement.getChildCount() == 0)) {

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginUndoManager.java

@@ -158,10 +158,9 @@ private void executeAdd(IModelChangeProvider model, Object[] elements) {
 							((ImportPackageHeader) header).addPackage((PackageObject) element);
 						}
 					}
-					if (element instanceof RequireBundleObject) {
+					if (element instanceof RequireBundleObject requireBundle) {
 						IBaseModel aggModel = getEditor().getAggregateModel();
 						if (aggModel instanceof BundlePluginModel pluginModel) {
-							RequireBundleObject requireBundle = (RequireBundleObject) element;
 							pluginBase = pluginModel.getPluginBase();
 							String elementValue = requireBundle.getValue();
 							IPluginImport importNode = null;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AbstractSchemaDetails.java

@@ -252,9 +252,8 @@ public void selectionChanged(IFormPart part, ISelection selection) {
 			return;
 		}
 		Object obj = ((IStructuredSelection) selection).getFirstElement();
-		if (obj instanceof ISchemaObject) {
+		if (obj instanceof ISchemaObject sObj) {
 			setBlockListeners(true);
-			ISchemaObject sObj = (ISchemaObject) obj;
 			fSchemaObject = sObj;
 			if (fShowDTD && fDtdSection != null) {
 				fDtdSection.updateDTDLabel(obj);

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java

@@ -604,7 +604,7 @@ public void handleModelChanged(IModelChangedEvent e) {
 					// the new selection is handled by the handleDelete method for cuts and deletes,
 					// for moves it is handled by the subsequent insert
 				}
-			} else if (obj instanceof ISchemaComplexType) {
+			} else if (obj instanceof ISchemaComplexType type) {
 				// first compositor added/removed
 				ISchemaCompositor comp = ((ISchemaComplexType) obj).getCompositor();
 				fTreeViewer.refresh(comp);
@@ -613,7 +613,6 @@ public void handleModelChanged(IModelChangedEvent e) {
 				}
 
 				if (e.getChangeType() == IModelChangedEvent.INSERT || e.getChangeType() == IModelChangedEvent.CHANGE) {
-					ISchemaComplexType type = (ISchemaComplexType) obj;
 					final ISchemaCompositor compositor = type.getCompositor();
 					if (compositor != null) {
 						fTreeViewer.getTree().getDisplay().asyncExec(() -> fTreeViewer.setSelection(new StructuredSelection(compositor), true));

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestTextHover.java

@@ -49,9 +49,8 @@ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		String hover = getHoverInfo2(textViewer, hoverRegion);
 		if (hover == null) {
 			IAnnotationModel annotationModel = fSourcePage.getViewer().getAnnotationModel();
-			if (annotationModel instanceof PDEMarkerAnnotationModel) {
+			if (annotationModel instanceof PDEMarkerAnnotationModel pdeAnnotationModel) {
 				int offset = hoverRegion.getOffset();
-				PDEMarkerAnnotationModel pdeAnnotationModel = (PDEMarkerAnnotationModel) annotationModel;
 				Iterator<Annotation> annotationIterator = pdeAnnotationModel.getAnnotationIterator(offset, 0, true,
 						true);
 				while (annotationIterator.hasNext()) {

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ExtensionsPatternFilter.java

@@ -221,9 +221,8 @@ public boolean isElementVisible(Viewer viewer, Object element) {
 
 	@Override
 	public Object[] filter(Viewer viewer, Object parent, Object[] elements) {
-		if (parent != null && parent instanceof BundlePlugin) {
+		if (parent != null && parent instanceof BundlePlugin pluginPlugin) {
 			if (fFoundAnyElementsCache.isEmpty() && fSearchPattern != null && fSearchPattern.length() > 0) {
-				BundlePlugin pluginPlugin = (BundlePlugin) parent;
 				doFilter(viewer, pluginPlugin, pluginPlugin.getExtensions(), false);
 			}
 		}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java

@@ -62,11 +62,10 @@ private void addOpenSchemaAction(Object object, IMenuManager menu) {
 			action.setInput((IPluginExtension) object);
 			action.setEnabled(true);
 			menu.add(action);
-		} else if (object instanceof IPluginExtensionPoint) {
+		} else if (object instanceof IPluginExtensionPoint point) {
 			// From PluginSearchResultPage
 			// From ExtensionPointsSection
 			OpenSchemaAction action = new OpenSchemaAction();
-			IPluginExtensionPoint point = (IPluginExtensionPoint) object;
 			String pointID = point.getFullId();
 			// Ensure the extension point ID is fully qualified
 			if (pointID.indexOf('.') == -1) {