Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProduct;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
Expand Down Expand Up @@ -74,7 +75,6 @@
import org.eclipse.ui.internal.ide.IDEInternalPreferences;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.ide.StatusUtil;
import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.osgi.framework.Bundle;
import org.osgi.framework.Version;
Expand Down Expand Up @@ -165,11 +165,13 @@ public Object start(IApplicationContext appContext) throws Exception {
// look and see if there's a splash shell we can parent off of
Shell shell = WorkbenchPlugin.getSplashShell(display);
if (shell != null) {
// should should set the icon and message for this shell to be the
// same as the chooser dialog - this will be the guy that lives in
// the task bar and without these calls you'd have the default icon
// with no message.
shell.setText(ChooseWorkspaceDialog.getWindowTitle());
// Set the taskbar title and icon for the splash shell. The title
// is taken from the configured product; if no product is set, the
// launcher's default title is kept.
IProduct product = Platform.getProduct();
if (product != null && product.getName() != null) {
shell.setText(product.getName());
}
shell.setImages(Window.getDefaultImages());
}

Expand Down Expand Up @@ -836,8 +838,7 @@ private static void writeWorkspaceVersion() {
try (OutputStream output = new FileOutputStream(versionFile)) {
props.store(output, null);
} catch (IOException e) {
IDEWorkbenchPlugin.log("Could not write version file", //$NON-NLS-1$
StatusUtil.newError(e));
ILog.of(IDEApplication.class).error("Could not write version file", e); //$NON-NLS-1$
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ protected class PreferenceFilteredTree extends FilteredTree {
super(parent, treeStyle, filter, true, true);
}

@Override
protected Text doCreateFilterText(Composite parent) {
return new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH | SWT.ICON_CANCEL);
}

@Override
public void setInitialText(String text) {
if (filterText != null && !filterText.isDisposed()) {
filterText.setMessage(text != null ? text : ""); //$NON-NLS-1$
}
}

/**
* Add an additional, optional filter to the viewer. If the filter text is
* cleared, this filter will be removed from the TreeViewer.
Expand Down