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

eclipse-pde-bot · laeubi · commit 402625dd191b · 2025-03-07T05:05:13.000+01:00
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java
@@ -87,13 +87,15 @@ public static void logException(Throwable e, final String title,
 			e = ((InvocationTargetException) e).getTargetException();
 		}
 		IStatus status = null;
-		if (e instanceof CoreException)
+		if (e instanceof CoreException) {
 			status = ((CoreException) e).getStatus();
-		else {
-			if (message == null)
+		} else {
+			if (message == null) {
 				message = e.getMessage();
-			if (message == null)
+			}
+			if (message == null) {
 				message = e.toString();
+			}
 			status = Status.error(message, e);
 		}
 		ResourcesPlugin.getPlugin().getLog().log(status);
@@ -112,8 +114,9 @@ public static IWorkbenchPage getActivePage() {
 	}
 
 	public PDEUserAssistanceLabelProvider getLabelProvider() {
-		if (fLabelProvider == null)
+		if (fLabelProvider == null) {
 			fLabelProvider = new PDEUserAssistanceLabelProvider();
+		}
 		return fLabelProvider;
 	}
 }
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java
@@ -70,8 +70,9 @@ private static ImageDescriptor create(String prefix, String name) {
 	}
 
 	public static Image get(String key) {
-		if (PLUGIN_REGISTRY == null)
+		if (PLUGIN_REGISTRY == null) {
 			initialize();
+		}
 		return PLUGIN_REGISTRY.get(key);
 	}
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java
@@ -39,8 +39,9 @@ public abstract class CSAbstractEditor extends MultiSourceEditor {
 	public void contributeToToolbar(IToolBarManager manager) {
 		// Add the register cheat sheet link to the form title area
 		if (WorkspaceModelManager.isPluginProject(getCommonProject())
-				&& getAggregateModel().isEditable())
+				&& getAggregateModel().isEditable()) {
 			manager.add(createUIControlConRegisterCS());
+		}
 	}
 
 	private ControlContribution createUIControlConRegisterCS() {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
@@ -66,8 +66,9 @@ public void createContents(Composite parent) {
 	public void createDetails(Composite parent) { // Create the main section
 		int style = ExpandableComposite.TITLE_BAR;
 
-		if (getDetailsDescription() != null)
+		if (getDetailsDescription() != null) {
 			style |= Section.DESCRIPTION;
+		}
 
 		fMainSection = getPage().createUISection(parent, getDetailsTitle(), getDetailsDescription(), style);
 		// Align the master and details section headers (misalignment caused
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java
@@ -45,8 +45,9 @@ public void setToRemove(CtxHelpObject[] objects) {
 
 	@Override
 	public void run() {
-		if (fObjects == null)
+		if (fObjects == null) {
 			return;
+		}
 
 		for (int i = 0; i < fObjects.length; ++i) {
 			if (fObjects[i] != null && fObjects[i].canBeRemoved()) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java
@@ -66,8 +66,9 @@ private static boolean hasValidTocExtension(IPath path) {
 	}
 
 	public static boolean isTOCFile(IPath path) {
-		if (!hasValidTocExtension(path))
+		if (!hasValidTocExtension(path)) {
 			return false;
+		}
 
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java
@@ -121,10 +121,12 @@ private boolean isShowInApplicable() {
 			IStructuredSelection selection = (IStructuredSelection) getSelection();
 			for (Iterator<?> iter = selection.iterator(); iter.hasNext();) {
 				Object obj = iter.next();
-				if (!(obj instanceof TocObject))
+				if (!(obj instanceof TocObject)) {
 					return false;
-				if (((TocObject) obj).getPath() == null)
+				}
+				if (((TocObject) obj).getPath() == null) {
 					return false;
+				}
 			}
 
 			return true;
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java
@@ -35,8 +35,9 @@ public TocHyperlinkDetector(PDESourcePage page) {
 	@Override
 	protected IHyperlink[] detectAttributeHyperlink(IDocumentAttributeNode attr) {
 		String attrValue = attr.getAttributeValue();
-		if (attrValue.length() == 0)
+		if (attrValue.length() == 0) {
 			return null;
+		}
 
 		IDocumentElementNode node = attr.getEnclosingElement();
 		if (node == null || !(node instanceof TocObject) || !((TocObject) node).getModel().isEditable()) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java
@@ -69,8 +69,9 @@ protected boolean isSelectionListener() {
 
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
-		if (IHyperlinkDetector.class.equals(adapter))
+		if (IHyperlinkDetector.class.equals(adapter)) {
 			return adapter.cast(new TocHyperlinkDetector(this));
+		}
 		return super.getAdapter(adapter);
 	}
 
@@ -88,8 +89,9 @@ protected IDocumentRange findRange() {
 
 		Object selectedObject = getSelection();
 
-		if (selectedObject instanceof IDocumentElementNode)
+		if (selectedObject instanceof IDocumentElementNode) {
 			return (IDocumentElementNode) selectedObject;
+		}
 
 		return null;
 	}
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
@@ -1097,8 +1097,9 @@ private void handleMultiAddAction(List<TocObject> objectsToAdd, TocObject tocTar
 			boolean insertBefore, TocObject targetParent) {
 		TocObject[] tocObjects = objectsToAdd
 				.toArray(new TocObject[objectsToAdd.size()]);
-		if (tocObjects == null)
+		if (tocObjects == null) {
 			return;
+		}
 
 		for (TocObject tocObject : tocObjects) {
 			if (tocObject != null) {
@@ -1131,8 +1132,9 @@ private void handleDeleteAction() {
 		List<?> list = fTocTree.getStructuredSelection().toList();
 		ArrayList<TocObject> objects = new ArrayList<>(list.size());
 		for (Object o : list) {
-			if (o instanceof TocObject)
+			if (o instanceof TocObject) {
 				objects.add((TocObject) o);
+			}
 		}
 		boolean beep = false;
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java
@@ -53,8 +53,9 @@ public void setToRemove(TocObject tocObject) {
 
 	@Override
 	public void run() {
-		if (fTocObjects == null)
+		if (fTocObjects == null) {
 			return;
+		}
 
 		for (int i = 0; i < fTocObjects.length; ++i) {
 			if (fTocObjects[i] != null && fTocObjects[i].canBeRemoved()) {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
@@ -64,8 +64,9 @@ private void configureParentLayout(Composite parent) {
 	public void createDetails(Composite parent) { // Create the main section
 		int style = ExpandableComposite.TITLE_BAR;
 
-		if (getDetailsDescription() != null)
+		if (getDetailsDescription() != null) {
 			style |= Section.DESCRIPTION;
+		}
 
 		fMainSection = getPage().createUISection(parent, getDetailsTitle(), getDetailsDescription(), style);
 		// Align the master and details section headers (misalignment caused
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java
@@ -111,12 +111,14 @@ private void initialize() {
 	private void initializePluginModel() {
 		IPluginModelBase base = PluginRegistry.findModel(getPluginProject());
 		// should never happen
-		if (base == null)
+		if (base == null) {
 			return;
-		if (base instanceof IBundlePluginModelBase)
+		}
+		if (base instanceof IBundlePluginModelBase) {
 			fExtensionsModel = ((IBundlePluginModelBase) base).getExtensionsModel();
-		else
+		} else {
 			fExtensionsModel = base;
+		}
 	}
 
 	@Override
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
@@ -82,8 +82,9 @@ protected void openFile() {
 				return;
 			}
 			IWorkbenchPage page = ww.getActivePage();
-			if (page == null || !fFile.exists())
+			if (page == null || !fFile.exists()) {
 				return;
+			}
 			IWorkbenchPart focusPart = page.getActivePart();
 			if (focusPart instanceof ISetSelectionTarget) {
 				ISelection selection = new StructuredSelection(fFile);
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
@@ -28,8 +28,9 @@ public class NewTocFileWizard extends TocHTMLWizard {
 	@Override
 	public void addPages() {
 		fPage = new TocWizardPage("tocfile", getSelection()); //$NON-NLS-1$
-		if (fInitialPath != null)
+		if (fInitialPath != null) {
 			fPage.setContainerFullPath(fInitialPath);
+		}
 		addPage(fPage);
 	}
 
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
@@ -85,12 +85,14 @@ private void initialize() {
 	private void initializePluginModel() {
 		IPluginModelBase base = PluginRegistry.findModel(getPluginProject());
 
-		if (base == null)
+		if (base == null) {
 			return;
-		if (base instanceof IBundlePluginModelBase)
+		}
+		if (base instanceof IBundlePluginModelBase) {
 			fExtensionsModel = ((IBundlePluginModelBase) base).getExtensionsModel();
-		else
+		} else {
 			fExtensionsModel = base;
+		}
 	}
 
 	private void updateUI() {
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
@@ -83,8 +83,9 @@ protected void openFile() {
 				return;
 			}
 			IWorkbenchPage page = ww.getActivePage();
-			if (page == null || !fFile.exists())
+			if (page == null || !fFile.exists()) {
 				return;
+			}
 			IWorkbenchPart focusPart = page.getActivePart();
 			if (focusPart instanceof ISetSelectionTarget) {
 				ISelection selection = new StructuredSelection(fFile);

Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,15 @@ public static void logException(Throwable e, final String title,`
`87`	`87`	`e = ((InvocationTargetException) e).getTargetException();`
`88`	`88`	`}`
`89`	`89`	`IStatus status = null;`
`90`		`- if (e instanceof CoreException)`
	`90`	`+ if (e instanceof CoreException) {`
`91`	`91`	`status = ((CoreException) e).getStatus();`
`92`		`- else {`
`93`		`- if (message == null)`
	`92`	`+ } else {`
	`93`	`+ if (message == null) {`
`94`	`94`	`message = e.getMessage();`
`95`		`- if (message == null)`
	`95`	`+ }`
	`96`	`+ if (message == null) {`
`96`	`97`	`message = e.toString();`
	`98`	`+ }`
`97`	`99`	`status = Status.error(message, e);`
`98`	`100`	`}`
`99`	`101`	`ResourcesPlugin.getPlugin().getLog().log(status);`
`@@ -112,8 +114,9 @@ public static IWorkbenchPage getActivePage() {`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`public PDEUserAssistanceLabelProvider getLabelProvider() {`
`115`		`- if (fLabelProvider == null)`
	`117`	`+ if (fLabelProvider == null) {`
`116`	`118`	`fLabelProvider = new PDEUserAssistanceLabelProvider();`
	`119`	`+ }`
`117`	`120`	`return fLabelProvider;`
`118`	`121`	`}`
`119`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,9 @@ private static ImageDescriptor create(String prefix, String name) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public static Image get(String key) {`
`73`		`- if (PLUGIN_REGISTRY == null)`
	`73`	`+ if (PLUGIN_REGISTRY == null) {`
`74`	`74`	`initialize();`
	`75`	`+ }`
`75`	`76`	`return PLUGIN_REGISTRY.get(key);`
`76`	`77`	`}`
`77`	`78`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,9 @@ private static boolean hasValidTocExtension(IPath path) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public static boolean isTOCFile(IPath path) {`
`69`		`- if (!hasValidTocExtension(path))`
	`69`	`+ if (!hasValidTocExtension(path)) {`
`70`	`70`	`return false;`
	`71`	`+ }`
`71`	`72`
`72`	`73`	`IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();`
`73`	`74`