[nobug] Fix typos and expansion levels Change-Id: I8c2d987830d72bea41a6fbef7e979a4410637f99
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java index 12ff1b4..6b5ff2d 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2016 IBM Corporation and others. + * Copyright (c) 2003, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ protected Button showAdapters; protected Link prefLink; protected AbstractTreeContentProvider contentProvider; - boolean showAdaptersLink = false; // To control the display of Show Downloadable Adpaters Link + boolean showAdaptersLink = false; // To control the display of Show Downloadable Adapters Link public AbstractTreeComposite(Composite parent) { @@ -145,7 +145,7 @@ } protected void createTree() { - tree = new FilteredTree(this, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new ServerPatternFilter(), true); + tree = new FilteredTree(this, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new ServerPatternFilter(), true, true); } protected abstract String getDescriptionLabel();
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java index 45320b3..8e1d29e 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java
@@ -52,11 +52,11 @@ protected abstract void fillTree(); - protected void fillAdapterTree(final TreeViewer treeViewer, final IProgressMonitor monitor){ + protected void fillAdapterTree(final TreeViewer treeViewer, final IProgressMonitor monitor) { final Thread t = new Thread(Messages.jobInitializingServersView) { - public void run() { - deferredAdapterInitialize(treeViewer, monitor); - } + public void run() { + deferredAdapterInitialize(treeViewer, monitor); + } }; t.setDaemon(true); t.start();
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java index 58ea699..e337bda 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2016 IBM Corporation and others. + * Copyright (c) 2003, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.util.ConfigureColumns; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ISelection; @@ -23,17 +24,17 @@ import org.eclipse.jface.viewers.LabelProviderChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.IShellProvider; -import org.eclipse.jface.util.ConfigureColumns; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; -import org.eclipse.swt.widgets.Button; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -93,7 +94,7 @@ }); treeViewer.setLabelProvider(labelProvider); treeViewer.setInput(AbstractTreeContentProvider.ROOT); - treeViewer.expandToLevel(1); + treeViewer.expandToLevel(2); treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent event) { @@ -163,8 +164,10 @@ Display.getDefault().asyncExec(new Runnable() { public void run() { try { - if (contentProvider.getInitialSelection(module.getProject()) != null) - treeViewer.setSelection(new StructuredSelection(contentProvider.getInitialSelection(module.getProject())), true); + Object initial = contentProvider.getInitialSelection(module.getProject()); + if (initial != null) { + treeViewer.setSelection(new StructuredSelection(initial), true); + } } catch (Exception e) { // ignore - wizard has already been closed } @@ -194,5 +197,9 @@ GridData data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING); data.horizontalSpan = 1; columnsButton.setLayoutData(data); - } -} \ No newline at end of file + } + @Override + public TreeViewer getTreeViewer() { + return super.getTreeViewer(); + } +}
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java index e0d0fd9..fed7b08 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -229,6 +229,7 @@ if (isExistingServer()) { mode = MODE_EXISTING; stackLayout.topControl = existingComp; + existingComp.getTreeViewer().expandAll(); existing.setSelection(true); } else { mode = MODE_MANUAL;