Fix Javadoc + compiler warnings

Author: laeubi

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java

@@ -688,7 +688,7 @@ public IDialogSettings getDialogSettings() {
 	/**
 	 * Sets the associated dialog settings storage.
 	 *
-	 * @return The dialog settings storage.
+	 * @param dialogSettings The dialog settings storage.
 	 */
 	public void setDialogSettings(IDialogSettings dialogSettings) {
 		this.dialogSettings = dialogSettings;

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java

@@ -39,7 +39,6 @@ public abstract class AbstractTriggerCommandHandler extends AbstractHandler {
 	 * @param commandId The command id. Must not be <code>null</code>.
 	 * @param selection The selection to pass on to the command or <code>null</code>.
 	 */
-	@SuppressWarnings("cast")
 	protected void triggerCommand(String commandId, ISelection selection) {
 		Assert.isNotNull(commandId);
 

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java

@@ -73,6 +73,7 @@ protected IContributionItem[] getContributionItems() {
 
 						ImageData id = icon != null ? ExternalExecutablesUtils.loadImage(icon) : null;
 						if (id != null) {
+							@SuppressWarnings("deprecation")
 							ImageDescriptor desc = ImageDescriptor.createFromImageData(id);
 							if (desc != null)
 								action.setImageDescriptor(desc);

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java

@@ -291,11 +291,17 @@ public void widgetSelected(SelectionEvent e) {
 				// Determine the filter path
 				String text = workingDir.getText();
 				if (Messages.PreferencePage_workingDir_userhome_label.equals(text)) {
-					dialog.setFilterPath(uh.toOSString());
+					if (uh != null) {
+						dialog.setFilterPath(uh.toOSString());
+					}
 				} else if (Messages.PreferencePage_workingDir_eclipsehome_label.equals(text)) {
-					dialog.setFilterPath(eh.toOSString());
+					if (eh != null) {
+						dialog.setFilterPath(eh.toOSString());
+					}
 				} else if (Messages.PreferencePage_workingDir_eclipsews_label.equals(text)) {
-					dialog.setFilterPath(ew.toOSString());
+					if (ew != null) {
+						dialog.setFilterPath(ew.toOSString());
+					}
 				} else if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$
 					try {
 						// Resolve possible dynamic variables
@@ -313,11 +319,11 @@ public void widgetSelected(SelectionEvent e) {
 				if (selected != null) {
 					IPath sp = new Path(selected);
 
-					if (uh.equals(sp)) {
+					if (sp.equals(uh)) {
 						workingDir.select(0);
-					} else if (eh.equals(sp)) {
+					} else if (sp.equals(eh)) {
 						workingDir.select(1);
-					} else if (ew.equals(sp)) {
+					} else if (sp.equals(ew)) {
 						workingDir.select(2);
 					} else {
 						workingDir.setText(sp.toOSString());
@@ -527,6 +533,7 @@ public Image getColumnImage(Object element, int columnIndex) {
 							if (i == null) {
 								ImageData id = ExternalExecutablesUtils.loadImage(icon);
 								if (id != null) {
+									@SuppressWarnings("deprecation")
 									ImageDescriptor d = ImageDescriptor.createFromImageData(id);
 									if (d != null)
 										i = d.createImage();

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java

@@ -257,7 +257,6 @@ public void openConsole(final Map<String, Object> properties, final Done done) {
 
 		executeServiceOperation(properties, new TerminalServiceRunnable() {
 			@Override
-			@SuppressWarnings("synthetic-access")
 			public void run(final String id, final String secondaryId, final String title,
 					final ITerminalConnector connector, final Object data, final Done done) {
 				if (restoringView) {

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/OpenFileMouseHandler.java

@@ -88,6 +88,7 @@ public class OpenFileMouseHandler implements ITerminalMouseListener2 {
 		}
 	}
 
+	@SuppressWarnings("restriction")
 	@Override
 	public void mouseUp(ITerminalTextDataReadOnly terminalText, int line, int column, int button, int stateMask) {
 		if ((stateMask & SWT.MODIFIER_MASK) != SWT.MOD1) {
@@ -134,7 +135,7 @@ public void mouseUp(ITerminalTextDataReadOnly terminalText, int line, int column
 					// relative path: try to append to the working directory
 					Optional<String> workingDirectory = terminal.getTerminalConnector().getWorkingDirectory();
 					if (workingDirectory.isPresent()) {
-						fullPath = Optional.of(workingDirectory.get() + "/" + textToOpen);
+						fullPath = Optional.of(workingDirectory.get() + "/" + textToOpen); //$NON-NLS-1$
 					}
 				}
 				// if the selection is a file location that maps to a resource
@@ -160,8 +161,9 @@ public void mouseUp(ITerminalTextDataReadOnly terminalText, int line, int column
 						// continue
 					}
 				}
+				ResourcesPlugin.getPlugin();
 				OpenResourceDialog openResourceDialog = new OpenResourceDialog(site.getShell(),
-						ResourcesPlugin.getPlugin().getWorkspace().getRoot(), IResource.FILE);
+						ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE);
 				openResourceDialog.setInitialPattern(textToOpen);
 				if (openResourceDialog.open() != Window.OK)
 					return;

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java

@@ -225,7 +225,6 @@ public void dispose() {
 	 *
 	 * @return The created tab item or <code>null</code> if failed.
 	 */
-	@SuppressWarnings({ "unused" })
 	public CTabItem createTabItem(String title, String encoding, ITerminalConnector connector, Object data,
 			Map<String, Boolean> flags) {
 		Assert.isNotNull(title);
@@ -832,7 +831,7 @@ public final void updateStatusLine() {
 				buffer.append(state2msg(item, terminal.getState()));
 				buffer.append(" - "); //$NON-NLS-1$
 
-				String encoding = terminal.getEncoding();
+				String encoding = terminal.getCharset().name();
 				if (encoding == null || "UTF-8".equals(encoding)) { //$NON-NLS-1$
 					encoding = "Default (UTF-8)"; //$NON-NLS-1$
 				}

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java

@@ -153,7 +153,6 @@ public void dispose() {
 	 * Setup the context menu for the tab folder. The method will return
 	 * immediately if the menu handler had been initialized before.
 	 *
-	 * @param tabFolder The tab folder control. Must not be <code>null</code>.
 	 */
 	public void initialize() {
 		// Return immediately if the menu manager and menu got initialized already

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java

@@ -62,7 +62,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 			// The VlmConsoleTabFolderManager is listening to the selection changes of the
 			// TabFolder and fires selection changed events.
-			if (enable && event.getSource() instanceof TabFolderManager) {
+			if (event != null && event.getSource() instanceof TabFolderManager) {
 				enable = event.getSelection() instanceof StructuredSelection && !event.getSelection().isEmpty()
 						&& (((StructuredSelection) event.getSelection()).getFirstElement() instanceof CTabItem
 								|| ((StructuredSelection) event.getSelection()).getFirstElement() instanceof String);
@@ -141,7 +141,6 @@ public void dispose() {
 	 * Setup the context menu for the tab folder. The method will return
 	 * immediately if the toolbar handler had been initialized before.
 	 *
-	 * @param tabFolder The tab folder control. Must not be <code>null</code>.
 	 */
 	public void initialize() {
 		// Return immediately if the toolbar manager got initialized already

terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java

@@ -689,13 +689,6 @@ public boolean show(ShowInContext context) {
 							elements.add(adapted);
 						continue;
 					}
-
-					if (adapted != null) {
-						if (!elements.contains(adapted))
-							elements.add(adapted);
-						continue;
-					}
-
 					isValid = false;
 				}